diff options
1391 files changed, 25583 insertions, 16513 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f4433807809..48b84f8c36c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -15,7 +15,7 @@ Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/do <!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. --> -- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) +- [ ] Tested using sandboxing ([nix.useSandbox](https://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](https://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) - Built on platform(s) - [ ] NixOS - [ ] macOS diff --git a/doc/contributing/quick-start.xml b/doc/contributing/quick-start.xml index 8e4e914d451..09d60834ec2 100644 --- a/doc/contributing/quick-start.xml +++ b/doc/contributing/quick-start.xml @@ -111,7 +111,7 @@ </para> <para> The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the <link - xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter on writing Nix expressions</link>. + xlink:href="https://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter on writing Nix expressions</link>. </para> </listitem> <listitem> diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 6ee450eeb59..1a8924082bf 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -167,7 +167,7 @@ parameters that the SDK composition function (the function shown in the previous section) supports. This build function is particularly useful when it is desired to use -[Hydra](http://nixos.org/hydra): the Nix-based continuous integration solution +[Hydra](https://nixos.org/hydra): the Nix-based continuous integration solution to build Android apps. An Android APK gets exposed as a build product and can be installed on any Android device with a web browser by navigating to the build result page. diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 7671714d8a9..159216ca981 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -40,6 +40,23 @@ </para> </section> + <section xml:id="ssec-icon-theme-packaging"> + <title>Packaging icon themes</title> + + <para> + Icon themes may inherit from other icon themes. The inheritance is specified using the <literal>Inherits</literal> key in the <filename>index.theme</filename> file distributed with the icon theme. According to the <link xlink:href="https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html">icon theme specification</link>, icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. + </para> + + <para> + The package <package>hicolor-icon-theme</package> provides a setup hook which makes symbolic links for the parent themes into the directory <filename>share/icons</filename> of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with <package>hicolor-icon-theme</package>. + </para> + + <para> + Also make sure that <filename>icon-theme.cache</filename> is installed for each theme provided by the package, and set <code>dontDropIconThemeCache</code> to <code>true</code> so that the cache file is not removed by the <package>gtk3</package> setup hook. + </para> + + </section> + <section xml:id="ssec-gnome-themes"> <title>GTK Themes</title> diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 84b146532b1..70c135555ea 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -192,18 +192,6 @@ deis = buildGoPackage rec { </para> <para> - <varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows: -<screen> -<prompt>$ </prompt>nix-build -A deis.bin -</screen> - or build all outputs with: -<screen> -<prompt>$ </prompt>nix-build -A deis.all -</screen> - <varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname> or <varname>systemPackages</varname>. - </para> - - <para> You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: <screen> for p in $NIX_PROFILES; do diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index b727f2fb634..cba4d0561b0 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -103,8 +103,8 @@ command displays the complete list of available compilers: $ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler haskell.compiler.ghc8101 ghc-8.10.1 haskell.compiler.integer-simple.ghc8101 ghc-8.10.1 -haskell.compiler.ghcHEAD ghc-8.11.20200403 -haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200403 +haskell.compiler.ghcHEAD ghc-8.11.20200505 +haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200505 haskell.compiler.ghc822Binary ghc-8.2.2-binary haskell.compiler.ghc844 ghc-8.4.4 haskell.compiler.ghc863Binary ghc-8.6.3-binary diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md index 5a81795c004..768e0690b96 100644 --- a/doc/languages-frameworks/ios.section.md +++ b/doc/languages-frameworks/ios.section.md @@ -18,7 +18,7 @@ The primary objective of this project is to use the Nix expression language to specify how iOS apps can be built from source code, and to automatically spawn iOS simulator instances for testing. -This component also makes it possible to use [Hydra](http://nixos.org/hydra), +This component also makes it possible to use [Hydra](https://nixos.org/hydra), the Nix-based continuous integration server to regularly build iOS apps and to do wireless ad-hoc installations of enterprise IPAs on iOS devices through Hydra. diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index e6f0b64fa9c..00d5d0ff04c 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -9,7 +9,7 @@ Several versions of the Python interpreter are available on Nix, as well as a high amount of packages. The attribute `python` refers to the default interpreter, which is currently CPython 2.7. It is also possible to refer to -specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to +specific versions, e.g. `python38` refers to CPython 3.8, and `pypy` refers to the default PyPy interpreter. Python is used a lot, and in different ways. This affects also how it is @@ -25,10 +25,10 @@ however, are in separate sets, with one set per interpreter version. The interpreters have several common attributes. One of these attributes is `pkgs`, which is a package set of Python libraries for this specific interpreter. E.g., the `toolz` package corresponding to the default interpreter -is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`. +is `python.pkgs.toolz`, and the CPython 3.8 version is `python38.pkgs.toolz`. The main package set contains aliases to these package sets, e.g. -`pythonPackages` refers to `python.pkgs` and `python35Packages` to -`python35.pkgs`. +`pythonPackages` refers to `python.pkgs` and `python38Packages` to +`python38.pkgs`. #### Installing Python and packages @@ -50,7 +50,7 @@ to create an environment with `python.buildEnv` or `python.withPackages` where the interpreter and other executables are able to find each other and all of the modules. -In the following examples we create an environment with Python 3.5, `numpy` and +In the following examples we create an environment with Python 3.8, `numpy` and `toolz`. As you may imagine, there is one limitation here, and that's that you can install only one environment at a time. You will notice the complaints about collisions when you try to install a second environment. @@ -61,7 +61,7 @@ Create a file, e.g. `build.nix`, with the following expression ```nix with import <nixpkgs> {}; -python35.withPackages (ps: with ps; [ numpy toolz ]) +python38.withPackages (ps: with ps; [ numpy toolz ]) ``` and install it in your profile with ```shell @@ -79,7 +79,7 @@ Nixpkgs set, e.g. using `config.nix`, { # ... packageOverrides = pkgs: with pkgs; { - myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]); + myEnv = python38.withPackages (ps: with ps; [ numpy toolz ]); }; } ``` @@ -101,7 +101,7 @@ environment system-wide. { # ... environment.systemPackages = with pkgs; [ - (python35.withPackages(ps: with ps; [ numpy toolz ])) + (python38.withPackages(ps: with ps; [ numpy toolz ])) ]; } ``` @@ -118,7 +118,7 @@ recommended method is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g. ```sh -$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])' +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' ``` opens a shell from which you can launch the interpreter @@ -131,7 +131,7 @@ The other method, which is not recommended, does not create an environment and requires you to list the packages directly, ```sh -$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz +$ nix-shell -p python38.pkgs.numpy python38.pkgs.toolz ``` Again, it is possible to launch the interpreter from the shell. The Python @@ -140,14 +140,14 @@ that specific interpreter. ##### Load environment from `.nix` expression As explained in the Nix manual, `nix-shell` can also load an -expression from a `.nix` file. Say we want to have Python 3.5, `numpy` +expression from a `.nix` file. Say we want to have Python 3.8, `numpy` and `toolz`, like before, in an environment. Consider a `shell.nix` file with ```nix with import <nixpkgs> {}; -(python35.withPackages (ps: [ps.numpy ps.toolz])).env +(python38.withPackages (ps: [ps.numpy ps.toolz])).env ``` Executing `nix-shell` gives you again a Nix shell from which you can run Python. @@ -158,7 +158,7 @@ What's happening here? imports the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. -2. Then we create a Python 3.5 environment with the `withPackages` function. +2. Then we create a Python 3.8 environment with the `withPackages` function. 3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` @@ -170,7 +170,7 @@ To combine this with `mkShell` you can: with import <nixpkgs> {}; let - pythonEnv = python35.withPackages (ps: [ + pythonEnv = python38.withPackages (ps: [ ps.numpy ps.toolz ]); @@ -188,13 +188,13 @@ option, with which you can execute a command in the `nix-shell`. We can e.g. directly open a Python shell ```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3" +$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3" ``` or run a script ```sh -$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py" +$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3 myscript.py" ``` ##### `nix-shell` as shebang @@ -231,11 +231,11 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; doCheck = false; @@ -260,8 +260,8 @@ information. The output of the function is a derivation. An expression for `toolz` can be found in the Nixpkgs repository. As explained in the introduction of this Python section, a derivation of `toolz` is available -for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz` -derivation corresponding to the CPython 3.5 interpreter. +for each interpreter version, e.g. `python38.pkgs.toolz` refers to the `toolz` +derivation corresponding to the CPython 3.8 interpreter. The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, you will want to test a Nix expression outside of the Nixpkgs tree. @@ -273,13 +273,13 @@ and adds it along with a `numpy` package to a Python environment. with import <nixpkgs> {}; ( let - my_toolz = python35.pkgs.buildPythonPackage rec { + my_toolz = python38.pkgs.buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; - src = python35.pkgs.fetchPypi { + src = python38.pkgs.fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; doCheck = false; @@ -290,12 +290,12 @@ with import <nixpkgs> {}; }; }; - in python35.withPackages (ps: [ps.numpy my_toolz]) + in python38.withPackages (ps: [ps.numpy my_toolz]) ).env ``` Executing `nix-shell` will result in an environment in which you can use -Python 3.5 and the `toolz` package. As you can see we had to explicitly mention +Python 3.8 and the `toolz` package. As you can see we had to explicitly mention for which Python version we want to build a package. So, what did we do here? Well, we took the Nix expression that we used earlier @@ -435,7 +435,7 @@ If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` is a local source, and if the local source has a `setup.py`, then development mode is activated. -In the following example we create a simple environment that has a Python 3.5 +In the following example we create a simple environment that has a Python 3.8 version of our package in it, as well as its dependencies and other packages we like to have in the environment, all specified with `propagatedBuildInputs`. Indeed, we can just add any package we like to have in our environment to @@ -443,7 +443,7 @@ Indeed, we can just add any package we like to have in our environment to ```nix with import <nixpkgs> {}; -with python35Packages; +with python38Packages; buildPythonPackage rec { name = "mypackage"; @@ -505,9 +505,9 @@ with import <nixpkgs> {}; ( let toolz = callPackage /path/to/toolz/release.nix { - buildPythonPackage = python35Packages.buildPythonPackage; + buildPythonPackage = python38Packages.buildPythonPackage; }; - in python35.withPackages (ps: [ ps.numpy toolz ]) + in python38.withPackages (ps: [ ps.numpy toolz ]) ).env ``` @@ -515,8 +515,8 @@ Important to remember is that the Python version for which the package is made depends on the `python` derivation that is passed to `buildPythonPackage`. Nix tries to automatically pass arguments when possible, which is why generally you don't explicitly define which `python` derivation should be used. In the above -example we use `buildPythonPackage` that is part of the set `python35Packages`, -and in this case the `python35` interpreter is automatically used. +example we use `buildPythonPackage` that is part of the set `python38Packages`, +and in this case the `python38` interpreter is automatically used. ## Reference @@ -662,7 +662,7 @@ following are specific to `buildPythonPackage`: variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this - defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications + defaults to `"python3.8-"` for Python 3.8, etc., and in case of applications to `""`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). @@ -960,7 +960,7 @@ has security implications and is relevant for those using Python in a When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` -and [PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). +and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. @@ -1014,7 +1014,7 @@ with import <nixpkgs> {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: {name="foo";}); }; - in pkgs.python35.override {inherit packageOverrides;}; + in pkgs.python38.override {inherit packageOverrides;}; in python.withPackages(ps: [ps.pandas])).env ``` @@ -1036,7 +1036,7 @@ with import <nixpkgs> {}; packageOverrides = self: super: { scipy = super.scipy_0_17; }; - in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) + in (pkgs.python38.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze]) ).env ``` @@ -1049,12 +1049,12 @@ If you want the whole of Nixpkgs to use your modifications, then you can use ```nix let pkgs = import <nixpkgs> {}; - newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: { - python27 = let - packageOverrides = self: super: { - numpy = super.numpy_1_10; + newpkgs = import pkgs.path { overlays = [ (self: super: { + python38 = let + packageOverrides = python-self: python-super: { + numpy = python-super.numpy_1_18.3; }; - in pkgssuper.python27.override {inherit packageOverrides;}; + in super.python38.override {inherit packageOverrides;}; } ) ]; }; in newpkgs.inkscape ``` diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 7fa65ab1102..549e42de7aa 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -42,7 +42,7 @@ distributed as soon as all tests for that channel pass, e.g. [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) shows the status of tests for the `nixpkgs` channel. -The tests are conducted by a cluster called [Hydra](http://nixos.org/hydra/), +The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), which also builds binary packages from the Nix expressions in Nixpkgs for `x86_64-linux`, `i686-linux` and `x86_64-darwin`. The binaries are made available via a [binary cache](https://cache.nixos.org). diff --git a/doc/release-notes.xml b/doc/release-notes.xml index 7575289e755..a15f5466729 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -286,7 +286,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</prog <note> <para> This release of Nixpkgs requires <link -xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> or higher. +xlink:href='https://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link> or higher. </para> </note> @@ -436,7 +436,7 @@ stdenv.mkDerivation { <listitem> <para> Distribution files have been moved to <link - xlink:href="http://nixos.org/" />. + xlink:href="https://nixos.org/" />. </para> </listitem> <listitem> diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 206203be1ce..65a343d7edd 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -145,7 +145,7 @@ genericBuild </listitem> <listitem> <para> - GNU Make. It has been patched to provide <quote>nested</quote> output that can be fed into the <command>nix-log2xml</command> command and <command>log2html</command> stylesheet to create a structured, readable output of the build steps performed by Make. + GNU Make. </para> </listitem> <listitem> diff --git a/lib/default.nix b/lib/default.nix index d00c4abec0a..e7f59a67abb 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -141,7 +141,7 @@ let mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults mergeAttrsByFuncDefaultsClean mergeAttrBy - fakeSri fakeSha256 fakeSha512 + fakeHash fakeSha256 fakeSha512 nixType imap; inherit (versions) splitVersion; diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 8c4fe9c390c..be0ef904c66 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -272,7 +272,7 @@ rec { imap = imap1; # Fake hashes. Can be used as hash placeholders, when computing hash ahead isn't trivial - fakeSri = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + fakeHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; fakeSha256 = "0000000000000000000000000000000000000000000000000000000000000000"; fakeSha512 = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; } diff --git a/lib/kernel.nix b/lib/kernel.nix index 2ce19f8cb68..8045a228d05 100644 --- a/lib/kernel.nix +++ b/lib/kernel.nix @@ -14,7 +14,7 @@ with lib; freeform = x: { freeform = x; }; /* - Common patterns/legacy used in common-config/hardened-config.nix + Common patterns/legacy used in common-config/hardened/config.nix */ whenHelpers = version: { whenAtLeast = ver: mkIf (versionAtLeast version ver); diff --git a/lib/lists.nix b/lib/lists.nix index f9f30412770..f424946c72c 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -73,8 +73,8 @@ rec { lconcat [ "a" "b" "c" ] => "zabc" # different types - lstrange = foldl (str: int: str + toString (int + 1)) "" - strange [ 1 2 3 4 ] + lstrange = foldl (str: int: str + toString (int + 1)) "a" + lstrange [ 1 2 3 4 ] => "a2345" */ foldl = op: nul: list: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9c98d743ee5..72d20a5a702 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1662,6 +1662,12 @@ } ]; }; + cyplo = { + email = "nixos@cyplo.dev"; + github = "cyplo"; + githubId = 217899; + name = "Cyryl Płotnicki"; + }; d-goldin = { email = "dgoldin+github@protonmail.ch"; github = "d-goldin"; @@ -2038,6 +2044,12 @@ githubId = 108501; name = "David Pflug"; }; + dramaturg = { + email = "seb@ds.ag"; + github = "dramaturg"; + githubId = 472846; + name = "Sebastian Krohn"; + }; drets = { email = "dmitryrets@gmail.com"; github = "drets"; @@ -2476,7 +2488,7 @@ }; evils = { email = "evils.devils@protonmail.com"; - github = "evils-devils"; + github = "evils"; githubId = 30512529; name = "Evils"; }; @@ -4019,12 +4031,6 @@ fingerprint = "8992 44FC D291 5CA2 0A97 802C 156C 88A5 B0A0 4B2A"; }]; }; - kjuvi = { - email = "quentin.vaucher@pm.me"; - github = "kjuvi"; - githubId = 17534323; - name = "Quentin Vaucher"; - }; kkallio = { email = "tierpluspluslists@gmail.com"; name = "Karn Kallio"; @@ -4429,6 +4435,16 @@ fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; }]; }; + lourkeur = { + name = "Louis Bettens"; + email = "louis@bettens.info"; + github = "lourkeur"; + githubId = 15657735; + keys = [{ + longkeyid = "ed25519/0xDFE1D4A017337E2A"; + fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; + }]; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; @@ -5054,6 +5070,12 @@ githubId = 3269878; name = "Miguel Madrid Mencía"; }; + mindavi = { + email = "rol3517@gmail.com"; + github = "Mindavi"; + githubId = 9799623; + name = "Rick van Schijndel"; + }; minijackson = { email = "minijackson@riseup.net"; github = "minijackson"; @@ -5780,6 +5802,12 @@ githubId = 15930073; name = "Moritz Scheuren"; }; + pablovsky = { + email = "dealberapablo07@gmail.com"; + github = "pablo1107"; + githubId = 17091659; + name = "Pablo Andres Dealbera"; + }; pacien = { email = "b4gx3q.nixpkgs@pacien.net"; github = "pacien"; @@ -5852,6 +5880,16 @@ githubId = 131844; name = "Igor Pashev"; }; + patryk27 = { + email = "wychowaniec.patryk@gmail.com"; + github = "Patryk27"; + githubId = 3395477; + name = "Patryk Wychowaniec"; + keys = [{ + longkeyid = "rsa4096/0xF62547D075E09767"; + fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; + }]; + }; patternspandemic = { email = "patternspandemic@live.com"; github = "patternspandemic"; @@ -7098,6 +7136,12 @@ githubId = 1505617; name = "Sean Lee"; }; + SlothOfAnarchy = { + email = "slothofanarchy1@gmail.com"; + github = "SlothOfAnarchy"; + githubId = 12828415; + name = "Michel Weitbrecht"; + }; smakarov = { email = "setser200018@gmail.com"; github = "setser"; @@ -7136,6 +7180,12 @@ githubId = 602439; name = "Serguei Narojnyi"; }; + snicket2100 = { + email = "57048005+snicket2100@users.noreply.github.com"; + github = "snicket2100"; + githubId = 57048005; + name = "snicket2100"; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; @@ -7598,12 +7648,6 @@ githubId = 1141680; name = "Thane Gill"; }; - the-kenny = { - email = "moritz@tarn-vedra.de"; - github = "the-kenny"; - githubId = 31167; - name = "Moritz Ulrich"; - }; thedavidmeister = { email = "thedavidmeister@gmail.com"; github = "thedavidmeister"; @@ -7656,12 +7700,24 @@ githubId = 7709; name = "Thomaz Leite"; }; + thomasdesr = { + email = "git@hive.pw"; + github = "thomasdesr"; + githubId = 681004; + name = "Thomas Desrosiers"; + }; ThomasMader = { email = "thomas.mader@gmail.com"; github = "ThomasMader"; githubId = 678511; name = "Thomas Mader"; }; + thomasjm = { + email = "tom@codedown.io"; + github = "thomasjm"; + githubId = 1634990; + name = "Tom McLaughlin"; + }; thoughtpolice = { email = "aseipp@pobox.com"; github = "thoughtpolice"; @@ -8317,6 +8373,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xiorcale = { + email = "quentin.vaucher@pm.me"; + github = "xiorcale"; + githubId = 17534323; + name = "Quentin Vaucher"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; diff --git a/maintainers/scripts/build.nix b/maintainers/scripts/build.nix new file mode 100644 index 00000000000..c70993cf138 --- /dev/null +++ b/maintainers/scripts/build.nix @@ -0,0 +1,43 @@ +{ maintainer }: + +# based on update.nix +# nix-build build.nix --argstr maintainer <yourname> + +let + pkgs = import ./../../default.nix {}; + maintainer_ = pkgs.lib.maintainers.${maintainer}; + packagesWith = cond: return: set: + (pkgs.lib.flatten + (pkgs.lib.mapAttrsToList + (name: pkg: + let + result = builtins.tryEval + ( + if pkgs.lib.isDerivation pkg && cond name pkg + then [ (return name pkg) ] + else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false + then packagesWith cond return pkg + else [ ] + ); + in + if result.success then result.value + else [ ] + ) + set + ) + ); +in +packagesWith + (name: pkg: + ( + if builtins.hasAttr "maintainers" pkg.meta + then ( + if builtins.isList pkg.meta.maintainers + then builtins.elem maintainer_ pkg.meta.maintainers + else maintainer_ == pkg.meta.maintainers + ) + else false + ) + ) + (name: pkg: pkg) + pkgs diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index 6e7ec2dbc00..0f738c5427b 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -79,7 +79,7 @@ def cli(jobset): and print a summary of failed builds """ - url = "http://hydra.nixos.org/jobset/{}".format(jobset) + url = "https://hydra.nixos.org/jobset/{}".format(jobset) # get the last evaluation click.echo(click.style( diff --git a/nixos/README b/nixos/README index 4ecf648a930..ce4dd1988d2 100644 --- a/nixos/README +++ b/nixos/README @@ -2,4 +2,4 @@ NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at -http://nixos.org/nixos and in the manual in doc/manual. +https://nixos.org/nixos and in the manual in doc/manual. diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index 182641055e4..02cb78f47e8 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -11,7 +11,7 @@ the package to your clone, and (optionally) submit a patch or pull request to have it accepted into the main Nixpkgs repository. This is described in detail in the <link -xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs +xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs manual</link>. In short, you clone Nixpkgs: <screen> <prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 5ef498cf9ae..5526dea247c 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -14,7 +14,7 @@ when managing complex systems. The syntax and semantics of the Nix language are fully described in the <link -xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix +xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link>, but here we give a short overview of the most important constructs useful in NixOS configuration files. </para> diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index ea980254a8f..289face16de 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -10,7 +10,7 @@ expression language. It’s not complete. In particular, there are many other built-in functions. See the <link -xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix +xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual</link> for the rest. </para> diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index ebf1f493c5c..abcf5f648a4 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -16,11 +16,11 @@ effects, some example settings: <programlisting> <link linkend="opt-services.picom.enable">services.picom</link> = { - <link linkend="opt-services.picom.enable">enable</link> = true; - <link linkend="opt-services.picom.fade">fade</link> = true; - <link linkend="opt-services.picom.inactiveOpacity">inactiveOpacity</link> = "0.9"; - <link linkend="opt-services.picom.shadow">shadow</link> = true; - <link linkend="opt-services.picom.fadeDelta">fadeDelta</link> = 4; + <link linkend="opt-services.picom.enable">enable</link> = true; + <link linkend="opt-services.picom.fade">fade</link> = true; + <link linkend="opt-services.picom.inactiveOpacity">inactiveOpacity</link> = 0.9; + <link linkend="opt-services.picom.shadow">shadow</link> = true; + <link linkend="opt-services.picom.fadeDelta">fadeDelta</link> = 4; }; </programlisting> </para> diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index cc0ec78cc74..8abc66dfec1 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -57,7 +57,7 @@ <listitem> <para> <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18"> - Make sure a channel is created at http://nixos.org/channels/. </link> + Make sure a channel is created at https://nixos.org/channels/. </link> </para> </listitem> <listitem> diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml index b4a466e2294..9fc5678ca1b 100644 --- a/nixos/doc/manual/development/replace-modules.xml +++ b/nixos/doc/manual/development/replace-modules.xml @@ -37,7 +37,7 @@ imports = [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable + # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable <nixos-unstable/nixos/modules/services/databases/postgresql.nix> ]; diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 56af5c0e25a..3b8671782de 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -7,7 +7,7 @@ <para> NixOS ISO images can be downloaded from the <link -xlink:href="http://nixos.org/nixos/download.html">NixOS download +xlink:href="https://nixos.org/nixos/download.html">NixOS download page</link>. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a @@ -26,7 +26,7 @@ xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installa <para> Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the - <link xlink:href="http://nixos.org/nixos/download.html">NixOS download + <link xlink:href="https://nixos.org/nixos/download.html">NixOS download page</link>. </para> </listitem> diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 9255ce763ef..84849282e9a 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -25,16 +25,6 @@ </group> </arg> <arg> - <group choice='req'> - <arg choice='plain'> - <option>--print-build-logs</option> - </arg> - <arg choice='plain'> - <option>-L</option> - </arg> - </group> - </arg> - <arg> <arg choice='plain'> <option>-I</option> </arg> @@ -179,12 +169,6 @@ </listitem> </varlistentry> <varlistentry> - <term><option>--print-build-logs</option> / <option>-L</option></term> - <listitem> - <para>Print the full build logs of <command>nix build</command> to stderr.</para> - </listitem> - </varlistentry> - <varlistentry> <term> <option>--root</option> </term> diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml index 8d8cea4303a..56dbb74a71d 100644 --- a/nixos/doc/manual/release-notes/rl-1404.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -49,7 +49,7 @@ <para> Nix has been updated to 1.7 (<link - xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>). + xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>). </para> </listitem> <listitem> diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 5c4d9970178..098c8c5095b 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -22,7 +22,7 @@ in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the <link - xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's + xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link>. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional @@ -555,7 +555,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc the compiler now is the <literal>haskellPackages.ghcWithPackages</literal> function. The <link - xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's + xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure</link> provides more information about this subject. </para> diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 9b512c4b1e5..6d4b28825fa 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -54,7 +54,7 @@ xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar> to a deterministic value, and Nix has <link - xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained + xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.11">gained an option</link> to repeat a build a number of times to test determinism. An ongoing project, the goal of exact reproducibility is to allow binaries to be verified independently (e.g., a user might only trust binaries that diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 78b8eee47ef..ede7bed609d 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -55,6 +55,12 @@ The new <varname>virtualisation.containers</varname> module manages configuration shared by the CRI-O and Podman modules. </para> </listitem> + <listitem> + <para> + Declarative Docker containers are renamed from <varname>docker-containers</varname> to <varname>virtualisation.oci-containers.containers</varname>. + This is to make it possible to use <literal>podman</literal> instead of <literal>docker</literal>. + </para> + </listitem> </itemizedlist> </section> @@ -71,7 +77,9 @@ <itemizedlist> <listitem> - <para /> + <para> + There is a new <xref linkend="opt-security.doas.enable"/> module that provides <command>doas</command>, a lighter alternative to <command>sudo</command> with many of the same features. + </para> </listitem> </itemizedlist> @@ -273,6 +281,13 @@ php.override { </listitem> <listitem> <para> + The Nginx log directory has been moved to <literal>/var/log/nginx</literal>, the cache directory + to <literal>/var/cache/nginx</literal>. The option <literal>services.nginx.stateDir</literal> has + been removed. + </para> + </listitem> + <listitem> + <para> The httpd web server previously started its main process as root privileged, then ran worker processes as a less privileged identity user. This was changed to start all of httpd as a less privileged user (defined by @@ -311,6 +326,24 @@ php.override { <manvolnum>5</manvolnum></citerefentry> for details. </para> </listitem> + <listitem> + <para> + In the <literal>picom</literal> module, several options that accepted + floating point numbers encoded as strings (for example + <xref linkend="opt-services.picom.activeOpacity"/>) have been changed + to the (relatively) new native <literal>float</literal> type. To migrate + your configuration simply remove the quotes around the numbers. + </para> + </listitem> + <listitem> + <para> + When using <literal>buildBazelPackage</literal> from Nixpkgs, + <literal>flat</literal> hash mode is now used for dependencies + instead of <literal>recursive</literal>. This is to better allow + using hashed mirrors where needed. As a result, these hashes + will have changed. + </para> + </listitem> </itemizedlist> </section> @@ -338,6 +371,11 @@ php.override { the <literal>notmuch.emacs</literal> output. </para> </listitem> + <listitem> + <para> + The default output of <literal>buildGoPackage</literal> is now <literal>$out</literal> instead of <literal>$bin</literal>. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl deleted file mode 100644 index 0485412b4c8..00000000000 --- a/nixos/lib/test-driver/log2html.xsl +++ /dev/null @@ -1,135 +0,0 @@ -<?xml version="1.0"?> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <xsl:output method='html' encoding="UTF-8" - doctype-public="-//W3C//DTD HTML 4.01//EN" - doctype-system="http://www.w3.org/TR/html4/strict.dtd" /> - - <xsl:template match="logfile"> - <html> - <head> - <script type="text/javascript" src="jquery.min.js"></script> - <script type="text/javascript" src="jquery-ui.min.js"></script> - <script type="text/javascript" src="treebits.js" /> - <link rel="stylesheet" href="logfile.css" type="text/css" /> - <title>Log File</title> - </head> - <body> - <h1>VM build log</h1> - <p> - <a href="javascript:" class="logTreeExpandAll">Expand all</a> | - <a href="javascript:" class="logTreeCollapseAll">Collapse all</a> - </p> - <ul class='toplevel'> - <xsl:for-each select='line|nest'> - <li> - <xsl:apply-templates select='.'/> - </li> - </xsl:for-each> - </ul> - - <xsl:if test=".//*[@image]"> - <h1>Screenshots</h1> - <ul class="vmScreenshots"> - <xsl:for-each select='.//*[@image]'> - <li><a href="{@image}"><xsl:value-of select="@image" /></a></li> - </xsl:for-each> - </ul> - </xsl:if> - - </body> - </html> - </xsl:template> - - - <xsl:template match="nest"> - - <!-- The tree should be collapsed by default if all children are - unimportant or if the header is unimportant. --> - <xsl:variable name="collapsed" select="not(./head[@expanded]) and count(.//*[@error]) = 0"/> - - <xsl:variable name="style"><xsl:if test="$collapsed">display: none;</xsl:if></xsl:variable> - - <xsl:if test="line|nest"> - <a href="javascript:" class="logTreeToggle"> - <xsl:choose> - <xsl:when test="$collapsed"><xsl:text>+</xsl:text></xsl:when> - <xsl:otherwise><xsl:text>-</xsl:text></xsl:otherwise> - </xsl:choose> - </a> - <xsl:text> </xsl:text> - </xsl:if> - - <xsl:apply-templates select='head'/> - - <!-- Be careful to only generate <ul>s if there are <li>s, otherwise it’s malformed. --> - <xsl:if test="line|nest"> - - <ul class='nesting' style="{$style}"> - <xsl:for-each select='line|nest'> - - <!-- Is this the last line? If so, mark it as such so that it - can be rendered differently. --> - <xsl:variable name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:variable> - - <li class='{$class}'> - <span class='lineconn' /> - <span class='linebody'> - <xsl:apply-templates select='.'/> - </span> - </li> - </xsl:for-each> - </ul> - </xsl:if> - - </xsl:template> - - - <xsl:template match="head|line"> - <code> - <xsl:if test="@error"> - <xsl:attribute name="class">errorLine</xsl:attribute> - </xsl:if> - <xsl:if test="@warning"> - <xsl:attribute name="class">warningLine</xsl:attribute> - </xsl:if> - <xsl:if test="@priority = 3"> - <xsl:attribute name="class">prio3</xsl:attribute> - </xsl:if> - - <xsl:if test="@type = 'serial'"> - <xsl:attribute name="class">serial</xsl:attribute> - </xsl:if> - - <xsl:if test="@machine"> - <xsl:choose> - <xsl:when test="@type = 'serial'"> - <span class="machine"><xsl:value-of select="@machine"/># </span> - </xsl:when> - <xsl:otherwise> - <span class="machine"><xsl:value-of select="@machine"/>: </span> - </xsl:otherwise> - </xsl:choose> - </xsl:if> - - <xsl:choose> - <xsl:when test="@image"> - <a href="{@image}"><xsl:apply-templates/></a> - </xsl:when> - <xsl:otherwise> - <xsl:apply-templates/> - </xsl:otherwise> - </xsl:choose> - </code> - </xsl:template> - - - <xsl:template match="storeref"> - <em class='storeref'> - <span class='popup'><xsl:apply-templates/></span> - <span class='elided'>/...</span><xsl:apply-templates select='name'/><xsl:apply-templates select='path'/> - </em> - </xsl:template> - -</xsl:stylesheet> diff --git a/nixos/lib/test-driver/logfile.css b/nixos/lib/test-driver/logfile.css deleted file mode 100644 index a54d8504a86..00000000000 --- a/nixos/lib/test-driver/logfile.css +++ /dev/null @@ -1,129 +0,0 @@ -body { - font-family: sans-serif; - background: white; -} - -h1 -{ - color: #005aa0; - font-size: 180%; -} - -a { - text-decoration: none; -} - - -ul.nesting, ul.toplevel { - padding: 0; - margin: 0; -} - -ul.toplevel { - list-style-type: none; -} - -.line, .head { - padding-top: 0em; -} - -ul.nesting li.line, ul.nesting li.lastline { - position: relative; - list-style-type: none; -} - -ul.nesting li.line { - padding-left: 2.0em; -} - -ul.nesting li.lastline { - padding-left: 2.1em; /* for the 0.1em border-left in .lastline > .lineconn */ -} - -li.line { - border-left: 0.1em solid #6185a0; -} - -li.line > span.lineconn, li.lastline > span.lineconn { - position: absolute; - height: 0.65em; - left: 0em; - width: 1.5em; - border-bottom: 0.1em solid #6185a0; -} - -li.lastline > span.lineconn { - border-left: 0.1em solid #6185a0; -} - - -em.storeref { - color: #500000; - position: relative; - width: 100%; -} - -em.storeref:hover { - background-color: #eeeeee; -} - -*.popup { - display: none; -/* background: url('http://losser.st-lab.cs.uu.nl/~mbravenb/menuback.png') repeat; */ - background: #ffffcd; - border: solid #555555 1px; - position: absolute; - top: 0em; - left: 0em; - margin: 0; - padding: 0; - z-index: 100; -} - -em.storeref:hover span.popup { - display: inline; - width: 40em; -} - - -.logTreeToggle { - text-decoration: none; - font-family: monospace; - font-size: larger; -} - -.errorLine { - color: #ff0000; - font-weight: bold; -} - -.warningLine { - color: darkorange; - font-weight: bold; -} - -.prio3 { - font-style: italic; -} - -code { - white-space: pre-wrap; -} - -.serial { - color: #56115c; -} - -.machine { - color: #002399; - font-style: italic; -} - -ul.vmScreenshots { - padding-left: 1em; -} - -ul.vmScreenshots li { - font-family: monospace; - list-style: square; -} diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index d96600b3c99..bf46d0df97f 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -143,7 +143,7 @@ class Logger: self.logfile = os.environ.get("LOGFILE", "/dev/null") self.logfile_handle = codecs.open(self.logfile, "wb") self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") - self.queue: "Queue[Dict[str, str]]" = Queue(1000) + self.queue: "Queue[Dict[str, str]]" = Queue() self.xml.startDocument() self.xml.startElement("logfile", attrs={}) @@ -369,7 +369,7 @@ class Machine: q = q.replace("'", "\\'") return self.execute( ( - "su -l {} -c " + "su -l {} --shell /bin/sh -c " "$'XDG_RUNTIME_DIR=/run/user/`id -u` " "systemctl --user {}'" ).format(user, q) @@ -391,11 +391,11 @@ class Machine: def execute(self, command: str) -> Tuple[int, str]: self.connect() - out_command = "( {} ); echo '|!EOF' $?\n".format(command) + out_command = "( {} ); echo '|!=EOF' $?\n".format(command) self.shell.send(out_command.encode()) output = "" - status_code_pattern = re.compile(r"(.*)\|\!EOF\s+(\d+)") + status_code_pattern = re.compile(r"(.*)\|\!=EOF\s+(\d+)") while True: chunk = self.shell.recv(4096).decode(errors="ignore") diff --git a/nixos/lib/test-driver/treebits.js b/nixos/lib/test-driver/treebits.js deleted file mode 100644 index 9754093dfd0..00000000000 --- a/nixos/lib/test-driver/treebits.js +++ /dev/null @@ -1,30 +0,0 @@ -$(document).ready(function() { - - /* When a toggle is clicked, show or hide the subtree. */ - $(".logTreeToggle").click(function() { - if ($(this).siblings("ul:hidden").length != 0) { - $(this).siblings("ul").show(); - $(this).text("-"); - } else { - $(this).siblings("ul").hide(); - $(this).text("+"); - } - }); - - /* Implementation of the expand all link. */ - $(".logTreeExpandAll").click(function() { - $(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() { - $(this).siblings("ul").show(); - $(this).text("-"); - }); - }); - - /* Implementation of the collapse all link. */ - $(".logTreeCollapseAll").click(function() { - $(".logTreeToggle", $(this).parent().siblings(".toplevel")).map(function() { - $(this).siblings("ul").hide(); - $(this).text("+"); - }); - }); - -}); diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 3891adc1043..88801f20517 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -62,25 +62,11 @@ in rec { requiredSystemFeatures = [ "kvm" "nixos-test" ]; - buildInputs = [ libxslt ]; - buildCommand = '' - mkdir -p $out/nix-support - - LOGFILE=$out/log.xml tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver - - # Generate a pretty-printed log. - xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml - ln -s ${./test-driver/logfile.css} $out/logfile.css - ln -s ${./test-driver/treebits.js} $out/treebits.js - ln -s ${jquery}/js/jquery.min.js $out/ - ln -s ${jquery}/js/jquery.js $out/ - ln -s ${jquery-ui}/js/jquery-ui.min.js $out/ - ln -s ${jquery-ui}/js/jquery-ui.js $out/ + mkdir -p $out - touch $out/nix-support/hydra-build-products - echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products + LOGFILE=/dev/null tests='exec(os.environ["testScript"])' ${driver}/bin/nixos-test-driver for i in */xchg/coverage-data; do mkdir -p $out/coverage-data diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 7d6a5c0a290..cbb7faf039e 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -58,23 +58,11 @@ in rec { requiredSystemFeatures = [ "kvm" "nixos-test" ]; - buildInputs = [ libxslt ]; - buildCommand = '' - mkdir -p $out/nix-support - - LOGFILE=$out/log.xml tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver - - # Generate a pretty-printed log. - xsltproc --output $out/log.html ${./test-driver/log2html.xsl} $out/log.xml - ln -s ${./test-driver/logfile.css} $out/logfile.css - ln -s ${./test-driver/treebits.js} $out/treebits.js - ln -s ${jquery}/js/jquery.min.js $out/ - ln -s ${jquery-ui}/js/jquery-ui.min.js $out/ + mkdir -p $out - touch $out/nix-support/hydra-build-products - echo "report testlog $out log.html" >> $out/nix-support/hydra-build-products + LOGFILE=/dev/null tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver for i in */xchg/coverage-data; do mkdir -p $out/coverage-data diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 77e47a350ec..22ddb3490c8 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -8,30 +8,22 @@ let # only with nscd up and running we can load NSS modules that are not integrated in NSS canLoadExternalModules = config.services.nscd.enable; - myhostname = canLoadExternalModules; - mymachines = canLoadExternalModules; # XXX Move these to their respective modules nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); - resolved = canLoadExternalModules && config.services.resolved.enable; hostArray = mkMerge [ (mkBefore [ "files" ]) - (mkIf mymachines [ "mymachines" ]) (mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ]) (mkIf nsswins [ "wins" ]) - (mkIf resolved [ "resolve [!UNAVAIL=return]" ]) (mkAfter [ "dns" ]) (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns - (mkIf myhostname (mkOrder 1600 [ "myhostname" ])) # 1600 to ensure it's always the last ]; passwdArray = mkMerge [ (mkBefore [ "files" ]) (mkIf ldap [ "ldap" ]) - (mkIf mymachines [ "mymachines" ]) - (mkIf canLoadExternalModules (mkAfter [ "systemd" ])) ]; shadowArray = mkMerge [ @@ -134,11 +126,6 @@ in { assertion = config.system.nssModules.path != "" -> canLoadExternalModules; message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled."; } - { - # resolved does not need to add to nssModules, therefore needs an extra assertion - assertion = resolved -> canLoadExternalModules; - message = "Loading systemd-resolved's nss-resolve NSS module requires nscd being enabled."; - } ]; # Name Service Switch configuration file. Required by the C @@ -164,12 +151,5 @@ in { hosts = hostArray; services = mkBefore [ "files" ]; }; - - # Systemd provides nss-myhostname to ensure that our hostname - # always resolves to a valid IP address. It returns all locally - # configured IP addresses, or ::1 and 127.0.0.2 as - # fallbacks. Systemd also provides nss-mymachines to return IP - # addresses of local containers. - system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]); }; } diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 16be8bcfdd7..b07edb0f6ac 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -51,6 +51,7 @@ in { rtlwifi_new-firmware zd1211fw alsa-firmware + sof-firmware openelec-dvb-firmware ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix index f57502d4c83..cf553497c89 100644 --- a/nixos/modules/hardware/device-tree.nix +++ b/nixos/modules/hardware/device-tree.nix @@ -19,7 +19,7 @@ in { base = mkOption { default = "${config.boot.kernelPackages.kernel}/dtbs"; defaultText = "\${config.boot.kernelPackages.kernel}/dtbs"; - example = literalExample "pkgs.deviceTree_rpi"; + example = literalExample "pkgs.device-tree_rpi"; type = types.path; description = '' The package containing the base device-tree (.dtb) to boot. Contains @@ -30,7 +30,7 @@ in { overlays = mkOption { default = []; example = literalExample - "[\"\${pkgs.deviceTree_rpi.overlays}/w1-gpio.dtbo\"]"; + "[\"\${pkgs.device-tree_rpi.overlays}/w1-gpio.dtbo\"]"; type = types.listOf types.path; description = '' A path containing device tree overlays (.dtbo) to be applied to all diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 7461e231402..6328971492c 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -34,10 +34,12 @@ let enabled = nvidia_x11 != null; cfg = config.hardware.nvidia; + pCfg = cfg.prime; syncCfg = pCfg.sync; offloadCfg = pCfg.offload; primeEnabled = syncCfg.enable || offloadCfg.enable; + nvidiaPersistencedEnabled = cfg.nvidiaPersistenced; in { @@ -50,6 +52,15 @@ in ]; options = { + hardware.nvidia.powerManagement.enable = mkOption { + type = types.bool; + default = false; + description = '' + Experimental power management through systemd. For more information, see + the NVIDIA docs, on Chapter 21. Configuring Power Management Support. + ''; + }; + hardware.nvidia.modesetting.enable = mkOption { type = types.bool; default = false; @@ -129,6 +140,15 @@ in <option>hardware.nvidia.prime.intelBusId</option>). ''; }; + + hardware.nvidia.nvidiaPersistenced = mkOption { + default = false; + type = types.bool; + description = '' + Update for NVIDA GPU headless mode, i.e. nvidia-persistenced. It ensures all + GPUs stay awake even during headless mode. + ''; + }; }; config = mkIf enabled { @@ -215,6 +235,46 @@ in environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ] ++ filter (p: p != null) [ nvidia_x11.persistenced ]; + systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out; + + systemd.services = let + baseNvidiaService = state: { + description = "NVIDIA system ${state} actions"; + + path = with pkgs; [ kbd ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${nvidia_x11.out}/bin/nvidia-sleep.sh '${state}'"; + }; + }; + + nvidiaService = sleepState: (baseNvidiaService sleepState) // { + before = [ "systemd-${sleepState}.service" ]; + requiredBy = [ "systemd-${sleepState}.service" ]; + }; + + services = (builtins.listToAttrs (map (t: nameValuePair "nvidia-${t}" (nvidiaService t)) ["hibernate" "suspend"])) + // { + nvidia-resume = (baseNvidiaService "resume") // { + after = [ "systemd-suspend.service" "systemd-hibernate.service" ]; + requiredBy = [ "systemd-suspend.service" "systemd-hibernate.service" ]; + }; + }; + in optionalAttrs cfg.powerManagement.enable services + // optionalAttrs nvidiaPersistencedEnabled { + "nvidia-persistenced" = mkIf nvidiaPersistencedEnabled { + description = "NVIDIA Persistence Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + Restart = "always"; + PIDFile = "/var/run/nvidia-persistenced/nvidia-persistenced.pid"; + ExecStart = "${nvidia_x11.persistenced}/bin/nvidia-persistenced --verbose"; + ExecStopPost = "${pkgs.coreutils}/bin/rm -rf /var/run/nvidia-persistenced"; + }; + }; + }; + systemd.tmpfiles.rules = optional config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" ++ optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) @@ -227,7 +287,8 @@ in optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ]; # If requested enable modesetting via kernel parameter. - boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"; + boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" + ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"; # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. services.udev.extraRules = diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index a3ff3fe2c0c..1bccbbfaf24 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -15,7 +15,6 @@ mountPoint=/mnt channelPath= system= verbosity=() -buildLogs= while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -60,9 +59,6 @@ while [ "$#" -gt 0 ]; do -v*|--verbose) verbosity+=("$i") ;; - -L|--print-build-logs) - buildLogs="$i" - ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -91,8 +87,11 @@ if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then fi # A place to drop temporary stuff. +tmpdir="$(mktemp -d -p $mountPoint)" trap "rm -rf $tmpdir" EXIT -tmpdir="$(mktemp -d)" + +# store temporary files on target filesystem by default +export TMPDIR=${TMPDIR:-$tmpdir} sub="auto?trusted=1" @@ -100,9 +99,9 @@ sub="auto?trusted=1" if [[ -z $system ]]; then echo "building the configuration in $NIXOS_CONFIG..." outLink="$tmpdir/system" - nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ --extra-substituters "$sub" \ - -f '<nixpkgs/nixos>' system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} ${buildLogs} + '<nixpkgs/nixos>' -A system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} system=$(readlink -f $outLink) fi diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0cd17775e51..40904ef0c17 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -200,6 +200,7 @@ ./security/rtkit.nix ./security/wrappers/default.nix ./security/sudo.nix + ./security/doas.nix ./security/systemd-confinement.nix ./security/tpm2.nix ./services/admin/oxidized.nix @@ -984,9 +985,9 @@ ./virtualisation/container-config.nix ./virtualisation/containers.nix ./virtualisation/nixos-containers.nix + ./virtualisation/oci-containers.nix ./virtualisation/cri-o.nix ./virtualisation/docker.nix - ./virtualisation/docker-containers.nix ./virtualisation/ecs-agent.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix index b27e122bd1d..6ac64a81fc2 100644 --- a/nixos/modules/programs/singularity.nix +++ b/nixos/modules/programs/singularity.nix @@ -5,8 +5,8 @@ let cfg = config.programs.singularity; singularity = pkgs.singularity.overrideAttrs (attrs : { installPhase = attrs.installPhase + '' - mv $bin/libexec/singularity/bin/starter-suid $bin/libexec/singularity/bin/starter-suid.orig - ln -s /run/wrappers/bin/singularity-suid $bin/libexec/singularity/bin/starter-suid + mv $out/libexec/singularity/bin/starter-suid $out/libexec/singularity/bin/starter-suid.orig + ln -s /run/wrappers/bin/singularity-suid $out/libexec/singularity/bin/starter-suid ''; }); in { diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 110570ac3f0..58faf38777d 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -75,7 +75,7 @@ in }; link = mkOption { - default = "http://planet.nixos.org"; + default = "https://planet.nixos.org"; type = types.str; description = '' Link to the main page. diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 82cd6431ad1..776ef07d716 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -87,13 +87,13 @@ let default = {}; example = literalExample '' { - "example.org" = "/srv/http/nginx"; + "example.org" = null; "mydomain.org" = null; } ''; description = '' - A list of extra domain names, which are included in the one certificate to be issued, with their - own server roots if needed. + A list of extra domain names, which are included in the one certificate to be issued. + Setting a distinct server root is deprecated and not functional in 20.03+ ''; }; @@ -250,7 +250,7 @@ in "example.com" = { webroot = "/var/www/challenges/"; email = "foo@example.com"; - extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; }; + extraDomains = { "www.example.com" = null; "foo.example.com" = null; }; }; "bar.example.com" = { webroot = "/var/www/challenges/"; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 2b29c117484..f802faee974 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -6,92 +6,249 @@ <title>SSL/TLS Certificates with ACME</title> <para> NixOS supports automatic domain validation & certificate retrieval and - renewal using the ACME protocol. This is currently only implemented by and - for Let's Encrypt. The alternative ACME client <literal>lego</literal> is - used under the hood. + renewal using the ACME protocol. Any provider can be used, but by default + NixOS uses Let's Encrypt. The alternative ACME client <literal>lego</literal> + is used under the hood. + </para> + <para> + Automatic cert validation and configuration for Apache and Nginx virtual + hosts is included in NixOS, however if you would like to generate a wildcard + cert or you are not using a web server you will have to configure DNS + based validation. </para> <section xml:id="module-security-acme-prerequisites"> <title>Prerequisites</title> <para> - You need to have a running HTTP server for verification. The server must - have a webroot defined that can serve + To use the ACME module, you must accept the provider's terms of service + by setting <literal><xref linkend="opt-security.acme.acceptTerms" /></literal> + to <literal>true</literal>. The Let's Encrypt ToS can be found + <link xlink:href="https://letsencrypt.org/repository/">here</link>. + </para> + + <para> + You must also set an email address to be used when creating accounts with + Let's Encrypt. You can set this for all certs with + <literal><xref linkend="opt-security.acme.email" /></literal> + and/or on a per-cert basis with + <literal><xref linkend="opt-security.acme.certs._name_.email" /></literal>. + This address is only used for registration and renewal reminders, + and cannot be used to administer the certificates in any way. + </para> + + <para> + Alternatively, you can use a different ACME server by changing the + <literal><xref linkend="opt-security.acme.server" /></literal> option + to a provider of your choosing, or just change the server for one cert with + <literal><xref linkend="opt-security.acme.certs._name_.server" /></literal>. + </para> + + <para> + You will need an HTTP server or DNS server for verification. For HTTP, + the server must have a webroot defined that can serve <filename>.well-known/acme-challenge</filename>. This directory must be - writeable by the user that will run the ACME client. + writeable by the user that will run the ACME client. For DNS, you must + set up credentials with your provider/server for use with lego. </para> + </section> + <section xml:id="module-security-acme-nginx"> + <title>Using ACME certificates in Nginx</title> <para> - For instance, this generic snippet could be used for Nginx: + NixOS supports fetching ACME certificates for you by setting + <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> + = true;</literal> in a virtualHost config. We first create self-signed + placeholder certificates in place of the real ACME certs. The placeholder + certs are overwritten when the ACME certs arrive. For + <literal>foo.example.com</literal> the config would look like. + </para> + <programlisting> -http { - server { - server_name _; - listen 80; - listen [::]:80; - - location /.well-known/acme-challenge { - root /var/www/challenges; - } +<xref linkend="opt-security.acme.acceptTerms" /> = true; +<xref linkend="opt-security.acme.email" /> = "admin+acme@example.com"; +services.nginx = { + <link linkend="opt-services.nginx.enable">enable</link> = true; + <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link> = { + "foo.example.com" = { + <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true; + <link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true; + # All serverAliases will be added as <link linkend="opt-security.acme.certs._name_.extraDomains">extra domains</link> on the certificate. + <link linkend="opt-services.nginx.virtualHosts._name_.serverAliases">serverAliases</link> = [ "bar.example.com" ]; + locations."/" = { + <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.root">root</link> = "/var/www"; + }; + }; - location / { - return 301 https://$host$request_uri; - } - } + # We can also add a different vhost and reuse the same certificate + # but we have to append extraDomains manually. + <link linkend="opt-security.acme.certs._name_.extraDomains">security.acme.certs."foo.example.com".extraDomains."baz.example.com"</link> = null; + "baz.example.com" = { + <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true; + <link linkend="opt-services.nginx.virtualHosts._name_.useACMEHost">useACMEHost</link> = "foo.example.com"; + locations."/" = { + <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.root">root</link> = "/var/www"; + }; + }; + }; } </programlisting> + </section> + <section xml:id="module-security-acme-httpd"> + <title>Using ACME certificates in Apache/httpd</title> + + <para> + Using ACME certificates with Apache virtual hosts is identical + to using them with Nginx. The attribute names are all the same, just replace + "nginx" with "httpd" where appropriate. </para> </section> <section xml:id="module-security-acme-configuring"> - <title>Configuring</title> + <title>Manual configuration of HTTP-01 validation</title> <para> - To enable ACME certificate retrieval & renewal for a certificate for - <literal>foo.example.com</literal>, add the following in your - <filename>configuration.nix</filename>: + First off you will need to set up a virtual host to serve the challenges. + This example uses a vhost called <literal>certs.example.com</literal>, with + the intent that you will generate certs for all your vhosts and redirect + everyone to HTTPS. + </para> + +<programlisting> +<xref linkend="opt-security.acme.acceptTerms" /> = true; +<xref linkend="opt-security.acme.email" /> = "admin+acme@example.com"; +services.nginx = { + <link linkend="opt-services.nginx.enable">enable</link> = true; + <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link> = { + "acmechallenge.example.com" = { + # Catchall vhost, will redirect users to HTTPS for all vhosts + <link linkend="opt-services.nginx.virtualHosts._name_.serverAliases">serverAliases</link> = [ "*.example.com" ]; + # /var/lib/acme/.challenges must be writable by the ACME user + # and readable by the Nginx user. + # By default, this is the case. + locations."/.well-known/acme-challenge" = { + <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.root">root</link> = "/var/lib/acme/.challenges"; + }; + locations."/" = { + <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.return">return</link> = "301 https://$host$request_uri"; + }; + }; + }; +} +# Alternative config for Apache +services.httpd = { + <link linkend="opt-services.httpd.enable">enable = true;</link> + <link linkend="opt-services.httpd.virtualHosts">virtualHosts</link> = { + "acmechallenge.example.com" = { + # Catchall vhost, will redirect users to HTTPS for all vhosts + <link linkend="opt-services.httpd.virtualHosts._name_.serverAliases">serverAliases</link> = [ "*.example.com" ]; + # /var/lib/acme/.challenges must be writable by the ACME user and readable by the Apache user. + # By default, this is the case. + <link linkend="opt-services.httpd.virtualHosts._name_.documentRoot">documentRoot</link> = "/var/lib/acme/.challenges"; + <link linkend="opt-services.httpd.virtualHosts._name_.extraConfig">extraConfig</link> = '' + RewriteEngine On + RewriteCond %{HTTPS} off + RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge [NC] + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301] + ''; + }; + }; +} +</programlisting> + + <para> + Now you need to configure ACME to generate a certificate. + </para> + <programlisting> <xref linkend="opt-security.acme.certs"/>."foo.example.com" = { - <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/www/challenges"; + <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/lib/acme/.challenges"; <link linkend="opt-security.acme.certs._name_.email">email</link> = "foo@example.com"; + # Since we have a wildcard vhost to handle port 80, + # we can generate certs for anything! + # Just make sure your DNS resolves them. + <link linkend="opt-security.acme.certs._name_.extraDomains">extraDomains</link> = [ "mail.example.com" ]; }; </programlisting> - </para> <para> The private key <filename>key.pem</filename> and certificate <filename>fullchain.pem</filename> will be put into <filename>/var/lib/acme/foo.example.com</filename>. </para> + <para> Refer to <xref linkend="ch-options" /> for all available configuration options for the <link linkend="opt-security.acme.certs">security.acme</link> module. </para> </section> - <section xml:id="module-security-acme-nginx"> - <title>Using ACME certificates in Nginx</title> + <section xml:id="module-security-acme-config-dns"> + <title>Configuring ACME for DNS validation</title> <para> - NixOS supports fetching ACME certificates for you by setting - <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> - = true;</literal> in a virtualHost config. We first create self-signed - placeholder certificates in place of the real ACME certs. The placeholder - certs are overwritten when the ACME certs arrive. For - <literal>foo.example.com</literal> the config would look like. + This is useful if you want to generate a wildcard certificate, since + ACME servers will only hand out wildcard certs over DNS validation. + There a number of supported DNS providers and servers you can utilise, + see the <link xlink:href="https://go-acme.github.io/lego/dns/">lego docs</link> + for provider/server specific configuration values. For the sake of these + docs, we will provide a fully self-hosted example using bind. </para> <programlisting> -services.nginx = { - <link linkend="opt-services.nginx.enable">enable = true;</link> - <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link> = { - "foo.example.com" = { - <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true; - <link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true; - locations."/" = { - <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.root">root</link> = "/var/www"; - }; - }; - }; +services.bind = { + <link linkend="opt-services.bind.enable">enable</link> = true; + <link linkend="opt-services.bind.extraConfig">extraConfig</link> = '' + include "/var/lib/secrets/dnskeys.conf"; + ''; + <link linkend="opt-services.bind.zones">zones</link> = [ + rec { + name = "example.com"; + file = "/var/db/bind/${name}"; + master = true; + extraConfig = "allow-update { key rfc2136key.example.com.; };"; + } + ]; } + +# Now we can configure ACME +<xref linkend="opt-security.acme.acceptTerms" /> = true; +<xref linkend="opt-security.acme.email" /> = "admin+acme@example.com"; +<xref linkend="opt-security.acme.certs" />."example.com" = { + <link linkend="opt-security.acme.certs._name_.domain">domain</link> = "*.example.com"; + <link linkend="opt-security.acme.certs._name_.dnsProvider">dnsProvider</link> = "rfc2136"; + <link linkend="opt-security.acme.certs._name_.credentialsFile">credentialsFile</link> = "/var/lib/secrets/certs.secret"; + # We don't need to wait for propagation since this is a local DNS server + <link linkend="opt-security.acme.certs._name_.dnsPropagationCheck">dnsPropagationCheck</link> = false; +}; </programlisting> + + <para> + The <filename>dnskeys.conf</filename> and <filename>certs.secret</filename> + must be kept secure and thus you should not keep their contents in your + Nix config. Instead, generate them one time with these commands: + </para> + +<programlisting> +mkdir -p /var/lib/secrets +tsig-keygen rfc2136key.example.com > /var/lib/secrets/dnskeys.conf +chown named:root /var/lib/secrets/dnskeys.conf +chmod 400 /var/lib/secrets/dnskeys.conf + +# Copy the secret value from the dnskeys.conf, and put it in +# RFC2136_TSIG_SECRET below + +cat > /var/lib/secrets/certs.secret << EOF +RFC2136_NAMESERVER='127.0.0.1:53' +RFC2136_TSIG_ALGORITHM='hmac-sha256.' +RFC2136_TSIG_KEY='rfc2136key.example.com' +RFC2136_TSIG_SECRET='your secret key' +EOF +chmod 400 /var/lib/secrets/certs.secret +</programlisting> + + <para> + Now you're all set to generate certs! You should monitor the first invokation + by running <literal>systemctl start acme-example.com.service & + journalctl -fu acme-example.com.service</literal> and watching its log output. + </para> </section> </chapter> diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix new file mode 100644 index 00000000000..b81f2d0c2d5 --- /dev/null +++ b/nixos/modules/security/doas.nix @@ -0,0 +1,274 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.security.doas; + + inherit (pkgs) doas; + + mkUsrString = user: toString user; + + mkGrpString = group: ":${toString group}"; + + mkOpts = rule: concatStringsSep " " [ + (optionalString rule.noPass "nopass") + (optionalString rule.persist "persist") + (optionalString rule.keepEnv "keepenv") + "setenv { SSH_AUTH_SOCK ${concatStringsSep " " rule.setEnv} }" + ]; + + mkArgs = rule: + if (isNull rule.args) then "" + else if (length rule.args == 0) then "args" + else "args ${concatStringsSep " " rule.args}"; + + mkRule = rule: + let + opts = mkOpts rule; + + as = optionalString (!isNull rule.runAs) "as ${rule.runAs}"; + + cmd = optionalString (!isNull rule.cmd) "cmd ${rule.cmd}"; + + args = mkArgs rule; + in + optionals (length cfg.extraRules > 0) [ + ( + optionalString (length rule.users > 0) + (map (usr: "permit ${opts} ${mkUsrString usr} ${as} ${cmd} ${args}") rule.users) + ) + ( + optionalString (length rule.groups > 0) + (map (grp: "permit ${opts} ${mkGrpString grp} ${as} ${cmd} ${args}") rule.groups) + ) + ]; +in +{ + + ###### interface + + options.security.doas = { + + enable = mkOption { + type = with types; bool; + default = false; + description = '' + Whether to enable the <command>doas</command> command, which allows + non-root users to execute commands as root. + ''; + }; + + wheelNeedsPassword = mkOption { + type = with types; bool; + default = true; + description = '' + Whether users of the <code>wheel</code> group must provide a password to + run commands as super user via <command>doas</command>. + ''; + }; + + extraRules = mkOption { + default = []; + description = '' + Define specific rules to be set in the + <filename>/etc/doas.conf</filename> file. More specific rules should + come after more general ones in order to yield the expected behavior. + You can use <code>mkBefore</code> and/or <code>mkAfter</code> to ensure + this is the case when configuration options are merged. + ''; + example = literalExample '' + [ + # Allow execution of any command by any user in group doas, requiring + # a password and keeping any previously-defined environment variables. + { groups = [ "doas" ]; noPass = false; keepEnv = true; } + + # Allow execution of "/home/root/secret.sh" by user `backup` OR user + # `database` OR any member of the group with GID `1006`, without a + # password. + { users = [ "backup" "database" ]; groups = [ 1006 ]; + cmd = "/home/root/secret.sh"; noPass = true; } + + # Allow any member of group `bar` to run `/home/baz/cmd1.sh` as user + # `foo` with argument `hello-doas`. + { groups = [ "bar" ]; runAs = "foo"; + cmd = "/home/baz/cmd1.sh"; args = [ "hello-doas" ]; } + + # Allow any member of group `bar` to run `/home/baz/cmd2.sh` as user + # `foo` with no arguments. + { groups = [ "bar" ]; runAs = "foo"; + cmd = "/home/baz/cmd2.sh"; args = [ ]; } + + # Allow user `abusers` to execute "nano" and unset the value of + # SSH_AUTH_SOCK, override the value of ALPHA to 1, and inherit the + # value of BETA from the current environment. + { users = [ "abusers" ]; cmd = "nano"; + setEnv = [ "-SSH_AUTH_SOCK" "ALPHA=1" "BETA" ]; } + ] + ''; + type = with types; listOf ( + submodule { + options = { + + noPass = mkOption { + type = with types; bool; + default = false; + description = '' + If <code>true</code>, the user is not required to enter a + password. + ''; + }; + + persist = mkOption { + type = with types; bool; + default = false; + description = '' + If <code>true</code>, do not ask for a password again for some + time after the user successfully authenticates. + ''; + }; + + keepEnv = mkOption { + type = with types; bool; + default = false; + description = '' + If <code>true</code>, environment variables other than those + listed in + <citerefentry><refentrytitle>doas</refentrytitle><manvolnum>1</manvolnum></citerefentry> + are kept when creating the environment for the new process. + ''; + }; + + setEnv = mkOption { + type = with types; listOf str; + default = []; + description = '' + Keep or set the specified variables. Variables may also be + removed with a leading '-' or set using + <code>variable=value</code>. If the first character of + <code>value</code> is a '$', the value to be set is taken from + the existing environment variable of the indicated name. This + option is processed after the default environment has been + created. + + NOTE: All rules have <code>setenv { SSH_AUTH_SOCK }</code> by + default. To prevent <code>SSH_AUTH_SOCK</code> from being + inherited, add <code>"-SSH_AUTH_SOCK"</code> anywhere in this + list. + ''; + }; + + users = mkOption { + type = with types; listOf (either str int); + default = []; + description = "The usernames / UIDs this rule should apply for."; + }; + + groups = mkOption { + type = with types; listOf (either str int); + default = []; + description = "The groups / GIDs this rule should apply for."; + }; + + runAs = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Which user or group the specified command is allowed to run as. + When set to <code>null</code> (the default), all users are + allowed. + + A user can be specified using just the username: + <code>"foo"</code>. It is also possible to only allow running as + a specific group with <code>":bar"</code>. + ''; + }; + + cmd = mkOption { + type = with types; nullOr str; + default = null; + description = '' + The command the user is allowed to run. When set to + <code>null</code> (the default), all commands are allowed. + + NOTE: It is best practice to specify absolute paths. If a + relative path is specified, only a restricted PATH will be + searched. + ''; + }; + + args = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = '' + Arguments that must be provided to the command. When set to + <code>[]</code>, the command must be run without any arguments. + ''; + }; + }; + } + ); + }; + + extraConfig = mkOption { + type = with types; lines; + default = ""; + description = '' + Extra configuration text appended to <filename>doas.conf</filename>. + ''; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + security.doas.extraRules = mkOrder 600 [ + { + groups = [ "wheel" ]; + noPass = !cfg.wheelNeedsPassword; + } + ]; + + security.wrappers = { + doas.source = "${doas}/bin/doas"; + }; + + environment.systemPackages = [ + doas + ]; + + security.pam.services.doas = { + allowNullPassword = true; + sshAgentAuth = true; + }; + + environment.etc."doas.conf" = { + source = pkgs.runCommand "doas-conf" + { + src = pkgs.writeText "doas-conf-in" '' + # To modify this file, set the NixOS options + # `security.doas.extraRules` or `security.doas.extraConfig`. To + # completely replace the contents of this file, use + # `environment.etc."doas.conf"`. + + # "root" is allowed to do anything. + permit nopass keepenv root + + # extraRules + ${concatStringsSep "\n" (lists.flatten (map mkRule cfg.extraRules))} + + # extraConfig + ${cfg.extraConfig} + ''; + preferLocalBuild = true; + } + # Make sure that the doas.conf file is syntactically valid. + "${pkgs.buildPackages.doas}/bin/doas -C $src && cp $src $out"; + mode = "0440"; + }; + + }; + + meta.maintainers = with maintainers; [ cole-h ]; +} diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index b99316803f3..e1a94b0121a 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -54,7 +54,7 @@ let description = '' If set, users listed in <filename>~/.yubico/authorized_yubikeys</filename> - are able to log in with the asociated Yubikey tokens. + are able to log in with the associated Yubikey tokens. ''; }; diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index cd4eb81dbe1..0a400f1d535 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -160,6 +160,11 @@ in { + " the 'users.users' option instead as this combination is" + " currently not supported."; } + { assertion = !cfg.serviceConfig.ProtectSystem or false; + message = "${whatOpt "ProtectSystem"}. ProtectSystem is not compatible" + + " with service confinement as it fails to remount /usr within" + + " our chroot. Please disable the option."; + } ]) config.systemd.services); config.systemd.packages = lib.concatLists (lib.mapAttrsToList (name: cfg: let diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index e20591b5beb..f4eb4a265a4 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -18,8 +18,6 @@ let ''} state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" - user "${cfg.user}" - group "${cfg.group}" ${optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''} ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 203631a577f..8098617d11f 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -268,7 +268,8 @@ let mkSrcAttrs = srcCfg: with srcCfg; { enabled = onOff enable; - mbuffer = with mbuffer; if enable then "${pkgs.mbuffer}/bin/mbuffer" + # mbuffer is not referenced by its full path to accomodate non-NixOS systems or differing mbuffer versions between source and target + mbuffer = with mbuffer; if enable then "mbuffer" + optionalString (port != null) ":${toString port}" else "off"; mbuffer_size = mbuffer.size; post_znap_cmd = nullOff postsnap; @@ -357,6 +358,12 @@ in default = false; }; + features.oracleMode = mkEnableOption '' + Destroy snapshots one by one instead of using one long argument list. + If source and destination are out of sync for a long time, you may have + so many snapshots to destroy that the argument gets is too long and the + command fails. + ''; features.recvu = mkEnableOption '' recvu feature which uses <literal>-u</literal> on the receiving end to keep the destination filesystem unmounted. @@ -372,6 +379,41 @@ in and <citerefentry><refentrytitle>zfs</refentrytitle><manvolnum>8</manvolnum></citerefentry> for more info. ''; + features.sendRaw = mkEnableOption '' + sendRaw feature which adds the options <literal>-w</literal> to the + <command>zfs send</command> command. For encrypted source datasets this + instructs zfs not to decrypt before sending which results in a remote + backup that can't be read without the encryption key/passphrase, useful + when the remote isn't fully trusted or not physically secure. This + option must be used consistently, raw incrementals cannot be based on + non-raw snapshots and vice versa. + ''; + features.skipIntermediates = mkEnableOption '' + Enable the skipIntermediates feature to send a single increment + between latest common snapshot and the newly made one. It may skip + several source snaps if the destination was offline for some time, and + it should skip snapshots not managed by znapzend. Normally for online + destinations, the new snapshot is sent as soon as it is created on the + source, so there are no automatic increments to skip. + ''; + features.lowmemRecurse = mkEnableOption '' + use lowmemRecurse on systems where you have too many datasets, so a + recursive listing of attributes to find backup plans exhausts the + memory available to <command>znapzend</command>: instead, go the slower + way to first list all impacted dataset names, and then query their + configs one by one. + ''; + features.zfsGetType = mkEnableOption '' + use zfsGetType if your <command>zfs get</command> supports a + <literal>-t</literal> argument for filtering by dataset type at all AND + lists properties for snapshots by default when recursing, so that there + is too much data to process while searching for backup plans. + If these two conditions apply to your system, the time needed for a + <literal>--recursive</literal> search for backup plans can literally + differ by hundreds of times (depending on the amount of snapshots in + that dataset tree... and a decent backup plan will ensure you have a lot + of those), so you would benefit from requesting this feature. + ''; }; }; @@ -423,5 +465,5 @@ in }; }; - meta.maintainers = with maintainers; [ infinisil ]; + meta.maintainers = with maintainers; [ infinisil SlothOfAnarchy ]; } diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 84f04a27641..eacfed85ddf 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -461,7 +461,7 @@ in moreutils remarshal utillinux - cfg.package.bin + cfg.package ] ++ cfg.extraPackages; reloadIfChanged = true; serviceConfig = { diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 809f61cfa81..8c2851c37ac 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -231,6 +231,10 @@ in }; + meta = { + maintainers = lib.maintainers.mic92; + }; + ###### implementation diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 0b79a996dc7..93f5c1ca5f5 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -34,13 +34,7 @@ in services.postgresql = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to run PostgreSQL. - ''; - }; + enable = mkEnableOption "PostgreSQL Server"; package = mkOption { type = types.package; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 03483f69fa2..74c60014dce 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -294,7 +294,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your <filename>~/.config/nixpkgs/config.nix</filename> (see - <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs + <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>): <example xml:id="module-services-emacs-config-nix"> <title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title> diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix index 5939d7808f7..896f52302ff 100644 --- a/nixos/modules/services/logging/awstats.nix +++ b/nixos/modules/services/logging/awstats.nix @@ -24,7 +24,7 @@ let logFile = mkOption { type = types.str; - example = "/var/spool/nginx/logs/access.log"; + example = "/var/log/nginx/access.log"; description = '' The log file to be scanned. @@ -110,7 +110,7 @@ in { "mysite" = { domain = "example.com"; - logFile = "/var/spool/nginx/logs/access.log"; + logFile = "/var/log/nginx/access.log"; }; } ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 230a2ae3f82..9fbf0c19752 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -407,7 +407,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - restartTriggers = [ cfg.configFile ]; + restartTriggers = [ cfg.configFile modulesDir ]; serviceConfig = { ExecStart = "${dovecotPkg}/sbin/dovecot -F"; diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix index 8e9bec15dd4..c1ebdb3dde9 100755 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -75,7 +75,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${cfg.package.bin}/bin/confd"; + ExecStart = "${cfg.package}/bin/confd"; }; }; diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 7322e1c080b..32360d43768 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -178,7 +178,7 @@ in { serviceConfig = { Type = "notify"; - ExecStart = "${pkgs.etcd.bin}/bin/etcd"; + ExecStart = "${pkgs.etcd}/bin/etcd"; User = "etcd"; LimitNOFILE = 40000; }; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 38910a5a005..f8bcedc94fe 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -14,53 +14,9 @@ let RUN_USER = ${cfg.user} RUN_MODE = prod - [database] - DB_TYPE = ${cfg.database.type} - ${optionalString (usePostgresql || useMysql) '' - HOST = ${if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port} - NAME = ${cfg.database.name} - USER = ${cfg.database.user} - PASSWD = #dbpass# - ''} - ${optionalString useSqlite '' - PATH = ${cfg.database.path} - ''} - ${optionalString usePostgresql '' - SSL_MODE = disable - ''} - - [repository] - ROOT = ${cfg.repositoryRoot} - - [server] - DOMAIN = ${cfg.domain} - HTTP_ADDR = ${cfg.httpAddress} - HTTP_PORT = ${toString cfg.httpPort} - ROOT_URL = ${cfg.rootUrl} - STATIC_ROOT_PATH = ${cfg.staticRootPath} - LFS_JWT_SECRET = #jwtsecret# - - [session] - COOKIE_NAME = session - COOKIE_SECURE = ${boolToString cfg.cookieSecure} - - [security] - SECRET_KEY = #secretkey# - INSTALL_LOCK = true - - [log] - ROOT_PATH = ${cfg.log.rootPath} - LEVEL = ${cfg.log.level} - - [service] - DISABLE_REGISTRATION = ${boolToString cfg.disableRegistration} - - ${optionalString (cfg.mailerPasswordFile != null) '' - [mailer] - PASSWD = #mailerpass# - ''} - - ${cfg.extraConfig} + ${generators.toINI {} cfg.settings} + + ${optionalString (cfg.extraConfig != null) cfg.extraConfig} ''; in @@ -279,9 +235,36 @@ in ''; }; + settings = mkOption { + type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); + default = {}; + description = '' + Gitea configuration. Refer to <link xlink:href="https://docs.gitea.io/en-us/config-cheat-sheet/"/> + for details on supported values. + ''; + example = literalExample '' + { + "cron.sync_external_users" = { + RUN_AT_START = true; + SCHEDULE = "@every 24h"; + UPDATE_EXISTING = true; + }; + mailer = { + ENABLED = true; + MAILER_TYPE = "sendmail"; + FROM = "do-not-reply@example.org"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + }; + other = { + SHOW_FOOTER_VERSION = false; + }; + } + ''; + }; + extraConfig = mkOption { - type = types.str; - default = ""; + type = with types; nullOr str; + default = null; description = "Configuration lines appended to the generated gitea configuration file."; }; }; @@ -294,6 +277,62 @@ in } ]; + services.gitea.settings = { + database = mkMerge [ + { + DB_TYPE = cfg.database.type; + } + (mkIf (useMysql || usePostgresql) { + HOST = if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port; + NAME = cfg.database.name; + USER = cfg.database.user; + PASSWD = "#dbpass#"; + }) + (mkIf useSqlite { + PATH = cfg.database.path; + }) + (mkIf usePostgresql { + SSL_MODE = "disable"; + }) + ]; + + repository = { + ROOT = cfg.repositoryRoot; + }; + + server = { + DOMAIN = cfg.domain; + HTTP_ADDR = cfg.httpAddress; + HTTP_PORT = cfg.httpPort; + ROOT_URL = cfg.rootUrl; + STATIC_ROOT_PATH = cfg.staticRootPath; + LFS_JWT_SECRET = "#jwtsecret#"; + }; + + session = { + COOKIE_NAME = "session"; + COOKIE_SECURE = cfg.cookieSecure; + }; + + security = { + SECRET_KEY = "#secretkey#"; + INSTALL_LOCK = true; + }; + + log = { + ROOT_PATH = cfg.log.rootPath; + LEVEL = cfg.log.level; + }; + + service = { + DISABLE_REGISTRATION = cfg.disableRegistration; + }; + + mailer = mkIf (cfg.mailerPasswordFile != null) { + PASSWD = "#mailerpass#"; + }; + }; + services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { enable = mkDefault true; @@ -335,7 +374,7 @@ in description = "gitea"; after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; - path = [ gitea.bin pkgs.gitAndTools.git ]; + path = [ gitea pkgs.gitAndTools.git ]; preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; @@ -347,11 +386,11 @@ in cp -f ${configFile} ${runConfig} if [ ! -e ${secretKey} ]; then - ${gitea.bin}/bin/gitea generate secret SECRET_KEY > ${secretKey} + ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey} fi if [ ! -e ${jwtSecret} ]; then - ${gitea.bin}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret} + ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret} fi KEY="$(head -n1 ${secretKey})" @@ -374,7 +413,7 @@ in HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS @@ -383,7 +422,7 @@ in # update command option in authorized_keys if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys fi ''; @@ -392,7 +431,7 @@ in User = cfg.user; Group = "gitea"; WorkingDirectory = cfg.stateDir; - ExecStart = "${gitea.bin}/bin/gitea web"; + ExecStart = "${gitea}/bin/gitea web"; Restart = "always"; # Filesystem @@ -435,9 +474,12 @@ in users.groups.gitea = {}; - warnings = optional (cfg.database.password != "") - ''config.services.gitea.database.password will be stored as plaintext - in the Nix store. Use database.passwordFile instead.''; + warnings = + optional (cfg.database.password != "") '' + config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead.'' ++ + optional (cfg.extraConfig != null) '' + services.gitea.`extraConfig` is deprecated, please use services.gitea.`settings`. + ''; # Create database passwordFile default when password is configured. services.gitea.database.passwordFile = @@ -450,7 +492,7 @@ in description = "gitea dump"; after = [ "gitea.service" ]; wantedBy = [ "default.target" ]; - path = [ gitea.bin ]; + path = [ gitea ]; environment = { USER = cfg.user; @@ -461,7 +503,7 @@ in serviceConfig = { Type = "oneshot"; User = cfg.user; - ExecStart = "${gitea.bin}/bin/gitea dump"; + ExecStart = "${gitea}/bin/gitea dump"; WorkingDirectory = cfg.stateDir; }; }; diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index ee99967c261..c5070aaa356 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -200,7 +200,7 @@ in description = "Gogs (Go Git Service)"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gogs.bin ]; + path = [ pkgs.gogs ]; preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; @@ -230,7 +230,7 @@ in HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs.bin}/bin/gogs,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS @@ -242,7 +242,7 @@ in User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.stateDir; - ExecStart = "${pkgs.gogs.bin}/bin/gogs web"; + ExecStart = "${pkgs.gogs}/bin/gogs web"; Restart = "always"; }; diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix index d4e88ecbebd..ef89d3e64d0 100644 --- a/nixos/modules/services/misc/leaps.nix +++ b/nixos/modules/services/misc/leaps.nix @@ -55,7 +55,7 @@ in Restart = "on-failure"; WorkingDirectory = stateDir; PrivateTmp = true; - ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}"; + ExecStart = "${pkgs.leaps}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}"; }; }; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0c2407e1dd2..2577cb78e96 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -283,7 +283,7 @@ in trustedBinaryCaches = mkOption { type = types.listOf types.str; default = [ ]; - example = [ "http://hydra.nixos.org/" ]; + example = [ "https://hydra.nixos.org/" ]; description = '' List of binary cache URLs that non-root users can use (in addition to those specified using @@ -510,8 +510,7 @@ in system.activationScripts.nix = stringAfter [ "etc" "users" ] '' - # Create directories in /nix. - ${nix}/bin/nix ping-store --no-net + install -m 0755 -d /nix/var/nix/{gcroots,profiles}/per-user # Subscribe the root user to the NixOS channel by default. if [ ! -e "/root/.nix-channels" ]; then diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix index e951a4c7ffa..f7c05deeecb 100644 --- a/nixos/modules/services/misc/ssm-agent.nix +++ b/nixos/modules/services/misc/ssm-agent.nix @@ -35,7 +35,7 @@ in { path = [ fake-lsb-release ]; serviceConfig = { - ExecStart = "${cfg.package.bin}/bin/agent"; + ExecStart = "${cfg.package}/bin/agent"; KillMode = "process"; Restart = "on-failure"; RestartSec = "15min"; @@ -43,4 +43,3 @@ in { }; }; } - diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index b1c12cce1f8..04e9da1c81a 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -148,7 +148,7 @@ in { User = cfg.user; Group = cfg.group; ExecStart = '' - ${cfg.package.bin}/bin/bosun -c ${configFile} + ${cfg.package}/bin/bosun -c ${configFile} ''; }; }; diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix index b5a78e4583e..893c15d568b 100644 --- a/nixos/modules/services/monitoring/grafana-reporter.nix +++ b/nixos/modules/services/monitoring/grafana-reporter.nix @@ -59,7 +59,7 @@ in { "-templates ${cfg.templateDir}" ]; in { - ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}"; + ExecStart = "${pkgs.grafana_reporter}/bin/grafana-reporter ${args}"; }; }; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 0f8bc2471e3..b0c81a46d4d 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -535,7 +535,7 @@ in { ${optionalString cfg.provision.enable '' export GF_PATHS_PROVISIONING=${provisionConfDir}; ''} - exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir} + exec ${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir} ''; serviceConfig = { WorkingDirectory = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 045e48a3d0f..01276366e97 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -58,7 +58,7 @@ in in { serviceConfig = { ExecStart = '' - ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ + ${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \ --config.file=${escapeShellArg configFile} \ --log.format=${escapeShellArg cfg.logFormat} \ --log.level=${cfg.logLevel} \ diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 38cd2213de7..6f13ce889cb 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -118,7 +118,7 @@ in { serviceConfig = { User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; + ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; }; }; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index b6d881afd7b..880f70ae141 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -37,9 +37,7 @@ let baseService = recursiveUpdate commonEnv { wants = [ "ipfs-init.service" ]; # NB: migration must be performed prior to pre-start, else we get the failure message! - preStart = '' - ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214) - '' + optionalString cfg.autoMount '' + preStart = optionalString cfg.autoMount '' ipfs --local config Mounts.FuseAllowOther --json true ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir} diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 689cbc8a986..f7d2afead06 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -179,15 +179,15 @@ in (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); serviceConfig = { - ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d" + ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d" + concatMapStrings (n: " -config-file ${n}") configFiles; - ExecReload = "${cfg.package.bin}/bin/consul reload"; + ExecReload = "${cfg.package}/bin/consul reload"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; Restart = "on-failure"; TimeoutStartSec = "infinity"; } // (optionalAttrs (cfg.leaveOnStop) { - ExecStop = "${cfg.package.bin}/bin/consul leave"; + ExecStop = "${cfg.package}/bin/consul leave"; }); path = with pkgs; [ iproute gnugrep gawk consul ]; @@ -238,7 +238,7 @@ in serviceConfig = { ExecStart = '' - ${cfg.alerts.package.bin}/bin/consul-alerts start \ + ${cfg.alerts.package}/bin/consul-alerts start \ --alert-addr=${cfg.alerts.listenAddr} \ --consul-addr=${cfg.alerts.consulAddr} \ ${optionalString cfg.alerts.watchChecks "--watch-checks"} \ diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index dd2f6454e95..4c040112d28 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -19,8 +19,8 @@ in { package = mkOption { description = "Package to use for flannel"; type = types.package; - default = pkgs.flannel.bin; - defaultText = "pkgs.flannel.bin"; + default = pkgs.flannel; + defaultText = "pkgs.flannel"; }; publicIp = mkOption { @@ -167,7 +167,7 @@ in { touch /run/flannel/docker '' + optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" - until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do echo "setting network configuration, retry" sleep 1 diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 6418ae69943..5d73038363a 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -20,12 +20,14 @@ let ssid=${cfg.ssid} hw_mode=${cfg.hwMode} channel=${toString cfg.channel} + ${optionalString (cfg.countryCode != null) ''country_code=${cfg.countryCode}''} + ${optionalString (cfg.countryCode != null) ''ieee80211d=1''} # logging (debug level) logger_syslog=-1 - logger_syslog_level=2 + logger_syslog_level=${toString cfg.logLevel} logger_stdout=-1 - logger_stdout_level=2 + logger_stdout_level=${toString cfg.logLevel} ctrl_interface=/run/hostapd ctrl_interface_group=${cfg.group} @@ -147,6 +149,35 @@ in ''; }; + logLevel = mkOption { + default = 2; + type = types.int; + description = '' + Levels (minimum value for logged events): + 0 = verbose debugging + 1 = debugging + 2 = informational messages + 3 = notification + 4 = warning + ''; + }; + + countryCode = mkOption { + default = null; + example = "US"; + type = with types; nullOr str; + description = '' + Country code (ISO/IEC 3166-1). Used to set regulatory domain. + Set as needed to indicate country in which device is operating. + This can limit available channels and transmit power. + These two octets are used as the first two octets of the Country String + (dot11CountryString). + If set this enables IEEE 802.11d. This advertises the countryCode and + the set of allowed channels and transmit power levels based on the + regulatory limits. + ''; + }; + extraConfig = mkOption { default = ""; example = '' @@ -167,6 +198,8 @@ in environment.systemPackages = [ pkgs.hostapd ]; + services.udev.packages = optional (cfg.countryCode != null) [ pkgs.crda ]; + systemd.services.hostapd = { description = "hostapd wireless AP"; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index b9536430868..97af2997839 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -26,7 +26,7 @@ let rpc-login=${rpc.user}:${rpc.password} ''} ${optionalString rpc.restricted '' - restrict-rpc=1 + restricted-rpc=1 ''} limit-rate-up=${toString limits.upload} diff --git a/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix index 0e32f182e2a..85aa40784af 100644 --- a/nixos/modules/services/networking/pixiecore.nix +++ b/nixos/modules/services/networking/pixiecore.nix @@ -115,7 +115,7 @@ in if cfg.mode == "boot" then [ "boot" cfg.kernel ] ++ optional (cfg.initrd != "") cfg.initrd - ++ optional (cfg.cmdLine != "") "--cmdline=${lib.escapeShellArg cfg.cmdLine}" + ++ optionals (cfg.cmdLine != "") [ "--cmdline" cfg.cmdLine ] else [ "api" cfg.apiServer ]; in '' diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 9825613d809..cdd341c9fb6 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -382,6 +382,11 @@ let default = "en"; description = "Default room language."; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional MUC specific configuration"; + }; }; }; @@ -792,6 +797,8 @@ in https_ports = ${toLua cfg.httpsPorts} + ${ cfg.extraConfig } + ${lib.concatMapStrings (muc: '' Component ${toLua muc.domain} "muc" modules_enabled = { "muc_mam"; ${optionalString muc.vcard_muc ''"vcard_muc";'' } } @@ -809,8 +816,8 @@ in muc_room_default_change_subject = ${toLua muc.roomDefaultChangeSubject} muc_room_default_history_length = ${toLua muc.roomDefaultHistoryLength} muc_room_default_language = ${toLua muc.roomDefaultLanguage} - - '') cfg.muc} + ${ muc.extraConfig } + '') cfg.muc} ${ lib.optionalString (cfg.uploadHttp != null) '' Component ${toLua cfg.uploadHttp.domain} "http_upload" @@ -820,8 +827,6 @@ in http_upload_path = ${toLua cfg.uploadHttp.httpUploadPath} ''} - ${ cfg.extraConfig } - ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" enabled = ${boolToString v.enabled}; diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix index 6ad18bb2240..e79d6de9264 100644 --- a/nixos/modules/services/networking/skydns.nix +++ b/nixos/modules/services/networking/skydns.nix @@ -83,7 +83,7 @@ in { SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers; }; serviceConfig = { - ExecStart = "${cfg.package.bin}/bin/skydns"; + ExecStart = "${cfg.package}/bin/skydns"; }; }; diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index a5087b0a99b..e37334b3cf5 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -43,12 +43,12 @@ in { description = "Provide EC2 instance credentials to machines outside of EC2"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; + requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; preStart = '' /run/current-system/sw/bin/rm -fv /run/hologram.sock ''; serviceConfig = { - ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; + ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; }; }; diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index bad02c7440b..4acf6ae0e21 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -123,7 +123,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; + ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}"; }; }; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 46caadee204..d5c5437329e 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -577,7 +577,7 @@ in serviceConfig = { User = "oauth2_proxy"; Restart = "always"; - ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; + ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}"; EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile; }; }; diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 76e18266a27..33a828fa2cb 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -188,7 +188,7 @@ let name = "icalevents"; # Download the plugin from the dokuwiki site src = pkgs.fetchurl { - url = https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip; + url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; }; sourceRoot = "."; @@ -216,7 +216,7 @@ let name = "bootstrap3"; # Download the theme from the dokuwiki site src = pkgs.fetchurl { - url = https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip; + url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; }; # We need unzip to build this package diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 853347bf86e..f5c2c356afc 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -224,7 +224,7 @@ in serviceConfig = { User = "nobody"; Group = "nogroup"; - ExecStart = "${pkgs.matterircd.bin}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}"; + ExecStart = "${pkgs.matterircd}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}"; WorkingDirectory = "/tmp"; PrivateTmp = true; Restart = "always"; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 8d49dc66eb1..1e9cda7e478 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -187,7 +187,7 @@ let then "/etc/nginx/nginx.conf" else configFile; - execCommand = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'"; + execCommand = "${cfg.package}/bin/nginx -c '${configPath}'"; vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: let @@ -463,13 +463,6 @@ in ''; }; - stateDir = mkOption { - default = "/var/spool/nginx"; - description = " - Directory holding all state for nginx to run. - "; - }; - user = mkOption { type = types.str; default = "nginx"; @@ -636,6 +629,13 @@ in }; }; + imports = [ + (mkRemovedOptionModule [ "services" "nginx" "stateDir" ] '' + The Nginx log directory has been moved to /var/log/nginx, the cache directory + to /var/cache/nginx. The option services.nginx.stateDir has been removed. + '') + ]; + config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test @@ -680,12 +680,6 @@ in } ]; - systemd.tmpfiles.rules = [ - "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" - "d '${cfg.stateDir}/logs' 0750 ${cfg.user} ${cfg.group} - -" - "Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" - ]; - systemd.services.nginx = { description = "Nginx Web Server"; wantedBy = [ "multi-user.target" ]; @@ -708,6 +702,12 @@ in # Runtime directory and mode RuntimeDirectory = "nginx"; RuntimeDirectoryMode = "0750"; + # Cache directory and mode + CacheDirectory = "nginx"; + CacheDirectoryMode = "0750"; + # Logs directory and mode + LogsDirectory = "nginx"; + LogsDirectoryMode = "0750"; # Capabilities AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; }; diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index f8a18954fc9..989866144e1 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -91,41 +91,47 @@ in { description = "Unit App Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ curl ]; preStart = '' - test -f '${cfg.stateDir}/conf.json' || rm -f '${cfg.stateDir}/conf.json' + [ ! -e '${cfg.stateDir}/conf.json' ] || rm -f '${cfg.stateDir}/conf.json' ''; postStart = '' - curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' + ${pkgs.curl}/bin/curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' ''; serviceConfig = { + Type = "forking"; + PIDFile = "/run/unit/unit.pid"; ExecStart = '' ${cfg.package}/bin/unitd --control 'unix:/run/unit/control.unit.sock' --pid '/run/unit/unit.pid' \ - --log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' --no-daemon \ + --log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' \ --user ${cfg.user} --group ${cfg.group} ''; - # User and group - User = cfg.user; - Group = cfg.group; - # Capabilities - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" ]; + ExecStop = '' + ${pkgs.curl}/bin/curl -X DELETE --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' + ''; + # Runtime directory and mode + RuntimeDirectory = "unit"; + RuntimeDirectoryMode = "0750"; + # Access write directories + ReadWritePaths = [ cfg.stateDir cfg.logDir ]; # Security NoNewPrivileges = true; # Sandboxing - ProtectSystem = "full"; + ProtectSystem = "strict"; ProtectHome = true; - RuntimeDirectory = "unit"; - RuntimeDirectoryMode = "0750"; PrivateTmp = true; PrivateDevices = true; ProtectHostname = true; ProtectKernelTunables = true; ProtectKernelModules = true; ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; LockPersonality = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; + RestrictSUIDSGID = true; PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 01fe230b8a4..5fcc8590232 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -109,7 +109,7 @@ in # Without this, elementary LightDM greeter will pre-select non-existent `default` session # https://github.com/elementary/greeter/issues/368 - services.xserver.displayManager.defaultSession = "pantheon"; + services.xserver.displayManager.defaultSession = mkDefault "pantheon"; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix index e6a24a2f1a3..3fd6fed91e1 100644 --- a/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -37,7 +37,7 @@ in # If there is any package configured in modulePackages, we generate the # loaders.cache based on that and set the environment variable # GDK_PIXBUF_MODULE_FILE to point to it. - config = mkIf (cfg.modulePackages != [] || pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) { + config = mkIf (cfg.modulePackages != []) { environment.variables = { GDK_PIXBUF_MODULE_FILE = "${loadersCache}"; }; diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index e3bd21be73e..1289edd2904 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -1,39 +1,48 @@ { config, lib, pkgs, ... }: with lib; -with builtins; let cfg = config.services.picom; - pairOf = x: with types; addCheck (listOf x) (y: length y == 2); - - floatBetween = a: b: with lib; with types; - addCheck str (x: versionAtLeast x a && versionOlder x b); - - toConf = attrs: concatStringsSep "\n" - (mapAttrsToList - (k: v: let - sep = if isAttrs v then ":" else "="; - # Basically a tinkered lib.generators.mkKeyValueDefault - mkValueString = v: - if isBool v then boolToString v - else if isInt v then toString v - else if isFloat v then toString v - else if isString v then ''"${escape [ ''"'' ] v}"'' - else if isList v then "[ " - + concatMapStringsSep " , " mkValueString v - + " ]" - else if isAttrs v then "{ " - + concatStringsSep " " - (mapAttrsToList - (key: value: "${toString key}=${mkValueString value};") - v) - + " }" - else abort "picom.mkValueString: unexpected type (v = ${v})"; - in "${escape [ sep ] k}${sep}${mkValueString v};") - attrs); + pairOf = x: with types; + addCheck (listOf x) (y: length y == 2) + // { description = "pair of ${x.description}"; }; + + floatBetween = a: b: with types; + let + # toString prints floats with hardcoded high precision + floatToString = f: builtins.toJSON f; + in + addCheck float (x: x <= b && x >= a) + // { description = "a floating point number in " + + "range [${floatToString a}, ${floatToString b}]"; }; + + mkDefaultAttrs = mapAttrs (n: v: mkDefault v); + + # Basically a tinkered lib.generators.mkKeyValueDefault + # It either serializes a top-level definition "key: { values };" + # or an expression "key = { values };" + mkAttrsString = top: + mapAttrsToList (k: v: + let sep = if (top && isAttrs v) then ":" else "="; + in "${escape [ sep ] k}${sep}${mkValueString v};"); + + # This serializes a Nix expression to the libconfig format. + mkValueString = v: + if types.bool.check v then boolToString v + else if types.int.check v then toString v + else if types.float.check v then toString v + else if types.str.check v then "\"${escape [ "\"" ] v}\"" + else if builtins.isList v then "[ ${concatMapStringsSep " , " mkValueString v} ]" + else if types.attrs.check v then "{ ${concatStringsSep " " (mkAttrsString false v) } }" + else throw '' + invalid expression used in option services.picom.settings: + ${v} + ''; + + toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings); configFile = pkgs.writeText "picom.conf" (toConf cfg.settings); @@ -61,7 +70,7 @@ in { }; fadeDelta = mkOption { - type = types.addCheck types.int (x: x > 0); + type = types.ints.positive; default = 10; example = 5; description = '' @@ -70,12 +79,11 @@ in { }; fadeSteps = mkOption { - type = pairOf (floatBetween "0.01" "1.01"); - default = [ "0.028" "0.03" ]; - example = [ "0.04" "0.04" ]; + type = pairOf (floatBetween 0.01 1); + default = [ 0.028 0.03 ]; + example = [ 0.04 0.04 ]; description = '' Opacity change between fade steps (in and out). - (numbers in range 0.01 - 1.0) ''; }; @@ -111,11 +119,11 @@ in { }; shadowOpacity = mkOption { - type = floatBetween "0.0" "1.01"; - default = "0.75"; - example = "0.8"; + type = floatBetween 0 1; + default = 0.75; + example = 0.8; description = '' - Window shadows opacity (number in range 0.0 - 1.0). + Window shadows opacity. ''; }; @@ -134,29 +142,29 @@ in { }; activeOpacity = mkOption { - type = floatBetween "0.0" "1.01"; - default = "1.0"; - example = "0.8"; + type = floatBetween 0 1; + default = 1.0; + example = 0.8; description = '' - Opacity of active windows (number in range 0.0 - 1.0). + Opacity of active windows. ''; }; inactiveOpacity = mkOption { - type = floatBetween "0.1" "1.01"; - default = "1.0"; - example = "0.8"; + type = floatBetween 0.1 1; + default = 1.0; + example = 0.8; description = '' - Opacity of inactive windows (number in range 0.1 - 1.0). + Opacity of inactive windows. ''; }; menuOpacity = mkOption { - type = floatBetween "0.0" "1.01"; - default = "1.0"; - example = "0.8"; + type = floatBetween 0 1; + default = 1.0; + example = 0.8; description = '' - Opacity of dropdown and popup menu (number in range 0.0 - 1.0). + Opacity of dropdown and popup menu. ''; }; @@ -210,7 +218,7 @@ in { }; refreshRate = mkOption { - type = types.addCheck types.int (x: x >= 0); + type = types.ints.unsigned; default = 0; example = 60; description = '' @@ -218,54 +226,69 @@ in { ''; }; - settings = let - configTypes = with types; oneOf [ bool int float str ]; - # types.loaOf converts lists to sets - loaOf = t: with types; either (listOf t) (attrsOf t); + settings = with types; + let + scalar = oneOf [ bool int float str ] + // { description = "scalar types"; }; + + libConfig = oneOf [ scalar (listOf libConfig) (attrsOf libConfig) ] + // { description = "libconfig type"; }; + + topLevel = attrsOf libConfig + // { description = '' + libconfig configuration. The format consists of an attributes + set (called a group) of settings. Each setting can be a scalar type + (boolean, integer, floating point number or string), a list of + scalars or a group itself + ''; + }; + in mkOption { - type = loaOf (types.either configTypes (loaOf (types.either configTypes (loaOf configTypes)))); - default = {}; + type = topLevel; + default = { }; + example = literalExample '' + blur = + { method = "gaussian"; + size = 10; + deviation = 5.0; + }; + ''; description = '' - Additional Picom configuration. + Picom settings. Use this option to configure Picom settings not exposed + in a NixOS option or to bypass one. For the available options see the + CONFIGURATION FILES section at <literal>picom(1)</literal>. ''; }; }; config = mkIf cfg.enable { - services.picom.settings = let - # Hard conversion to float, literally lib.toInt but toFloat - toFloat = str: let - may_be_float = builtins.fromJSON str; - in if builtins.isFloat may_be_float - then may_be_float - else throw "Could not convert ${str} to float."; - in { + services.picom.settings = mkDefaultAttrs { # fading - fading = mkDefault cfg.fade; - fade-delta = mkDefault cfg.fadeDelta; - fade-in-step = mkDefault (toFloat (elemAt cfg.fadeSteps 0)); - fade-out-step = mkDefault (toFloat (elemAt cfg.fadeSteps 1)); - fade-exclude = mkDefault cfg.fadeExclude; + fading = cfg.fade; + fade-delta = cfg.fadeDelta; + fade-in-step = elemAt cfg.fadeSteps 0; + fade-out-step = elemAt cfg.fadeSteps 1; + fade-exclude = cfg.fadeExclude; # shadows - shadow = mkDefault cfg.shadow; - shadow-offset-x = mkDefault (elemAt cfg.shadowOffsets 0); - shadow-offset-y = mkDefault (elemAt cfg.shadowOffsets 1); - shadow-opacity = mkDefault (toFloat cfg.shadowOpacity); - shadow-exclude = mkDefault cfg.shadowExclude; + shadow = cfg.shadow; + shadow-offset-x = elemAt cfg.shadowOffsets 0; + shadow-offset-y = elemAt cfg.shadowOffsets 1; + shadow-opacity = cfg.shadowOpacity; + shadow-exclude = cfg.shadowExclude; # opacity - active-opacity = mkDefault (toFloat cfg.activeOpacity); - inactive-opacity = mkDefault (toFloat cfg.inactiveOpacity); + active-opacity = cfg.activeOpacity; + inactive-opacity = cfg.inactiveOpacity; - wintypes = mkDefault cfg.wintypes; + wintypes = cfg.wintypes; - opacity-rule = mkDefault cfg.opacityRules; + opacity-rule = cfg.opacityRules; # other options - backend = mkDefault cfg.backend; - vsync = mkDefault cfg.vSync; - refresh-rate = mkDefault cfg.refreshRate; + backend = cfg.backend; + vsync = cfg.vSync; + refresh-rate = cfg.refreshRate; }; systemd.user.services.picom = { diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 04a9fc46628..b815c5f16a1 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -30,6 +30,7 @@ in ./sawfish.nix ./stumpwm.nix ./spectrwm.nix + ./tinywm.nix ./twm.nix ./windowmaker.nix ./wmii.nix diff --git a/nixos/modules/services/x11/window-managers/tinywm.nix b/nixos/modules/services/x11/window-managers/tinywm.nix new file mode 100644 index 00000000000..8e5d9b9170c --- /dev/null +++ b/nixos/modules/services/x11/window-managers/tinywm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.tinywm; +in +{ + ###### interface + options = { + services.xserver.windowManager.tinywm.enable = mkEnableOption "tinywm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "tinywm"; + start = '' + ${pkgs.tinywm}/bin/tinywm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.tinywm ]; + }; +} diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix index 7eb52e3d021..e75aa9d1387 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.nix @@ -3,8 +3,8 @@ pkgs.substituteAll { src = ./raspberrypi-builder.sh; isExecutable = true; - inherit (pkgs) bash; - path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; + inherit (pkgs.buildPackages) bash; + path = with pkgs.buildPackages; [coreutils gnused gnugrep]; firmware = pkgs.raspberrypifw; inherit configTxt; } diff --git a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix index 1dc397e521b..a4352ab9a24 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/uboot-builder.nix @@ -20,7 +20,7 @@ let extlinuxConfBuilder = import ../generic-extlinux-compatible/extlinux-conf-builder.nix { - inherit pkgs; + pkgs = pkgs.buildPackages; }; in pkgs.substituteAll { diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index da61c64faf8..b7aaef575ac 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -138,6 +138,10 @@ in users.users.resolved.group = "systemd-resolve"; + # add resolve to nss hosts database if enabled and nscd enabled + # system.nssModules is configured in nixos/modules/system/boot/systemd.nix + system.nssDatabases.hosts = optional config.services.nscd.enable "resolve [!UNAVAIL=return]"; + systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ]; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 2167df60bc9..36a25c4e6c3 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -201,8 +201,23 @@ let ]; makeJobScript = name: text: - let mkScriptName = s: "unit-script-" + (replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape s) ); - in pkgs.writeTextFile { name = mkScriptName name; executable = true; inherit text; }; + let + scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); + out = pkgs.writeTextFile { + # The derivation name is different from the script file name + # to keep the script file name short to avoid cluttering logs. + name = "unit-script-${scriptName}"; + executable = true; + destination = "/bin/${scriptName}"; + text = '' + #!${pkgs.runtimeShell} -e + ${text} + ''; + checkPhase = '' + ${pkgs.stdenv.shell} -n "$out/bin/${scriptName}" + ''; + }; + in "${out}/bin/${scriptName}"; unitConfig = { config, options, ... }: { config = { @@ -250,40 +265,28 @@ let environment.PATH = config.path; } (mkIf (config.preStart != "") - { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' - #! ${pkgs.runtimeShell} -e - ${config.preStart} - ''; + { serviceConfig.ExecStartPre = + makeJobScript "${name}-pre-start" config.preStart; }) (mkIf (config.script != "") - { serviceConfig.ExecStart = makeJobScript "${name}-start" '' - #! ${pkgs.runtimeShell} -e - ${config.script} - '' + " " + config.scriptArgs; + { serviceConfig.ExecStart = + makeJobScript "${name}-start" config.script + " " + config.scriptArgs; }) (mkIf (config.postStart != "") - { serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" '' - #! ${pkgs.runtimeShell} -e - ${config.postStart} - ''; + { serviceConfig.ExecStartPost = + makeJobScript "${name}-post-start" config.postStart; }) (mkIf (config.reload != "") - { serviceConfig.ExecReload = makeJobScript "${name}-reload" '' - #! ${pkgs.runtimeShell} -e - ${config.reload} - ''; + { serviceConfig.ExecReload = + makeJobScript "${name}-reload" config.reload; }) (mkIf (config.preStop != "") - { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" '' - #! ${pkgs.runtimeShell} -e - ${config.preStop} - ''; + { serviceConfig.ExecStop = + makeJobScript "${name}-pre-stop" config.preStop; }) (mkIf (config.postStop != "") - { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" '' - #! ${pkgs.runtimeShell} -e - ${config.postStop} - ''; + { serviceConfig.ExecStopPost = + makeJobScript "${name}-post-stop" config.postStop; }) ]; }; @@ -405,6 +408,8 @@ let "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" ]; + proxy_env = config.networking.proxy.envVars; + in { @@ -827,6 +832,27 @@ in system.build.units = cfg.units; + # Systemd provides various NSS modules to look up dynamic users, locally + # configured IP adresses and local container hostnames. + # On NixOS, these can only be passed to the NSS system via nscd (and its + # LD_LIBRARY_PATH), which is why it's usually a very good idea to have nscd + # enabled (also see the config.nscd.enable description). + # While there is already an assertion in place complaining loudly about + # having nssModules configured and nscd disabled, for some reason we still + # check for nscd being enabled before adding to nssModules. + system.nssModules = optional config.services.nscd.enable systemd.out; + system.nssDatabases = mkIf config.services.nscd.enable { + hosts = (mkMerge [ + [ "mymachines" ] + (mkOrder 1600 [ "myhostname" ] # 1600 to ensure it's always the last + ) + ]); + passwd = (mkMerge [ + [ "mymachines" ] + (mkAfter [ "systemd" ]) + ]); + }; + environment.systemPackages = [ systemd ]; environment.etc = let @@ -1035,6 +1061,7 @@ in systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; + systemd.services.systemd-importd.environment = proxy_env; # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 89ba9c3c663..2af4214302d 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -4,6 +4,11 @@ with lib; let cfg = config.virtualisation.cri-o; + + # Copy configuration files to avoid having the entire sources in the system closure + copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + cp ${filePath} $out + ''; in { imports = [ @@ -45,9 +50,9 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ cri-o cri-tools conmon iptables runc utillinux ]; - environment.etc."crictl.yaml".text = '' - runtime-endpoint: unix:///var/run/crio/crio.sock - ''; + + environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o.src}/crictl.yaml"; + environment.etc."crio/crio.conf".text = '' [crio] storage_driver = "${cfg.storageDriver}" @@ -66,23 +71,7 @@ in manage_network_ns_lifecycle = true ''; - environment.etc."cni/net.d/20-cri-o-bridge.conf".text = '' - { - "cniVersion": "0.3.1", - "name": "crio-bridge", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "10.88.0.0/16", - "routes": [ - { "dst": "0.0.0.0/0" } - ] - } - } - ''; + environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o.src}/contrib/cni/10-crio-bridge.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix index fc51b159579..93fefe56d1a 100644 --- a/nixos/modules/virtualisation/ecs-agent.nix +++ b/nixos/modules/virtualisation/ecs-agent.nix @@ -38,9 +38,8 @@ in { if [ ! -z "$ECS_DATADIR" ]; then mkdir -p "$ECS_DATADIR" fi - ${cfg.package.bin}/bin/agent + ${cfg.package}/bin/agent ''; }; }; } - diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index de48d3a780e..53b89a9f55b 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -108,7 +108,7 @@ in ''; serviceConfig = { - ExecStart = "@${cfg.package.bin}/bin/lxd lxd --group lxd"; + ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd"; Type = "simple"; KillMode = "process"; # when stopping, leave the containers alone LimitMEMLOCK = "infinity"; diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 5ab990a3d7c..a46dd65eb49 100644 --- a/nixos/modules/virtualisation/docker-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -1,17 +1,20 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; let - cfg = config.docker-containers; + cfg = config.virtualisation.oci-containers; + proxy_env = config.networking.proxy.envVars; - dockerContainer = + defaultBackend = options.virtualisation.oci-containers.backend.default; + + containerOptions = { ... }: { options = { image = mkOption { type = with types; str; - description = "Docker image to run."; + description = "OCI image to run."; example = "library/hello-world"; }; @@ -58,18 +61,19 @@ let log-driver = mkOption { type = types.str; - default = "none"; + default = "journald"; description = '' Logging driver for the container. The default of - <literal>"none"</literal> means that the container's logs will be - handled as part of the systemd unit. Setting this to - <literal>"journald"</literal> will result in duplicate logging, but - the container's logs will be visible to the <command>docker - logs</command> command. - - For more details and a full list of logging drivers, refer to the - <link xlink:href="https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver"> - Docker engine documentation</link> + <literal>"journald"</literal> means that the container's logs will be + handled as part of the systemd unit. + + For more details and a full list of logging drivers, refer to respective backends documentation. + + For Docker: + <link xlink:href="https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver">Docker engine documentation</link> + + For Podman: + Refer to the docker-run(1) man page. ''; }; @@ -172,10 +176,10 @@ let description = '' Define which other containers this one depends on. They will be added to both After and Requires for the unit. - Use the same name as the attribute under <literal>services.docker-containers</literal>. + Use the same name as the attribute under <literal>virtualisation.oci-containers</literal>. ''; example = literalExample '' - services.docker-containers = { + virtualisation.oci-containers = { node1 = {}; node2 = { dependsOn = [ "node1" ]; @@ -184,10 +188,10 @@ let ''; }; - extraDockerOptions = mkOption { + extraOptions = mkOption { type = with types; listOf str; default = []; - description = "Extra options for <command>docker run</command>."; + description = "Extra options for <command>${defaultBackend} run</command>."; example = literalExample '' ["--network=host"] ''; @@ -205,24 +209,31 @@ let }; mkService = name: container: let - mkAfter = map (x: "docker-${x}.service") container.dependsOn; - in rec { + dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn; + in { wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; - after = [ "docker.service" "docker.socket" ] ++ mkAfter; - requires = after; - path = [ pkgs.docker ]; + after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] ++ dependsOn; + requires = dependsOn; + environment = proxy_env; + + path = + if cfg.backend == "docker" then [ pkgs.docker ] + else if cfg.backend == "podman" then [ config.virtualisation.podman.package ] + else throw "Unhandled backend: ${cfg.backend}"; preStart = '' - docker rm -f ${name} || true + ${cfg.backend} rm -f ${name} || true ${optionalString (container.imageFile != null) '' - docker load -i ${container.imageFile} + ${cfg.backend} load -i ${container.imageFile} ''} ''; - postStop = "docker rm -f ${name} || true"; - + postStop = "${cfg.backend} rm -f ${name} || true"; + serviceConfig = { + StandardOutput = "null"; + StandardError = "null"; ExecStart = concatStringsSep " \\\n " ([ - "${pkgs.docker}/bin/docker run" + "${config.system.path}/bin/${cfg.backend} run" "--rm" "--name=${name}" "--log-driver=${container.log-driver}" @@ -233,12 +244,12 @@ let ++ optional (container.user != null) "-u ${escapeShellArg container.user}" ++ map (v: "-v ${escapeShellArg v}") container.volumes ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" - ++ map escapeShellArg container.extraDockerOptions + ++ map escapeShellArg container.extraOptions ++ [container.image] ++ map escapeShellArg container.cmd ); - ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || docker stop ${name}"''; + ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${cfg.backend} stop ${name}"''; ### There is no generalized way of supporting `reload` for docker ### containers. Some containers may respond well to SIGHUP sent to their @@ -263,19 +274,50 @@ let }; in { + imports = [ + ( + lib.mkChangedOptionModule + [ "docker-containers" ] + [ "virtualisation" "oci-containers" ] + (oldcfg: { + backend = "docker"; + containers = lib.mapAttrs (n: v: builtins.removeAttrs (v // { + extraOptions = v.extraDockerOptions or []; + }) [ "extraDockerOptions" ]) oldcfg.docker-containers; + }) + ) + ]; + + options.virtualisation.oci-containers = { + + backend = mkOption { + type = types.enum [ "podman" "docker" ]; + default = + # TODO: Once https://github.com/NixOS/nixpkgs/issues/77925 is resolved default to podman + # if versionAtLeast config.system.stateVersion "20.09" then "podman" + # else "docker"; + "docker"; + description = "The underlying Docker implementation to use."; + }; - options.docker-containers = mkOption { - default = {}; - type = types.attrsOf (types.submodule dockerContainer); - description = "Docker containers to run as systemd services."; - }; - - config = mkIf (cfg != {}) { - - systemd.services = mapAttrs' (n: v: nameValuePair "docker-${n}" (mkService n v)) cfg; - - virtualisation.docker.enable = true; + containers = mkOption { + default = {}; + type = types.attrsOf (types.submodule containerOptions); + description = "OCI (Docker) containers to run as systemd services."; + }; }; + config = lib.mkIf (cfg.containers != {}) (lib.mkMerge [ + { + systemd.services = mapAttrs' (n: v: nameValuePair "${cfg.backend}-${n}" (mkService n v)) cfg.containers; + } + (lib.mkIf (cfg.backend == "podman") { + virtualisation.podman.enable = true; + }) + (lib.mkIf (cfg.backend == "docker") { + virtualisation.docker.enable = true; + }) + ]); + } diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 1dc79272ccb..652850bf500 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -8,13 +8,11 @@ let # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { - outputs = [ "out" "bin" "man" ]; + outputs = [ "out" "man" ]; inherit (podmanPackage) meta; } '' - mkdir $out - - mkdir -p $bin/bin - ln -s ${podmanPackage.bin}/bin/podman $bin/bin/docker + mkdir -p $out/bin + ln -s ${podmanPackage}/bin/podman $out/bin/docker mkdir -p $man/share/man/man1 for f in ${podmanPackage.man}/share/man/man1/*; do @@ -88,11 +86,21 @@ in }; }; + package = lib.mkOption { + type = types.package; + default = podmanPackage; + internal = true; + description = '' + The final Podman package (including extra packages). + ''; + }; + + }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ podmanPackage ] + environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; environment.etc."containers/libpod.conf".text = '' diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 85b75ba6804..ac86330c098 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -189,9 +189,18 @@ let mkdir /boot/grub echo '(hd0) /dev/vda' > /boot/grub/device.map - # Install GRUB and generate the GRUB boot menu. - touch /etc/NIXOS + # This is needed for systemd-boot to find ESP, and udev is not available here to create this + mkdir -p /dev/block + ln -s /dev/vda2 /dev/block/254:2 + + # Set up system profile (normally done by nixos-rebuild / nix-env --set) mkdir -p /nix/var/nix/profiles + ln -s ${config.system.build.toplevel} /nix/var/nix/profiles/system-1-link + ln -s /nix/var/nix/profiles/system-1-link /nix/var/nix/profiles/system + + # Install bootloader + touch /etc/NIXOS + export NIXOS_INSTALL_BOOTLOADER=1 ${config.system.build.toplevel}/bin/switch-to-configuration boot umount /boot diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index eff1752bbbf..5a0c9d1afae 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -24,7 +24,6 @@ in _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; atd = handleTest ./atd.nix {}; - automysqlbackup = handleTest ./automysqlbackup.nix {}; avahi = handleTest ./avahi.nix {}; babeld = handleTest ./babeld.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 @@ -69,8 +68,9 @@ in deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; + doas = handleTest ./doas.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; - docker-containers = handleTestOn ["x86_64-linux"] ./docker-containers.nix {}; + oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {}; docker-registry = handleTest ./docker-registry.nix {}; @@ -85,6 +85,7 @@ in ecryptfs = handleTest ./ecryptfs.nix {}; ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; + enlightenment = handleTest ./enlightenment.nix {}; env = handleTest ./env.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; @@ -143,6 +144,7 @@ in initrdNetwork = handleTest ./initrd-network.nix {}; installer = handleTest ./installer.nix {}; iodine = handleTest ./iodine.nix {}; + ipfs = handleTest ./ipfs.nix {}; ipv6 = handleTest ./ipv6.nix {}; jackett = handleTest ./jackett.nix {}; jellyfin = handleTest ./jellyfin.nix {}; @@ -164,7 +166,6 @@ in kubernetes.rbac = handleTestOn ["x86_64-linux"] ./kubernetes/rbac.nix {}; latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; }; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; - ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; @@ -176,6 +177,8 @@ in magnetico = handleTest ./magnetico.nix {}; magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; + mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; + mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {}; mathics = handleTest ./mathics.nix {}; matomo = handleTest ./matomo.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; @@ -197,9 +200,10 @@ in munin = handleTest ./munin.nix {}; mutableUsers = handleTest ./mutable-users.nix {}; mxisd = handleTest ./mxisd.nix {}; - mysql = handleTest ./mysql.nix {}; - mysqlBackup = handleTest ./mysql-backup.nix {}; - mysqlReplication = handleTest ./mysql-replication.nix {}; + mysql = handleTest ./mysql/mysql.nix {}; + mysql-autobackup = handleTest ./mysql/mysql-autobackup.nix {}; + mysql-backup = handleTest ./mysql/mysql-backup.nix {}; + mysql-replication = handleTest ./mysql/mysql-replication.nix {}; nagios = handleTest ./nagios.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; @@ -297,6 +301,7 @@ in syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-analyze = handleTest ./systemd-analyze.nix {}; + systemd-boot = handleTestOn ["x86_64-linux"] ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; @@ -320,6 +325,7 @@ in trickster = handleTest ./trickster.nix {}; tuptime = handleTest ./tuptime.nix {}; udisks2 = handleTest ./udisks2.nix {}; + unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; uwsgi = handleTest ./uwsgi.nix {}; vault = handleTest ./vault.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index fc5d3a5c52f..795b93f6f54 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -37,7 +37,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { </head> <body onload="javascript:document.title='startup done'"> <img src="file://${pkgs.fetchurl { - url = "http://nixos.org/logo/nixos-hex.svg"; + url = "https://nixos.org/logo/nixos-hex.svg"; sha256 = "07ymq6nw8kc22m7kzxjxldhiq8gzmc7f45kq2bvhbdm0w5s112s4"; }}" /> </body> diff --git a/nixos/tests/doas.nix b/nixos/tests/doas.nix new file mode 100644 index 00000000000..9c0a4bdc756 --- /dev/null +++ b/nixos/tests/doas.nix @@ -0,0 +1,83 @@ +# Some tests to ensure doas is working properly. +import ./make-test-python.nix ( + { lib, ... }: { + name = "doas"; + meta = with lib.maintainers; { + maintainers = [ cole-h ]; + }; + + machine = + { ... }: + { + users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.users = { + test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + test1 = { isNormalUser = true; }; + test2 = { isNormalUser = true; extraGroups = [ "foobar" ]; }; + test3 = { isNormalUser = true; extraGroups = [ "barfoo" ]; }; + test4 = { isNormalUser = true; extraGroups = [ "baz" ]; }; + test5 = { isNormalUser = true; }; + test6 = { isNormalUser = true; }; + test7 = { isNormalUser = true; }; + }; + + security.doas = { + enable = true; + wheelNeedsPassword = false; + + extraRules = [ + { users = [ "test1" ]; groups = [ "foobar" ]; } + { users = [ "test2" ]; noPass = true; setEnv = [ "CORRECT" "HORSE=BATTERY" ]; } + { groups = [ "barfoo" 1337 ]; noPass = true; } + { users = [ "test5" ]; noPass = true; keepEnv = true; runAs = "test1"; } + { users = [ "test6" ]; noPass = true; keepEnv = true; setEnv = [ "-STAPLE" ]; } + { users = [ "test7" ]; noPass = true; setEnv = [ "-SSH_AUTH_SOCK" ]; } + ]; + }; + }; + + testScript = '' + with subtest("users in wheel group should have passwordless doas"): + machine.succeed('su - test0 -c "doas -u root true"') + + with subtest("test1 user should not be able to use doas without password"): + machine.fail('su - test1 -c "doas -n -u root true"') + + with subtest("test2 user should be able to keep some env"): + if "CORRECT=1" not in machine.succeed('su - test2 -c "CORRECT=1 doas env"'): + raise Exception("failed to keep CORRECT") + + if "HORSE=BATTERY" not in machine.succeed('su - test2 -c "doas env"'): + raise Exception("failed to setenv HORSE=BATTERY") + + with subtest("users in group 'barfoo' shouldn't require password"): + machine.succeed("doas -u test3 doas -n -u root true") + + with subtest("users in group 'baz' (GID 1337) shouldn't require password"): + machine.succeed("doas -u test4 doas -n -u root echo true") + + with subtest("test5 user should be able to run commands under test1"): + machine.succeed("doas -u test5 doas -n -u test1 true") + + with subtest("test5 user should not be able to run commands under root"): + machine.fail("doas -u test5 doas -n -u root true") + + with subtest("test6 user should be able to keepenv"): + envs = ["BATTERY=HORSE", "CORRECT=false"] + out = machine.succeed( + 'su - test6 -c "BATTERY=HORSE CORRECT=false STAPLE=Tr0ub4dor doas env"' + ) + + if not all(env in out for env in envs): + raise Exception("failed to keep BATTERY or CORRECT") + if "STAPLE=Tr0ub4dor" in out: + raise Exception("failed to exclude STAPLE") + + with subtest("test7 should not have access to SSH_AUTH_SOCK"): + if "SSH_AUTH_SOCK=HOLEY" in machine.succeed( + 'su - test7 -c "SSH_AUTH_SOCK=HOLEY doas env"' + ): + raise Exception("failed to exclude SSH_AUTH_SOCK") + ''; + } +) diff --git a/nixos/tests/docker-containers.nix b/nixos/tests/docker-containers.nix deleted file mode 100644 index 0e318a52d9f..00000000000 --- a/nixos/tests/docker-containers.nix +++ /dev/null @@ -1,27 +0,0 @@ -# Test Docker containers as systemd units - -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "docker-containers"; - meta = { - maintainers = with lib.maintainers; [ benley mkaito ]; - }; - - nodes = { - docker = { pkgs, ... }: { - virtualisation.docker.enable = true; - - docker-containers.nginx = { - image = "nginx-container"; - imageFile = pkgs.dockerTools.examples.nginx; - ports = ["8181:80"]; - }; - }; - }; - - testScript = '' - start_all() - docker.wait_for_unit("docker-nginx.service") - docker.wait_for_open_port(8181) - docker.wait_until_succeeds("curl http://localhost:8181 | grep Hello") - ''; -}) diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 2b907133ed5..05271919eff 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -5,7 +5,7 @@ let name = "bootstrap3"; # Download the theme from the dokuwiki site src = pkgs.fetchurl { - url = https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip; + url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; }; # We need unzip to build this package @@ -20,7 +20,7 @@ let name = "icalevents"; # Download the plugin from the dokuwiki site src = pkgs.fetchurl { - url = https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip; + url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; }; # We need unzip to build this package diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 6aeeb17ba31..5a59d65e602 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -108,7 +108,7 @@ in { inherit image; sshPublicKey = snakeOilPublicKey; - # ### http://nixos.org/channels/nixos-unstable nixos + # ### https://nixos.org/channels/nixos-unstable nixos userData = '' { pkgs, ... }: diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix new file mode 100644 index 00000000000..5fa8d765dd1 --- /dev/null +++ b/nixos/tests/enlightenment.nix @@ -0,0 +1,101 @@ +import ./make-test-python.nix ({ pkgs, ...} : +{ + name = "enlightenment"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ romildo ]; + }; + + machine = { ... }: + { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.desktopManager.enlightenment.enable = true; + services.xserver.displayManager.lightdm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then + virtualisation.memorySize = 1024; + environment.systemPackages = [ pkgs.xdotool ]; + services.acpid.enable = true; + services.connman.enable = true; + services.connman.package = pkgs.connmanMinimal; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in '' + with subtest("Ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + + with subtest("Check that logging in has given the user ownership of devices"): + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + + with subtest("First time wizard"): + machine.wait_for_text("Default") # Language + machine.succeed("xdotool mousemove 512 185 click 1") # Default Language + machine.screenshot("wizard1") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("English") # Keyboard (default) + machine.screenshot("wizard2") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Standard") # Profile (default) + machine.screenshot("wizard3") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Title") # Sizing (default) + machine.screenshot("wizard4") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("clicked") # Windows Phocus + machine.succeed("xdotool mousemove 512 370 click 1") # Click + machine.screenshot("wizard5") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("bindings") # Mouse Modifiers (default) + machine.screenshot("wizard6") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Connman") # Network Management (default) + machine.screenshot("wizard7") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("BlusZ") # Bluetooh Management (default) + machine.screenshot("wizard8") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Compositing") # Compositing (default) + machine.screenshot("wizard9") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("update") # Updates + machine.succeed("xdotool mousemove 512 495 click 1") # Disable + machine.screenshot("wizard10") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("taskbar") # Taskbar + machine.succeed("xdotool mousemove 480 410 click 1") # Enable + machine.screenshot("wizard11") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Home") # The desktop + machine.screenshot("wizard12") + + with subtest("Run Terminology"): + machine.succeed("terminology &") + machine.sleep(5) + machine.send_chars("ls --color -alF\n") + machine.sleep(2) + machine.screenshot("terminology") + ''; +}) diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix index b610caf06fb..c4a707943ef 100644 --- a/nixos/tests/gitdaemon.nix +++ b/nixos/tests/gitdaemon.nix @@ -55,6 +55,9 @@ in { with subtest("git daemon starts"): server.wait_for_unit("git-daemon.service") + server.wait_for_unit("network-online.target") + client.wait_for_unit("network-online.target") + with subtest("client can clone project.git"): client.succeed( "git clone git://server/project.git /project", diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 8d1bfa96d03..eef9abebf9f 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -97,7 +97,7 @@ let def create_machine_named(name): - return create_machine({**default_flags, "name": "boot-after-install"}) + return create_machine({**default_flags, "name": name}) machine.start() @@ -650,6 +650,32 @@ in { ''; }; + bcache = makeInstallerTest "bcache" { + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda --" + + " mklabel msdos" + + " mkpart primary ext2 1M 50MB" # /boot + + " mkpart primary 50MB 512MB " # swap + + " mkpart primary 512MB 1024MB" # Cache (typically SSD) + + " mkpart primary 1024MB -1s ", # Backing device (typically HDD) + "modprobe bcache", + "udevadm settle", + "make-bcache -B /dev/vda4 -C /dev/vda3", + "echo /dev/vda3 > /sys/fs/bcache/register", + "echo /dev/vda4 > /sys/fs/bcache/register", + "udevadm settle", + "mkfs.ext3 -L nixos /dev/bcache0", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir /mnt/boot", + "mount LABEL=boot /mnt/boot", + "mkswap -f /dev/vda2 -L swap", + "swapon -L swap", + ) + ''; + }; + # Test a basic install using GRUB 1. grub1 = makeInstallerTest "grub1" { createPartitions = '' diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index 3cff7e99ff8..4d721aec0c7 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -1,55 +1,25 @@ - -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "ipfs"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ mguentner ]; }; - nodes = { - adder = - { ... }: - { - services.ipfs = { - enable = true; - defaultMode = "norouting"; - gatewayAddress = "/ip4/127.0.0.1/tcp/2323"; - apiAddress = "/ip4/127.0.0.1/tcp/2324"; - }; - networking.firewall.allowedTCPPorts = [ 4001 ]; - }; - getter = - { ... }: - { - services.ipfs = { - enable = true; - defaultMode = "norouting"; - autoMount = true; - }; - networking.firewall.allowedTCPPorts = [ 4001 ]; - }; + nodes.machine = { ... }: { + services.ipfs = { + enable = true; + apiAddress = "/ip4/127.0.0.1/tcp/2324"; + }; }; testScript = '' - startAll; - $adder->waitForUnit("ipfs-norouting"); - $getter->waitForUnit("ipfs-norouting"); - - # wait until api is available - $adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id"); - my $addrId = $adder->succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id -f=\"<id>\""); - my $addrIp = (split /[ \/]+/, $adder->succeed("ip -o -4 addr show dev eth1"))[3]; - - $adder->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.Gateway | grep /ip4/127.0.0.1/tcp/2323)\" ]"); - - # wait until api is available - $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id"); - my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2"); - chomp($ipfsHash); + start_all() + machine.wait_for_unit("ipfs") - $adder->mustSucceed("[ -n \"\$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)\" ]"); + machine.wait_until_succeeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id") + ipfs_hash = machine.succeed( + "echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | awk '{ print $2 }'" + ) - $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId"); - $getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]"); - $getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]"); - ''; + machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord") + ''; }) diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix deleted file mode 100644 index 74b002fc00e..00000000000 --- a/nixos/tests/ldap.nix +++ /dev/null @@ -1,405 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ...} : - -let - unlines = lib.concatStringsSep "\n"; - unlinesAttrs = f: as: unlines (lib.mapAttrsToList f as); - - dbDomain = "example.com"; - dbSuffix = "dc=example,dc=com"; - dbAdminDn = "cn=admin,${dbSuffix}"; - dbAdminPwd = "admin-password"; - # NOTE: slappasswd -h "{SSHA}" -s '${dbAdminPwd}' - dbAdminPwdHash = "{SSHA}i7FopSzkFQMrHzDMB1vrtkI0rBnwouP8"; - ldapUser = "test-ldap-user"; - ldapUserId = 10000; - ldapUserPwd = "user-password"; - # NOTE: slappasswd -h "{SSHA}" -s '${ldapUserPwd}' - ldapUserPwdHash = "{SSHA}v12XICMZNGT6r2KJ26rIkN8Vvvp4QX6i"; - ldapGroup = "test-ldap-group"; - ldapGroupId = 10000; - - mkClient = useDaemon: - { lib, ... }: - { - virtualisation.memorySize = 256; - virtualisation.vlans = [ 1 ]; - security.pam.services.su.rootOK = lib.mkForce false; - users.ldap.enable = true; - users.ldap.daemon = { - enable = useDaemon; - rootpwmoddn = "cn=admin,${dbSuffix}"; - rootpwmodpwFile = "/etc/nslcd.rootpwmodpw"; - }; - users.ldap.loginPam = true; - users.ldap.nsswitch = true; - users.ldap.server = "ldap://server"; - users.ldap.base = "ou=posix,${dbSuffix}"; - users.ldap.bind = { - distinguishedName = "cn=admin,${dbSuffix}"; - passwordFile = "/etc/ldap/bind.password"; - }; - # NOTE: passwords stored in clear in Nix's store, but this is a test. - environment.etc."ldap/bind.password".source = pkgs.writeText "password" dbAdminPwd; - environment.etc."nslcd.rootpwmodpw".source = pkgs.writeText "rootpwmodpw" dbAdminPwd; - }; -in - -{ - name = "ldap"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ montag451 ]; - }; - - nodes = { - - server = - { pkgs, config, ... }: - let - inherit (config.services) openldap; - - slapdConfig = pkgs.writeText "cn=config.ldif" ('' - dn: cn=config - objectClass: olcGlobal - #olcPidFile: /run/slapd/slapd.pid - # List of arguments that were passed to the server - #olcArgsFile: /run/slapd/slapd.args - # Read slapd-config(5) for possible values - olcLogLevel: none - # The tool-threads parameter sets the actual amount of CPU's - # that is used for indexing. - olcToolThreads: 1 - - dn: olcDatabase={-1}frontend,cn=config - objectClass: olcDatabaseConfig - objectClass: olcFrontendConfig - # The maximum number of entries that is returned for a search operation - olcSizeLimit: 500 - # Allow unlimited access to local connection from the local root user - olcAccess: to * - by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth manage - by * break - # Allow unauthenticated read access for schema and base DN autodiscovery - olcAccess: to dn.exact="" - by * read - olcAccess: to dn.base="cn=Subschema" - by * read - - dn: olcDatabase=config,cn=config - objectClass: olcDatabaseConfig - olcRootDN: cn=admin,cn=config - #olcRootPW: - # NOTE: access to cn=config, system root can be manager - # with SASL mechanism (-Y EXTERNAL) over unix socket (-H ldapi://) - olcAccess: to * - by dn.exact="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" manage - by * break - - dn: cn=schema,cn=config - objectClass: olcSchemaConfig - - include: file://${pkgs.openldap}/etc/schema/core.ldif - include: file://${pkgs.openldap}/etc/schema/cosine.ldif - include: file://${pkgs.openldap}/etc/schema/nis.ldif - include: file://${pkgs.openldap}/etc/schema/inetorgperson.ldif - - dn: cn=module{0},cn=config - objectClass: olcModuleList - # Where the dynamically loaded modules are stored - #olcModulePath: /usr/lib/ldap - olcModuleLoad: back_mdb - - '' - + unlinesAttrs (olcSuffix: {conf, ...}: - "include: file://" + pkgs.writeText "config.ldif" conf - ) slapdDatabases - ); - - slapdDatabases = { - ${dbSuffix} = { - conf = '' - dn: olcBackend={1}mdb,cn=config - objectClass: olcBackendConfig - - dn: olcDatabase={1}mdb,cn=config - olcSuffix: ${dbSuffix} - olcDbDirectory: ${openldap.dataDir}/${dbSuffix} - objectClass: olcDatabaseConfig - objectClass: olcMdbConfig - # NOTE: checkpoint the database periodically in case of system failure - # and to speed up slapd shutdown. - olcDbCheckpoint: 512 30 - # Database max size is 1G - olcDbMaxSize: 1073741824 - olcLastMod: TRUE - # NOTE: database superuser. Needed for syncrepl, - # and used to auth as admin through a TCP connection. - olcRootDN: cn=admin,${dbSuffix} - olcRootPW: ${dbAdminPwdHash} - # - olcDbIndex: objectClass eq - olcDbIndex: cn,uid eq - olcDbIndex: uidNumber,gidNumber eq - olcDbIndex: member,memberUid eq - # - olcAccess: to attrs=userPassword - by self write - by anonymous auth - by dn="cn=admin,${dbSuffix}" write - by dn="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" write - by * none - olcAccess: to attrs=shadowLastChange - by self write - by dn="cn=admin,${dbSuffix}" write - by dn="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" write - by * none - olcAccess: to dn.sub="ou=posix,${dbSuffix}" - by self read - by dn="cn=admin,${dbSuffix}" read - by dn="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" read - olcAccess: to * - by self read - by * none - ''; - data = '' - dn: ${dbSuffix} - objectClass: top - objectClass: dcObject - objectClass: organization - o: ${dbDomain} - - dn: cn=admin,${dbSuffix} - objectClass: simpleSecurityObject - objectClass: organizationalRole - description: ${dbDomain} LDAP administrator - roleOccupant: ${dbSuffix} - userPassword: ${ldapUserPwdHash} - - dn: ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit - - dn: ou=accounts,ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit - - dn: ou=groups,ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit - '' - + lib.concatMapStrings posixAccount [ - { uid=ldapUser; uidNumber=ldapUserId; gidNumber=ldapGroupId; userPassword=ldapUserPwdHash; } - ] - + lib.concatMapStrings posixGroup [ - { gid=ldapGroup; gidNumber=ldapGroupId; members=[]; } - ]; - }; - }; - - # NOTE: create a user account using the posixAccount objectClass. - posixAccount = - { uid - , uidNumber ? null - , gidNumber ? null - , cn ? "" - , sn ? "" - , userPassword ? "" - , loginShell ? "/bin/sh" - }: '' - - dn: uid=${uid},ou=accounts,ou=posix,${dbSuffix} - objectClass: person - objectClass: posixAccount - objectClass: shadowAccount - cn: ${cn} - gecos: - ${if gidNumber == null then "#" else "gidNumber: ${toString gidNumber}"} - homeDirectory: /home/${uid} - loginShell: ${loginShell} - sn: ${sn} - ${if uidNumber == null then "#" else "uidNumber: ${toString uidNumber}"} - ${if userPassword == "" then "#" else "userPassword: ${userPassword}"} - ''; - - # NOTE: create a group using the posixGroup objectClass. - posixGroup = - { gid - , gidNumber - , members - }: '' - - dn: cn=${gid},ou=groups,ou=posix,${dbSuffix} - objectClass: top - objectClass: posixGroup - gidNumber: ${toString gidNumber} - ${lib.concatMapStrings (member: "memberUid: ${member}\n") members} - ''; - in - { - virtualisation.memorySize = 256; - virtualisation.vlans = [ 1 ]; - networking.firewall.allowedTCPPorts = [ 389 ]; - services.openldap.enable = true; - services.openldap.dataDir = "/var/db/openldap"; - services.openldap.configDir = "/var/db/slapd"; - services.openldap.urlList = [ - "ldap:///" - "ldapi:///" - ]; - systemd.services.openldap = { - preStart = '' - set -e - # NOTE: slapd's config is always re-initialized. - rm -rf "${openldap.configDir}"/cn=config \ - "${openldap.configDir}"/cn=config.ldif - install -D -d -m 0700 -o "${openldap.user}" -g "${openldap.group}" "${openldap.configDir}" - # NOTE: olcDbDirectory must be created before adding the config. - '' + - unlinesAttrs (olcSuffix: {data, ...}: '' - # NOTE: database is always re-initialized. - rm -rf "${openldap.dataDir}/${olcSuffix}" - install -D -d -m 0700 -o "${openldap.user}" -g "${openldap.group}" \ - "${openldap.dataDir}/${olcSuffix}" - '') slapdDatabases - + '' - # NOTE: slapd is supposed to be stopped while in preStart, - # hence slap* commands can safely be used. - umask 0077 - ${pkgs.openldap}/bin/slapadd -n 0 \ - -F "${openldap.configDir}" \ - -l ${slapdConfig} - chown -R "${openldap.user}:${openldap.group}" "${openldap.configDir}" - # NOTE: slapadd(8): To populate the config database slapd-config(5), - # use -n 0 as it is always the first database. - # It must physically exist on the filesystem prior to this, however. - '' + - unlinesAttrs (olcSuffix: {data, ...}: '' - # NOTE: load database ${olcSuffix} - # (as root to avoid depending on sudo or chpst) - ${pkgs.openldap}/bin/slapadd \ - -F "${openldap.configDir}" \ - -l ${pkgs.writeText "data.ldif" data} - '' + '' - # NOTE: redundant with default openldap's preStart, but do not harm. - chown -R "${openldap.user}:${openldap.group}" \ - "${openldap.dataDir}/${olcSuffix}" - '') slapdDatabases; - }; - }; - - client1 = mkClient true; # use nss_pam_ldapd - client2 = mkClient false; # use nss_ldap and pam_ldap - }; - - testScript = '' - def expect_script(*commands): - script = ";".join(commands) - return f"${pkgs.expect}/bin/expect -c '{script}'" - - - server.start() - server.wait_for_unit("default.target") - - with subtest("slapd: auth as database admin with SASL and check a POSIX account"): - server.succeed( - 'test "$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL ' - + "-b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' " - + "-s base uidNumber | " - + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}" - ) - - with subtest("slapd: auth as database admin with password and check a POSIX account"): - server.succeed( - "test \"$(ldapsearch -LLL -H ldap://server -D 'cn=admin,${dbSuffix}' " - + "-w '${dbAdminPwd}' -b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' " - + "-s base uidNumber | " - + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}" - ) - - client1.start() - client1.wait_for_unit("default.target") - - with subtest("password: su with password to a POSIX account"): - client1.succeed( - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "${ldapUserPwd}\n"', - 'expect "*"', - 'send "whoami\n"', - 'expect -ex "${ldapUser}" {exit}', - "exit 1", - ) - ) - - with subtest("password: change password of a POSIX account as root"): - client1.succeed( - "chpasswd <<<'${ldapUser}:new-password'", - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "new-password\n"', - 'expect "*"', - 'send "whoami\n"', - 'expect -ex "${ldapUser}" {exit}', - "exit 1", - ), - "chpasswd <<<'${ldapUser}:${ldapUserPwd}'", - ) - - with subtest("password: change password of a POSIX account from itself"): - client1.succeed( - "chpasswd <<<'${ldapUser}:${ldapUserPwd}' ", - expect_script( - "spawn su --login ${ldapUser} -c passwd", - 'expect "Password: "', - 'send "${ldapUserPwd}\n"', - 'expect "(current) UNIX password: "', - 'send "${ldapUserPwd}\n"', - 'expect "New password: "', - 'send "new-password\n"', - 'expect "Retype new password: "', - 'send "new-password\n"', - 'expect "passwd: password updated successfully" {exit}', - "exit 1", - ), - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "${ldapUserPwd}\n"', - 'expect "su: Authentication failure" {exit}', - "exit 1", - ), - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "new-password\n"', - 'expect "*"', - 'send "whoami\n"', - 'expect -ex "${ldapUser}" {exit}', - "exit 1", - ), - "chpasswd <<<'${ldapUser}:${ldapUserPwd}'", - ) - - client2.start() - client2.wait_for_unit("default.target") - - with subtest("NSS"): - client1.succeed( - "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}", - "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'", - "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}", - "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'", - "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}", - "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'", - "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}", - "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'", - ) - - with subtest("PAM"): - client1.succeed( - "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true", - "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true", - ) - ''; -}) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 3b061974267..02d1f7aa6c2 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -44,7 +44,7 @@ in { # Create a test bucket on the server machine.succeed( - "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} S3v4" + "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" ) machine.succeed("mc mb minio/test-bucket") machine.succeed("${minioPythonScript}") diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix new file mode 100644 index 00000000000..73abf6c555f --- /dev/null +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -0,0 +1,223 @@ +import ./../make-test-python.nix ({ pkgs, ...} : + +let + mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; + mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute netcat procps pv socat ]; }; + +in { + name = "mariadb-galera-mariabackup"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ izorkin ]; + }; + + # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, + # and checking the table's presence on the other node. + + nodes = { + galera_01 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.1.1 galera_01 + 192.168.1.2 galera_02 + 192.168.1.3 galera_03 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-mariabackup ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + ensureDatabases = [ "testdb" ]; + ensureUsers = [{ + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + }]; + initialScript = pkgs.writeText "mariadb-init.sql" '' + GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; + FLUSH PRIVILEGES; + ''; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://"; + wsrep_cluster_name = "galera"; + wsrep_node_address = "192.168.1.1"; + wsrep_node_name = "galera_01"; + wsrep_sst_method = "mariabackup"; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_02 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.1.1 galera_01 + 192.168.1.2 galera_02 + 192.168.1.3 galera_03 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-mariabackup ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; + wsrep_cluster_name = "galera"; + wsrep_node_address = "192.168.1.2"; + wsrep_node_name = "galera_02"; + wsrep_sst_method = "mariabackup"; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_03 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.1.3"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.1.1 galera_01 + 192.168.1.2 galera_02 + 192.168.1.3 galera_03 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-mariabackup ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; + wsrep_cluster_name = "galera"; + wsrep_node_address = "192.168.1.3"; + wsrep_node_name = "galera_03"; + wsrep_sst_method = "mariabackup"; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + }; + + testScript = '' + galera_01.start() + galera_01.wait_for_unit("mysql") + galera_01.wait_for_open_port(3306) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" + ) + galera_02.start() + galera_02.wait_for_unit("mysql") + galera_02.wait_for_open_port(3306) + galera_03.start() + galera_03.wait_for_unit("mysql") + galera_03.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_02.succeed("systemctl stop mysql") + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" + ) + galera_02.succeed("systemctl start mysql") + galera_02.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 39" + ) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 38" + ) + galera_03.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_02.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") + galera_03.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + ''; +}) diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix new file mode 100644 index 00000000000..cacae4569b5 --- /dev/null +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -0,0 +1,216 @@ +import ./../make-test-python.nix ({ pkgs, ...} : + +let + mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; + mysqlenv-rsync = pkgs.buildEnv { name = "mysql-path-env-rsync"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ lsof procps rsync stunnel ]; }; + +in { + name = "mariadb-galera-rsync"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ izorkin ]; + }; + + # The test creates a Galera cluster with 3 nodes and is checking if rsync-based SST works. The cluster is tested by creating a DB and an empty table on one node, + # and checking the table's presence on the other node. + + nodes = { + galera_04 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.1"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.2.1 galera_04 + 192.168.2.2 galera_05 + 192.168.2.3 galera_06 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-rsync ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + ensureDatabases = [ "testdb" ]; + ensureUsers = [{ + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + }]; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://"; + wsrep_cluster_name = "galera-rsync"; + wsrep_node_address = "192.168.2.1"; + wsrep_node_name = "galera_04"; + wsrep_sst_method = "rsync"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_05 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.2"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.2.1 galera_04 + 192.168.2.2 galera_05 + 192.168.2.3 galera_06 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-rsync ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; + wsrep_cluster_name = "galera-rsync"; + wsrep_node_address = "192.168.2.2"; + wsrep_node_name = "galera_05"; + wsrep_sst_method = "rsync"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_06 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.3"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.2.1 galera_04 + 192.168.2.2 galera_05 + 192.168.2.3 galera_06 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-rsync ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; + wsrep_cluster_name = "galera-rsync"; + wsrep_node_address = "192.168.2.3"; + wsrep_node_name = "galera_06"; + wsrep_sst_method = "rsync"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + }; + + testScript = '' + galera_04.start() + galera_04.wait_for_unit("mysql") + galera_04.wait_for_open_port(3306) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" + ) + galera_05.start() + galera_05.wait_for_unit("mysql") + galera_05.wait_for_open_port(3306) + galera_06.start() + galera_06.wait_for_unit("mysql") + galera_06.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_05.succeed("systemctl stop mysql") + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" + ) + galera_05.succeed("systemctl start mysql") + galera_05.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 43" + ) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 42" + ) + galera_06.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_05.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") + galera_06.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + ''; +}) diff --git a/nixos/tests/automysqlbackup.nix b/nixos/tests/mysql/mysql-autobackup.nix index 224b93862fb..65576e52a53 100644 --- a/nixos/tests/automysqlbackup.nix +++ b/nixos/tests/mysql/mysql-autobackup.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./../make-test-python.nix ({ pkgs, lib, ... }: { name = "automysqlbackup"; diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix index a0595e4d553..c4c1079a8a6 100644 --- a/nixos/tests/mysql-backup.nix +++ b/nixos/tests/mysql/mysql-backup.nix @@ -1,5 +1,5 @@ # Test whether mysqlBackup option works -import ./make-test-python.nix ({ pkgs, ... } : { +import ./../make-test-python.nix ({ pkgs, ... } : { name = "mysql-backup"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ rvl ]; diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index a2654f041ad..81038dccd94 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : +import ./../make-test-python.nix ({ pkgs, ...} : let replicateUser = "replicate"; diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql/mysql.nix index 11c1dabf936..d236ce94632 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : { +import ./../make-test-python.nix ({ pkgs, ...} : { name = "mysql"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco shlevy ]; diff --git a/nixos/tests/testdb.sql b/nixos/tests/mysql/testdb.sql index 3c68c49ae82..3c68c49ae82 100644 --- a/nixos/tests/testdb.sql +++ b/nixos/tests/mysql/testdb.sql diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix new file mode 100644 index 00000000000..bb6c019f07c --- /dev/null +++ b/nixos/tests/oci-containers.nix @@ -0,0 +1,43 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +, lib ? pkgs.lib +}: + +let + + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + + mkOCITest = backend: makeTest { + name = "oci-containers-${backend}"; + + meta = { + maintainers = with lib.maintainers; [ adisbladis benley mkaito ]; + }; + + nodes = { + ${backend} = { pkgs, ... }: { + virtualisation.oci-containers = { + inherit backend; + containers.nginx = { + image = "nginx-container"; + imageFile = pkgs.dockerTools.examples.nginx; + ports = ["8181:80"]; + }; + }; + }; + }; + + testScript = '' + start_all() + ${backend}.wait_for_unit("${backend}-nginx.service") + ${backend}.wait_for_open_port(8181) + ${backend}.wait_until_succeeds("curl http://localhost:8181 | grep Hello") + ''; + }; + +in +lib.foldl' (attrs: backend: attrs // { ${backend} = mkOCITest backend; }) {} [ + "docker" + "podman" +] diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix deleted file mode 100644 index 01a08995950..00000000000 --- a/nixos/tests/partition.nix +++ /dev/null @@ -1,247 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: - -with pkgs.lib; - -let - ksExt = pkgs.writeText "ks-ext4" '' - clearpart --all --initlabel --drives=vdb - - part /boot --recommended --label=boot --fstype=ext2 --ondisk=vdb - part swap --recommended --label=swap --fstype=swap --ondisk=vdb - part /nix --size=500 --label=nix --fstype=ext3 --ondisk=vdb - part / --recommended --label=root --fstype=ext4 --ondisk=vdb - ''; - - ksBtrfs = pkgs.writeText "ks-btrfs" '' - clearpart --all --initlabel --drives=vdb,vdc - - part swap1 --recommended --label=swap1 --fstype=swap --ondisk=vdb - part swap2 --recommended --label=swap2 --fstype=swap --ondisk=vdc - - part btrfs.1 --grow --ondisk=vdb - part btrfs.2 --grow --ondisk=vdc - - btrfs / --data=0 --metadata=1 --label=root btrfs.1 btrfs.2 - ''; - - ksF2fs = pkgs.writeText "ks-f2fs" '' - clearpart --all --initlabel --drives=vdb - - part swap --recommended --label=swap --fstype=swap --ondisk=vdb - part /boot --recommended --label=boot --fstype=f2fs --ondisk=vdb - part / --recommended --label=root --fstype=f2fs --ondisk=vdb - ''; - - ksRaid = pkgs.writeText "ks-raid" '' - clearpart --all --initlabel --drives=vdb,vdc - - part raid.01 --size=200 --ondisk=vdb - part raid.02 --size=200 --ondisk=vdc - - part swap1 --size=500 --label=swap1 --fstype=swap --ondisk=vdb - part swap2 --size=500 --label=swap2 --fstype=swap --ondisk=vdc - - part raid.11 --grow --ondisk=vdb - part raid.12 --grow --ondisk=vdc - - raid /boot --level=1 --fstype=ext3 --device=md0 raid.01 raid.02 - raid / --level=1 --fstype=xfs --device=md1 raid.11 raid.12 - ''; - - ksRaidLvmCrypt = pkgs.writeText "ks-lvm-crypt" '' - clearpart --all --initlabel --drives=vdb,vdc - - part raid.1 --grow --ondisk=vdb - part raid.2 --grow --ondisk=vdc - - raid pv.0 --level=1 --encrypted --passphrase=x --device=md0 raid.1 raid.2 - - volgroup nixos pv.0 - - logvol /boot --size=200 --fstype=ext3 --name=boot --vgname=nixos - logvol swap --size=500 --fstype=swap --name=swap --vgname=nixos - logvol / --size=1000 --grow --fstype=ext4 --name=root --vgname=nixos - ''; -in { - name = "partitiion"; - - machine = { pkgs, ... }: { - environment.systemPackages = [ - pkgs.pythonPackages.nixpart0 - pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2 - ]; - virtualisation.emptyDiskImages = [ 4096 4096 ]; - }; - - testScript = '' - my $diskStart; - my @mtab; - - sub getMtab { - my $mounts = $machine->succeed("cat /proc/mounts"); - chomp $mounts; - return map [split], split /\n/, $mounts; - } - - sub parttest { - my ($desc, $code) = @_; - $machine->start; - $machine->waitForUnit("default.target"); - - # Gather mounts and superblock - @mtab = getMtab; - $diskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1"); - - subtest($desc, $code); - $machine->shutdown; - } - - sub ensureSanity { - # Check whether the filesystem in /dev/vda is still intact - my $newDiskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1"); - if ($diskStart ne $newDiskStart) { - $machine->log("Something went wrong, the partitioner wrote " . - "something into the first 512 bytes of /dev/vda!"); - die; - } - - # Check whether nixpart has unmounted anything - my @currentMtab = getMtab; - for my $mount (@mtab) { - my $path = $mount->[1]; - unless (grep { $_->[1] eq $path } @currentMtab) { - $machine->log("The partitioner seems to have unmounted $path."); - die; - } - } - } - - sub checkMount { - my $mounts = $machine->succeed("cat /proc/mounts"); - - } - - sub kickstart { - $machine->copyFileFromHost($_[0], "/kickstart"); - $machine->succeed("nixpart -v /kickstart"); - ensureSanity; - } - - sub ensurePartition { - my ($name, $match) = @_; - my $path = $name =~ /^\// ? $name : "/dev/disk/by-label/$name"; - my $out = $machine->succeed("file -Ls $path"); - my @matches = grep(/^$path: .*$match/i, $out); - if (!@matches) { - $machine->log("Partition on $path was expected to have a " . - "file system that matches $match, but instead has: $out"); - die; - } - } - - sub ensureNoPartition { - $machine->succeed("test ! -e /dev/$_[0]"); - } - - sub ensureMountPoint { - $machine->succeed("mountpoint $_[0]"); - } - - sub remountAndCheck { - $machine->nest("Remounting partitions:", sub { - # XXX: "findmnt -ARunl -oTARGET /mnt" seems to NOT print all mounts! - my $getmounts_cmd = "cat /proc/mounts | cut -d' ' -f2 | grep '^/mnt'"; - # Insert canaries first - my $canaries = $machine->succeed($getmounts_cmd . " | while read p;" . - " do touch \"\$p/canary\";" . - " echo \"\$p/canary\"; done"); - # Now unmount manually - $machine->succeed($getmounts_cmd . " | tac | xargs -r umount"); - # /mnt should be empty or non-existing - my $found = $machine->succeed("find /mnt -mindepth 1"); - chomp $found; - if ($found) { - $machine->log("Cruft found in /mnt:\n$found"); - die; - } - # Try to remount with nixpart - $machine->succeed("nixpart -vm /kickstart"); - ensureMountPoint("/mnt"); - # Check if our beloved canaries are dead - chomp $canaries; - $machine->nest("Checking canaries:", sub { - for my $canary (split /\n/, $canaries) { - $machine->succeed("test -e '$canary'"); - } - }); - }); - } - - parttest "ext2, ext3 and ext4 filesystems", sub { - kickstart("${ksExt}"); - ensurePartition("boot", "ext2"); - ensurePartition("swap", "swap"); - ensurePartition("nix", "ext3"); - ensurePartition("root", "ext4"); - ensurePartition("/dev/vdb4", "boot sector"); - ensureNoPartition("vdb6"); - ensureNoPartition("vdc1"); - remountAndCheck; - ensureMountPoint("/mnt/boot"); - ensureMountPoint("/mnt/nix"); - }; - - parttest "btrfs filesystem", sub { - $machine->succeed("modprobe btrfs"); - kickstart("${ksBtrfs}"); - ensurePartition("swap1", "swap"); - ensurePartition("swap2", "swap"); - ensurePartition("/dev/vdb2", "btrfs"); - ensurePartition("/dev/vdc2", "btrfs"); - ensureNoPartition("vdb3"); - ensureNoPartition("vdc3"); - remountAndCheck; - }; - - parttest "f2fs filesystem", sub { - $machine->succeed("modprobe f2fs"); - kickstart("${ksF2fs}"); - ensurePartition("swap", "swap"); - ensurePartition("boot", "f2fs"); - ensurePartition("root", "f2fs"); - remountAndCheck; - ensureMountPoint("/mnt/boot", "f2fs"); - }; - - parttest "RAID1 with XFS", sub { - kickstart("${ksRaid}"); - ensurePartition("swap1", "swap"); - ensurePartition("swap2", "swap"); - ensurePartition("/dev/md0", "ext3"); - ensurePartition("/dev/md1", "xfs"); - ensureNoPartition("vdb4"); - ensureNoPartition("vdc4"); - ensureNoPartition("md2"); - remountAndCheck; - ensureMountPoint("/mnt/boot"); - }; - - parttest "RAID1 with LUKS and LVM", sub { - kickstart("${ksRaidLvmCrypt}"); - ensurePartition("/dev/vdb1", "data"); - ensureNoPartition("vdb2"); - ensurePartition("/dev/vdc1", "data"); - ensureNoPartition("vdc2"); - - ensurePartition("/dev/md0", "luks"); - ensureNoPartition("md1"); - - ensurePartition("/dev/nixos/boot", "ext3"); - ensurePartition("/dev/nixos/swap", "swap"); - ensurePartition("/dev/nixos/root", "ext4"); - - remountAndCheck; - ensureMountPoint("/mnt/boot"); - }; - ''; -}) diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index 8bfd0c131e6..bce489168f9 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -179,7 +179,7 @@ in import ./make-test-python.nix { s3.succeed( "mc config host add minio " + "http://localhost:${toString minioPort} " - + "${s3.accessKey} ${s3.secretKey} S3v4", + + "${s3.accessKey} ${s3.secretKey} --api s3v4", "mc mb minio/thanos-bucket", ) diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix index adb3fcd36d7..39ae66fe111 100644 --- a/nixos/tests/service-runner.nix +++ b/nixos/tests/service-runner.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail(f"curl {url}") machine.succeed( """ - mkdir -p /run/nginx /var/spool/nginx/logs + mkdir -p /run/nginx /var/log/nginx /var/cache/nginx ${nodes.machine.config.systemd.services.nginx.runner} & echo $!>my-nginx.pid """ diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix new file mode 100644 index 00000000000..e911c393361 --- /dev/null +++ b/nixos/tests/systemd-boot.nix @@ -0,0 +1,31 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +makeTest { + name = "systemd-boot"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + + machine = { pkgs, lib, ... }: { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + boot.loader.systemd-boot.enable = true; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + + # Ensure we actually booted using systemd-boot. + # Magic number is the vendor UUID used by systemd-boot. + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) + ''; +} diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 64f5b6c40d2..50a02396891 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let stick = pkgs.fetchurl { - url = "http://nixos.org/~eelco/nix/udisks-test.img.xz"; + url = "https://nixos.org/~eelco/nix/udisks-test.img.xz"; sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b"; }; diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix new file mode 100644 index 00000000000..c6327a1f825 --- /dev/null +++ b/nixos/tests/web-servers/unit-php.nix @@ -0,0 +1,47 @@ +import ../make-test-python.nix ({pkgs, ...}: + let + testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();"; + +in { + name = "unit-php-test"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ]; + + machine = { config, lib, pkgs, ... }: { + services.unit = { + enable = true; + config = '' + { + "listeners": { + "*:9074": { + "application": "php_74" + } + }, + "applications": { + "php_74": { + "type": "php 7.4", + "processes": 1, + "user": "testuser", + "group": "testgroup", + "root": "${testdir}/www", + "index": "info.php" + } + } + } + ''; + }; + users = { + users.testuser = { + isNormalUser = false; + uid = 1074; + group = "testgroup"; + }; + groups.testgroup = { + gid= 1074; + }; + }; + }; + testScript = '' + machine.wait_for_unit("unit.service") + assert "PHP Version ${pkgs.php74.version}" in machine.succeed("curl -vvv -s http://127.0.0.1:9074/") + ''; +}) diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixos/tests/xmpp/prosody-mysql.nix index 0507227021b..9a00bcabf38 100644 --- a/nixos/tests/xmpp/prosody-mysql.nix +++ b/nixos/tests/xmpp/prosody-mysql.nix @@ -6,6 +6,11 @@ import ../make-test-python.nix { environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) ]; + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ${nodes.server.config.networking.primaryIPAddress} conference.example.com + ${nodes.server.config.networking.primaryIPAddress} uploads.example.com + ''; }; server = { config, pkgs, ... }: { nixpkgs.overlays = [ @@ -18,6 +23,8 @@ import ../make-test-python.nix { ]; networking.extraHosts = '' ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} conference.example.com + ${config.networking.primaryIPAddress} uploads.example.com ''; networking.firewall.enable = false; services.prosody = { @@ -39,6 +46,14 @@ import ../make-test-python.nix { domain = "example.com"; enabled = true; }; + muc = [ + { + domain = "conference.example.com"; + } + ]; + uploadHttp = { + domain = "uploads.example.com"; + }; }; }; mysql = { config, pkgs, ... }: { diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index a1f4b9ad950..f1e652cbcad 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation rec { homepage = "http://audacityteam.org/"; license = licenses.gpl2Plus; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index e63124e8547..674795dca20 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "08xwz5v8wrar0rx7qdr9pkpjz2k9sw6bn5glhpn6sp6453fabf8q"; + sha256 = "1zz1cirmx4wm4im4gjdp691f2042c8d1i8np1ns71f6kqdj9ps3k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 6970296cbd9..f30b5dba5b6 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.0.0"; + version = "1.4.0.1"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "1b17rsf7bv45gfhyhfmpz9d4rkxn24c0m2hgmpfjz3nlp0rf7bic"; + sha256 = "1m0fhndbqaf0lii1asyc50c66bv55ib6mbnm8fzk5qc5ncs0r8hi"; }; nativeBuildInputs = [ flex bison which ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index ae32a5f41a3..04277badfbe 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia"; + sha256 = "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index f032f435a35..26478b2bb2e 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,7 +2,7 @@ , gtk2 , jack2Full , alsaLib -, opencv +, opencv2 , libsndfile }: @@ -20,7 +20,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full alsaLib - opencv + opencv2 libsndfile ]; diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 144d19cb01e..a2f1c2139a1 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,6 +1,6 @@ { faust , jack2Full -, opencv +, opencv2 , qt4 , libsndfile , which @@ -17,7 +17,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ jack2Full - opencv + opencv2 qt4 libsndfile which diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 6ee120f3d1a..071a4a9caab 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "freewheeling"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "1gjii2kndffj9iqici4vb9zrkrdqj1hs9q43x7jv48wv9872z78r"; + sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index eff1d6411a1..fcf4d0b8652 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -1,23 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, - fltk, jansson, rtmidi, libsamplerate, libsndfile, - jack2, alsaLib, libpulseaudio, - libXpm, libXinerama, libXcursor }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, fltk +, jansson +, rtmidi +, libsamplerate +, libsndfile +, jack2 +, alsaLib +, libpulseaudio +, libXpm +, libXinerama +, libXcursor +, catch2 +, nlohmann_json +}: stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.1"; + version = "0.16.2.2"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "0b3lhjs6myml5r5saky15523sbc3qr43r9rh047vhsiafmqdvfq1"; + sha256 = "0rpg5qmw3b76xcra869shb8fwk5wfzpzw216n96hxa5s6k69cm0p"; }; - configureFlags = [ "--target=linux" ]; + configureFlags = [ + "--target=linux" + "--enable-system-catch" + ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ fltk libsndfile @@ -30,9 +48,16 @@ stdenv.mkDerivation rec { libpulseaudio libXinerama libXcursor + catch2 + nlohmann_json ]; - meta = with lib; { + postPatch = '' + sed -i 's:"deps/json/single_include/nlohmann/json\.hpp":<nlohmann/json.hpp>:' \ + src/core/{conf,init,midiMapConf,patch}.cpp + ''; + + meta = with stdenv.lib; { description = "A free, minimal, hardcore audio tool for DJs, live performers and electronic musicians"; homepage = "https://giadamusic.com/"; license = licenses.gpl3; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 1905699e516..933c9ac0203 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.13"; + version = "3.10.15"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1h542syaxsx1hslfzlk3fx1nbp190zjw35kigw7a1kx1jwvfwapg"; + sha256 = "0ghbanj142n0hgydzfjmnkdgri2kswsjal3mn10c723kih4ir4yr"; }; patches = [ diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 2badfd6a0b1..742c63b3d83 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.46.0"; + version = "3.47.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0c7b6zbcj4bq5qsxvhjwqclrl1k2hs3wb50pfjbw7gs7m3gm2b7d"; + sha256 = "1lvq5qsnn2djwkgbadzr7rr6ik2xh8yyj0p3y3hck9pl96ms7lfv"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mup/default.nix b/pkgs/applications/audio/mup/default.nix index 347cddca856..0227255d38d 100644 --- a/pkgs/applications/audio/mup/default.nix +++ b/pkgs/applications/audio/mup/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "mup"; - version = "6.7"; + version = "6.8"; src = fetchurl { url = "http://www.arkkra.com/ftp/pub/unix/mup${builtins.replaceStrings ["."] [""] version}src.tar.gz"; - sha256 = "1y1qknhib1isdjsbv833w3nxzyfljkfgp1gmjwly60l55q60frpk"; + sha256 = "06bv5nyl8rcibyb83zzrfdq6x6f93g3rgnv47i5gsjcaw5w6l31y"; }; nativeBuildInputs = [ autoreconfHook bison flex ghostscript groff netpbm ]; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index c08e4f7f4ff..aea50d71d75 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.37"; + version = "0.38"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1b0vd0h49kjg4nxjfjrcg8gzplz93ryr6xyfha2pvhlrzdd2d1lj"; + sha256 = "1kidpd1xrfax3v31q93r9g9b7jd841476q47wgd94h1a86b70gs9"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix new file mode 100644 index 00000000000..3a23347c1e7 --- /dev/null +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: + +stdenv.mkDerivation rec { + pname = "ninjas2"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "clearly-broken-software"; + repo = pname; + rev = "v${version}"; + sha256 = "1kwp6pmnfar2ip9693gprfbcfscklgri1k1ycimxzlqr61nkd2k9"; + fetchSubmodules = true; + }; + + patchPhase = '' + patchShebangs dpf/utils/generate-ttl.sh + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate + ]; + + installPhase = '' + install -dD bin/ninjas2.lv2 $out/lib/lv2/ninjas2.lv2 + install -D bin/ninjas2-vst.so $out/lib/vst/ninjas2-vst.so + install -D bin/ninjas2 $out/bin/ninjas2 + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/clearly-broken-software/ninjas2"; + description = "sample slicer plugin for LV2, VST, and jack standalone"; + license = with licenses; [ gpl3 ]; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix new file mode 100644 index 00000000000..3a4f4b2ce2b --- /dev/null +++ b/pkgs/applications/audio/orca-c/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ncurses, portmidi }: +stdenv.mkDerivation { + pname = "orca-c"; + + version = "git-2020-05-01"; + + src = fetchFromGitHub { + owner = "hundredrabbits"; + repo = "Orca-c"; + rev = "d7a3b169c5ed0b06a9ad0fdb3057704da9a0b6ce"; + sha256 = "101y617a295hzwr98ykvza1sycxlk29kzxn2ybjwc718r0alkbzz"; + }; + + buildInputs = [ ncurses portmidi ]; + + patchPhase = '' + patchShebangs tool + ''; + + installPhase = '' + mkdir -p $out/bin + install build/orca $out/bin/orca + ''; + + meta = with stdenv.lib; { + description = "An esoteric programming language designed to quickly create procedural sequencers."; + homepage = "https://github.com/hundredrabbits/Orca-c"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 911bb4c8c77..19bd6ecc0c8 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz"; + sha256 = "079iwwlkl1gscyv70v9ambad8shxbs0ixdfp0vsl6dbh87b09qzh"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 5830e1eefb8..dc06134c910 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj"; + sha256 = "sha256-rJbpoPjNMlw4diWjwNQ/DPo3rltvISU4kuRqBbvlBZ0="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 2f21e3ea56b..5284c8af682 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.07"; + version = "1.12"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0g2bp9n05ng2fvqw86pb941zamcqnfz1l066wvh5j3av1w22khi8"; + sha256 = "1y7kv889rm3nvaigcda4bglvwm799f3gp0zrivkvrg1lrlygs89f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index fe7b9f8ba66..509c95ad545 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.3.7"; + name = "qmmp-1.4.0"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "13mk8p7bfl3fkavpqyhpcxkxb8a4f5d4qc1lasyf7wls3ghrdag7"; + sha256 = "13rhnk55d44svksl13w23w2qkfpkq4mc0jy5mi89nzqkzshwvfd8"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix index ef57466ec84..8f9819bd913 100644 --- a/pkgs/applications/audio/rofi-mpd/default.nix +++ b/pkgs/applications/audio/rofi-mpd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rofi-mpd"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "Rofi_MPD"; rev = "v${version}"; - sha256 = "1b0y8706mmrxhiyz8g6znisllc35j8g7sz8gfjll9svysjmvb6lc"; + sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg"; }; propagatedBuildInputs = with python3Packages; [ mutagen mpd2 toml appdirs ]; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 3fb111db851..e7a43ad8a59 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,17 +1,32 @@ -{ stdenv, fetchFromGitHub, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx -, libsamplerate, rubberband, pkgconfig, libtool, gettext, ncurses, which +{ stdenv +, fetchFromGitHub , autoreconfHook +, pkgconfig +, which +, libtool +, liblo +, libxml2 +, libjack2 +, libsndfile +, wxGTK30 +, libsigcxx +, libsamplerate +, rubberband +, gettext +, ncurses +, alsaLib +, fftw }: stdenv.mkDerivation rec { - pname = "sooperlooper-git"; - version = "2016-07-19"; + pname = "sooperlooper"; + version = "unstable-2019-09-30"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "3bdfe184cd59b51c757b8048536abc1146fb0de4"; - sha256 = "0qz25h4idv79m97ici2kzx72fwzks3lysyksk3p3rx72lsijhf3g"; + rev = "4d1da14176e16b0f56b727bb1e6c2e8957515625"; + sha256 = "1gsgqa7hdymzw2al1ymzv0f33y161dyhh3fmy88lpjwv3bfchamg"; }; autoreconfPhase = '' @@ -22,11 +37,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ]; buildInputs = [ - liblo libxml2 libjack2 libsndfile wxGTK libsigcxx - libsamplerate rubberband gettext ncurses + liblo + libxml2 + libjack2 + libsndfile + wxGTK30 + libsigcxx + libsamplerate + rubberband + gettext + ncurses + alsaLib + fftw ]; - meta = { + meta = with stdenv.lib; { description = "A live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory. @@ -35,11 +60,9 @@ stdenv.mkDerivation rec { However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) and the engine can be run standalone on a computer without a monitor. ''; - - version = version; - homepage = "http://essej.net/sooperlooper/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + homepage = "http://essej.net/sooperlooper/"; # https is broken + license = licenses.gpl2; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index d29e9e33568..91acab35389 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "15icg332iyacdn4ydr4nivblayg4xkcnjh4f0sjnhj4q173v8fq2"; + sha256 = "1bdcfkfbvvn262p4j0nb4kvjzzgrvn3kxlif48yipqkkykzsgz6g"; }; - cargoSha256 = "0rw8pj74k88rvcr18837g356lwsn2vdq384yma9df462xd2cw823"; + cargoSha256 = "13v2ilmfs9468kavlx6wrsp0dscppxbxgygwpdd35p5hq3vnhl7k"; - nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; - buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux libxcb + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 6c565911eb4..dce73c38670 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.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0ssyqa14j54sja2dzhzrznbf1bbl0nc62p4jh2pd6fhinpw8y6dk"; + sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld"; }; buildInputs = [ diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 55ed40c2fb8..1411fe59b30 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -16,6 +16,5 @@ stdenv.mkDerivation rec { homepage = "http://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 15094a1eee4..450102da66f 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -5,7 +5,7 @@ with stdenv.lib; let - version = "0.19.0.1"; + version = "0.19.1"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "7ac9f972249a0a16ed01352ca2a199a5448fe87a4ea74923404a40b4086de284"; + sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0"; }; nativeBuildInputs = @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; - homepage = "http://www.bitcoin.org/"; + homepage = "https://bitcoin.org/"; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix index 163ed2615d3..258aad8e1bd 100644 --- a/pkgs/applications/blockchains/dcrwallet.nix +++ b/pkgs/applications/blockchains/dcrwallet.nix @@ -29,8 +29,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -pv $bin/bin - cp -v dcrwallet $bin/bin + mkdir -pv $out/bin + cp -v dcrwallet $out/bin ''; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index edc68f9d0c7..1c76ef8df28 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.1.0"; + version = "2.3.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1ywvdqmq8asczhmvc6ai2v6di1f5q19x3ygqlinwz8d1hrj3496r"; + sha256 = "0xd3w564zij614ajg57n1qlvz0hd9l7219qxx81ai6b02b9a5g9h"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index 0aa087e20af..aff38e242f8 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.9.2-beta"; + version = "0.10.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0gm33z89fiqv231ks2mkpsblskcsijipq8fcmip6m6jy8g06b1gb"; + sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w"; }; - modSha256 = "1khxplvyaqgaddrx1nna1fw0nb1xz9bmqpxpfifif4f5nmx90gbr"; + modSha256 = "15i4h3pkvyav9qsbfinzifram0knkylg24j6j0mxs4bnj80j4ycm"; subPackages = ["cmd/lncli" "cmd/lnd"]; diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index 5cb94b8bd54..f30e9a60980 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -17,11 +17,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.17.1.2"; + version = "0.19.1.1"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "16hcyxwp6yrypwvxz6i2987z3jmpk47xcgnsgh9klih8baqg64p5"; + sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index 49bc0be108f..f745860f661 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -21,8 +21,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -pv $bin/bin - cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin + mkdir -pv $out/bin + cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 8869f8a0f62..cd6b46880b4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "11fmpf58z44i78ldkapzivz6md65744vqczzbwv8mkjkv9nz95rs"; }; latestVersion = { # canary & dev - version = "4.1.0.7"; # "Android Studio 4.1 Canary 7" - build = "193.6401718"; - sha256Hash = "1xa61rhi7dgxm0y6yl5dxd09x530mzyxvx9bp1jprzfwvc7s0byh"; + version = "4.1.0.8"; # "Android Studio 4.1 Canary 8" + build = "193.6423924"; + sha256Hash = "0ksgmhz9vhkw2mxzjapli0w6203ssd8ddgb0dq06rck8v7ysy8bp"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index ff1daef8b80..c7ac671c15b 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bluefish-2.2.10"; + name = "bluefish-2.2.11"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1ciygj79q6i3ga5x1j8aivc05nh6rhhnm7hrq8q8xd9vd4ms3v5g"; + sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25"; }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index cedc56e97ce..852f395c4a2 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; fetchSubmodules = true; - rev = "752fe1bd891425cb7a4a53cd7b98c194c1fe4518"; - sha256 = "0asfdswh8sbnapbqhbz539zzxmv72f1iviha95iys34sgnd5k1nk"; + rev = "d4c52a7b22b0622aecf0b0d59941a4a2b250617c"; + sha256 = "133m0bmm8ahy0jbappgcdjqppkpxf5s9wg4gg254afx3f7yfqzbh"; }; in pkgs.mkShell { diff --git a/pkgs/applications/editors/emacs-modes/emacspeak/default.nix b/pkgs/applications/editors/emacs-modes/emacspeak/default.nix index 5bc8bbc6a90..f2ae3712cac 100644 --- a/pkgs/applications/editors/emacs-modes/emacspeak/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacspeak/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl, makeWrapper, emacs, tcl, tclx, espeak-ng }: +{ stdenv, fetchurl, makeWrapper, emacs, tcl, tclx, espeak-ng, lib }: stdenv.mkDerivation rec { pname = "emacspeak"; version = "51.0"; - src = fetchurl { url = "https://github.com/tvraman/emacspeak/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "09a0ywxlqa8jmc0wmvhaf7bdydnkyhy9nqfsdqcpbsgdzj6qpg90"; @@ -33,11 +32,11 @@ stdenv.mkDerivation rec { --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' ''; - meta = with stdenv.lib; { - homepage = https://github.com/tvraman/emacspeak/; + meta = { + homepage = "https://github.com/tvraman/emacspeak/"; description = "Emacs extension that provides spoken output"; - license = licenses.gpl2; - maintainers = [ dema ]; - platforms = platforms.linux; + license = lib.licenses.gpl2; + maintainers = [ ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 302f5adcfb1..4ff1db1c743 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 = "20191203"; + version = "20200504"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20191203.tar"; - sha256 = "1fcgiswjnqmfzx3xkmlqyyhc4a8ms07vdsv7nkizgxqdh9hwfm2q"; + url = "https://orgmode.org/elpa/org-20200504.tar"; + sha256 = "1nalr2jafhzfkaf4bn8kscxd7nm1wz7dbw2629j2msxknw76dwk1"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20191203"; + version = "20200504"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20191203.tar"; - sha256 = "1kvw95492acb7gqn8gxbp1vg4fyw80w43yvflxnfxdf6jnnw2wah"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200504.tar"; + sha256 = "1ykw3qspz18jgf3ngsvk2ys282489fcjrbk7pbv3ppxzjha4rmhb"; }; packageRequires = []; meta = { @@ -30,4 +30,4 @@ license = lib.licenses.free; }; }) {}; - } + } \ No newline at end of file diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index 1ee2f5d4fe7..5bc29a046bc 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; + maintainers = with maintainers; [ lovek323 peti jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index fc00384c03a..2d48da0eb28 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ./tramp-detect-wrapped-gvfsd.patch # unbreak macOS unexec (fetchpatch { - url = https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch; + url = "https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch"; sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw"; }) ]; @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { description = "The extensible, customizable GNU text editor"; homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ]; + maintainers = with maintainers; [ lovek323 peti jwiegley adisbladis ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 30e8af7facd..c30cfcb1fb9 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "focuswriter"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "19fqxyas941xcqjj68qpj42ayq0vw5rbd4ms5kvx8jyspp7wysqc"; + sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 282d950c85d..2319e0560de 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "18mbw72vgrzkvjykc23h17qxrxfvhjzhy9rxpi2asw196qalavzp"; /* updated by script */ + sha256 = "0136hmknkxrsgbygxqzrq1836kg02p14hmv5mzbpp79yglhv2xml"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1z3asz9fp3xnmbhngar60g8rba83kx987ar67j5m8ws7cijqlzix"; /* updated by script */ + sha256 = "0ivnicpn67mfyhmiwbx80pq5l2xa4g1cpp79mh7rgm2c5klmf201"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1qlpx3vfqwpyyxjsknhxvbdhyciwihhl0hkinrpdky6bza1yfgf6"; /* updated by script */ + sha256 = "0v6vi6m94fwzsg5s357ymh8604zkv6q0zhyqfh9sj4ynzi7l4fyv"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1rgqr7fn1sy0zbkfmrw3ll8jps345br3y4aqhynyr48mxiwi4c7s"; /* updated by script */ + sha256 = "0q848swfg9mjiini5bbjdj1f0qpd1n4glxdpncjj7mbpvp7s2h5k"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0lrimmczl49azwsms56l4dg7himzr991a209r921jxa32rdjfq6x"; /* updated by script */ + sha256 = "13khjc7fp28mpcdn74msdw57nzhicg32xrrvj7s7na2qd9gqz0hf"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1yvqljjv6004kw2nkpddrsgnigb56rapgs3f1pcvl20h6hj08qj8"; /* updated by script */ + sha256 = "16gclbczd9czqhply0xb2ykv0bw4bgv85fihy1n2szc4rp643qdw"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1ld9hh9bxirsv5rwrx7wbmfaxwvxfw7cjfjqi8l0q0n93v89z90s"; /* updated by script */ + sha256 = "0p2q01yragab7c15aicpmaby075y7mpf6iavdfipi033q4gnlnki"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1swd2qfhsa6i1aq7z2s183d0hif2gmk1kkw9ns4aybny0wvvnqw2"; /* updated by script */ + sha256 = "1lq97aqnibvg483ww7wi8slh302gydd2kdkw6p2516rjcmm6n324"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.1.0"; /* updated by script */ + version = "2020.1.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1allpdr7k48nvl8vbvzyn6h81jpklzaqdqivrqqyh8hy9l98w4ws"; /* updated by script */ + sha256 = "0flwq61p7827f8nmldqgfpxbfl422imclksw6w97mgzqqhcbgksd"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1hk6k4f24infw9qj9mxp305nl0bxif6ymdsqg005pskvnyi8v5fi"; /* updated by script */ + sha256 = "0xhx3n2xdk0k0qx7hdiyfga16hjf2j95k219wh7mh0cys20hkrg8"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.1"; /* updated by script */ + version = "2020.1.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1c68li5jxsjml0macdb0s04llwwq1hni5z8vq2zdfcn5zm3xwpif"; /* updated by script */ + sha256 = "0d543g06bxpw4q2p19vmvrxpbhqsvspjbs3sqnw6hxni7wcflhkg"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 72ef0810704..4bd6e34b4fc 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1hd3ckayrwszda517zfvhihrfmzq4m3kcsrz4sqkbvib0giwsfkp"; + sha256 = "1z3mmlg5srzff0y1pjd4wfdf9k4rzk7gfdvbvzizkiy395qw1phv"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 275aaba4f2e..80a5436c955 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0kna6vkxc6lrfzb3gzn11qvw8jpa86gi1k996hdk83gn0lhmkvx5"; + sha256 = "0k4j2kp77sz2p8s77wmcawia81bx7vfb2nnh9lqxzdk2mmlg387c"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 51dfbbab61e..476819369cf 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0438721v24pim5q0q54ivsws9a679fm7ymrm1nn9g1fv06qsm4d8"; + sha256 = "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index f7c6d80dbf1..f09fd2ec277 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "07f10qwvi3p7bskzxnx5rlhlfrh7rx8v0xdlc4vs2271438j1j2z"; + sha256 = "1s9jvxwzsl32clp78g92nq9p2byf08libr5widl1jnkv1cpkbvh9"; }; dontBuild = true; diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index de1a5ce7879..612cdcc7f88 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages }: stdenv.mkDerivation rec { pname = "mg"; - version = "20171014"; + version = "6.7"; - src = fetchurl { - url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz"; - sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; + src = fetchFromGitHub { + owner = "ibara"; + repo = "mg"; + rev = "mg-6.7"; + sha256 = "15adwibq6xrfxbrxzk765g9250iyfn4wbcxd7kcsabiwn6apm0ai"; }; enableParallelBuilding = true; @@ -17,14 +19,13 @@ stdenv.mkDerivation rec { install -m 555 -Dt $out/bin mg install -m 444 -Dt $out/share/man/man1 mg.1 ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ncurses ]; + buildInputs = [ ncurses ]; meta = with stdenv.lib; { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - homepage = "https://homepage.boetes.org/software/mg"; + homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; license = licenses.publicDomain; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 9bc8e1bc920..8fa85ab7557 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1bgsbcx09ca063kdqfc7nigly99d7xgx2cbkpk1nkhr0hvkyg9l9"; + sha256 = "0xmnfqqdn7p84aksb8yzs14ikgy5driylr6m4p5ffsb6i9aa0i9h"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 7f94b354dd2..0cfa2b62dce 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "1m75ns6vgycyi3zjlc9w2gnry1gyfz1jxhrklcxxi6aap0jxlgnr"; + sha256 = "1y5slcwgs6p5n52whhhjg0c7053688311wnc9wqrk7vjk10qkx9d"; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 0e73dffb20a..bee9934a9ca 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0v8imw6zdygs9ymsgk41jclsfr1jwbracjc5balydh15r57rvwjd"; + sha256 = "0q3x1v88szxm8177qcnynfiyc7w8sn07ig6c7fjd164q7w30y24m"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 371adc36789..5aa5881ec5a 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1n083pzp2dsz6z6rcl1ldcwhd4i03sjigdfslfardhc4v5lbvmv8"; - x86_64-darwin = "1qk3gscyskf4fwc8i09afr3wsyd1lwwycx6rf02wwh4n9py50b20"; + x86_64-linux = "16zchjp72m6n6za4ak5kn2ax1s5pjfn7l082d6gfbb2y62isvs7q"; + x86_64-darwin = "0w35s6nxagcnd6xcm6bp0m63agkqxffig61cr3nnmpbcgj9zc969"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.2"; + version = "1.45.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index fe96223b65f..531abb06daa 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "141hwj1a2bsgzpfk354dnnmg4ak00fss3xsgqplyk949pbk6v1af"; - x86_64-darwin = "0fi8nz1gayzw5dp6d3m7jsmij3jj4yjg5rk1s9w6falpgka76dm1"; + x86_64-linux = "1wb4s2jw90irlawgl6539gwl0xwaxglaksmbcddbvnr6rq3ypn8n"; + x86_64-darwin = "16c1r7knfd5pfqhnk77nanh82azkc28pwkqfcyasbdgm70k17d3p"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.2"; + version = "1.45.0"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 05f895bdee1..388ac1ee7a7 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, - libharu, opencv, vigra, postgresql, Cocoa, + libharu, opencv2, vigra, postgresql, Cocoa, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma + buildInputs = [ gdal wxGTK30 proj libharu opencv2 vigra postgresql libiodbc lzma qhull giflib ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index c07c3957254..f2542301119 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -84,6 +84,5 @@ stdenv.mkDerivation { description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 57ce02bb661..0ded57b1a72 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -99,7 +99,6 @@ stdenv.mkDerivation { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ the-kenny ]; license = licenses.asl20; }; } diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index f6f9cb281a7..e6865d2d8f0 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }: stdenv.mkDerivation rec { pname = "apitrace"; @@ -15,7 +15,48 @@ stdenv.mkDerivation rec { # of games -- so it's fine to use e.g. bundled snappy. buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + # Don't automatically wrap all binaries, I prefer to explicitly only wrap + # `qapitrace`. + dontWrapQtApps = true; + + postFixup = '' + + # Since https://github.com/NixOS/nixpkgs/pull/60985, we add `/run-opengl-driver[-32]` + # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. + # `RUNPATH` doesn't propagate throughout the whole application, but only + # from the module performing the `dlopen()`. + # + # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` + # files in $out/lib/apitrace/wrappers. + # + # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` + # and other dispatcher libraries, and run `dlopen()` by themselves. + # + # As `RUNPATH` doesn't propagate through the whole library, and they're now the + # library doing the real `dlopen()`, they also need to have + # `/run-opengl-driver[-32]` added to their `RUNPATH`. + # + # To stay simple, we add paths for 32 and 64 bits unconditionally. + # This doesn't have an impact on closure size, and if the 32 bit drivers + # are not available, that folder is ignored. + for i in $out/lib/apitrace/wrappers/*.so + do + echo "Patching OpenGL driver path for $i" + patchelf --set-rpath "/run/opengl-driver/lib:/run/opengl-driver-32/lib:$(patchelf --print-rpath $i)" $i + done + + # Theses open the OpenGL driver at runtime, but it is not listed as NEEDED libraries. They need + # a reference to libglvnd. + for i in $out/bin/eglretrace $out/bin/glretrace + do + echo "Patching RPath for $i" + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [libglvnd]}:$(patchelf --print-rpath $i)" $i + done + + wrapQtApp $out/bin/qapitrace + ''; meta = with stdenv.lib; { homepage = "https://apitrace.github.io"; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 8b1811c645f..9981e8a439e 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.4.3"; + version = "4.6.2"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "03pq55mdgbaf6c2q57ww2990wr6qz8hk1r6xs1irqy8990m4afvk"; + sha256 = "1ldvscxfvwpsir8vr1ca9ra0841m6xy331ys31dngcp77nwncjqc"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 50162166013..63b8d7b3f60 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -126,7 +126,6 @@ mkDerivation rec { description = "Photo Management Program"; license = licenses.gpl2; homepage = "https://www.digikam.org"; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch b/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch deleted file mode 100644 index 91eacecbf8c..00000000000 --- a/pkgs/applications/graphics/graphicsmagick/1.3.32-darwin-png-strlcat-fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -# reduced version of commit f30492f40f78d867b43422215057dd21de4ba447 -# from upstream hg repository: -RegisterPNGImage(): Pass correct size value to strlcat(). - -diff -r 95c4711e8bee -r f30492f40f78 coders/png.c ---- a/coders/png.c Mon Jun 17 07:24:30 2019 -0500 -+++ b/coders/png.c Mon Jun 17 18:54:43 2019 -0500 -@@ -6427,26 +6427,26 @@ - - *version='\0'; - #if defined(PNG_LIBPNG_VER_STRING) -- (void) strlcat(version,"libpng ",MaxTextExtent); -- (void) strlcat(version,PNG_LIBPNG_VER_STRING,MaxTextExtent); -+ (void) strlcat(version,"libpng ",sizeof(version)); -+ (void) strlcat(version,PNG_LIBPNG_VER_STRING,sizeof(version)); - #if (PNG_LIBPNG_VER > 10005) - if (LocaleCompare(PNG_LIBPNG_VER_STRING,png_get_header_ver(NULL)) != 0) - { -- (void) strlcat(version,",",MaxTextExtent); -- (void) strlcat(version,png_get_libpng_ver(NULL),MaxTextExtent); -+ (void) strlcat(version,",",sizeof(version)); -+ (void) strlcat(version,png_get_libpng_ver(NULL),sizeof(version)); - } - #endif - #endif - - #if defined(ZLIB_VERSION) - if (*version != '\0') -- (void) strlcat(version,", ",MaxTextExtent); -- (void) strlcat(version,"zlib ",MaxTextExtent); -- (void) strlcat(version,ZLIB_VERSION,MaxTextExtent); -+ (void) strlcat(version,", ",sizeof(version)); -+ (void) strlcat(version,"zlib ",sizeof(version)); -+ (void) strlcat(version,ZLIB_VERSION,sizeof(version)); - if (LocaleCompare(ZLIB_VERSION,zlib_version) != 0) - { -- (void) strlcat(version,",",MaxTextExtent); -- (void) strlcat(version,zlib_version,MaxTextExtent); -+ (void) strlcat(version,",",sizeof(version)); -+ (void) strlcat(version,zlib_version,sizeof(version)); - } - #endif diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index be5114565ff..b7a1a8c4a6f 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,16 +4,15 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.32"; + version = "1.3.35"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "1qclp9i31idpcbbqswmnq2q11lmv0a7cvdb1y72xcky8sshaahmq"; + sha256 = "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq"; }; patches = [ ./disable-popen.patch - ./1.3.32-darwin-png-strlcat-fix.patch ]; configureFlags = [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 4a6526fe9c6..27e8e00bdb3 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.8.3"; + version = "3.10.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a0gss9cjcwayrcpkam5kc1giwbfy38jgqxvh33in9gfq9dgrygg"; + sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 6ad67f75b21..f98edd1e8ae 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.2.7.1"; + version = "4.2.9"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1sx4j4brk71bas3cpqzk4bd8bknyl3x4fdg5pv4r7pcfd3vpq2vy"; + sha256 = "0rvm9mpaq66lxyq4f09x9w6xxhgys0phza223hm5zv6kgn413xsf"; }; # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 818fc63535e..2337dfb370e 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -24,6 +24,10 @@ python3Packages.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; + postInstall = '' + install -m666 -Dt $out/share/applications krop.desktop + ''; + # Disable checks because of interference with older Qt versions // xcb doCheck = false; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 95af658ddd3..62e9fa06abc 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -80,7 +80,6 @@ mkDerivation rec { homepage = "http://openscad.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; - [ bjornfor raskin the-kenny gebner ]; + maintainers = with stdenv.lib.maintainers; [ bjornfor raskin gebner ]; }; } diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 4bbf6aa31d3..2b24a34fbc2 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -16,25 +16,15 @@ mkDerivation rec { pname = "qimgv"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl"; + sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac"; }; - patches = [ - # QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only - # has Qt 5.12. This appears to be the only instance of Qt 5.12 - # incompatibility, and will be fixed in the next release. - (fetchpatch { - url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch"; - sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s"; - }) - ]; - nativeBuildInputs = [ cmake pkgconfig diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 812c26f56e5..4371bc5838e 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "RAW converter and digital photo processing software"; homepage = "http://www.rawtherapee.com/"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ jcumming mahe ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 96515a13724..9472f931246 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.19.1.1"; + version = "3.20"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "0px88rc1slf7n1n8lpk56hf29ppbnnd4lrqfyggihcr0pxmw157c"; + sha256 = "08j8lpn2nd41gavgrj03rlrxl04wcamq1y02f1x1569ykbhycb3m"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 6ae45057f19..dc0b63594c4 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw }: @@ -9,6 +9,14 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # Fix a bug with thumbnail.so processes hanging: + # https://bugs.kde.org/show_bug.cgi?id=404652 + (fetchpatch { + url = "https://github.com/KDE/kdegraphics-thumbnailers/commit/3e2ea6e924d0e2a2cdd9bb435b06965117d6d34c.patch"; + sha256 = "0fq85zhymmrq8vl0y6vgh87qf4c6fhcq704p4kpkaq7y0isxj4h1"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kio libkexiv2 libkdcraw ]; } diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 19f0790fea3..518ec310ffb 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -100,10 +100,10 @@ rustPlatform.buildRustPackage rec { '' + ( if stdenv.isDarwin then '' mkdir $out/Applications - cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app + cp -r $releaseDir/osx/Alacritty.app $out/Applications/Alacritty.app '' else '' install -D extra/linux/Alacritty.desktop -t $out/share/applications/ - install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg + install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg # patchelf generates an ELF that binutils' "strip" doesn't like: # strip: not enough room for program headers, try linking with -N diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index d5d37ae27c9..38b51efa240 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Edit the Pantheon desktop application menu"; homepage = "https://github.com/donadigo/appeditor"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 665198b3d1f..8b17ecea3cb 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,32 +1,33 @@ -{ stdenv, fetchFromGitHub, cairo, cmake, libxkbcommon +{ stdenv, lib, fetchFromGitHub, cairo, libxkbcommon , pango, fribidi, harfbuzz, pcre, pkgconfig , ncursesSupport ? true, ncurses ? null -, waylandSupport ? true, wayland ? null +, waylandSupport ? true, wayland ? null, wayland-protocols ? null , x11Support ? true, xlibs ? null, xorg ? null }: assert ncursesSupport -> ncurses != null; -assert waylandSupport -> wayland != null; +assert waylandSupport -> ! lib.elem null [wayland wayland-protocols]; assert x11Support -> xlibs != null && xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "03k8wijdgj5nwmvgjhsrlh918n719789fhs4dqm23pd00rapxipk"; + sha256 = "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0"; }; - nativeBuildInputs = [ cmake pkgconfig pcre ]; + nativeBuildInputs = [ pkgconfig pcre ]; - cmakeFlags = [ - "-DBEMENU_CURSES_RENDERER=${if ncursesSupport then "ON" else "OFF"}" - "-DBEMENU_WAYLAND_RENDERER=${if waylandSupport then "ON" else "OFF"}" - "-DBEMENU_X11_RENDERER=${if x11Support then "ON" else "OFF"}" - ]; + makeFlags = ["PREFIX=$(out)"]; + + buildFlags = ["clients"] + ++ lib.optional ncursesSupport "curses" + ++ lib.optional waylandSupport "wayland" + ++ lib.optional x11Support "x11"; buildInputs = with stdenv.lib; [ cairo @@ -34,18 +35,18 @@ stdenv.mkDerivation rec { harfbuzz libxkbcommon pango - ] ++ optionals ncursesSupport [ ncurses ] - ++ optionals waylandSupport [ wayland ] + ] ++ optional ncursesSupport ncurses + ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optionals x11Support [ xlibs.libX11 xlibs.libXinerama xlibs.libXft xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/Cloudef/bemenu"; description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ thiagokokada ]; + maintainers = with maintainers; [ lheckemann ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index afd602f6088..869785ef82a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi"; + sha256 = "0m8mvyw5c1khd54jx896w6nfwaydmpi3cb6wi5p2a0hxdksqgrkm"; }; patches = [ diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 7c00add7797..d2ade055d6f 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.39.2"; + version = "0.39.3"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1l6wh24bhp4yhmsfmc0r4n2n10nlilkv4cmv5sfl80i250fiw7xa"; + sha256 = "1k9i7acpphx0if6ij2p9fkmj638ry6hcyr1rdr039a8zi8hq98gz"; }; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index cdcfcc00481..eef05fe91d2 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 081acb3acb6..ec2bd6b32c0 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "05nhgndiq0sm1bvb80sf5fgnm38249dclwzmfm7hzrablmkwgv3c"; + sha256 = "1wx6nqcyzknbw71sliwq4cb5qq1gy6pr9867s6x3vpg3n8g2czkf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 4c4fe9b1abd..1b5c7c23956 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,25 +2,26 @@ mkDerivation rec { pname = "cura"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "0fm04s912sgmr66wyb55ly4jh39ijsj6lx4fx9wn7hchlqmw5jxi"; + sha256 = "0h1r9caa579d3gfpcmch54rdbkg5df64ds2v84iqsbxwjp0rmn4n"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0fgkwz1anw49macq1jxjhjr79slhmx7g3zwij7g9fqyzzhrrmwqn"; + sha256 = "1k5c3qmixhpz3z2yi0fysxcyyf1yhcwmdlrcypkw827lhsialqp4"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ libsavitar numpy-stl pyserial requests uranium zeroconf + sentry-sdk trimesh ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 35d6c97fa0b..9fbe647046c 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, python3Packages }: +{ stdenv, fetchFromGitHub, fetchpatch, python3Packages }: let @@ -6,21 +6,24 @@ let octoprint = stdenv.mkDerivation rec { pname = "Cura-OctoPrintPlugin"; - version = "3.5.11"; + version = "3.5.12"; src = fetchFromGitHub { owner = "fieldOfView"; repo = pname; - rev = "3cef0a955ae7ccfa5c07d20d9d147c530cc9d6ec"; - sha256 = "0q9bkwgpsbfwkp1bfaxq3wm9pbwx5d7ji0jr7cwc4y5nizji81is"; + rev = "ad522c0b7ead5fbe28da686a3cc75e351274c2bc"; + sha256 = "0ln11ng32bh0smfsk54mv2j3sadh0gwf031nmm95zrvbj9cr6yc0"; }; - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = with python3Packages; [ netifaces ]; + installPhase = '' + mkdir -p $out/lib/cura/plugins/OctoPrintPlugin + cp -rv . $out/lib/cura/plugins/OctoPrintPlugin/ + ''; + meta = with stdenv.lib; { description = "Enables printing directly to OctoPrint and monitoring the process"; homepage = "https://github.com/fieldOfView/Cura-OctoPrintPlugin"; diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index 1191be09f76..87d2aba891b 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { configurePhase = ""; buildPhase = ""; - + patches = [ ./numpy-cast.patch ]; installPhase = '' @@ -69,6 +69,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/daid/Cura"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 2eb256935d7..0a4ec62ca78 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1gml8f6yqmghgncl1zggs7h2hdh05wf68jw9npg0gh7n9l7yzkk4"; + sha256 = "1fr151hmdg2lhk9pbpan1hb1pafj784nijr4pz646ljmjh12vfk2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index d353fff87ef..394a94f19ab 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation { homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 163cb5ed54e..8aaa7faa54d 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.3"; + version = "7.0.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "189rsavmaa7480r61qhpzagia3c8jr3dfcl01ks3nfyq53j08hml"; + sha256 = "1d36d2rzsr8c048w0jyacvmgh46jamr9nzs22rmpm7xbzlnvdg4k"; }; installPhase = '' diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 038df41875f..623e6dc0fbe 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wb2osz/direwolf/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 9e379009027..1b892c7f536 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.3"; + version = "6.4.4"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1r6k14m40ni9114i3j1lr6zwpxky6k89mycgxxg0cpdap4a0wdmh"; + sha256 = "1smbydwfjq29a2l44g6mgj0cd412fz40gbq6vq0klm7pmgd606si"; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index b777c3b72e7..b0224c052c4 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 791db13e423..6845cbcb59d 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.13.3"; + version = "1.13.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0nhbhli45i2xhkmyj9mpg8fn1l58y2zmr6nnnnms557wpdpg112x"; + sha256 = "17hgryj8qsxcx3c96ir25q0wsh5q0s6c6fb33lqfdbrfxrjcixbk"; }; doCheck = false; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index b8b1193058b..d7d6ad5302d 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72"; + sha256 = "1xwrgmy2azvr99b7df92m2imj0wy4fh53bn7lvcrnghjbnh7n0l0"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix new file mode 100644 index 00000000000..215542003ad --- /dev/null +++ b/pkgs/applications/misc/genxword/default.nix @@ -0,0 +1,54 @@ +{ lib +, python3 +, fetchFromGitHub +, gettext +, gobject-introspection +, wrapGAppsHook +, pango +, gtksourceview3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "genxword"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "riverrun"; + repo = pname; + rev = "v${version}"; + sha256 = "00czdvyb5wnrk3x0g529afisl8v4frfys9ih0nzf1fs4jkzjcijg"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + pango + gtksourceview3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 + ]; + + # to prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + # there are no tests + doCheck = false; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Crossword generator"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index e64ae08037a..b1985be2c94 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-4.1.0"; + name = "grip-4.1.1"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "0iy7bcyrxm7zyrxah06qyxdshkgq6yqkadlw211j2qzld38a79j5"; + sha256 = "1sbjgawb7qrinixybwi0adk7mpdfb565gkffp5gxxsw8fqd068fs"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index 3e1bb31091f..8d17ff09204 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "1.2.8"; pname = "grsync"; src = fetchurl { url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; - sha256 = "06ani65d58p8r3jvxjwpwyqrr07ya3icdqc243nxcrv7bvmarmb6"; + sha256 = "1c86jch73cy7ig9k4shvcd3jnaxk7jppfcr8nmkz8gbylsn5zsll"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index e58c933b84b..f0e191097d5 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.69.2"; + version = "0.70.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0bw31264q8w2r3fm3g2qjh9531nmbn942vl5rjf2cjff25c0d4ji"; + sha256 = "14g1x95jh91z9xm3xkv2psw2jn7z6bv2009miyv727df4d58nh6m"; }; - modSha256 = "1i1mw8jcklmnsqawc1jkgw4h1dxjxb9zaf2p8pgfzxzpy5cp6qkl"; + modSha256 = "015ha8pjz1fv8qg558xa6hl52fp2qd486ir9m01dvxw63xqx76ss"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index b421ea71795..9e244fb44b8 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.2.1) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) @@ -24,7 +24,7 @@ GEM http_parser.rb (0.6.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jekyll (4.0.0) + jekyll (4.0.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -41,7 +41,7 @@ GEM terminal-table (~> 1.8) jekyll-avatar (0.7.0) jekyll (>= 3.0, < 5.0) - jekyll-mentions (1.5.1) + jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-sass-converter (2.1.0) @@ -52,11 +52,12 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.1) + jemoji (0.12.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.1.0) + kramdown (2.2.1) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) @@ -66,25 +67,26 @@ GEM mercenary (0.3.6) mini_portile2 (2.4.0) minitest (5.14.0) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.3) - rb-fsevent (0.10.3) + public_suffix (4.0.5) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.16.0) + rexml (3.2.4) + rouge (3.18.0) safe_yaml (1.0.5) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.1) - zeitwerk (2.2.2) + unicode-display_width (1.7.0) + zeitwerk (2.3.0) PLATFORMS ruby diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index d698d25cb3b..a02ec1f16c4 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1"; + sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326"; type = "gem"; }; - version = "6.0.2.1"; + version = "6.0.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa"; + sha256 = "1gw05bh9iidnx2lxw0h5aiknbly818cmndc4a9nhq28fiafizi82"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -152,10 +152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r81nbw598s485jsppbpy9kwa471w1rdkpdn3a1mq0swg87cp67v"; + sha256 = "1n8y67plydfmay3jn865igvgb3h6s2crk8kq7ydk3wmn9h103s1r"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; jekyll-sass-converter = { dependencies = ["sassc"]; @@ -207,20 +207,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; + sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; type = "gem"; }; - version = "0.11.1"; + version = "0.12.0"; }; kramdown = { + dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; + sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -290,10 +291,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -311,20 +312,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.5"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -337,15 +338,25 @@ }; version = "0.10.1"; }; + 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 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi"; + sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; type = "gem"; }; - version = "3.16.0"; + version = "3.18.0"; }; safe_yaml = { groups = ["default"]; @@ -363,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; + sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -395,29 +406,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; zeitwerk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 111b0a8867a..54857d61420 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -47,6 +47,7 @@ in bundlerApp { host sites right from your GitHub repositories. ''; homepage = "https://jekyllrb.com/"; + #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown"; license = licenses.mit; maintainers = with maintainers; [ primeos pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 51a835e4b9f..d5588438ae6 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.2.1) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) classifier-reborn (2.2.0) @@ -23,7 +23,7 @@ GEM http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (1.0.0) + faraday (1.0.1) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) ffi (1.12.2) @@ -35,7 +35,7 @@ GEM http_parser.rb (0.6.0) i18n (1.8.2) concurrent-ruby (~> 1.0) - jekyll (4.0.0) + jekyll (4.0.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -59,7 +59,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.5.1) + jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) @@ -73,11 +73,12 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.1) + jemoji (0.12.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.1.0) + kramdown (2.2.1) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) kramdown-syntax-coderay (1.0.1) @@ -92,25 +93,26 @@ GEM mercenary (0.3.6) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.1009) + mime-types-data (3.2020.0425) mini_portile2 (2.4.0) minitest (5.14.0) multipart-post (2.1.1) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - octokit (4.16.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.3) - rb-fsevent (0.10.3) + public_suffix (4.0.5) + rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rdoc (6.2.1) - rouge (3.16.0) + rexml (3.2.4) + rouge (3.18.0) safe_yaml (1.0.5) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) @@ -118,12 +120,12 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - tomlrb (1.2.9) - tzinfo (1.2.6) + tomlrb (1.3.0) + tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.1) + unicode-display_width (1.7.0) yajl-ruby (1.4.1) - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 44d7f1d0fc8..8c2b1ffaf95 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1"; + sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326"; type = "gem"; }; - version = "6.0.2.1"; + version = "6.0.3"; }; addressable = { dependencies = ["public_suffix"]; @@ -132,10 +132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11yn7mhi4rl24brs2qfwysas14csjf1zmb835cfklqz5ka032xp6"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; fast-stemmer = { groups = ["default"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fpckw5nf4hfr5vhhdlmaxxp5lkdmc1vyqnmijwvy9fmjn4c87aa"; + sha256 = "1gw05bh9iidnx2lxw0h5aiknbly818cmndc4a9nhq28fiafizi82"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -282,10 +282,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r81nbw598s485jsppbpy9kwa471w1rdkpdn3a1mq0swg87cp67v"; + sha256 = "1n8y67plydfmay3jn865igvgb3h6s2crk8kq7ydk3wmn9h103s1r"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; jekyll-paginate = { groups = ["default"]; @@ -358,20 +358,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; + sha256 = "09sxbnrqz5vf6rxmh6lzism31gz2g3hw86ymg37r1ccknclv3cp9"; type = "gem"; }; - version = "0.11.1"; + version = "0.12.0"; }; kramdown = { + dependencies = ["rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; + sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -477,10 +478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh"; + sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; type = "gem"; }; - version = "3.2019.1009"; + version = "3.2020.0425"; }; mini_portile2 = { groups = ["default"]; @@ -518,10 +519,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -529,10 +530,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn"; + sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; type = "gem"; }; - version = "4.16.0"; + version = "4.18.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -550,20 +551,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.5"; }; rb-fsevent = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -586,15 +587,25 @@ }; version = "6.2.1"; }; + 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 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi"; + sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; type = "gem"; }; - version = "3.16.0"; + version = "3.18.0"; }; safe_yaml = { groups = ["default"]; @@ -612,10 +623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; + sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -654,10 +665,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0njkyq5csj4km8spmw33b5902v254wvyvqq1b0f0kky5hs7bvrgg"; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; type = "gem"; }; - version = "1.2.9"; + version = "1.3.0"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -665,20 +676,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; yajl-ruby = { groups = ["default"]; @@ -707,9 +718,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1"; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 47f02e32d77..46792588f4c 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk"; + sha256 = "1wcmx2yhm6n54w6nymgb8pgfjv411i3zj1vk79q9vr052y1622z0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 5787836487b..3c84588530c 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.0.200"; + version = "1.0.201"; desktopItem = makeDesktopItem { name = "Joplin"; exec = "joplin-desktop"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "14gwv8i6dprvl96mifadq0zj77a82rww8xd5bmzm8ql6sidi2216"; + sha256 = "060dkgamsv59vgslqyjfh1g8wg3nldrvfb9lf0y9sxjlbsv8bc55"; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index eec7a066a88..f68de80b701 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,46 +1,50 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11, libXxf86vm }: - -stdenv.mkDerivation rec { +{ stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: +let pname = "josm"; version = "16239"; - - src = fetchurl { - url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1"; + srcs = { + jar = fetchurl { + url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; + sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1"; + }; + macosx = fetchurl { + url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; + sha256 = "1nlw1rvwdfp1hhsxyjli8pylm0hb7k62sa0nqvgyiw54dz78n00c"; + }; + pkg = fetchsvn { + url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; + rev = version; + sha256 = "1qqk4bal84wnb66jym6qrdi10ypzvdzihd4jk5rnyfl3wm5qafbi"; + }; }; +in +stdenv.mkDerivation { + inherit pname version; - buildInputs = [ jdk11 makeWrapper ]; - - desktopItem = makeDesktopItem { - name = "josm"; - exec = "josm"; - icon = "josm"; - desktopName = "JOSM"; - genericName = "OpenStreetMap Editor"; - comment = meta.description; - categories = "Education;Geoscience;Maps;"; - }; + dontUnpack = true; - # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin - buildCommand = '' - mkdir -p $out/bin $out/share/java - cp -v $src $out/share/java/josm.jar + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ jre makeWrapper ]; - makeWrapper ${jdk11}/bin/java $out/bin/josm \ - --add-flags "-jar $out/share/java/josm.jar" \ - --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' + installPhase = + if stdenv.isDarwin then '' + mkdir -p $out/Applications + ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications + '' else '' + install -Dm644 ${srcs.jar} $out/share/josm/josm.jar + cp -R ${srcs.pkg}/usr/share $out - mkdir -p $out/share/applications - cp $desktopItem/share/applications"/"* $out/share/applications - mkdir -p $out/share/pixmaps - ${unzip}/bin/unzip -p $src images/logo_48x48x32.png > $out/share/pixmaps/josm.png - ''; + # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin + makeWrapper ${jre}/bin/java $out/bin/josm \ + --add-flags "-Djosm.restart=true -Djava.net.useSystemProxies=true" \ + --add-flags "-jar $out/share/josm/josm.jar" \ + --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' + ''; meta = with stdenv.lib; { description = "An extensible editor for OpenStreetMap"; homepage = "https://josm.openstreetmap.de/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.rycee ]; + maintainers = with maintainers; [ rycee sikmir ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 0d3c9d0cbd0..8646b9864d9 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,12 +1,12 @@ { stdenv, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.16.0"; + version = "0.16.1"; pname = "khard"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0a1zpkq0pplmn9flxczq2wafs6zc07r9xx9qi6dqmyv9mhy9d87f"; + sha256 = "0fg4qh5gzki5wg958wlpc8a2icnk74gzg33lqxjm755cfnjng7qd"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 90dd04c9d68..80cf90ced16 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.3"; + version = "0.17.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1nx8gjavq8kc656ayh3wign1f68b46jbnmy8zyks25wg0p9gid8l"; + sha256 = "1rbyj84y8r6h7qd6w7cw58v2abspippignj458ihv2m26i4als2x"; }; buildInputs = [ diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/pkgs/applications/misc/kitty/library-paths.patch index 5f8daacc3c2..608dfb80d61 100644 --- a/pkgs/applications/misc/kitty/library-paths.patch +++ b/pkgs/applications/misc/kitty/library-paths.patch @@ -12,21 +12,27 @@ --- a/kitty/desktop.c +++ b/kitty/desktop.c -@@ -30,7 +30,7 @@ - static PyObject* - init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) { - static bool done = false; -- static const char* libname = "libstartup-notification-1.so"; -+ static const char* libname = "@libstartup_notification@"; - // some installs are missing the .so symlink, so try the full name - static const char* libname2 = "libstartup-notification-1.so.0"; - static const char* libname3 = "libstartup-notification-1.so.0.0.0"; -@@ -105,7 +105,7 @@ load_libcanberra_functions(void) { +@@ -34,10 +34,7 @@ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) { + done = true; - static void - load_libcanberra(void) { -- static const char* libname = "libcanberra.so"; -+ static const char* libname = "@libcanberra@"; - // some installs are missing the .so symlink, so try the full name - static const char* libname2 = "libcanberra.so.0"; - static const char* libname3 = "libcanberra.so.0.2.5"; + const char* libnames[] = { +- "libstartup-notification-1.so", +- // some installs are missing the .so symlink, so try the full name +- "libstartup-notification-1.so.0", +- "libstartup-notification-1.so.0.0.0", ++ "@libstartup_notification@", + NULL + }; + for (int i = 0; libnames[i]; i++) { +@@ -113,10 +110,7 @@ load_libcanberra(void) { + if (done) return; + done = true; + const char* libnames[] = { +- "libcanberra.so", +- // some installs are missing the .so symlink, so try the full name +- "libcanberra.so.0", +- "libcanberra.so.0.2.5", ++ "@libcanberra@", + NULL + }; + for (int i = 0; libnames[i]; i++) { diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 78b32f7fca1..73b51e4adbc 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.2"; + version = "0.26.4"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0svyqayvr45snqw0dhx6jpnjhg4qb097pz28s8k1crx5i31nnd94"; + sha256 = "0hqc11vz24b6nfpfzsjwwmaq0sznwwqpzmd48q5wpdl0kz1309gj"; }; postPatch = '' diff --git a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch deleted file mode 100644 index 80b9ebf4d57..00000000000 --- a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81cf57e4653360af7f1718391e424fa05d8ea000 Mon Sep 17 00:00:00 2001 -From: Keshav Kini <keshav.kini@gmail.com> -Date: Thu, 9 Aug 2018 18:36:15 -0700 -Subject: [PATCH] Use `rm` from PATH - -On NixOS (a Linux distribution), there is no `/bin/rm`, but an `rm` -command will generally be available in one's path when running shell -scripts. Here, I change a couple of invocations of `/bin/rm` into -invocations of `rm` to deal with this issue. - -Since `rm` is already called elsewhere in the script without an -absolute path, I assume this change will not cause any -regressions. Still, I've tested this on a CentOS machine and a NixOS -machine, though not other platforms. ---- - makeself-header.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makeself-header.sh b/makeself-header.sh -index 4d2c005..2babf34 100755 ---- a/makeself-header.sh -+++ b/makeself-header.sh -@@ -515,7 +515,7 @@ if test x"\$quiet" = xn; then - fi - res=3 - if test x"\$keep" = xn; then -- trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; /bin/rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 -+ trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 - fi - - if test x"\$nodiskspace" = xn; then -@@ -581,7 +581,7 @@ if test x"\$script" != x; then - fi - if test x"\$keep" = xn; then - cd "\$TMPROOT" -- /bin/rm -rf "\$tmpdir" -+ rm -rf "\$tmpdir" - fi - eval \$finish; exit \$res - EOF --- -2.14.1 - diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 7dedf52e893..6fcd86596fb 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.2"; pname = "makeself"; src = fetchFromGitHub { owner = "megastep"; repo = "makeself"; rev = "release-${version}"; - sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n"; + fetchSubmodules = true; + sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; }; - # backported from https://github.com/megastep/makeself/commit/77156e28ff21231c400423facc7049d9c60fd1bd - patches = [ ./Use-rm-from-PATH.patch ]; + patchPhase = "patchShebangs test"; - postPatch = '' - sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh - ''; + doCheck = true; + checkTarget = "test"; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} @@ -26,6 +25,10 @@ stdenv.mkDerivation rec { cp makeself-header.sh $out/share/${pname}-${version} ''; + fixupPhase = '' + sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i $out/bin/makeself + ''; + meta = with stdenv.lib; { homepage = "http://megastep.org/makeself"; description = "Utility to create self-extracting packages"; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index bd018a690d4..79dcf105361 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "19.09"; + version = "20.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; + sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index fd1aa050fe7..0b3d65e21e3 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "0pfp0dglj2ig2p1h000137dxw777mjvzzqj3gcnbxjxqz3m6fzc0"; + sha256 = "00lkb1w536jyhka2znxmgbyss13j4h75yvl42z4hlgz31wljcin4"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index da6250fadf3..f58fb13e61f 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.8.9"; + version = "3.9.0"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1iy7wq953gcnygr1d04h5ddvhpmy8l575n5is2w0rj3ck31ihpqd"; + sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 0a54bc98bb9..6a152176415 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.3"; + version = "0.43.16"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "0kl7wksiqmy0hqbg6xwmzqfn3l17if2hiw7xc9x067x9rviyxrl3"; + sha256 = "1gx1hbxiilggwfw0jspyk2cw92r6qs9a8yqa8x1d2ndf493mjx9y"; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index 5225f88094f..8f90c7a581d 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,4 +1,5 @@ -{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, +{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, qemu, unzip, zip, + coreutils, gnugrep, which, gnused, e2fsprogs, autoPatchelfHook, gptfdisk, python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }: # Note: Multibootusb is tricky to maintain. It relies on the @@ -19,17 +20,30 @@ python36Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook + autoPatchelfHook + unzip + zip ]; - buildInputs = [ - libxcb - mtools - p7zip + runTimeDeps = [ + coreutils + gnugrep + which parted + utillinux + qemu + p7zip + gnused + mtools procps + e2fsprogs + gptfdisk + ]; + + buildInputs = [ + libxcb python36Packages.python qt5.full - utillinux ]; src = fetchFromGitHub { @@ -52,6 +66,20 @@ python36Packages.buildPythonApplication rec { python36Packages.six ]; + # multibootusb ships zips with various versions of syslinux, we need to patchelf them + postPatch = '' + for zip in $(find . -name "*.zip"); do + zip=$(readlink -f $zip) + target="$(mktemp -d)" + pushd $target + unzip $zip + rm $zip + autoPatchelf . + zip -r $zip * + popd + done + ''; + postInstall = '' # This script doesn't work and it doesn't add much anyway rm $out/bin/multibootusb-pkexec @@ -69,6 +97,9 @@ python36Packages.buildPythonApplication rec { # Then, add the installed scripts/ directory to the python path --prefix "PYTHONPATH" ":" "$out/lib/${python36Packages.python.libPrefix}/site-packages" + # Add some runtime dependencies + --prefix "PATH" ":" "${stdenv.lib.makeBinPath runTimeDeps}" + # Finally, move to directory that contains data --run "cd $out/share/${pname}" ) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a3067bc4af8..34ada062c71 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -74,6 +74,7 @@ in stdenv.mkDerivation rec { Comment=PDF viewer Exec=$bin/bin/mupdf-x11 %f Terminal=false + MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip EOF ''; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 03483a1a2b8..07ca64518e5 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -45,11 +45,11 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.19"; + version = "8.0.20"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "unrszSK+tKcARSHxRSAAos+jDtYxdDcSnFENixaDJsw="; + sha256 = "0c0ig2fqfpli7fwb4v4iwvfh4szzj3grx8j9rbh40kllkc8v5qh6"; }; patches = [ @@ -142,7 +142,7 @@ in stdenv.mkDerivation rec { "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" - # mysql-workbench 8.0.19 depends on libmysqlconnectorcpp 1.1.8. + # mysql-workbench 8.0.20 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 9a00959de02..923f5fb4528 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -3,14 +3,24 @@ let pname = "notable"; version = "1.8.4"; -in -appimageTools.wrapType2 rec { + sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; + name = "${pname}-${version}"; + src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; - sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; + inherit sha256; + }; + + appimageContents = appimageTools.extract { + inherit name src; }; +in +appimageTools.wrapType2 rec { + + inherit name src; + profile = '' export LC_ALL=C.UTF-8 export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS @@ -18,7 +28,14 @@ appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ + $out/share/icons/hicolor/1024x1024/apps/notable.png + substituteInPlace $out/share/applications/notable.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { description = "The markdown-based note-taking app that doesn't suck"; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index c9fc0ff30fc..0ca4f11e548 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.1"; + version = "3.36.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07w3k0f791zd1pj9j6d27k7gk7c6hx112ngrdz18h573df5n9b61"; + sha256 = "0hxz8wlyjn6w3zqg1p56pwdj0p23d6vynzczklyc6n91dyvma06g"; }; patches = [ diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 82144e9689f..c0d20c14f7c 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "199dvajik5d56nybk2061vdjyxwakngfd7frxj99wr2vsrp4aw2b"; + sha256 = "18afn5qzdjpip176kk5pr04mj0p7dv70dbz1n36qmqnq3gyms10q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 7603a66cd36..29dc6f54e6c 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}" + wrapProgram "$out/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}" ''; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 58d889484d6..4d2576aaadc 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "11q14pxyp5z4y3gabjnis3ip3xss6n94zjl42akwf27dxgxlpcjk"; + sha256 = "0n4jw0dsqw929a34ff077kz8w89vkjkqf8dy4c356zh6gf23cdxr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index abf49f93684..d1892352785 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.1.2"; + version = "4.1.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "1k1azxz92vkb4hylk4ki0szfn47ids0lwg01zfs54yc89j0c6142"; + sha256 = "1rhv6mf6pr9aaa8516i3b7v6h622qb1p8c4jsy3j0s5wrdry5l9l"; }; unpackPhase = '' diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index e90a86f225b..52a47954776 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -1,19 +1,29 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "11x4y3ah9f7mv9jssws95sw7rd20fxwdh11mrhcb4vwk59cmqsjz"; + sha256 = "050cx9ncs1hfb14llly0wm3h5s4377s3sinmkjc52xm2z2gc7m5f"; }; - cargoSha256 = "06zv3li14sg4a8bgj38zzx576ggm32ss0djmys1g0h5a0nxaaqfx"; + cargoSha256 = "1hw0y6c1ypp470cca3yw6fc7xvligy3av8hsa9bhdm5can46hyzi"; - checkPhase = "cargo test -- --skip test_single_huge_payload"; + nativeBuildInputs = [ installShellFiles ]; + + checkFlagsArray = [ "--skip=test_single_huge_payload" ]; + + postInstall = '' + # zsh completion generation fails. See: https://github.com/Nukesor/pueue/issues/57 + for shell in bash fish; do + $out/bin/pueue completions $shell . + installShellCompletion pueue.$shell + done + ''; meta = with lib; { description = "A daemon for managing long running shell commands"; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 81fbcc8b483..43393478ec4 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -101,12 +101,13 @@ rec { redshift-wlr = mkRedshift { pname = "redshift-wlr"; - version = "2019-04-17"; + # upstream rebases so this is the push date + version = "2019-08-24"; src = fetchFromGitHub { owner = "minus7"; repo = "redshift"; - rev = "eecbfedac48f827e96ad5e151de8f41f6cd3af66"; + rev = "7da875d34854a6a34612d5ce4bd8718c32bec804"; sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22"; }; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index f42a58e0057..d1e31b4077f 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = "Query GUI for mongodb"; desktopName = "Robo3T"; genericName = "MongoDB management tool"; - categories = "Development;IDE;mongodb;"; + categories = "Development;IDE;"; }; nativeBuildInputs = [makeWrapper]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 195437250a1..46b80dc98f0 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.15.1"; + version = "1.16.0"; sha256 = { - x86_64-linux = "1q1y5favj2ny0l2iq53vq39ns68zfr2z1plskxdg2d93jarvcr8x"; + x86_64-linux = "01nk3dbyhs0p7f6b4bkrng95i29g0x7vxj0rx1qb7sm3n11yi091"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 25019f76545..912deee4cb1 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://slic3r.org/"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor the-kenny ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 7f094607859..926db03652d 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -73,14 +73,14 @@ in { application = mkSweetHome3D rec { pname = stdenv.lib.toLower module + "-application"; - version = "6.2"; + version = "6.3"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "0a514a1zmipykvawil46v826ivkw9c00vdkyggyl6m41giay15zf"; - rev = "6822"; + sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i"; + rev = "6896"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 16bfdfb9a03..01d1891dd73 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.8"; + version = "0.10.9"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "1g27v109m0ar090b340x6lsrzfp85hskcr3kapc2rgdhaa0mygpd"; + sha256 = "19kni5v9g0p4751bw2xb8dawg5yjkyk39vdy0m93448lsl8cqq04"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 5ccdbbbb6b4..ad6f9e9382b 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, -click, pyfiglet, dateutil}: - -with stdenv.lib; +{ stdenv +, fetchFromGitHub +, buildPythonApplication +, click +, pyfiglet +, dateutil +, setuptools +}: buildPythonApplication rec { - pname = "termdown"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { - rev = version; - sha256 = "0k429ss1xifm9vbgyzpp71r79byn9jclvr0rm77bai2r8nz3s2vf"; - repo = "termdown"; - owner = "trehn"; + rev = version; + sha256 = "1sd9z5n2a4ir35832wgxs68vwav7wxhq39b5h8pq934mp8sl3v2k"; + repo = "termdown"; + owner = "trehn"; }; - propagatedBuildInputs = [ dateutil click pyfiglet ]; + propagatedBuildInputs = [ dateutil click pyfiglet setuptools ]; meta = with stdenv.lib; { - description = "Starts a countdown to or from TIMESPEC"; + description = "Starts a countdown to or from TIMESPEC"; longDescription = "Countdown timer and stopwatch in your terminal"; - homepage = "https://github.com/trehn/termdown"; - license = licenses.gpl3; - platforms = platforms.all; + homepage = "https://github.com/trehn/termdown"; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index f8ae5587ff9..84d37a4f461 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "tilda"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; rev = "${pname}-${version}"; - sha256 = "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx"; + sha256 = "1kk69sg7ph906yr5jagkjx0qfkhr5w2nyx407wl2dsjimbps44rd"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 7f1c3648f24..5ce35f3292b 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.25.2"; + version = "0.26.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "0g18x8pbwhk2d3aphah6dqqbhz62k48pwx63flsnqd4brccd0jkh"; + sha256 = "146jj83jixahgxwh12bbkfvci2wrz398h5x01kgppdy59m4pa4pl"; }; checkInputs = with python3Packages; [ pytest ]; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index e418ee69b95..62e66055a2f 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "translate-shell"; - version = "0.9.6.11"; + version = "0.9.6.12"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "137fz3ahzf65hfqcs4k7hhrmfjlhlw7wr3gfsvk88bnyqkyw44sm"; + sha256 = "075vqnha21rhr1b61dim7dqlfwm1yffyzcaa83s36rpk9r5sddzx"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index e9b09d68da6..30868a9900e 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.7"; + version = "0.0.8"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "1v1cvdsrxz1yj2vibx3iapw17ngfihjkr62zhxsn1msb77xyd7lb"; + sha256 = "0wb5lf0zbhmg962p71bqlpyxn8f1n9fp1jh7y7fcg6w5mga8gqq3"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 8b9ed830064..9e3022457a0 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.3.0"; + version = "4.4.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "0s7i1qjnh4mfjyrfvbbr1dklqi0n2nwksls21106q633wk9qdlqx"; + sha256 = "1k2svpzq01n1h9365nhi7r2k7dmsviczxi9m6fb80ccccdz7i530"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 719d26c7199..e5dc92c4ad6 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.4"; + version = "2.1.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - sha256 = "14f908jy5jzvgm1h1sr47hjqjq3q2nq91byhimk84kj044fn21w9"; + sha256 = "sha256-IdlRScAy7tCyVCElCceY4PvqPXWfZZ35f+MwCo3nO3s="; }; buildInputs = [ diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 027ff8f264c..ae18ff72d27 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xiphos"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; rev = version; - sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; + sha256 = "14il9k4i58qbc78hcadw3gqy21sb9q661d75vlj6fwpczbzj7x1a"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index a205b402bc8..b564c5c530f 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.10.0"; + version = "5.11.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "06nxhrb5vnlq3sxybiyzdpbv6ah1zam7r07s1c31sv37znlb77d5"; + sha256 = "04wsz7hcmzm5dv9q1wb26nvcz5gxdcgkf00cp5bpbr3y9vc6dyz6"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index fc3070d1dcb..82247d02c66 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, libuuid, openssl +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl , donateLevel ? 0 }: stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "5.0.1"; + version = "5.10.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "0lp11p4lf03l9x2kcpq1j19z7c1zrdvjmcfh2xyvlbw8pqx0hxkv"; + sha256 = "1p8bxp2nv30c3j3kb0bpby86378h6m7nv2vvzw06lqsj5fqbw4g5"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd libuuid openssl ]; + buildInputs = [ libuv libmicrohttpd openssl ]; postPatch = '' # Link dynamically against libuuid instead of statically diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index eb39a702f93..2fffee0f0bb 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "yubioath-desktop"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "19ingk0ab88a22s04apcw8kx9xygxlbk8kp4xnb8pmf8z3k6l2gf"; + sha256 = "1g0jd7mmch6a6n8k5pp3w27qd5cijnvzk05lwraf0i96m68h7x1k"; }; doCheck = false; @@ -38,13 +38,13 @@ mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" mkdir -p $out/share/applications - cp resources/yubioath-desktop.desktop \ - $out/share/applications/yubioath-desktop.desktop + cp resources/com.yubico.yubioath.desktop \ + $out/share/applications/com.yubico.yubioath.desktop mkdir -p $out/share/yubioath/icons - cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons - substituteInPlace $out/share/applications/yubioath-desktop.desktop \ + cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons + substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ - --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/yubioath.png" + --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 64e0a9dcba2..7079e3afa9a 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.6.1"; + version = "2.7.0"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256:0417qk925k7p3fiq1zha9al86jrz6mqspda7mi3h9blpbyvlcy7w"; + hash = "sha256:0xjg9j69yj06ys8229x6mwsjlk3mvxi8gnr2kymx0vhhg1zvqi1k"; }; profile = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 40ddafd2541..defb58822a0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1s3flhzp69g62285r9nwc5m9fa65ldx19inwdm4nq1m5bn63v6lj"; - sha256bin64 = "0xbbj89xx98vvw1a4l4wj7hhwjasdmkxbbkgaad2cj4zqmbb8h52"; - version = "83.0.4103.23"; + sha256 = "0z9p4v5mkinf7hbdagh4bz6ymqjxg3df3wjpvm201ilzzngmjqz1"; + sha256bin64 = "1srvlirhnynh0q2a17p8z13p7r54z0cchh1d1h07hqljnwmsf8qj"; + version = "83.0.4103.34"; }; dev = { - sha256 = "1jgx55sb3azwb2rni89yxlz94j264iilwh0br29sngcailxamrbd"; - sha256bin64 = "107yndkcdb78zxpswn9aja63n0q4q5q49183058z5jm4zlplkgad"; - version = "84.0.4122.7"; + sha256 = "178fc112bsbrgj2hss78y8rhnz8hl85fr33gawk9fz88zk5qz7xd"; + sha256bin64 = "06qra245l2bbgxc3k04aabkgq1qnzybnrjhrjb25vriv31ji36b1"; + version = "84.0.4128.3"; }; stable = { - sha256 = "1ls663s1f74p912x42qp3zcvm17kmjiv1ij6yy1c14gdhcpmjx7z"; - sha256bin64 = "0nzds27x1j3298cq5xkgikjdddymbw88gcpnlm03492b6090257y"; - version = "81.0.4044.129"; + sha256 = "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l"; + sha256bin64 = "0sl4wv7npc3rhi7jgn679hi7j5ykzwpx5dahy78h87yfg4fx84wx"; + version = "81.0.4044.138"; }; } diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 53d0ffb4c19..69e8179489c 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "093bqc40p4s8jc1s5rg49363x24vnwwjayvgzmi4xag28f1x6kn8"; + sha256 = "1lzcwaczh601kwbx7fzg32nrzlg67asby7p86qy10qz86xf4g608"; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The always-incognito web browser"; homepage = "https://github.com/cassidyjames/ephemeral"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 0737bac48c7..a0a0b7003be 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b4"; + version = "76.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "069dab2a91793ac9cdaa128473f706e194cf763df66ae448217cd7e5297857bb2d21ad198f9592bbe4831a2bbe9b76ec1ef96c288c4d8a85e35733ef0f75462f"; + sha512 = "f4b15745610d97f3919b644ed47b515eadfeb654eb81c5a890a2d225f1223f2f554612a5df14c4514f0f835b25f44649a923d09fdd199db4b052384075df89ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "bf1c4da2b03f95f241497e646d77ce5675f09dd8947def93983814c5bad257e38acc5c918faf7b758bf7293c09594baeac43ffaad814a47d3cbebcd5a49b4f4f"; + sha512 = "a39343493647a46579ea6f37e5da14ed59ab5ef91a4e47b9b7f43cd3f469110b9544ef660b214b7a5f3df6373a9f6bf9b55656586a96a7f2991b4fb9a66abe42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "04bf37a16a65d453d1c9406196d095acd0087a0bfad0ffbb466afc2c99249f7a82899434a47343399db63c95d9c827a9a49b5c9eede2ad7bb7bcd91d82770fcf"; + sha512 = "ff0655c7fb043f01c8c4cbde006a7835a6f0271133a9dd07b90b3e0bf369233f9dc0ed0caf38421ea9b1870f1daaa598508865a239f5f2391eccfa6c0341c94e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "71bcef558731031d1e38b370494be88dcd82299918a98c45be7fbec61ba5122ffcf3bbf4f2705c2e81cc133a888289c118511d8713ed722d99638a530d5d4da2"; + sha512 = "b89d38b6a44ebe00806cf7b16a29264c324d6afecf4d83e20ae4b35c502b13ee04a052a879d1c68e084e99ebd9850a9b597b6d4ea19350e0005c8d006d5cfbc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9f73a427c5a520fefd777d84aea6dfe50f2bd65f29e9acd16f0238ba5869e2c129872073c04769afab3ee973bfbcc6b50e204a53a8ca380a0e5d578557d59599"; + sha512 = "34a6db5926e8bc90e47e8ed8c413e3c47fe35d119aa3c2315c01b0ea38a04a8acb44551e689b798dc030902b9d3dba3f62971b2d927ed4cdc0f965657a189af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8717b342a6c49356017674c516b58415a21aa2a84fdf986c427f0dfc6af3944dae822728aca93184a10f5517202cf5e6ee49221485c64526edc0e083b0caae52"; + sha512 = "3a1bd479e251ad695dd397d019b3f492915f8051984ba399fd93035455070eb9a2b05bc43d87506e671ff80c4b2e4f17808f37e959d94dcb6a3067f8761f617f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0bf61f3952c7b40e4950bfd294f5382da877eecc265bd9a1ea78135471b5802b69bc90361c6e286e2a2c7f5151a44c711c45f3d9b053324213ade49c79907b8b"; + sha512 = "0c53c0abf67079d254b5da7c3d7edee506678bc3be55d24b61865e18f8e81b9e26f8ec98d08e7e8aacfb47a231460cafa52e065a4d216cadfaae70ae0a9202f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "de46cf916c7289f04590beab6ca3aecbcecb6ac65b7377206244e9cd41d0df8e68e6006ca49ae477ecabbb9b13c9b1df11c4cd732967b13aef3e9d0d708d2e3d"; + sha512 = "b608676213c5ce9cae42d18af0f6a836586d990d58042ac8bdd0112590f3aed30abd4272d4581a0cbb633043b4f0cadca7a90ac40777e5fdb7afe807fff1c2ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "46ae6e3ef632317f2f449223d64ebdea050c21f72a37fb27e5cff10d60f87cdb5d8b58de0e0d63e1a6f55ed0559eb5ef40a0768615a52dd5e2f2dee1e0bcf08c"; + sha512 = "44fc7a158689424b3c781812e46b38efefae4f49098bce533c1abfcf9cae78a6be2369fe21f6be12c96fd85afab875b8a6f77af399348f82a1cce3ad4b0279f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f0652632fe303db805cc422ee010f968493377014865a3a80af13ea308c3eca7c9793172106064dc2f36ec2f8f3aa3e679f285975a431fc7de6aeca4373db67d"; + sha512 = "f9f3bc634fe7c21e1cf9800f8875979e9f77764f71861926b67e9addd604e88b22f90cf31da5dc93b3ebb2dfac8c04ad423b9b21416732c9000e9747ab588a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "31efa7360e56508f2b249d2789387bb8130a3db14843b87463dfb600ba3f37328fb86113c263dca3ceb30c620e889810194bd408220941ce9700dddea908e1f5"; + sha512 = "3558b3eb7da562ba50f1273ae461f753a95d42eca3714eb1e044bbca3e63de16ce1f040f5b34709c8a0e86fc59ac6c9d65f1dccf3a0fdc30e96c0f7490867d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "f6ddaa4f75bf434474da6f441c8caedaa77a53ecfef92532135a27c8e76f8acad7afc26b3549a2f753676533c0352227cdd875d952c1a720332cf9cf4dfbfbf4"; + sha512 = "b79f0e814ce7df9de0f2a488a3a798ce9a33c840c7a39efc6a749a07e568ba881bd2e42b4a49fbe7ccee0ddbb3e7768382181ce16379a6b24551ad555685a792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4d58cd473798b52dfaa5fb4424f9ec57eb4e667c884808dd4fdceb851161ef3f3f72354588ce25eec24ff7ee671e7bdc1dfa7ef18c262540549ba34d8471ca42"; + sha512 = "69a6c978b4c896091f6118b55783988fc505c819d74cd455ec6274d54fb6994a012f41d09d9b574be90bc10e47b8d186b8021421d86d05db6945ecda1e51d127"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5aa6d504cf97e0d446e8699bbc34b9e69632455b97c0427c1081d9083c200ef3a83472b95ee3804612e36d93f0d5992bcc4f8bade7eb132a30c313d2efd7a75a"; + sha512 = "8253f68114e9bb035edb0d718439f0d28f04e6afa7ea33d1001a1457723c4cbcd17362c0b517a23ca78a53ad2dfc847be396e28beb3a302f2380a6dad5eedee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c8ee077240afe3df4052f093e6a5f13ec2449f84863063483edd11b8c76ccd42a45cce2c627ef57d5b4e337f71a88e510efdea1fb1f0065fddc1390d4753ce12"; + sha512 = "1413cbd3345770ce7597ef139242b72fcc9b7c53bca4b7cbfa707f00bc3d2778305f617047ba24fa22f808c0168524166a6fe7cc7db6ea0c5cd30b609e80d404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b0352034fcfc9e2acbb546343ec2e8103f08b3c802289486611d694c07bd154d9bab7509e8a09134b44929ffb54a806ea4cf44a8d4b1ea506c23b84adee123ef"; + sha512 = "1628a73872c268d4aa8ac78bffe6ab49341735c6abd5c8f805c86129ca0fcf5d03251e962fcd4c9ecdda6af125b8d4f9d095e42b2ff5c185267cd41f3090acd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "57bfa4d27ab78cdf9da4d04a4bd6a38873918bb800ccc1e49259c5d6753e9fdee0620795c96193c84938c126a94423d21ae12a3c998274474ff7b71b3da9e701"; + sha512 = "f51f300911731acd439068bcbbab712ce4920345b481b8db80b3f6ca1c1cf18fd201a9e639abc78db97933d4872c7241324591a9c045bc1c6d71898e2a2fca93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "61cfd12448a01a71c98ef855ea9c54d105bde516d97e8e1d70e5008a3633c0a45c194a751f2a7884e0632c56d7ee830bfd1a0d9a07bcfd54606f7c37bf2b4b92"; + sha512 = "196ce93a18112d7e0df8a8c1e444d503d3b0a2d11e70907963197760c2127c4f827ae9a0eb79fa7745190c92be10c7828a42414d33ec9ccea1f0b7194ffcc325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d6d3f08595f1675f181b40cc55f03009ccc212bfa733c341e51151e24089372a357a3a2851806eee708cc143a75a1d1a8d8a078fffa5988683945183f927f801"; + sha512 = "da6f0afd218345ffa1bc0b037ca20c9aa6b18597471d35d5cc8f4fcbd4f39f91e2839fe35f186577ed4445d34e76d4c8175f2df24f7bc0795f606cc6ab47db7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "559c34cd79cb820f674d0aff9aec9e9cccc51ff7b1fcbd17ef95b9066e35880c5c980155d2ec6913e1d9ad3f9e25ff8757ce84e0b22beb21e893ab0bf30ddd5b"; + sha512 = "4ea4754aa0b337e94f3fec5b108c703ac80827d514e64e3e6c890e050107249367c4167b58f21177c3071c11301c37de08703136f03edc0aa901a22e2126b279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "9f850ab71ab61eff4d2c9630cedbe42773982e1a8086a59723db64a01852a9ebf5ec90be7e315b9b7e142bc040eb2523b805eeab13b47a01ccd0978786d77fa4"; + sha512 = "f6f59d13148c7e5510a03e93644b38a788911ed904e088be48cd1bde071ac372b4b047f988714ed44d1f64ca6a32502564f01780be80f6c49373119ff7021454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "134740c2c4efb9f014f42eb5002a4eddf8da67c62798f8c733623ec3f28a2ce7c2caad0e3b0f05fc5474148714c7394c53ba77953d4f5c56d1ad4aa8fd35c19d"; + sha512 = "fa42017d8111e96c4d81ce515577e1307e187493866c04f3687746647904f2f89a3f0df822ffdc2004bb0fa06aeba102e29b660e250737b2264b5015010ab869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4401f8e0efe0ff589ae496ea959dec86834c331af0108cdae4a4380fc48e989068d12d33faca0cedbc4e5fb78460b6495a29022c42bbbcc94731cccede9927d3"; + sha512 = "5f47dbf433ab20c2db027542eb0a3dcff7fb0b526ec93908f182e1dadde112da327f84edbaf44ccb26d36c120a414d64ebb9b10a77501644d9f1c9c3d34b7346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "93a79dd6fc6acfc8829bd520139e6ba4075f67a091701c1a877212e495c4b530e35cc21bdf5d15526c27aacf2e25a87375f3a4aa555453677348f0442378ad37"; + sha512 = "3cd5e9e99b73694aeded24d9acc7c594bcc582eafca5867a7123c5067e34f7e96781164fd7db2b53366bd0d0d66fc495931cad42b1e3d56726c8e5f82c8aea4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ac7d84178ac2b315007cd5a0ec632dad6172117378f3a4afe6ad0099b45ca6d50534230e93c3045d1d89a18e742541514f6600f1b581547931e75769d361954e"; + sha512 = "ae43f7147a3ce843488623c4558d9088690fe6ecf7153ff30da09051e9e9fe90df28bf6529a469b8d799554c8ee3ef92006e73a2cb9e68a5b71ab392a977e849"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "cba6f234b9e7f4612cffb24fb648dc715730b0128bcf070b3e4f44ff2026610be4f8e36c9ff122688d47930a2d22a96942df6cce8d2c40ed443a8fb7204f3e49"; + sha512 = "6ccde441b5c44514da5bf7cb9aa959f818d5c499fa8d33487102cb1a1cb98a501b1575ecc28f8288cbc4b69dc70bc76f365e9b52d4329b685f25a1ba9d1ff063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e65aec8d339144b3acc24867da6e7832658bb625277934320ed428c21af537df3eaae6922102d43b8b4742e5e33b789836865e64f3ceba08e7a752781e2ad8fa"; + sha512 = "3800ba267d51d9046999c931b5bd9a743d2a3481486a7ee713f76c003c863b8579d44ca53ea56f5b32c8022ffd9ee0184b7c734e5671b412f60d04653ca2c8fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "13c0a83ad36749003d96b8e56471d632cf7006cde3c4b89ce2ff98bc42ddfa76b1afa4f3437e87009182cf7677931c5a307a4a2ac0e0250346da3f12dc723f64"; + sha512 = "600a1aa9a0b97fe66947107ee9018740e2f7c07bd3ac51b03c0c6d52728d72f93062c9dfebb97042c9a23a85631c88502feaa6a8cee395953ef23c2addf6a99f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "004eff52a5c6e4d8d60c488a52e894b0cfe8471f1c9258c319bf2e023c231c3bf282ef3d03d3a8045fcc8ef53e6e1173ea580dd71f73dd0bb2aea198f96eccb1"; + sha512 = "498f59dc3a6faf067c8c3d23eb5754dc8cf0478b50379359122b7a8e6ead6d7c6c39856cb34f3510f7fe1a11af3e0533a3805821ba49cb7cbf1d40b1caf36b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "3633383291f77632882744592c09be7a808897ed02809f0fff84ee4f16a58bf0ca6a82c0efc82b6c7291bf8ed48b0fe8eded288affdae9b0b55137b4dbce40dd"; + sha512 = "a5d58868468f9ccf22afe78734121e1f81961efc9c7add2a065ec9b9d5d68d8fe96b5f563a85b960ea7ff94c70e1c3aa3a9f0f1bb23cd175df549375c1479072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "683984fd0b388d69206a5d9ac1cf174b513aec52ca19eb6644209818a0cbe54124428adccd15e1ad9e7d41c6016c34a70ad77b721440655b593ad95aa66290bd"; + sha512 = "02a5d946542aff81bea82ec73fe30919fe4a1d1acbd18ef194a7c8879d9b70e319abaee2e4d8b3a2671cecd28fffaa37a182f7dfa06884f83d765b8701c60a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7c12dc3450e511915494757ebcaa6b0a5a0f3ed1bd349ce1c28b4cce1b931844408daf59e27486eb044b669fd7bd1ca4cb9512eb2332e7a7d360e20dccdae260"; + sha512 = "4ab405c47fbdb83eace54b0db61c734941d5ae6c5735d50dc6800271dc59cd82de9df9e1e98f238c4726ff9319c31a8879b2f0330792289db5e4b01cd3caf3da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ffb87a2702b7f3e8fc80038670a3cf45bf64b11442b129751e7e80cd0b328d6009190b2658b8a28562f8ecabed52a64f327fd263a0d93540f8f5f09250d4a882"; + sha512 = "82f95d6462097fb2975285326ef6b35a572b4c25bf07517f3ad680a978aea95f5cd4ab946275dd74cd6aa98566d1a4288761c985c39e1cb3d9e963b892a37544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aacb42dde2e18082ce80cf3e1201c73aa9985d711ccdb4b227efb6619a010fc108315a5dbfe23a666c9d851ba397f117dbaa53e5b4b3d0730c85a53ed4b0512d"; + sha512 = "a6df8eea8918292c18b281f5118a0373bc69aabc585d3a711ff77355a1aa95f5049d31df3bdb72087931dfc347050f4ccd791a9729f7bd3d95cab20c78da8a59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ba06e4276fedbc7212bcbf62ee1b0a1dcb7005a449778de5e70d8b99e86d83ed48d9408fbf016bf33dde135ad049c80011d00b5c72b0965ec6be7f91b759471f"; + sha512 = "d5cbb68867369a82d84ade5a847d8574ff687c0cada8714c8a072291aa02eef748dc109b42f1b246980f1ca14060b799098885bff2d7e4c55e7ff644ccc01e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9318d21491ab5ab6f2ef1c437ac12f92bd755a4857d873231920f5d67a36b81b4bc415baa8da92aed1b060aebd31013aa58e8cf845bd7cdc7d0f778526875b80"; + sha512 = "8d9a299c49949609f162f9bba7db369fe7c34f2b29d3075c607afd3c3bdb5ffa0ae0d9bb9d5ff5a5f0cd28556eeea5265b8f9809a2db36ae11209b9cbcb5b8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7f323988df0077354e5c391138468af9a331fe4430a2e70b039fd599e92b7f0cca770fb1da21c192f96342d6a7430502ddacce7ed026bbdc2b2685c5baab64a9"; + sha512 = "4431eeb86c0e3920bd08db00c10185941bc7fb3f5b055b8ba114e63bdfd7b64ccb8cdffcb754453557bec011d08d87e08b6a2ce022c77fe32add49269f3ac6d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b68fc3c3323ac5683ab9c168e870917a93120a0fa94ee6d427b384031764018c055ddc3ef7b9de6a1803057db2eaeb5581c45d4c52d6c532b380144148270411"; + sha512 = "0963628808ab6f6ce65f70e09c12ca38c524992c82446a2654eb42917ee2d32dc1dae94b15578ac5209e12e0fc4cbd2f56265ae8c259336415d4a56b560be96e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f326eff5f21e139e2e7f7f618997e4a9edf9b3fd0dbccd610eea731a5f7fc8e75711007c10b39a277cb1de353870bd0e0cf96b3239034be427422ab575d03e78"; + sha512 = "1b19d9ca238eb05709007ddf00ff40596b49ec771839f6b1ac21162796101701fb523c0b8ff18dc6d3428eca3ed2ac0fd3bf17c5ea91efac998ebe4b8ece6c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "49407bb72ff464ea85719b074b07c7495398d6a8900b64a4b5df267c9a51158248d416c8eff83984a3ff801769c069975500dd08b20abc2b6af461a2323bf9a8"; + sha512 = "c0d2fa00166926927e1985ce112a035980ad24771d4ede83143c4bb9012006c811aed2612fb1f2c4b1bfc852a7c7799309f4b579aaf86fc5b11ab216239911b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c5ae0b8b5f05770c7318a3b50ca4808ff4553521c10a1f71f385f25a133213aac84cc73eaa2016b3f9878bd890b4896b9814b9dc3624a26420e1596132682103"; + sha512 = "b2a5440b57ef85a3e3ee607e9e497e6b70e3652c7f258a2c7e98e18b5a95c8d34de908d64e464be9ad224aac7869efde785e38462fad3c284649bb9c524574b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7471dc2b1f24b6fb34d8af5bfd5043d80a6c1720d0a843d20911dbfec9dcf60f0a8aa9dd8cbb80b460325763dc3cb4334a451d39218e3c3d4190a69eb1122dc3"; + sha512 = "2ffeeb8d559097e9d67f7603c34585d8b4d1571a23ef5a9d04c47407b03c4db2d4633637e8352ad96989facbacf6796aa48eb94ad81b70b0be3f0955b8a0e32a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f8e3d737b9563edcd3423851eedc401529fb67baa4f82b4dd4924e789b60144032c675c461350fc0fd86410accc89c3fb6324a3cc2524cc4fc74ddc24362f602"; + sha512 = "91ef9459edcf44b88e9bb6c5bdf1a1d5689c99e5a44f14f4700d0821e0274e9f8c3f79388c7a97e0aa235b8ffe1099ac80a523b4d62420eba5163a608d48aae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8e36e7885f185d43c46abd2fbeb54dbbfc73ce2562874a6ecdf91dcaca9d6516884014e5b0640eed287ac578ab0283b045b6d2d5fb49cb6aa07a2ebafe620da8"; + sha512 = "8173f8c47566f7aa486266b8c0e83eadc11c484f597334aa48eebd3ed353f5910eef527bde508e98f082240d01804006ca4771aa7992290b254601d2eec6a206"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "fbf5014981544ef8dc0301aa92a9e809d02a2e861b0f1890d227f980fdd8967db28d092ffec3d8e3d3eab70eea955c0d7cf6cff7aedad3ec73fb3c4d34c5d9c5"; + sha512 = "7ceb26c11204ce6b1e6c3596d9dc3e6146422cc3eb0d1ef9c06251430e32f2353ee42b4363204852d6374cc845f8b84997958d2e66af3e770aad679d0ad3e66b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d3e4b26d3f6555041311c226aa3e6dceb18d7867075bcaa22469ff4f1a880ccd2d688eeff20bd2096aec8296327aa43757a2077f2d62eca9453ad5f5946fb54f"; + sha512 = "cbc66db54c574aca15f8e2726ff68910d19a67cbbed9e2b63518976e3f614b4f5f6928bb7cdfd5c357d7152ef04ffe1a311656125ff5cb62e471ae59213b79e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "34799d3a4b84f46df4ca28c62c57ccb131b43a4a7264b0c6ba1503a153534bb9b2bffed6ab581be3fa86df50cceb4103818b7a5baee8a3dc9af15b8205e85539"; + sha512 = "19325c8a1aa3067fa8df803b93f124427519020903ace8cf12585711634f8d546662166f11b3944880dca5eb79ae87a9e2d0e4e273d95543a4641e9cf4324ebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "82758675bbba9d27115f3b9eee456f2559e81cefb8261d94966f2a65d17ca452c684112e5d4a1c4fde2366f797cd9bb3e98e4fca05a4f4929cf3cd0b5dfd1ead"; + sha512 = "b74338470d7eb1aecfc75ead675e2408df33fd4841ab4953cadadfb9a7f6169f8a10c4896d4d48fe86113d3f1ff312c4298976ef8b997c26d6406f8598b19a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e9dc6cff8cff9963c6bf9987a459c943d694c4dc672ad817c87cf5b1620bf6f9680d9154e36d34c36e21f76b19312ecc7f8e90992d55541fa00abc623eeddc19"; + sha512 = "cb3cae07b27f0d485f9eb70805671ae50325491d622dacace2a39606efd7a72e46220e4981ff012f115183641b8e00271ab06c5ab2e8bcf3baeda040546c8b12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0b341c669e25f728928425ce782af1e723631f4db4d76b628a79afcf239e8c6269f900a50c515b6e81a960de4408496b3d4217a544294712e4692146b0c52aa5"; + sha512 = "83b7175ff91bad6733db2cd095172ef943867aa2dd911c6ec857dbeaad8cf4cd906278f3b8fd488e8905cd5d5574f727066ae73e92948d22804dabe16b4a11cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "86957c5b4a95b9fe948b6db1cc97d4ec0110852e921e3dc2819724afac89b5b7a237892669845a039a860d779cfb4116926eda6030d1627f6dd16821e2c81b5e"; + sha512 = "b97a3c637b1632b6a6285af946eb0a2c178d8fd901cb3a9b0fa5b62d14e3bc314acedd504153ae111557b78a2edbb056bd4a255f5971e1ebad3e335879dec40b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "bf412ae236b800497b528303cb3f1e34b051c3e3fe235b780700f044bf61e68a7c7f112b72347ab8c27ff3dacd6cf6209a3e0acde3a931b29be53dce2f580ab6"; + sha512 = "2f5ae830c52bcdef8fb47880c6941d5aaf4830139b77c59c8e188e82036d315f57732633ea785c54a950d086ea02423e97ea2ac01105b5d2990821c7a15036be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4bebea8af04166fc6dcf87c2f2ba96dc752adf9121e01e5edd9dfae25829fede3ea7bc1e5245ab4a4a98af78d4211e8f1600a25b52ce97537c809169f5c7602b"; + sha512 = "4be9c49a6b6203f2f3b3aa3b5ee2c3246d77409da5a7b7cde2c14a3fa592eba87715199447df96688e95d9905d6f1eadaf867ffe1d01be9a12feb03255848c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1c04e195889e0b1e936e3cd3d0829c06963270353f4ff4b4e7dbd494436107848c07c8c2753270f2db596d32140e90f28e17188266e97bd600212a6aec708cd9"; + sha512 = "d15c5f6fbbe9b16510e94d1cf49f36fb758a97af5e75069f38b33aab8be007812d88babdb8aa365fe3e4c17a822be234111885a2d71ff335bd7ec6703e81434b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2b10e6d123c6158c250fbe3b5509c69937576d4b8db6e6c36fe44b25309c099e46bc807d7039608c5610bbcdba84d4e7a37f25371d741690c62308b26a6f3997"; + sha512 = "351facfee64d07ffedd0e5509e8b796d0432c7b44ad29d109c50668adb8fb13f408026166a49f37a92f99bdbf7e032929a22088d4bc42c14169449234841dc90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "10d9af4c6d6983c521db9fddeca2f8cf3b975e57772ebc7c6ef9af92a0436137ea277405bd1a2fefa1e8fea05cfd933582556d8f7cfc629fb21ae0336b7b7ba1"; + sha512 = "dab3f1437cea072c466c9407fdf647f368838bbb7c30177642bc1247a8002874f832d0661e8a3aa32df8c0017f8c664caf6125b6989a113cd08f9c874753dfa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "00ad6c4a883e7de44eca52f1ff79b5c7fab992fdeac271dd341e18c9d2a9060efa33c5425a8cb81248e11377426888b66373eb35f2d8a5ffd7fb6d942f83b5c7"; + sha512 = "b62dde501b06b4d825d9ffa8008b45a40bbfc93123df07136128f22c7f6e1f1cc42a0ea7e97c1a962a7b1a1a23bccd5eb66785a246781769b22bb43b8ef451e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "46b3475e7f24773799140517e53d14a02d00e2bb2e09543fbbed3797d0b098a93ba226b146864c83a3945815b859ee124b7e2b5cdd484ab6e72157787fc8d232"; + sha512 = "9fe6488ed61c360ec1ba0d784409938159637c96abff94ebe18f198a8c0a72b052b5b0e6b5946339cdc5b5b3288c8e76811704366a4e9f9c498a9041955f7df8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f1088be15822fca949331c2977aed82c3db214a2d0c97bd2494890d427efa5fde0846d2ab552c254ef804f0cfc8623bb6fdf9275d396abe354c73dbd9d138eec"; + sha512 = "804c3639ec0275d844f9ea37b1ccf5f259c50301cd5ee719b6be07a5097218937b5337a25d375c0d534d59143af3fdb338809fd9490a898d226e9cbddf39b6c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3516bb6d83b565bc05afb340d35923e32265202c203f498519c632731fde4a6d1fa1d1189f79e50b315f8f135c383c4d07d5ff44861130146c3167e7d899a416"; + sha512 = "14b263e7abfdad1ce738d58bc30f054f80099a7513ae443d32aa8dcde6b12f2daac56aefe9d3cbc2db9f9cab573a5ef2b046b8e8df9d5417cffea44d109d1403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7b217348ff5e7618f6907f2d434e55b0a3f7a442771bd4eeb00964563d601b73254274fdfe1280c86ab3fd397ead7ee7cdd0366cf12486dba208ae08225b38b6"; + sha512 = "068eae194df8e756a668b8e372a0790ab8fdcbd5c54b823c82106230a9cba32b5b6e530de7a981273c67af25e5d329da2c543c8a5c96c91f010d19b6ecb25bb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "fa059e39ea57570763a96c4732e4ecce3cdd7afb9486669a209f1bebe4b65a4fd22a179f893a05bfb20de97ec8f7c22b6106b5456e752ae7093fb37f36789750"; + sha512 = "6775e61398e028c2a6dcf9171ffb3d8fd4746653beb58e8c012f3256685e545abf4a62d53d67aaed3a2f04f216dedbb14a09920f24c2b6bc288fd29caa1ce2f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0ceabb970350d20d5189dca2c57224f5c0e09ab7aaa90ddaee4289df038ad647f04a3476275582b3168f553998d452e8c5a04e099e34567dc03be1d62681c696"; + sha512 = "b66a91988d816963731c823f16d001b89ce14928caa129ef90dfd1f01e3c54cea2ddcf0e5f7fe34ffe23b265c0a64715c3877fe0c5c8365f80b859d3e06e84ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1540e1335b36c46574b1abb80900ba622d8f2e59b0ac5e91809fef3ec16c1dfacde14be967449a62ba2f2f2bbc65fd3fc750be121da6d2b6fe5de7e30eaa01dd"; + sha512 = "29796ba9076ab6c46f16fc06119a267861b34652322397e77872a7570e8375e3efe88c3c08731cc8909d817d3eb71e269f7d245e691b8ba4778bb653a766914b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "02d16488ad3e575a87038143c77287216290e355c1fa274233099b15878ac10ae0ef4d95651145684fd2896c09399099ffcf329922f093803741efc8f028be65"; + sha512 = "d7fe426dcbd53043a94d143a038fd901875630627e98547997be62b3319d5f2c2172ccf9315886d97d30c4a041a099e0ad8a229e840a0f4061faa9d6d3c64361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9fd9caa037156164fac2a9c1b4bc556a8d8bacda7fd2fd051cf71f8614e7a5a032b5e60168821c72f2b0c17b261f1ead1fc16218afeb022751ad39437686976d"; + sha512 = "093ee3c1d513adaff69bf84f5b9236c245c4580ae25f7caa642be239a591ad9242b329f15e2dde0969d12223cb6ab8decfc657ca440e344a87e42dd880450adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ebee59e46e8a6982d939c8e20c7586e0c273b9c3febc51eb69ab95e36b47060a4c340d321e935b2812bc7431fabd586b7cd88d2bb4f03a3dae167cb2f9b382e3"; + sha512 = "e912de72ee10ac764cccf1243c0c1f8fcf159d6ade88c7ff575a5f7a5175efe8086d8b4ad4c9a72cd65d59186665d0e11abc4399b0692428bb8c93d025de2f9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "57c77cb4b877ecc1cc0cf37064c0c19aed334db2cb3d16460157941baea6d67c9459e68057f75f9108b227777e724caa7cf15e9eea5a9003544a864ff5a0f5e0"; + sha512 = "52c57e140593211af5abdf729d4dd45be242539aaad4688ab081d311804d56afe05ac6ae3e21c439a560f5213e49abd1ae0e5650f091215948ca514ad3eb7e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "8b184fcee7e71be29ba02e615fbd9b050d8bcd2578639b08ff013a29e3240bd2f2be72ba9647edff2f80e23cf9723f14bcbf3d35b589d4f340f14888cb7daa06"; + sha512 = "d249ab86026370ce7f417ddb7d7cc0a4fc58563a1c12388a4e1628938e3af8a1428f2e43cf7ace0c9e455e4b4999942221fc3d96723bd927c50f7e45c7bc1a1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6a56a3ba86d28fe28d488ba2c5f3daa1e994b3b5f801e505ce5006cf78d40462d96ba4c9793c68cc23c687dee7aa936c5746a8838d54e80255e9aed9b244dc5a"; + sha512 = "7d5d1861559627f9a77160106dd5c527d09656be5586791c2bf2a61292b1cb1150c545ff1f39a6744453af58bd44777b9668993a10e654ed4c8edddddec12467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "cecef84e1c88e19e4c5881d07b842b9d6ef77b1293e304df4eddc68a9533061929582df8d2842ca9594072c29e0d564122ceb1ce9670afa7ede0f33cdf32da62"; + sha512 = "24a419ca7b8c82112bac80aa9d956f3198cb324991492f9f66bcf0d64fcbe5618a2e654849dcb5794399dad32de91bf48bd3bba70003e02b9bf28634b8d4b267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "80dbe662dd616c6b1e5e10be423f906463dea4e6a7c894ed14a21ce26ce544c0fe258cb6a7c9227335d18f11284bf082988a746b66243b44cef6b34d10cb0f56"; + sha512 = "cf33be7018dfffc891e4cac9950ead0274957b9a44e27bd7924abd62f93e69b575dbaab1a663ebf829a05283f957dae0a7442abe76e8e1a8a6e35e12be6e2821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5c30b271b67ff97687e833c083d789ac86a79da984b3ed7ca3f9330f2b4412797edf5dbea0601d6af9cb0775cd571a55451d4fe2f2ec48c1738c08c3c93feaf4"; + sha512 = "c368498ffa8eb48801634fa6b50a74a563a28d4fcd23e4634eea52fb6ecf2872e4cd91aef5799afd8dcbf6020c7f694dd3eeff1197c3cfdac63bd72acfa7d7cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d7e06efb84135db959d28c59d6b258b658bbe2f0961b1b3e0da796d3dd8ce4f2e726c1d719a8b111c2388285ec88528e6ee2d11fbbd6fe07ea01606984ab25f9"; + sha512 = "d2064ab0dba1c122a599954efb01e4a68f189a1ce1d5059d60373e8c4b89c860d6b6a68c1e58afebe65107c3f8c5c5f87e771cad61efe7449e86f8ce25bacc5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "fe9aee440439e425a99780033da20ebd8a0928b30d862444ffa3d8d8a0cee012af0fb998de4eb20604e260d4d0b0726c20646d3bd3064131f32ee7b748e11562"; + sha512 = "64d566ac3acb823cc062dddaa33e1ae321edd3a4e54b02e317a04595bbc145ee4cd06f3f84b20d1853ad6d0eb4cb7b13bb10bfc8383799264342a409e2254dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "dc89313d47f0ca64de20fdd81afe30d797852333040f72243d8ff7f6713333dea6264bbb81cd5082ad3184ae463348816737a327ee2de2f7c446b32fb6bc4e80"; + sha512 = "2240c612c9d746774fba47019068391d6e08fc4933b082670269cab1416ce538b2bf9b948aac994e81a31a52b91a11df6968b847ce0e843615a75b8841443c23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "45719657f156ce045666b8f2b3a3809d37eb9175b8f4750ee97ff6a2196236de4af8d3d1b47c2b67bedaf0e053111487a5682ea04230fc566dd2ec28540c29c4"; + sha512 = "f579d1d21cb45d91394b9a08e1b960a43ddadd7040e417c20e66e1dd4d3f7ea3a8963ab8334e49cb22ad6eb2ef81ba98eae1298acab3abfa512fffb6024da622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "af8f67818559137004954538f9b977516095abe7c2203ff0fcb3e942bcb14294e3e87db6a3b623b2f711eaa7c30fe98019f4c674fe6e735bee5c1d5341b05eb9"; + sha512 = "6d2436ef789404b6d7247ca222cda81ccf518b91bb854d7f53b6c2c1c68b96cf5785bf6b768e49a0b0a4db02fc899c72969ac0c1441ad6bfb8ddb944e2388d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2bf61fd712342493e47c134cb97cd7b174658551d22319face8e3d9df3c89081fa5326feac3d78604bed23f2a334000ce6e08967f36d4494fc98551bc2113754"; + sha512 = "4ed452c03a08506498ec2663b6fab477b2aa52c9505085b493d799b19e5215ac72a90ab642ab2ba3520c609909b93a5b176d5f13c79066598492e7babd94ecaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "33d57aa16bfa5851ae02887f845ea442ddfb78135f1af37f503503b3ef1057b74e631aea2fa8ba96629e5f13d3fb26df32626a11b78f589f39db5901e4a17623"; + sha512 = "d3c77c8a85dbb280f75068ca49891de95fc081b4074cfbd569c773fcfd4d0b017e2b734a6531dabc41dfb3e3f7accb51d47e7cfcff2bae6f230fed8d69db2073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "813e08a3c6eb60b352ac4b62e7ebcfd9581650b911facfd301f6bf716ca8031283e7fcef9b9a10b2ef4ec52d19cfb2870b24fc0cfbe69fc87bb4457d8b696323"; + sha512 = "94aa56c2d731533105c9e1c7d20862ca9cfd5729fd474b2ca784e2528f798915e9dc177e5966e2b5bb77d6eebc7962e6564f1494ecc284a91175565d25451cdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a7c93cdc4e45d826e4ee4dd62f6767192616f8b8efc5200137d8290d5bc6cd54cf391390e2ed831195187a0be14f539f8156548b86f4fbbca3c1951a3c1961eb"; + sha512 = "3785e6ba189c2ec41f56282ca8925c8eb14d68157c5c035e90fab09f27941e67c9286298c07c31ab0792488f2cba86bce166adf76259d10cc3007f5047847392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ae6ce8e076ccbfa89a653d7458fa395cb43c8bb4926eee153cef0f7b2eae0843d3c54358206d9dcdd2ab8deb4f5416f22641c71c7665ac66f9bd5559a1ce3bce"; + sha512 = "a98ea8c31d5e6ecf3d3c4b0def2d2921aacd901d095ab53aed1da202937022c073834fcb1d3ced826c294c18660d2e4888473b2f8f9e91083bbfd0e040fa6ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "853517617c258d3c441cda468fb3d78a122cd75a369265ce2b290721e08daa1b681c8c84793339883bf701b0e7c5a24744c3382e2bcaa67de92b40162e420b9f"; + sha512 = "5c64882b2fe34cbff29ebe7668ba96526abfe29cc599881331e048da2655ec735f8425d98f64475073e86508626b464364e3a7212b44ac297e6a50c7fdb5b4f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e5e511d2c19a5c289d337e5630c1a1d3aeb8edc5c6c5192fa8ee36c041c5ba1a344cefd5331c605335325b34d68609c08ac57816d33590c6f9416f50d0a60a4d"; + sha512 = "1506161ae00a4fa203cce5b31779a38f0e7df94021123cbd57197cff807a4a6ab2ee9907240b70b55e6795574b4074a83bd692d2b4ae208438a12357d6a898d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "498f18339722286b024b968e0db485edd8d16cd944a1a84c95698695f4b0afda99faf5aa23e9dd893ffe0cf89fbd69f0ef34d9c7080cb3aea06178a38a1bb2c1"; + sha512 = "97950bd4c56df1defdcc7f6f1693dd6fd0065805d63145aca80242e2d5a83186585dc1a165e7fe9a0dde52a8f60fa6b32ee097fe0febdbac5937a410e654b20a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "d04963a4247e8c53d748b9d32d0787beea159f1da8e31164a162de4090fa521d6a7c5a598a4874bf8b2be64733d922748a615d08871c90ba693bf4cd82d1398f"; + sha512 = "994980dc3ad618140b0b422db46cf19cdaeb99c4d3202c426c415494812b5cac525b43c4b290fcb58ea66ab9330680c4add11e8ed92a5e36b7daeab19c96b4bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "302a68064154f22e5bcff55da98dea6fc94abedb839f572db61e9542bda47021c740b51baf57741368a9e616e9a3620dcdba96f55f5010d783da1cf1e9acf37a"; + sha512 = "65558235961baf87812242607d8b77f6e843bc5828e79002d55dce462bb2d40a00ccc97a9e83de56777d1e0ca35991a2c577ce40217964c481930a4081955289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "26ad41f597dc9addebdafa5632e0fe930e6b704e65b8b8058773de3954e1877f9b5be4856a53635417d7027364ce4c70025140caf53605c18ddac59447007099"; + sha512 = "cbc3c626919406af47ea8a00e01fc8146838042a8b7a04fde88f39e8b21bb3ec8c15b9ed2b327f5df1bae621427c8c2917837a29c95f27b1bade9d82e4eb93ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d5d63e51c3cc11ee58ee0ee2c9190a66d4cf136af6aff31e2db28107e8f3af5d492d92e5e869b3bca570f7ba9f4fb513df6b21d064d75d5d246671dadd050e59"; + sha512 = "70ac4bcb16191992de317cc6dbe2f3e8d6ccd0b7bee0568d7a2272429bf164610621f53d6d3817ab6b3c7643d63db243273f6e99dfc5c5133dab4645f9824174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e7a3492d0802acc3d3db2410fc57282334d16405ecc6ff3420c29c6eb35ba313f3e46dcb7f0fe830e0869b355138f07ef51b33caeccceada7ac7e95d69cc4304"; + sha512 = "e66011a9db9ff2512dd3b2a338440ecf268141200754b0dc09c484d1504534b109aeb83364181b3bee7b534ea078c879ebca1860af63c388689517397055f670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "397adc911b685b261cfb38f50ef9f107db83c3e21c5d0f3435c47b345ea007c9f6cd98f8b0353c804071874e3d5bd715d5942c484f1062ad8341a9a781b1ce93"; + sha512 = "e09d595c56d8fb54592a046a6e4f9868a1bcb2bb638cbecbb87f94000127d0f3acedca67ea7f8db15445cd2142052873bf73ddf4df2fcea16373c614d6501728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "049675506e157ec2d3b7af91a6bce93566c990eae6334620de4fc1c9aeeb9bca01cc16b00c79d0396ec49470759855b690fbbfcd3b4b1c5ee90df70efb9eacd9"; + sha512 = "04d5647b360d52ddb714c25443b55558b3d54fdb31a385513832fba336e7db28a8dc27653ceef32e72a4dac7cb771e82178b6161b55917c07da839e80523a8bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "08cae5e6d2b4a826e4e4c6485a793ba2a991c1759498641c63f4ffb8334c68efa6190bc7d33fc8ec83e8cad8299ca81825dfffa7e20cff6179e3fac023a9d3c9"; + sha512 = "bc564788b8fa57981b7963b584a445d69e4c198ae83d8d6ae1a5e4402796492bc2cf92d0119a9db067f75577240b0e9d6afb2f38fa94e3e101ce6481b8406fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c989ef3602539795503af56d6ebbd426d4985db0c35be60eb911b1f46ac20b317ea15df3d915fcff361a22cc6ec654c5378c615e5b5271b3f436a2f4713af59c"; + sha512 = "38fc3b4eef5cc6ffe867665d82dae4156ea2676749a9dd0b15bfbd9e01798829570bba75e0023ffdcf9b104ebe85911586eaba95868ab0773b22e121fc75679e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8c3479944dad80dc70ebb285731ee8df051fe63f8d0a5bdfccdce5315ed07e54bd66e4b2d0c7b75b575ff63dd2dd80117166382e389c21a581bd848570805c70"; + sha512 = "73477a782280c18dd42d7d62e26cfc5674201d3904d155c2ac712251ef8b65f422b522804104d7374865cd7e8286a8ea9291cbf7da37d412a1cdf8d24d18a3ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "547a8dc40bea2ed9cd47acd06c1f6a0e12a0d4631adea0193d8f0ef8baa41bf4cac9e53b7954ade543ceb85cd22cf0798b7212b2a91d795782af5f2575b4c729"; + sha512 = "a35694c831c424eda7b6e5069c1b03d1e6b2fba051b3a29a7e8ebbded9b3b12fc1fbd39131d86f1c0d28a728a9ef2b7c8f903f6ba792d522c5e96490cf68563f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cb853435e91129651532055c5c5293dbfc758e806a316ade7023ed0f8e646594834ee18d470fec2372f954e1dfad3aa8ebe7f9457cb885ba8758d55e1027e8c0"; + sha512 = "9fdc8e1e39d2fb69d3afb64f676fa85fd674b45eb86d4d4735df403bca27eb499be9e7a6f5f9e67cd3e588352adb29ee805b403f35a859c3226507684a69ecc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6be613e6d99cf74fe7f08c109805b8847fc8a4e6ef3c972baf6bf2ea730f4eb6666eaec2606560f2d14db649d2148b718d4882af9aad894becdf436b08f6112f"; + sha512 = "1da6aa658841d59069bf57960f9c5888e879056777e4c227037c1745648417356bd87bf062de6afe41058a290998e7e080ea7fec895cbc86619d0466ab0bf64a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "28d5fb36ecc45d3ce09087ed2aa2da7431334f66a6b183187d36ac9309f9785d32e1d59f0bb14ae281f1a66795f546507269919fb001ebbb72fadeb79c26df69"; + sha512 = "8cfc1c08b728727053277a60c19e289f0d0407e01cb2da5632cbbfe5ab48f751298f4f83930dfd5907d4be8973a4aeec3f3a719dae16827f48f0eb0d4151cd03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "8384154a51d40037a39cd4fb4bb21cd9c7174ec75c9ddd36d79f35bea00380b1ec74eba449b240bf0cd66ffebd014c9a948d60bdcde7efd67e5136d047b75bb0"; + sha512 = "96c7451450e0d6e133a6576b098b37dfab5059240a6107fb95be17a82e9600ffc4003b60918f4ccd8907d8aef814d55a79a61107504f41fe086fe3d6c83232b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "84d902069d997ea001efe7f836f25d78fe921f40ad1c383f3d510c34f12219c0ed372a1aabb27c5b43465dec2647babfbfcb3e3d4e2916fe4641063df4547f46"; + sha512 = "0211b3ff84eb9e7e9f6a0c81a141273009a2afc7ff237bdad751bcd68a24b60c9e9c896a836068d3373f0a0e6469fc77ce8f502197cdf9701ba033ab63eb5e03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b973756f954d83a87e2bf9b114c5b5631b42819abb1f586c6ab9fe49b2599fb9dd5bffc995453113499db2bee449e2755db61cd4957bdc6f5be7514d62d7eb74"; + sha512 = "e268741abb735b0425d42fb21a1a70b7035f915122c64e45418f2e61a3fb5f9c123b53e93979c96e7a183b8511cfeea4c3c6e3af87756622f4f8d049657a7a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a5ae19c797b3c32f20db99777cc8b35d586f9cf2e5714213cf4322df140c6fc87ff2cb03c0de88f9e48395d808196d54a1102b659f9d574f0c9698da5a7ca7a4"; + sha512 = "3de7753956fcee2d2697f2c8a3cde18719621ae4c728b190d43b7e936c39543d6d6dae3ca593698931fb17b0270a19840377ec9392d1eb8bc591dcc7fc915404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "63d6f402dd97e0728fe77428b13a3532770e13d7f8099b853d370d0db45aa9c1c753b2523c25a764cf810cde0c50f1db932e26416b9ea38eac56dbe89e7ea697"; + sha512 = "ff9b2217e043c7cbba98f9993c729d23dea838e6f120c6adcbb4d03ff127484111ac2be2426de2134dc914aa765550ae62a464822ed31b24231fdfb50d295610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7fbdeb3a3c1f5adb723dfbeba22390091483155b30fcfb3f80d58b47e181f7b88bb0870c5e2a82b638baa3771ba93f776c47f5e98f66dc40ae9ca58933ba311c"; + sha512 = "805d85cad7af9264c1e8e3534b6c6248573ae445410616a8d74402cda2273b68dfeae4d47240e0247fb29b56bcf6f2d627f4a872afa8eda3d8156f14bf8851af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "7fac00f114f2f792bcc4c42febd5b8a5a1a7952a7acf2d596c4ee4125e82e510d956a7de575405c98c0fc776eee4b27ab24291bb4f5db6d5a955be5c0d6c8dd0"; + sha512 = "40f56cc3fa11d85b7e9e8d770ac5bec91ba5b8203e11a0cf898ef6bc94d58ddc73d6919e5c56a2e79a846393f28922233211784e693f3da63ae9315f3befc80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "75b7d3222b5d3efba3d97ebe44b1b28e82cbfc441689776386516a84d42075f1ced4b80856c1a8c87d3cd8101376cf747a4a5eec0f442608fc303862b34a7193"; + sha512 = "00dafbfb3095d7b76d1bf08bdbe5e99cfd207b39ae2a787eacb39ca412f1b2ea7c4fade4c99715f44cdd774823c4929d0efb65b40757f1b86faec738d4f11493"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "23e050317e92745044a0a5af3b9455a8f112884fbdf9e9d701ae5e8c614cc3d97a4de06ab10e2ffe22344c38108e575eb8d8ae6a1f3095ac1ba15bc6a37b104f"; + sha512 = "24c21262e498e8840cba3f8411d8f46108f736f10bba2a0c37ad9fab6e0bc773f38ac086334d3d572e19223309e9d106035d3458e05c9b7b8db237b7bb1e1984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "58179bf33afda4d10fd6dbb9143f6724ca8ae5bb6122b292eb48773c84458cbcb85120c2ea87c6a3f4f4878004fdb997354b571223a35ef9cdee23902292296f"; + sha512 = "fa849173b8af4d6be6a499734042763d2ac532e213cb863a611e66e405acb5df7a51649bb1f9509ec637e15c055fdaac63e380128290623b6d3818e528a9c532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "41557936332f5c966a1b51d8791699783a162eac46b14e22fd0f79abe6175a31fe0f6252270b51c816c88ec15f2982df17babec0101a0eecd6cb25a8ae900dbb"; + sha512 = "5b718c2dc82230343e35b8d45725e9f7c331cdf5716d973d671b7465e06d50e92e0a353c73c7c31c33cec1115b9332e2457f17f6e5fcf8f033bcf7e222802267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1603e2dd3cfd417b12c0a6c933708835505cc8f5e0e827fb5072af0f440a0dd0dab5d961d58fd712776d58e803d1ff3dab179c7ab45a30e08be6c895fa1c1c06"; + sha512 = "7b037bdbe658d26c2ea75b8da80b4040b9a0c4cefc00784bb94512481de435463605c565eda38f0e958725adea11f09a9ec5a37d9513c16118214d0486db9031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ba2198d4224c3b2b609c8471a1b8d6bd47d51cb42caf81e7f1a4e7ee0220ba459b4d2a4d6270d5ad25806d8ab0b9012cfbd9e3b242b4f4be54f0c5f7885ff67"; + sha512 = "9752b73c59784ea54a95b0bbf63123ebbbfdfb7d2742e3418a872982c0d8198fc0450b3c33f4fc569fcd43a633cead3ea1893057b6d7e8c6ab78632fad3555cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1a3e1997151a4a74a6e2a35037564c2189f4d0c90359084aa387212177ac3df08e8114b514bccbeb9b7b63dee5eb8028614c08d680cae0529784cb471864b380"; + sha512 = "067ad7a8a5a4c6120c1f1be2f9b4066f1ef830e3cb49ba850478d18693c8e4ab12d54a07036d23ddf3e138837320728f1fd6bbfffed760b530d8ab6addba6b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6e40f39108d5f00faf81793852de22623574fb3f201080a2f9d8e3c31de80373eccda582cc0d63adf6e86c67748ece5b5405e880e6db8636428c3139aafe156b"; + sha512 = "9f4b6f73a3966a7aa60c168c16d88382dcfb278f934f3fa485e691a6b6af43a14f49395a3f8177b4ca9802275706b2cf701aba2310262149b0bb42cf6d096c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f08984d8fbe3b5c585e7e361c1f21b7d6374ee3e58a12aee599444788f89bb570d277fb178a76e773917ae4445904e3d3cdae99096d8e1b8a188720a161d436b"; + sha512 = "43a0710f463542a1389e98b5993d1d1b35f443f0a0ccabca65ec5505d19c28311d91cdddee4f9c102b6f4a25a87e4c2c6ad7be89252f60a724c7af935e30f675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6fecccf3fef10d99fcdbec8674ebca50b4d2a5708bf423778266a440fcd5f7fd4ea0255808d86567fa26542c229bd4ba06448e40ee0faa3a5dcb2b36d694f1ee"; + sha512 = "6717d9c590e5f06d3b02f643ad4eb27f48499ca759c41144aa5e0351e478bacc54163378faedd731042ce56ff5e8f55b2c6b6bde7768d3576b70a0abaf4c91bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d9336c9eeb6678923c53a21873760ecea096262bf4b3cab6afe69c1cf30d57fa95c8cd496508a80bf1538dff3cfd4e68ca864ba8bc9d58906b4155011c5adc38"; + sha512 = "320a50b2461d617962093c1d7eea94517c56a93d6857a4d4efc4183e76f24dc9320619f9c3143c9dda017ec5e8e3d71c730a27d532bd7141c750598edbcb0121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "fb405ed1f6c6429c98a7be7046e8a4e39b594febf7ef11fa163c863c3daacc887142cc77d7da30f709ffc6384c2092896f8ad4dc69665701b0c83013374f8a8c"; + sha512 = "ea7f210807e2306d3578c39d1d58ce12525c47cb9dff3198dc9153683f8e49229e19dfd9fcfd3d76e109cda4f92392e4f9f1fac2cffbd59e6430105ebfc705f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "804001240e8a6809312634de4afc2b8a055051e9c8d399dd25cb96f9bfeefdf6b9526c8cbee670616a63420ff848873b6d8d1cedd8496fee38752408bdae21e8"; + sha512 = "bd1dbf20cbd4aadef8bafa74f308f097b5dce955ba7f2299cddcb1cc9cc9d8805e399684cbca1af750535ba0ddc939757f4d38331035e4a708ffe1c252da9c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b98d387cc62b3c87acde8336843c2111f67f2ec425ad78ad1033a150efc253561d9f12a42a61c8b2db5a926e9ec18dd466ab81df93fd12cf8342de2f2baca21c"; + sha512 = "1e7a48ba49c4f96ff0d16efa3798e4254b7f38f0da8f51e62a4bb71c13e3f066a64c2c6d778da18b5db83da52684dc39067f6c765987d95921df2b3118de2c6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "cb5b8275ef7d62647b623506ac73b87e4552ab7d946838a4bfb7e690c8976d4acf7862a7bcd6642994d0c42c510e6aee5f3177a6a7d3c566678d5f0897b53368"; + sha512 = "9c7e6456459a4e2b6c7aba254afb145ca3c8efa4023f7e023c3cf326b0e0afd88149888265856e9f28179b686e1a458d453acace73f635a5fc8c90419e6fa043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8c0bd3e0901696be921b440b03c919bd77cbd15f22e3022e0ac077db4b8bd9df34ca8f321f8bc27d459b71f89e19ca5549b140a7cba27014f4b6fd68cff5d214"; + sha512 = "95e2d89e0f94f9ac95489f8a084d0857aa5339c8257fc1bbe7c7ecba31694963831917461537cb12199fda05372e1304e6820683802efc0b4ec02324194ec2de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a580888df34b1062e6dcfd55112a61de1f6c031eb9dedfa4e8150f3b02f907b222e8f8ec570ffe1f21cba29a561f2ffe51701a509249ea3ccd6f2b01b6c00563"; + sha512 = "5fc41cbecc716fb024df2d13e9fffb2b656e18f47adcb496d3f8f3d61580f97fe801435240576f1403805151c7183c208425e83a2ac56373051f0e82031115ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "03ce56316a24ff43f9070205eb154254f139d1791c46dc7d37879208ac59234494cf0e584f43e2c483d1a1516de5c3d8b8d0debe551f377df2ef9d7ef382e6c0"; + sha512 = "16c5eb3e9739e100dbce0eb93f209fecb11b5b024ed62f18a47b00927452d8823b77a14fac1788d9c4bca9062e85e724a78c39630694b0d692b3867e4f62f7fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "eeca8dafce55e70b17ae42e8f3c807207ebfc2eabec44934f0f2984214426230fc498f3a683d2e4841787352ba8e52e37f5c70a0e5e78217e9a5516371a35a9d"; + sha512 = "0352971bb2d43782052f20341f8fff0f6e919ced7909e6a860648e9772101e5f79bfdf0f912647d3593a0f6dc9dbe84fc193519c3b24ddcd13742f01ec59d1af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "d16ae96bf3c7f4f31861814194f348737f4b02746de6acf0eb377eba8c3d66e36cc53b0cd1a0606d88d9604989bfa984d1897b504c38b06ee562a326224216aa"; + sha512 = "4856a0b482dd0676cdb5d46de7bcd96a4c9aa61bd976f3b46205019493b8933c78d7b253c41f4c2178e2f79b000dea8a9cf13e1fc7a31a5242432e1c9205d445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "9aca0543d152c6886d706e759b174a490a52ff897d0a4a455b40c7eb9f9e6cad72c720fce6f63991e995e3b50f4517a5c3640aca81f12ad6e0d4e55c84d78773"; + sha512 = "e85757478feafe009085ff55492913944d5d8490426f93cfca481cbd97842bc3c6dbf709e17c372b5b51b14fea3b057415120b6fe145de928a108c7464de9af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "40cf4a38094db6df21bd188e7ddd008488af74d502d2a151e0761c37ec8c31040863f152419902b38ce28b3e70033795b7499374e38ec354f690489a18e45316"; + sha512 = "f479d48fd6176baf30b0d648120669ba47ae2ec5d681ac6b610d6f0b0a617a0f259db863966625376b63a6b871d56049adc500ce8e8e0e27da3520a953bf1736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b0bdfc5be5c95338b235eea81d9de384268d05af2d501735fe4de3a8b525b6a08f98a40dfbbe60a6adbfcd92e806072a5baec8f2692a0823e686c124bc308b61"; + sha512 = "4caa574275e5c0756ae787e73398f73a2702b36d4d3f49d3a3dfad8cda8393cef24ec0375d65d0cee4f41be8fc94b5419a3b613dda287d884f8e7b6317e3fe13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0952e195b01c4a42db08b1ea6afdc4eaa4806f3fa98a35a7f7e55789de6902a255a2a5ea6bacb47c5e3b9439b83548ee81b85fe5c6520629ae8cf2e9b803eead"; + sha512 = "28d31bc60979c84d874f444555e6157b906b9d34399cb87608099e67127dc7480d6789b855c38615b075f5b07f8a6b222f04dd99e5690ae36d56490953135149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "02d735bc251be237efc86ff7642af066819b59c0c890b9a8c8525306537d52a603301fb81e4f2628a9f8d2af062425022b01db35b19fcc705b8de6d888c2bb6f"; + sha512 = "b83c50b728bb1e4febc53ceb3a4fb8a6589751b5ef77ef81f03941ff33d3e289c8986b501d95afeb56feb8f94be7d9a7b38e5330ca359543948d762e71402f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "404d9aaa382f9d641486dc1339b55f113c6c67f5b7523fb7b2c07c8114b4732e6e4882538d5dc2c57ec871b41bcd2e7248326db84baf4970a0ca451b785c711d"; + sha512 = "e1b2535e07364a29cedf36047b99dffeec8937b775a247b605532376b3a43a8c0037e2cc9a6a461a9b68e00eb67ac1d337bd40ee7110ce9890cf862dde3cfb60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "fca768b0d97af4c14d71ee0963da7861bebf77d6c67378091842b184360f2ed7a54cb5e9d80918ba21fc34a77f36e2e1402c773b5e551f20b9ab9cd92e4f91b1"; + sha512 = "776e2fb5cd75a8f5dd1e6340af21356141a24be87eeb6968ca926cb3d3aec1b48adde0881a7e4413a83fdf45f5caa3e829c0ca1754cf7176eebf2b9e3ccbb02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e8925de0b33c779c0f26974a1f7f4f1586b7ff7ed969eab7e2721307aec67ac447dd85ac9c838d5cb9c799fd3f85e0f4e7236fc94111cad341aeb2b8a616c45d"; + sha512 = "bd3bb0d416557c94a57c8b364ad08ddcc1885bf55a2435f5a2f74f5af1607a828795fc68027a470cc95bf46d553d84eed1c0af3de1ae9d72546587b486a1bafa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "11e8e2d7c434861e4119e5e2a6db9e1dbebcbfb318a9f707f3a09418889c4998faf280a63aa54f1a4d7f970ac657950e558004a019148e77ef539fea38072f54"; + sha512 = "b789f7adc37302354f797988e052957fd95f270dce838352636a367e03475ea92a740ab5ed49c9561eb5e90b106e38a767d6d3b4e8f1b3f07db7dada400b6aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a72b2da8c97f0517c8a1410114adbaaf8d3cb6ad76ad96cea967f6e73e934280e9af3a25b5c4457ba929b91db9f07b6ab740dcd19b0b4eb8093ce943a889e354"; + sha512 = "afbb11407ee19f4d3846673c451848ebd4efaf5795d1f864871c57f7e5d36d26e38c7107e326c5843109f89a315cbc38f25df1622f97d6c355f824d06986341b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "07f298aa7f1ea9a484dfd918b61c2373b7114e0440759c91ff77d2f1f9712294a55bcd941f689431496fca05aed17d4e8a167e7e9b2afda6da2d5896e49c7818"; + sha512 = "03c32d07601cf4b98d02495baf97b70a38a8e82abc8685ed507f0c9abb907468b1e8b8403b2272c9c06ea8b0cb020bb330f70f8abe5b5fe0c757fed710c912ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "02f1a630873af11a48fb4a2e56653a4e13b363dcbe49979b56f7049f14f6154b26cda2ac2311940a88be97e055e3e19b54db02044b8829ab833fdf76c2e6156e"; + sha512 = "47c923096c22e509063298e9229f3b74df60142aec4296d7008b5e49c69ee9542915e639b52ef8aa65a7ab9f118d1d23117874a3b717b37930d8a988386b6ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0983f9e86b860b3070092d2a6f6478ea5d3e73ae46d3c0b2da20c03290d24fdc7dbdf14f0df78ec0d187c37410319c0c7e4ff1a1e8152646780fff0015e33ae9"; + sha512 = "2e2b3c390ad20fef9860c4e3516a32a66b091e1f60a0dc71916172de3a667cdeab3d712f8f2a5baef8857da3d9211fb7bea808b975cf3cce1920e8ef2d73614d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "ec77cede3cd23c70f0a8ac5e3ea46c3cf8771df271e91df5e2d0e35edd1c08e0e3151282e9a14c82df18cb907393428f38f58619dd198bbf57ff8f062222317a"; + sha512 = "4c5e5fc5e859751cfdbe1eea6217b92dcd3bf2a30b4967965d0242de72deb6d497823b0d17c170be1e7113a15f9d607a6890a5283c47c254ef2c94022397b977"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "590562000f4aa0a8a6a4ebcb95ac01f38f8bd1f42e3dbadeeb8f03c4f6fcf62d5dd81fd8841ebbd8716a702526276bad17a6e767d4b6c483102ce0c9ba686ca0"; + sha512 = "6953bf0ef7dfb0b703d4aa1ab9c26b85fc049c12a04d669121e9e98005ae870d92df9ce16bd567aa1586d02162ee94fd01800d4d291f5a0c1b6e0cfdafd89c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "098497d2dbb70a702b0c804a22734b2dfaecec0cdc325ed8f63f2a4d03b295442363c6d9214d21a3b96d63221123b43a3ad27f1335b38eb4198e7cc1c5eff5ff"; + sha512 = "e7bb763c2049dfb8081384059313e977ca44eb3d147caa2fbba755e288e45d6ee5e47b6aef1267e23d4e8c6a625f9dbdda7b938a9183a7012b3d943b857645af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "38ecd79e96d54887ab8358d848cabfcc638d2f6e66e73349f92f3ef2f4f7f5ed3f6be00e84b4062cf7cca082ebd851fccdb7c398f10c7a56b2f2587d5da7a9c7"; + sha512 = "a4139cd488a85cd70e595bcbd3f8fce96fdebcce2c61c04c06b70ea0f2a99348ab69590f1ccabbf803798952fd436a30bf6c103beb3006ecbd14f70d6c3ecf93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "18def001b8dbf3e70f424990cb78b54e9700dbe4ac6285acc402c1c28e4ad2c5e4fdd74d703bffa296381d89798bbbc12b9cb929cc26137dfebee683bf4a692e"; + sha512 = "e485e4b6f5a8ae5fda9be8ebcdfa102bad2c55ccee6d9dfbaf2778f92c68e68133a26a599998e134314186b296df68fc0dba7c849a109f699d3198a2c5a31001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "06084de26c5266892d6da49ee126aa53a96b515ff66669d369334d02cf8c25b553bd3d00899f655f8ac09aa9c1891c247021241bf7ce8600f5e9d4d1bf9304de"; + sha512 = "032e3e3b854a0be7ace835d71dfa864c0c84004c87ff09314615e633d64011f8676118ea73797b725bcb1c1e079fe632e16c15eeedf78602201c7ed371222e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5e2742f4030a941ea741bff0d363ce39c115a83988149ef682c30554ddabd3b94a7d72d9bbb4172ad1faae893fce35efa30b01b9cabf1eefa89c69199ddee7ac"; + sha512 = "dbdf163abdde2bfc22f5574d2be4e3daea52c7cca394a9b0f1f1b8af19c65593383a112a2fc7dc55e224ea6f5d63537f03be8d2cf02fd3d3566963bd0d51d204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f8f2d3b22d4fddbf25348eef1527c7e9bf0733572093c1fed1831feaa2c53b2559380bac3198fd79a51fddf5ebdcbaccf09e27c4d69317081aef52f37abacb7e"; + sha512 = "2cd1446890227f1ba4d7f50ef778731b350f694646b6cf33e1407325784b071db4bc2fe43eeefef2ed98ffc5353538d42df48ff8e546f4495a366d5acbc2aace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "1600fa39c920554bb733009cfd6de7c0cd2ccfe53e91e8f3c770fcce29843dd89c488d733fb0beb81c868d26a74fa7b770fd64ec92459ff9f6a8ff9d98d42d02"; + sha512 = "87c131e32ad46194175e8ca8061cc1399813b2259c9c3e83e612c74bac27c9364cbbc63860c283eeb8416e3b108297ced4a1d9755c0a273c9143cc6b468f5cbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a2701ef2fa5f2127808c17a4136e4ec291225f613318ec04c0ad812d75356fe90b0ce94c0de5fedb17e16462f46c480e89e1a0ce92ad113430dff04756675b59"; + sha512 = "6977a2478623dd8963121a1cb3da0a8669d1cf17357ed85475f61384a9e1ffc2c1b4286b3d7150386031786e365c33c188cded495036012a63dcf2db44e19d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "373caab422978dfa5629f4f6152a72e6e8f16f5add1f341528b98a617672c9dec3db41bc3021c561808b2c65124bebc0b2dd39163f3961e46204f9bd1aafe04a"; + sha512 = "4893ae9bb4695b227a6906db91c1df7997c866953ae3960a334856f9a1c99e05937518ecea2e59c5bdf12a4ccd3e644ce328e99294dae53d7a9d9a9f5e2e483a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "203b7f9ea3ef8520cd9e614451275bad69b477deba0a26956b633545ba203a9a2ca88743c619aa311ea3f4f3acabfe96c2ea9463e2cd5b988951738073766c60"; + sha512 = "eb78a32ea736f139fe1c5cf0a1ae59df33272c6078e643a571968d0a5e4f3801c280aade938a5a714a7695700dbd2db84116f6e5ccbb7362d394ee929a2d9efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0dbe6bdee022274aca34cf8f480b7733f62bb38486c3c449805f636f9bb7439435e9e9af0442b4c4fa6c266cb97ab678eb46ac3a1b42376cc025ce5131c32c54"; + sha512 = "3bc572b109fe9c5b14cb94d7705ab7fa972a99e914eabddfbef4901e5be9f058ee6412c59b2173fa0620166612c982ed6bccb1f4fd684189845a5446c93364ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e98b22e33ce330a8f3da068d13086a48740e4c8de43f0fc0851cfad3cf519e5fb29eae3c30fc93e9c8d341842079655a921dad762c1014d408763de695300876"; + sha512 = "9364ab431f931727157b0722ed021736bb8a2771a01fd8e12e616c02d7ff8a2ad23add11ea720b1d462e727df51c985b5fcad908307af04ffb57af5d25674c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b9205df8b26104adb8f7c699317d972ba8f1e7de95580e916cd7ff9c019745ee5b60bb6650aadee54c48da773c65679b9427a3d8b3efaeb70a345e71ff8de837"; + sha512 = "c2ebacf0d93c38d51d16cda493aa1152f8a682aa41b7f6626422596f21038ae16d3419873dd253f60f59971486568f3a71420df4d2c503a79aef80ec413adbc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "52df48db54bf4c2029366836708324940890d6387cf0ad21b918c420e9388b8f6cd29ed88e4eb230d162df0702fa5c6ad3d674a56d6d4c0b8e273f1776b2f6c8"; + sha512 = "a1e0962bd4a10f1c1336650e97ce79fccfba6e752e2929156f60ae10a9b3a9e74b9e2cb8c265d7b1c242b2a34ec52f2368d07777bf7c687dbdd7914daae55c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "610086ca01b542ac23e6b162aad833931354729df4b90949f2db3a22ee6fe6193cb3bce1472a859bdf5d0e718c4c72d06b0427df2001a984cfa2ac6d275c3e51"; + sha512 = "e6b4cc5658ffdcc1a52979845abda4870917f8d036588daf1c1db93645696c85cbddc8a8dfcdb6f6166c43276ff52069c3c4289db38e9e98e7592b0d83fe3d08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "725e696800f68a6ef7c9af9542d830a38872b4ca0aa864d1d415ee05f1d287d88d7dc19346f472fcab8f64094ff592575787dfbe2c62e14c97d69e82b8205bfd"; + sha512 = "9d4cad2c1b192b199ac9a7c0ba233c0096546de7be31a21c4ee5789c82fa8fbaa5b9c5a37ac4001ef9bd774b62f57d33aa5760fbb0ee6ce60000f256e91f7054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d6cee082a677b0f97f9f2792a4bbdb1b50d96b09693ce72b9de855eed006b6da6e89f9c6e671aef06ee9b7c166d1136ca86b9c977ba4eaf57790537917b0f0dd"; + sha512 = "56d8a03ac84fab825c387ce84a45efd656abae43f9ea965ee45a09b417bb2634ed1f7fde0874294cb09ff3e3789782df7db19b6fce4598073a81854a91a6f800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "af5c543a13b1deb82fbe7596349a883c61bfff3fbbf029a117e8194e27d16d587b721c317d96f6c76eeb54a9a4483fbbb416a5f46290de64d7048245c0d000c0"; + sha512 = "a9768618490611f5073438986de4265bbc7bf3a2613f4314b78533430d1f830f83b7929c74d431d8bfaa2ee9d5ef64b189695ac838c52c5ee6dadde88d3a3606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e4e6e9d1bf9eb930fee48b2ffb29da791fec545a835e034799bd88423c7cb207d3a24d68e8da2bfd18a20529b1d03d818fd0d4331ab91099d7c01ccce44a289c"; + sha512 = "4a413a17a3796f4ba4b0b783c4226419f7fb800ce4965288129cae2f1f087a11226376764afe51e09c57a23a85df762bbe833d167a13b6c93c22fa378f0ae47d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "ea5b7bcb45fb54509f2d11d261c1c1672e1a2664e310f291c7022bd11e69e0686c2a1da9f8b42d7c6c152b3e1213fee221ce44576d7c370bb09cb128c62a04e9"; + sha512 = "899e26c0ab61e7dcd4ba97b4df082b13fd93d07c22e849a02dcbd887f870df0a6de4b05517b200a4917fda6f7cc83d7ff603d8e0bbd96a39ff016adacb669c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "bb0c66623c439b0a274d98498dfbb9aa9ee620bd02fa0f4f41556a020975522799800f23872cbcdf47fbd8592afffd578d10da87d0469ec43c4f28564f8d93ed"; + sha512 = "59b6885bce4c6cb95288e1338d6df199e8710313bd569dcbfa2cd2029b02bdfee9e28d4aa11f561765ef9e51d982a999d689935e18fbdd0d60d8ec25cf4544e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e58160d3ca153065e82216d3773c15947d66ed7cc9c646d1990c66fdad869a8717cfb1cef9a2239996b625894cf4214712c36b54852eb955848da270a269982e"; + sha512 = "40e62963d39f0b23498a438c3ad184d0367cdceff9a2674e565153c70bc450992d11145e5f651bbb53f389d5a74eb3d7413968c608b7d7650e9d553ee26d5cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d2174ee3a3288bc424d41f0e51626a217dff28f1f8b8f153e9ff5d51f867f2bfbd9c81bfb6ab004053f5bffffa390264c72a9af522ed13523e04e74f03d7c6c5"; + sha512 = "3ea480ff19ffafa1812069ef7dd1ff1852b10abf2ec4cc094912173937b82c744f29f1480de2e95dc65ee1062a766f0ec33d234e3e3d714f49972458a09705f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ef26bdbf4c4e602dbfd84c64ac4c91960d648123ceda5039aee40e40c9df360d690d0490c18362f3d29b355578eb56b05fd5e2c8cb10304ca368db6b2133b414"; + sha512 = "8a13731a6072abb0c34241f206898fb59d91dc26eb3f4c0627d2aee2e6a53fba8b3735d8f5f2b36dddca9609ff4c1d9c5d441c350e9164aecc2ce9a69b1f0c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "35c8c303987fc6226678c02ed5eca9e36377f20c44a22513aaabbc1a86a661a4ef295a393d86e65707e714df13a877cdb2b1d52819c12382bf063f14e32044f0"; + sha512 = "853bd27d468111e512907ca3226f399ba0be48c3332836342ff15b4a8bc4e3253e31fe91a31f462863f9a6559273ad6693f1bf65a1763178aa3488185779da91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "9c04bd4dfcb38b887fef24a784fd3c7aec9a76b52675023f89c9d2cd9e83a0bff7a8c00fd91c7ba309112ffdbad1e2e9776ee2eeba9736438dffe0bd7f7a07a9"; + sha512 = "d70bde7178c6ce76eedbd8a8e33617ddc7e7271aff41afae4d190e5f28bddec2094c1450c3782ae7dfe8ea7a6b844d50602e27294454946ab5c65a44b3553f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a056d933c16581e0b78df43c419fb6eb0fddbd970ad00ad13ace6076a19f21289722b6cecbe859761dbce0c3042a6d00cff4d04de7c4d594619a14cdf8daf5d2"; + sha512 = "6e8e2f7519e88809dd38d694f5a293379af1529afe7fdfd6f19e09e240bfd184291720ac48db382308c8d79c38c955916c57bf88d85ec2d220de7bd872954f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6c808501f9bf72bee900665a689ca27fa0017ee23e08ddaf3fc969fd37bf113e189f57aa5ba8cbe3073e08993515120cf9907ef3981a2f18ad3bb4b5a8ac99c2"; + sha512 = "928018a321f1c0b86d13c092a5390652fe5d13bc63ee19274b6d3a107e2c5157fc969683e59055a13798c5982c75e02ae0e5cb40f5c94203a052c7898d1ad607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e21c30b888b9a5cd8a1276abadf1cb7b61ef16aea1a2d14570649b887e6d4130e0e4d42bcbdb0e9f48760338c0cb2a8f52081cf6ed5163a4b7339923e5e13acf"; + sha512 = "b2fe56c56cb25471fd7cd40d9fbdaad10d25438b94fdffbbd81ab93a7340befd1678d904a3629a28c8db6fa10d969243c27b003817ef3c9b38030d6f43f39f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6e8ebb45f4d0dc3b73c692db8e07032c62948d5a8ca6799d09087206a071db61c98cb883c85db0dfe1423f99383ef7efb613d5092fb0b295b9c3a24d29b60f6a"; + sha512 = "bb4745d61f87f6e7acae842be9068a7f7b9d9da3c44d2d32a45c4d4a0dcd127e4c98bf5c7cc9ce03c9dd1782e4d9d03f8c1c82a6008a2b9b93b5ce380020d98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "0d588d2befab1e7b23591f373b76083bfedca1ecc269c72f8d63a35e30d71db2a98c6b1ea18ed298909628800acd274ebc281c4d5e5399bec3f359f1f66e9bcd"; + sha512 = "efa44e8a4e69d10feb35385ee01b171d08c46feffea0d74ea8ee9b7cf21a839b2cc43ff138752c50ad43db1923b264495b63a0d46b5b2e579c3ba61b6bdf3acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f4fd28a6f9397290f7db17ad30078b51e743f7093351493eaa117b526893f5a8f8ef36f255b50503d2b48c4bb3fbb3071ed0b25ea687cab01b01379b6ad64e6d"; + sha512 = "3f9e63ad4c1e8a4f6bfac97925e189c9b3888c2e952c1801e4fcf935a246a294f9b088eaad6c18bf7dd93c136579529605bad6bcd95fa7b68c89a0fb087a44f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "8d6218ee90b9a767e03acb9f6bce4602bb948377cf91cc81b0dbe2020b5dac0750f1e283913940c59e0ee1cc14a0ce1928338ea90695948e5ddc854244b62c47"; + sha512 = "79d4a1aed3c9afab1c1847ed4365ab7e99d0982fdaf09d6d9652b9f95ce3c32b123b2389a1a9d6486e6141953d25c06fac0a06156bff8c2eff6e295c8f79c28e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "4818470e713cb9b7209cf9b6b73fd2682ec9b017516f56570b83d1123e69921f7bf2f8c2ff8de36d622f0f93e1191e8671b00357864e1aa862ffeb7b88a90dc5"; + sha512 = "5faec58c78ab2acb1fb5f3aa3aabdb9d5ad9df6168215f818967bc2b3575aeee1428ee8354aabfb36b37ed66137f8ca6b2ce9ce5fee0075562c618fc3cfba9e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "0ef59e995790814ca0ed50c2b510a1971ae802a1f362d2bb5a90e35687fae26aed9ba925c8e08bb68a7a0279a832132e2d66adb5dc1471a4a8e426cd4731d7aa"; + sha512 = "32c67a6ace809219fbd51775c421fa6a68e29bef9e908678b43b53e1bffc85d8bf773e2a5b9a00861b0a437d56ee3ad5ff1cd1e84504a48816cf74a69240b851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5387f446bb9a4e3edb89a3aa8f19bff7972c932cfba97b386bc07875354ed6585fe39873a3e9f74aa68ae13ca4d7a1e765e3185517c5a266072167069b037786"; + sha512 = "ea3aff47c7e428a445aea0ebd7fa98e8de3a41dad208cea39adcad84327d2181b862ecd977e9c7a6aa8fb21cc99ada9698be67c86c5a931b1b41edafb744450b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "067f132d49fedf4e8dcc1401b39445b88a11aa5a7796ee24a06233540dd2b1ace5042dc06218f28bb6472716747dafedfa183b1db1e87d22ca5b865fa6f972eb"; + sha512 = "dcef09b5dee93167dbe6bc87d1fbb6f0e472db6471b99815d38532f6d223ac7a12183b323b5e979fa7943e4db1fc25b48760caf4540afa111f9dfd0958568767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4016a1677a62dc4877dad75c0ec2f4d8dd5ed3aaaf625c73175fadae527d54f628bd29db2044f90c8be36e72b89422280e8030a231cda9db0f98c18d3fc037da"; + sha512 = "598e3169673ad39832fea1afe0c141070795d54636846b18fd7ccb4a9e66575f779789553550552f9a9786ebe691afb10b81f0d0ba127242827e2d11f941c115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bd4a683f30e92fe9631506bfb2aaf726c6765044db65adb8d85795e60365684c7a9d2d351b7ae5b02125546dea8ffea6ec637a39e417bcd61acc57b8560068ee"; + sha512 = "a1501c3fe46adc0d29ea098aba2800c71f6eb14b33e44a367e33f5f9c705357cad8445e0980cc758102eb7c01c18a79f3007cfbd8d1b9c1ae9766e0e793ec3b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1b10aa327fdb46c322af0848a66ca03ecff38fc29ada50fce6e44e9056a874275407bcc3959cc7668493a6de599e71644e6c4f57f83e031b18d4a88505b35f9f"; + sha512 = "1bf0876237e5c8eea321970f86c3878770a3c54c7cbacf67bfb75904fd270ce88252d9844450086e00758cb2b1a0e1db40394246cb9ef8a7018c76bba03e3850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "febcf3fc454d7079bece7a9da0a9d158c15d0cd7a61058befb411d921e35f7d180773b2063c2084552cb6f7fda552430778f75875b474312878f72014ae9913a"; + sha512 = "5a0f3514e196803d7d6062cac1ec75342ffb49155624a0035eb49ddcaf829dfeaf37f7e26997b31cb85b9e43ee21fca9f7129ab6bf4a065fdade9bdb06573628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a23a443245eadeb943858bde3cb5d824277b47365cab047904268f783ffe3e0f42c0809b0b083a428b1d16038ae24cfc873b545d9513e1449661b511d17313d2"; + sha512 = "8b81e0479b60cad9b97f2108745445f584986fef5521c9ab88bb6ecd48dbc9a989b906122fad29c755dfbff859719c1c9da34452383dbf027d69288a32ea7af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "c614aae0b803329d05aec5f60aec633d31353bed9822d9b8b7c5dff5d08fcbbc551aae480c02021abf0bdad1059b665e4ef627dc00ac5cab0380fa30111cb15d"; + sha512 = "9b3d99608d163d860d0b123eddd794a2d3b44866e6b92bfc0f06c05fbdb59ebd1ade970850e5b1974332424886edfde04861abd1d47868e60970826846fc5b31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "80bce7f860ed4d8921e9826d25f6d877879c3e4e3e3bf7bd8bf9ed4de4cc10cf72e42cb6323240f799a53ac6fc366ee7e1e6deb4b1c697f2444e97ab090ab9db"; + sha512 = "f056c542bd5b83bdfc7b2a8d7234d40b64e88063208ee4b0b1b7b27017ede66b8acbbaa9d835a6d2667a321d6b965002bb87b68e5aae0eeae27aba8dfc87164a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ac2d7c2ab3d26157feb78283a16e8d2195f78eabeeecb4ded60352fd423d8ff57f5e8a5fde72feaf32c3fece3a4e90c49d18d672ccff5775bc497e1c89b3fbea"; + sha512 = "a36a8c25ebe88fcf086fd476619a657b1ff26364133d05b32bdc13cca81b61009c4f1afb760bae961942ed1396b178c2eb3cda9add8c6b502353a2ce8c486cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "a3cde7db978a3876b3ea596ae5b3e1aa1e77064f49686eb39bb083e4344cdda8366f01d37ceee4a007c1a36b4fd18499b2c46b2233f58b7efa8be4e59cc9e347"; + sha512 = "d07515f921caedca18f7661fad83ac772369a2f7f99d65fb827a0236818fd8eff211dbab90aa9525a6318374b1a2f84d8099667d1957f21c30e9dca35f97a111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b76c01da5b4be1e39a3080ed2088bf6cad5e6f08364edae08a74c6b5ec07c35a214c47ef80b8bf5e3f4c53db6789e8eff1d6be22a1a75d408570fd9a9bf5140c"; + sha512 = "de51d63ce79c249496222658ebbf53fa656916a753e6305d36047a99879b25e17a4ea4ebce1ccd07141cb507a7501362d0bb556aae97d115686d0d38db7742ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9175fe7659d000ed22cbbd8968146e57e0d8b39a112ce22f1bc18f553bca36c94c374f0f89d7b4743a521f654f2689e50ea4a4cf13ff320752c498e038abdbdf"; + sha512 = "b01037ce68d8147dc79aeb0d540fe22a06d89ba5cf804951d16af3a896f592a00be7519b184de2f3aca7531d3026f78283b9f6b409c24031faf4859e92bfd1bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0ffaffd4a316c36aeb75242902cf05bfd99143b6bbd67eed7bc6070ca4eb4328dcc7903f706fcf7e93e980d916b24d2041ecd5f7324b0bbe5e7ca2fb7b755574"; + sha512 = "0e6088a9b32ec76410fc45fc1433c514b1deb9fdab7f5249bd7ab3e1db9e0e5ad4294bffbfabf2f665bcfbedf8234ab64192ee50b34259e4133d7d035f6f4ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ca46afa28f7e756718aa45e7d84fc5a14773671aa18edcc33b4c3e5ca68017a14a6f0d7b737ccfd098875c333c6d65b271a3521eecd3d4c64f535620f8c66346"; + sha512 = "82042857b33d2dd642c8d6404bb864c79c2ffd91d2f8b342f39d9389e63ca59738b0083f192b607a391cf2fadac056760fd07c2b76a74172118eb44ed5724a1b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index f10bd8e9f39..c2f92dc1e3d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b4"; + version = "76.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "9d76b71a20b9079513af70a082d6ab7373378e01b126cac5111437a040b08aaf3c78ad6d944cb27943043917be5d00ad90dd428ac3f2107754e2c96d5ec5c7cc"; + sha512 = "0c2e0175eb3950098d7e13352d037f00b46edd7094e2978ed568d4bfe7c046b533d4c5473be6e28f84baa6eb3aaa6658b174da23409eaf34841ab7ac4aa244d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b498c1f6b56a65b66765173ac6c4568066facbf67b945d8e863a0d046cfdfda5e792acffaaffd1e7e5e5e5753b4a85ece8d19aa97d743340028346686a65cc7a"; + sha512 = "3a10b739bb0ace8331190a9bd045cd4de78fa81fd18d271903db6a29828da814454751ff56dde9181786c81ecfc373a1bae05701f4982f5889dd6007ab2bde59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "115e952394389af064117dc837d1f2ec157ced9aa35affc1d490e0a4860f36309c445a0e4781d0020420e2f4f3bdad18d078321b6bb760aaf2900273f5601e5b"; + sha512 = "3a4d769aa9b123fcc5080bc877b6d29444926c5c7f45665e058bf7c4c9a7c87cd3c604eb56fb2a25b4a62a84360a3b6df51d123435f23b921b03e1bfdd65ef5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "cdebc4f71f304c930ee06c2048a142a1b610965059a3c2167882f6859446eb8af661c5d64011de3639144702b3b1936c1ef6af7eccaf7944fbbd7eda7161f569"; + sha512 = "7febbf4429c33bdca13b978610e1f996d99e8db90290fa4c4ae5dded909d8fd60e416de328eb4b68b07af6af48b079232f9f85f64f30c751c2f877d7756d0c67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6a96535466e06326f0577f045bdaf310d05a7f3878db940521bef58f60abef196cca038912145f25bd6879b55a693b6c98933d0045bfd5da58ff436cdcd1de6d"; + sha512 = "6e6989857228793a3e3492a6f42b6c073c7ea58a9999daa5d88b465ecef5a0123d7607ede7c7297038747f4f0ea1c5fee70c2ff6436c6b7b642abe3f9a72be19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "327cf4ba8de32044426d6ced1e250e03972e9a24705373a0c15e46c2f6c4994fc83cd1c67aacf09c2d11d9b665e63dba6176e845ef8c037241c55e9c536caa8a"; + sha512 = "391becbf14940922f7a290840519af8ea5149058ae420738bb2bfa80ee057c16c04910f54660ee5eb3bc6067d6fd3b61053464eae4439eef708379bc220e4416"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9fa7311bf0425d7314298751553b49597b6eee71f9d251e52318f13e1d38d86adbfe1a1b6d599319d6f61de47652a5cfd33ef3f3ae9a2ee3f16af53629f0b85a"; + sha512 = "c87ec6c520c9b47541e0b6ea2bd6a6916dc5a41e03affdf3caaee7247a8ad51925fbc7208725033518f03cab72a159cc5a75076bb9089ecf85210686cc704a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "084fffbd48bad4fd38c649dd7ef5aaacfd5c86be4482a87f25c8e19ac6469e28897cf1ceeaed14cda55f40c77b08425a75ae3679d9866c255eaa8927a3c4e7e1"; + sha512 = "f50f02c10d5c14756670aac99ccc909bcfc62d30ad7ab4ffdfa2870ded4b97ada7d21a78fe94610e01a448231d5a4b1decee47caf467978b667cd65b31d53dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "bd6d179e2ebc392bd8a2b5fc2b67d486150b00a4d881aa23c4d49ec2bbb7e8b8e9d70247bd704f608972af5ea3ffc5f53f949096a33455bb1fcb018acd4a0987"; + sha512 = "f81e4f057defb28b57e218b74d115b140f595f17b40af00cacd4b46db1f45790e34a222c61551e8f9387c5dc505423f451904fc82adb2e18908786ca0e4a2ffd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "55d293e4f510229cc6545e41631db06987779f094020edf70093a38d1612d755334b59fc492f6b77ad3bb5e9996883231c0896d99ab83ffa418ea55b61cb76ee"; + sha512 = "2834602a86796ca65d278ad7e13d7e1722ef6d375d294d6623256c427eaa60691211244bc10a22b48c9831f832a9d2e948e814962464beaa430962e862000c78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b69e81c5b10411e7b391de4f9a3d3df4d183e4870b81ee3963bb663b85da2b955d2ea71ffa6246790a77cd2f512a1797bbe90f35d9da75b5d4bfe0c4e4209621"; + sha512 = "f4efa6b86bb314f850466d81e8fcffdd6b1fe4f8a372750edeecfda2fd5feb172251227ae8ead7d79bae3f3757b948e45200d779d8368fabc980ae73ef8c7b68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "047cb7e2135ad93aa4d1378e9d48e8baaeac711aed823ae603f6d9431b90a8e46096948712f4fbaa6a80ae519ae7d75dcc5704305323c7eaa9c307cc688194fb"; + sha512 = "ec51ece975fa6e3fd4b3fe508c5ccacc62dc340562aefa8e22a74f2c818bbc81982ebb5d9b0f85a460ebf75030e3d25e084a554ff3ad8ea142a4bfd9b020ad96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "417dfb9a91902fd3bf7245accf6c48ce0dc1b9944376d5c73d38816e5b8c05ce214c1327f31773d5a72470a4b565b17f2469ed2f9d3fd6a7739699e19ac9bbd9"; + sha512 = "84cb922c3b7c61185fee0f08d6c6123efad63730a8be960b2087fd6074ed3486c1ead7081dba0a6cb0ea1799e14cd9a32f3690c31017e5ce2a3d2875d0368750"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "823f2cb33b41a6a4ad870515f5f443213df254bc6306cda23ce2b2b8a435f6a6bfa0884ea504645791a15c76934bdb92460674fb628b517f9d4e1f2263347fdd"; + sha512 = "7245add38d451e6dbad55140d9b2aee182df94b4285645ded8713f3c2c3aa4bf4c602a3f9a0a5f39ca091561cabde58aea18be3fe4247c53c742d03dc43c9858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "618e4e48246192c6103757ef151ec192e41ac1011786478d631169d934569610d2e280cf20de2db54a57e1e794fd66c685427d69d2a6cf185508234066f71d34"; + sha512 = "883a2c0ddd7cd826e6bfe6835c8ff33c135a9bc77962d9f1f67d49a0928ad9172c07974f0681769cb874ae7db4f6a1a96fbc78af3275262cffadb744ec6527fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "000d6c8434ef716a63fe4885d2b4ee2f6d025b58ec0de6ae2957a9d8807d9ed1c740fe37b679a66a1ca63a7f5690aa9a3ceb3aca6011dbb13071a66d329caab8"; + sha512 = "93b8379294b7a6ca49aa8b454f64de1f2df3db75f47c4bfe6e11e9317cbcea41da1ad8b73564a273c9343b4317329ee96f1f1ae7dee4a61f52b3a26e5790fc0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b49a8f64bb4a5625bd7b4d8046fb819296ea56aac468d4ea3220a73730c8d512a5ecc0d3798cffdb27afdc13b584830ce2c800a912976467a4b7851712fae481"; + sha512 = "6233c7a642883903c1e8054c6508dbc5cee01a5ee08baadc12ff388cf3353d879968a6cad59ea7458e93df9e1520e2a938a30c04b0f2e3c903857275bab801f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fb82402e6e65bb87878b036f54518cd04b078564a14ebd8ef25dd60a006fe9f12c5e34b7f4bc10858228982dd0eaf05ada0a9f099059a9d71fe3933b49b3b2ca"; + sha512 = "41febc39a7ade5843b45a02950ddb1485fca32abd0a0bd8f8e017cf8f1503d4b4b20e7dfaf89e8833900aefad44f5119ec9c8d73f5f5fc7641dd3ae1e5d794ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c447e017eb5df8ba8ece0ff51a62b3ec7b8c7cd12f55b1b41cfcfccb1a7f936e8efb12792b9075c8eb6995802dc24d17d43b395805b03476196103fcbc1a2faf"; + sha512 = "3e4f96d7653f0cc4bec4de6c3eafea64c309f8dd88d54dc9fa27eca90c877d1f026b552fa755c0742a8537bc65a2ca831fd57adccda0c3f5573df95afbdf368f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d3e17c8c3a6f6f1290c64b19f6f2184f0cfc80c087ef3c02684c16c6e9b1b1e311feb9a134bfb7bf577d6995c8fd45365154935a25aa5f40e37ad198e41de62d"; + sha512 = "3fe9b14954d3774a389deccbe7d7b1e81c3f50f1e7b7b2e92f8c5bd55c3f4623f99f518e3fc8acf92473dc4c05e2ce316c370aa19d8d39e970a1f99bb9d221c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "7175f58d6d81c34647e6c021cb0cf7c9d3a30c4a3d732d931821219c649e89f693529177d4bf037c56b37c330f8b29d3dce9038a7d2cb24590445b387b64801d"; + sha512 = "d57062e3ca388a52485fb28eed924376f6decb324ba0cb9e9af2583f10447a24d129b1c0ae17dbeb9bcac829a4da09870eac22fd8aa378ffa2ca9dd2090292d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0a003523e3e254f631834dba70784af7fdde9d0e912e17e2a92e8e0cb9d6973ada3670f1f83927d53afbe4b90be9de6e456cbe8b32c7bfbf2aba54bfa6c3dad0"; + sha512 = "62d571af76baad53a699a7e80dcc7c7e60ba87aa3d6325cadbac7230b710180dcdd7ba058b7b502303067ee7fd590247d08278583e188394a1873ba9f5f23b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4ea639262102238e209a7164d5be46bb88d38e275f265340b109a7477ad8d5c3833772c44cf37ac9dda96dd859b3b07a86ed0942ba0e1c4a4b58b767c218c8a1"; + sha512 = "b934ff6b86c84600fae27cd006606b26cea62a42c8c21bdc5472b776f95faaa8604acc9c7072a8ea5aa6bc7fee6a62375b75ca4b34ae7ad83d16e074445ed327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "083063dcf61db9d69ca39756c9fe697af133dbf87f455ce3590b2d336e629c67566ec1f3a8973f2d28122e283a8e718ef84bdadbbae3844b00e7e6aac2978454"; + sha512 = "7135b45b7424650933d579778130484b877766ddc7db83a5c4bf2f7faa662b127d475126d5fd67fffa3406f637128ced63693946e9ddfa4d33d57fe1396f3fe4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c43aed8aab29941423a292734525a2f5c8594ce3ae62cec91fe4f5ad6f04908e14a13c409b4ffc47ab9049c4c9194c388097bff307edf632fcfd06d363619085"; + sha512 = "0e66427df853ba3ba45880e45f466349bd4805812a879e6f654b2a02d4bcca71de27578140e4ae301b3bb329335453ddf3a756be6f49b1e92ca06abc58ff1654"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b7ae67f8943841f254650820b4d36b164e95dee1bf8c425cfb9c878f4efcf4c4f0892a84ec5ed7ee2ccc7f03ec43a5f67374f3e1e268ccb753db4bb2f5b6474a"; + sha512 = "36ed5cedcf9a2a75b19de328c5a5d89f07c09e9da728fb3431a31781a5c522b5a53a03fa5dfdcb079ce140f5bab3d7bedc79c0e3c79e3aaf672b5cce3eee2b1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b298d239fcef24f2e34e5672329779db55032f500a08e2b2e8e0663bddfdf3925a1eb16eb08a1729898a8cc122d2ca923d26c0be3e147172e4b869305df05b31"; + sha512 = "616477226b52076c86371cf1f1a548c2c95112685ab0e4b9835bef7b8bcf6c0ebb839ed3cee2f348cf26d990bd88b2dff46e20e38938421a6670cf66a82ee3b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e9a107d459a4a7eb90b38edbb33a67c6f03d7851fca8be00c5f981849cdf9c88b92e283d094d3a13ff1b3f37da417c09e0d0379828eddebcb984e9684b000385"; + sha512 = "87dcfd61c3e02515f772e02b182fdd465d34c79dea55d5fc125ad6f32e504c22aa3d7cc6f23a7b2905dc4f2fb73106ecd7c662758d218349fd6419ab889a98f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3f859bfcd75718abf816668a1fd15b26bff4b70fcbddd330e69180476d7ad40be13447c533e49ba24bbfe5667dede1fd0024b7aa976df5e4c739ffe75b0ed31d"; + sha512 = "81221fd364e6ba5e6300e93402dc727f9640b73015060d5a3fcb3d0d60f8fd031bcad94c9a5b35157bdb0ee2671fb2020656916fa2f5218d6e5cc1745d47629e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6081be920d434127391e4946429e677f421b381f371fc0539ebc92e29963aeabe07116dc9c81d2430ca0cbbdd52bea69157ade801f076cc8b192e3eaa2f5e427"; + sha512 = "58b0849c7df2d8d4cd5bc1e076728678b85adadcd504978356e6ac2810a4b1b9d2318e2ad9e056fd9598d3ddc829c16a1ab89102a11d17a8742021d9c8b5e293"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "abc53c13aae0ced9217532e92a9e9b4a9f9d95d76ec8ae0395d77447804d24aa503caf644a030acc29e69feb6f89569b53b9036589f454a1e9e72eb900403ef7"; + sha512 = "9f8db5e7054f377e4672333c3f775dbec755e6096660d1d642080bd5e9bcd0c8d50a05bcc92bbb357555f60f8aceb21fbffacb019f8b3c901b1390ff3dcee034"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ba30dc08436d48280298efcf85f509a56c903e5bff1909332b792449032178764bdd7ca77ae81d02047f439da93cac45486a2a8fcce0d1dc1c876c01b3468066"; + sha512 = "4fcad8469fc5c742e4b4c4dc838da969ec3ee4af5c8c856aeb2afce85e2de7927713acc1ab9c422814d51c1114917e131af7c1a9efb6b91b1e68a5c5b36a3c92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5e6833e0d4cc404a9224ecf5ae6cd1e5efb4a5776cefc19f7b1eca9aafde6b3b6a3eac8a34b2cf33b16c60b68f2940fa206ee8f34b3a1acbb13aa468dd5f1457"; + sha512 = "a86ca2d70706f2c3aa8601372986525eddd8a268e47fdc7613223cc322fbfae68b86e8041c244366969cc1d5f09db7aa9c6cde9dccbd007fadcffc27b9310cc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c33412dce69592c1b92b42e982a7a7392f46142036a250ad39f4e1a0de741017081b6730fe1ef93a3b8015abee13a8e4f3ffab652d1b7a86be04d469b910fd85"; + sha512 = "ec1c210cb0bafaaf14a6f8d79c81d2777d228ed31a7a4b1516227ce9c505574a2ad9a15bf72150439ddf32e5e2200f07471c92540d25bff31c6b9b3e123e8091"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "f1dacff746fc0695c9e3576da48a6d1dc485398b5468659fadc03f7ec24a2b9ca1e530f4c1c8a8556d80f682d36fc977438cdb8bb2397a01dab54f8e09ff41fd"; + sha512 = "530c2e803501a91433401445badf6528ccb51b0459028c098d3708a33369e566f679702fbcb50190fc5236acc3aaf4ebb4acfabb529b86a47dceecedeea9e45b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "423ccf14bc5a31a332428c023784f33ae35106fb282591d161194504f9c3b4f647dedc6af919720b718925250d1bf2a4c3595aaeaee0502d0bff85025bcaa441"; + sha512 = "a81f82c5b4623afc3344eeded3d786f4e666627fbd40f64390dc21b728452cdca9f3510e21572d62e550c4e3b9230503eb771b615c3d4ef77e1a0211d79a5f08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "004b52581644e3263aa8212048c48e163e48bac6172cbf17da9de686a6265299f96f72ebb7b2d3e8aa60fb1e71e1459b4ee717a8d74557c576edd79cd5c581dc"; + sha512 = "633b05aed902b9a655d22f45e5cb62d8978596e4d9b63f403a3f7f2a7db63b0dd2b9a1e5a82f7c9f5e8231edd15eda1ede415a80d9debfb96fc98058ed48472c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "206fe47aaf14c3c054d1371d84a1adfba8853ed0e5622c871566bc4540f6f099530ad62d0e719f1731816a014fc9310db5dff5881a8bf48ef3807b143d42a2ff"; + sha512 = "052141759e0bfebedc42a7c9209b122e4ef4bb15f83ea42b8559d7b2894544e26167a6935e854541082a60dde2b301e17f2fd3a5c659642f6a4c83828ea55273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f5089e9300d10b3e51f29d90821c6e9117bacec194d37c89d9c26d28a00f1bf694b5399f51bb7a314dc42e30b2693e8507af8eb5edab6d9edbd509e0c0e11761"; + sha512 = "74977e4afb2d61c01834cc63f0d4440012752254ee475f28e80d33c63148b7c43520e141f043d90e611be4268da89103ec6432af8beb96ae243b8acdf4f4e934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "38756c6000aa8032a6f182f3267e738cb100ceb7762900d718e996a9b538a92bee3acc9d2368cae1a675647031c4f05218745111828031587e0d29195f56eb04"; + sha512 = "bbe4e976026c98c7f32b83941841c3da8992495122e96954d550fc8263e989539372f120d8b359423ae9fce043e79421c096d8dbdea921ac7bea8133485ad62b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "bba86d7a1fc6746b1f14e1df5720d5cfd688140779ed0117eb0b7966d3d1500537a3caac19968c7c272f9061bb6d57dd068543456cf87d939ce567c99974a014"; + sha512 = "cd7b957a983efe5cf9c4760f0dbfe35a06e6a7dd01702d94474eccc19b91fe136a3c14c5eb5d5a1dccbf02bece9535f059179afce15c42567a918c40cceba1aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "90ad90dae1a6864e1df05b174105e145d0a2395e465f5e517e6a4b240e157bd3710b6a44c6c016fd49fec3756d9f59e2122d1ec6279fd7717881f40f17eeca13"; + sha512 = "0a12a9cadbaaab40db835e5986d9211527d175a4724207af1e3ec6a22879a16054f4e9d7d5deb2c428f0b59b72b6f2d2d1c2d8ea5aaf10e20c0f4be1aaebc174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b0ff873b157d62f227a0855cea5a14651a42533c6eacfd4a278a3c28ee9cc87aef79c459dcb28c90f2554c65f5974b03378cfb764b54a0d1d89fe45d6572147f"; + sha512 = "0d219e5bea0ac4d75fd7b6d1ec2819e6bae95ebdb6766a09e34eeae2f8de3a330b58f6292c3a00e9d1b255e8286858db39ecbffdedf7af588ef393bfc7cddb02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "742a1ade2fb13ede18024c8d24268012ff00cd9dec283a7ca93dca80d6f3ad4eb0835cc151cdbc70327a2da0d53b34c366239a9da625d4b6a6b19951a32168af"; + sha512 = "ee2325e90ff0e3fa5128e9a13938afa532fedc7565cb9d26c016a37227dd9417bb78eca928c9c33bd2526cca0b2c3a6f469a76ac5d7685755aac29f06ef6c506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d8635bffa34c824f15b8328ffc5a3334321470a9f2f4a9d16a534fe2548f4e438a612ccea108ad5165b6e87b9cd837c478e8fbe42c89fbba36202dcf49896ca8"; + sha512 = "df602af7bc01521ff5c37876db7deb0d25414cdeabf34346c7cdf61e9083a12784ff94ee647fb75fcc9bb33e7458371b137cf3400b4d07dad4064b32a7cab11c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ff885e94eadc4734a640b97c85e540a662737bc68ba26ac6dc4a467b30c96a5d29a08a635542981d60e38754123d843c5f9722a9e94928a7b408ca252823089d"; + sha512 = "774ed56ff51c7ea363c81fc11dddf8e6d54fa7242d9c7dcfc6cc3678dfe032cbd70ca93f014299690ff461da6c8013b946fa9ed170ca755a33fb95a85eb726f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "65e62703b9ea3b10d3134956c56e3ea6c44a1ea4c4d36c1a6c1cdff46fccd25baf43500108ff34a8a8c5b8328c478600b3cf7d33ce865884302aad407b46e89c"; + sha512 = "c2513985cd2d6f1d874eb4f28eee05f7f42e639f8dcbc4d2a39d331507cf6681dbaae35e400a1f8e876598e8a633d67cd51b133391db30e36db46f65ede1cca2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "02656928185eab47e08787fc1ff267447c3b5cd4997b4a1d954d31c26c36fc78445f28e85250c3d0bd94244900e7bd9a962e3a93e8eb4046ae8979e407b07ce3"; + sha512 = "3bcad2477cfc42e2f01f5ef1bf3e907f80d96649fb5b2f143f58f6478939694fdfbab33bcd35b1f95023ad39ff807cf532faf43e1dac8aa66ca1e8d95c44ebbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "597a29fdefc3ac3746eb1b898a51f1294cdce2fc7edfb958a8967c624291275d46b382e103fb3f3e39c08684b1bc4a90235e62256b16c37bdd230e4eb2b65e7e"; + sha512 = "f01ce9358446ed8ed4b01297fc175e2fc36804262905f2d5e6732827ffcccf2897d5daaa6464a4ca146fe46d9a1487164de3febb6a222343277cb26492e5a787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6eb5658a073a1ee84803ed669794bf307cbd615c220d8e95596f4c27811f20afa4f2b67bfaed94553dfb2cf3c4f5a09f0a5b4ab61f517794200a8ac11e00262f"; + sha512 = "52f23996de3c4cd409cff547348757f48e421555c965a58dc43fa82c99b51260b1ec24a97a04b046f29455955d62bc28a41d67d8087e23b9c490032cc28402c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0292e5eb4fe8a11f13a8a824cc1f996133abf49968956887847a9556f2f418fd4146629d806a8364e103ab62542abac4c405e32800567b140a51036b5a99eede"; + sha512 = "490a950113acbc895226749335d8fbda813708ed916fb79719c0980920401871c632150bd2d88749cffd26bc7d3e7352b6706f379b37d11df6a8519d6a6642e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "19d98eeca2ad2198b928f9c28c2ccf27328b3fa47b56a9f6aa1878299d582d1a18209625dca3e00285219b2fa8c08ae6e4ef581db80611af699304b8072a56f4"; + sha512 = "12191f6adf723389595e7b9b3ff1ae20c3873b511a021205046c51f29e960db1faf45e74c055edfeaee506e6c8dcdadca7967da4b4421f892a88bc337c6b5046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f47d60eec573dfe2234cd166270c078aa649e0af0b5c85b6a439ed83535b497185bce6be633a923a557a845f6a66f441c42b7a8e8b76118eab5a545f6dafd512"; + sha512 = "a21ab0cff70609b3aebc28ce34ab2e6404b53638135667c330915491d8cb5c5ed7f292385e118e03e1bf2b4cfd197ad114f98b41371f5641c02d8372a7682286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d25c996f6255d6df234504f7a0cd6de5e231ad00ee1baad4d09ca15543bb7fdca6ee94c9e06a61090360377245d367dcbb8686fc94997722cf3d2b75ddbe2e1e"; + sha512 = "93b2d1d091f9c14619d575eab5fa41ebe5a36f3278fa537f8143bd9fade793859d2d94e14d809e82fe037ecf2a05d0f84ef49c70970d00274d51beb2bc14fdc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "24b64f1d5f8b5f26d213390559f1cf3145a845d0bc5d27bd53fd9311a3110f0bfdb54f03962daeed0c456fd59e9db26c400af67df783e9f76546e3a9bc689615"; + sha512 = "184185ab33f3d73ea0a5f38b5e9931201ce3018e5060b72b0344211d11f8ebe9ee685e77c2160ce58a60b61e1377ba28f4bbdc2732f0a3ccef2190ce55072065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6305fc10709819a454b475a6828fa309aa23634de6704a2edc46ff41e05cb899c96189ec8698b72d375a3d33da47eab654d26e4987ba86c97edda4184fe33e96"; + sha512 = "b0917c696844114ccfeb854d13e75d48038404e1221b13629dcd981b1272f7765cfc85a0843d85957a1f3ead2a98288ae28739da47d1186b762058213681eae3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2359b56d7262c17689f5c1b1609f08c36312b5f01a1aeba482b8e2f274d3bfa6142d936867c01656abdb9502d688a94d39924c422883918e74bb55f365decee6"; + sha512 = "4ce9e202f6d794585294d6bf664c999b88674d74d2b085109ad48f7f16737e26c89980c76e9d6ab34800e841bce9074fdde6c574b228116056922799369fa04e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d0e6bafc119c5e5d466420b5713ba0720871cd2f51c19c7c71c60cc5676c21bbde865d94d118747377dd0ea73a572dd50fa43c853ca5df13523549f4b6979be4"; + sha512 = "3138f5abddc0f49355c768fa84ec475bb3c013fad94bb4c87a2eae616b590244339236b112f03fe16dfd0b10ccb6d106cc1db0f73a5eb95df7e0dab9a247b496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "95c0ccfbf994ca172eb1e69edaf896b2c471f6eb1da2884e28273f91b8ee7617b29e0f713228f5c6f4a39a13baac39e6ec760ed33961264bbf915cdb4641cba1"; + sha512 = "7080f9e7838c5ac076bcfd0e1192f1435b623c81144f53b1ee935aaa07c941ca8afb0cf399f161496bce02052d069033f6990bc9da16a1ab23f228417935d8ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "7c4951a58394c510499d8d0350cb5ae5124f26c926129471ec2b3067cfa69416855f49cab8cd32b86d1b003f2ed13e672635cfb46389b45fc59c0308a638c6e5"; + sha512 = "c058a8c6b4ea8c48991ecba72cc4c5645410da2d9a8ef9175475fbe906f5bbb2fe82f2c4bcdd86aed73cc75aaa0fd5a2e00a6a780f394b843ce075fdd031f8be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7694100e1894b91632393c9662e376a9884cb5c69298dab112daf47123f16509ff020c3f52f790c2173b5bf8b1316e893def1c9fa8b2d4643e0db6c5da7ab475"; + sha512 = "f64a6373a56c7ee37ccca43708ab33b3e001b477d2ce25870553eb96fd3c42f20206171f46c93513cb328203c4454461d808b6f888260b0c2df76450ba676fb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ff15aeed5144f65978b28e7fdf3679ebb3de83f696b7bc7ec3a390dbd9375c85e7d793a157ebffd958eea271a69ae054b4bf7112488ef42cdbee5b7a72d16783"; + sha512 = "14f58b3f59e68b9692a6fc562888e7868becf95b53aa6be0de0d3ba6c883cfde4b56496fe017b5e6e38a89b0248794408402657a34a0db45eecae74d9ce7f9ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1c0b206705a8fe0dd4b7adf155feb4ba1e8dabd176f891754f5b3ff7cc2279d17cf5ca3b23e85fc6033092cc0bce4cfb62d433a4905d42940028c4075704cdc0"; + sha512 = "238d2c63d4ffe36db493ef153c30a6e4b33e1403e456d2c02275786d3c13c8b2e0467a80916cb08f4676ed68c94b2127ee9876614909e4bece2577609f027ef3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a3fb6b26e2ef26b681240d3bc3b9e46ee164260e0d3b14d9541a041a8c0c3e8129e6b2f6c7995825462b3f9c423611fc3c7327725aee8aa3dccf571d5f178be2"; + sha512 = "843d4d67ed852b2d0f54dee78cbe3e27ef052537270357e71f3ee0643904c2d370d5e0d25cc2e1dcc150d5f999f2841b963df41c7a98493a5101132dc6ef9a77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8f0a43f17490354a6f3a800e069dcaccdf3c8acd99a2133e5cc65c0fd8ee62637967ab528dc0fe7b992e35a69e508db95b30c42375c5b8d5268de153169caa81"; + sha512 = "e8eff86060d9f6bc6fd0f13c6f1840c77b9282f8be07177cd6ffd5472ded9b55c3d4e7641a67c655c94fd72a21a100648ff1ccbdcf90b5e7543ac1ffeb604dae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c7379020b8800e44e18a3beb98729a716159d8a4e9b19556aaee935bce39a99ec629056c5a9fc40deced93d2947a1d360498c87fb6e9060545ac359774589912"; + sha512 = "bb62e672ea5aabe57ab78dd37081922a67ea6471558c8a412bc5f6718b88439afb87debd23bc8e8076b7f0ca20083b79745ab0e85cfedbed024d82fee7a79986"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "88b24713707ab9991dc189973a9077dba86833580edab2ef5c40641a55a34306fc27c68dc56baa0d84b30051f170aab2db89a4433daf5b14a3dc29d58c01f691"; + sha512 = "9e0ffb62fc391ffc0bee82e67c26fd24f22be3c9ab0d14d929cc0ddaaced27facebe49b55bbcb53dad9e27466d22a4edbcc1358cf38c4beb1f846278574fcf76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "55c9b1ad3b7f452de4357b423240ccffdeeb37ed8c1bf5b428f36e12337ce81de9c53f3a3fc7c5db1171080d07d8b62dd8cbc3c984730dfb39d7deef70dba46a"; + sha512 = "ea71229a06a26c13d436662336e5a9b52b290c2094561c3626bdda069930c3a5b4dd61a25f76d147fb152eaefa07fd1e032b7a739b5a2038a2c4360827322144"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "fda67181ce402948b53b37975e85803d34be4269e8668bd1446f814f644c2c6adaa1c01f097efaa68f6c1ed90e183fef85a838248102c5b2858039575363eff0"; + sha512 = "f0ca79deb5450984e1f70bafddb2002f81adba022ffd2ae9c68c009fa559253f47a5fd66bb232afc5ed685721c78d7c81335e4e5e898e4a469019f98330bc602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "dc29b7e1d0fe74cf8d5ddcee4b201e34e538e7ed0e9b1a6271957183c40aa07a978cc02dcd71eae546c4894f7d869938c312e896d84b9c966bbd8765bf407567"; + sha512 = "6e730c323889c7d889bac2cf7d4d2fe13347c4c9ed6251ce9e3f3825e99248c896740ee24557e9238e8fe4f5b29702f6344ba4a3210279a6e6432ab94774d990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e6730cd1d34b13a26f6e6e7ecd6c893ae49d3158a9173b4870a913a35c8ac743f26e7220a4c4b3a7e10209e2bf3593416da74b9b07ef27e91bd46ac9df833010"; + sha512 = "e48f82f35d338852abe3ddb1abcd1c06c5d401f464bed702b7b649fe29e1a8a3ae25f4a2d0b4d30615340021cc71784777eed114b1dde4a34928159b8d616ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4d7f7598095164a8784157f7fbf5e9a7e08be8cc66492dd2bb083002546675c725819281b1d46f3095b9d5735ad8375b083b90936b301c2b90bbd2db0f7ccf35"; + sha512 = "cd84947d36f334740d2bc590ceaf8b052ef90c7b261712eef9c85580ee9d703e0b362ddd5d51ae24ae7bf56e2bddaf32f36081df2717e673c016ec91874f6b53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6c929036a8acaa3bcc0e7fe824b6d899abe06cfcfecc0a382db722ec139969f78789dda53432d14640d538648237fe3c93e532c035d81c3ca72023a6800f0ede"; + sha512 = "6c59d46bb4b740098ec69c7a573233cf871d88ec1f9a9ecfbbf5f38a4ec1977cc7d8c7b9a6ed78dde2a795d6d078a2e505646704e91ad37b09fff564585b170d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f21aefb4ca321533b46c550421db84094a5df593f6d77a6e036d25284dde0394c317bca12ac1ec45f04b6d16cd94cf12e0c5a3f6f43b3336e16f6ec0f6317e2b"; + sha512 = "f700e667bb8bec958501dffb33bba8cffd4bbb84cdcc9f00ddee78d43676db9afddbdf6a3d9b2ab9e58c10d2b1a2727c47224e6e824f36bcf018f7bf53b45b43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "598376640d64d6a882653adb0a77164267ca694dcdb1a87024591393e209df516df891e5fc548edb2cb045901846f898c203bc6d08e56792341498fdae64a0a7"; + sha512 = "e40a8935b7ad0b0656783023c622dc357921eda21583b1ed46c85a7ad2de8972167196764e98f75ee0c15ef046ebf09c99a2fa4613106c5302de8a9ce6429b97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d3d45abfe074d85c992bd74b622387d738d8d19bb4e994669aef9b63b15e9de0a9ffdd0349ff9684380a8797dc23934e2ddfd7d54438b5fbd9c310a1a421ac6d"; + sha512 = "780f5df88cd75c306e725a48aaeae2b45ab5b30342ad74f5ce521f10dcf6b96affc92693fbc0dd1e95c927a21ec26e2fb9cfc74774040656459f2a7477520d61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c7cdd65c9f7404146101c265e79ccd33554b398595506acea531beaa022e8f64a8ab62feca77c94a355cc86ade99d6d470818b84c9dac80ca143390ec3617873"; + sha512 = "59a20ec7a102830976fefad4f87fa4a59ce723541b069204c03728e4c7f19cddfd74e604844da72969439542bb67e404cf5d6a649372f85250cba4fb8fb42d7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6e7040a36cccebee23671247a150fe3be0a0b7c831615c7c65d5aa615ddf740c94cc2c27418e7aac8eee136c9e829b3724c767e7be1c88d001d44dcc7ad9ba06"; + sha512 = "56c540f1a5d46f7e67cfcf8c6197febb7e7c4761bdbd0d4250a0c79671f84ff87c3f146f549c8dab85392c7ee94d59a4fa2101d5d8b9c7379b0f39a24d37b5e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "bac64f281f57da938e1acfecdfcfa69dbcca2b1b5f923e92a5a01aa0f706a40db34dd563dfc19b2f2cf4eb3d3216c78eb1af9001beac4d3f387401f442bbe6a3"; + sha512 = "af3c4e96ca34c177fdfad0203daf1a85819e731b4137bd7685ca95d33583a04fbaf54097777c571fdc0ffafc4748f57b683cdf6773177ceef1e6ffe764f780ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1f0a557c16baef46717b448e84b5e5cc249e706a8ab9f4fdfc1b0ead85334beed931fcb19484f0eb796946638c09342bad52b8c0b93c8a9f6eeb71e7d96d0a2f"; + sha512 = "045767b189c1f8ba26bfbec61f841ae2c66c7e1b35569edb26ddbfc9169e1cb6122237d83808a87e3bb3ce4a6b1f080a9bd77bd6f8d7f731a87a894a559cab1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7e996dccbaf10e76939b018c1fb656a42691d2f9b70bd8d018b2767cad55bd34c1241e0dd4a738b7ab503efebbb17b8ae9353a70fae296f0fbe3549b4071a9e8"; + sha512 = "4126eedaa46dca25e491e74ad788af4ded93127061219dade8be09cd18d807b4df549178c4e1d525ba1530ddd50dc4c6e35586e7762f550cc0381bb7d9c2d7ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6cfb8e0e55a61bbf5b74153503ee71fb2851bff5905c68e61adbe2501d7898f45014e7b20073beffd2b02c0f51d861b5be8473522a42acedcac463e55998c959"; + sha512 = "60ef4c3830baf02481d7371d4a55ad8da7b7cb059c1e7171b3aca0be159baeb287b2aeac15e0ef0936f452a12c8e6d2570f50a846af7b87f5d8e1779fcf8c8b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "88aeb01a8983a482a0e984d95c40d737f1fa89e39d37f7d5feb5e246c25a39f42e0cb99a8d3b8f7da001854d60cc370cc3f62ade04498e6d2f9817ccb869f312"; + sha512 = "354e699c53e9b9e0a803824a4f5d00fc991adc3822a21f5842a1268e6d028c89951c943aa2461402d39b7345487bf74c73bcf1cb49ea2acbce5a24a49ace8b9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8e8dfd8a3a0fab2528ffd237d6ca83c3fa41551be79e2d85fbee9766731ff53345f912af6689b336db7dc8467a57b92664c0981f5c660217a8deacdb2b350408"; + sha512 = "ada3a7ee976f82841096b9cd80fc1af79000833cf65971b3c141f70cb9ede5a523c6e7e8f6be36d6a175c7b1e8415f95a84553d21b35bed90bf1865861ed9d19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "43af76e66b26af3736c373a54b2bd03571257aa819e33b7ba40659dd7e5f9e7815116ccb80bad66ce5a2bcea4d9130a07830cb72b70624e567d1b9650dd31c4c"; + sha512 = "ec9d5f601856bdedfa4f005692911e4e9a5afc88d8c0a5551e507ccebe28f2280b2ee3f842df5255e1cca5b1e35308354827d8c6006c593366a08e917622366c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "c8ff860ceb0176dead8663f5043ff68865a38ff008a8a110bb37212afecc57042afd150c35c0b39a56fadc04479b95494e95f966c79a789adefb295269420222"; + sha512 = "e939d4888cb59e0a1f066c641c213bdf33ad56c60e73eb7b97983026249b223f2465703bf8df931b6b844ced18a8703b77310ac61c847be054eb83b8196dea6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "b6d313bae860d3d7449eec5527be23a8cd148a580b416bdb2bb8760c2c5996863a31b175291cc4682d574635d3dfd35e70230cd0fc7933be78a217092ebc0c64"; + sha512 = "4f269b9ce6f25e236f00374e68438d09cb30107babbe3fcaf88312b7abdcf8d4a5b619860e3e4010f367b341646cc9de027ee094f175cb144a00bef47f427806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "42b3895f52de7c7f332f337ed0dd3ad108c3d41cbce8a6c3bfc64d4041266bcdb240d0960519e6157a5ee1537f3fb50fac8aec3bbf89aff0cf1a4d99fde9ccf8"; + sha512 = "9275209304112ead1c200f9f62386de665922bedfe8501f5975a7598a6ab19ec6941fa61cec4904fabf75d76c42105f7abcf86d91c746b609bcbc6957b8c40b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "f4982e28dbe0f5ffb9cdb5038d230f7401c77c368e6a1427018ea4e085bce534c8deee81b30a8b4f1b93d48baa0298d6d74720cfc0667f0c9555eb18a6746e26"; + sha512 = "4b06342ca02d40b6bf9de58e50d29ff2ffd3ffba60e79b6aafc7e59a1ff8bc28e1d32ef6fed7ab5d90d5224fb98ea11aee57c758938ae84015c52202be97a300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d82258a4aa12e64e13e5e22948f9a80be1482fb59585e31ac5caffa80d0886af98cf14c122394f0978b5706e66e34b1158a0e19da213c49037b3f65683a39984"; + sha512 = "02189417dac9ad1371fedf3a2909d3a1cb612566d653255a58402dd79656a56fdd859b23aa7b9872a928d2ac088e96bc9d24d97504ac183d6e3c7baec8c072a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "527296db4c495f09b66b4898e6b04f496ae202ad23243de7259715043ac026863ce8a1c849493226e935dc04d04f528ba9a7bd4e9498ac36b2215eba118dace7"; + sha512 = "6a629c7c06883c0cb3d62f69d996c6778a0929802bfa086fded6f7b5d3572e615f6280a68b3343c43a111c02ff6b18f77ed411029ce9c6084c98f418f9cf5fa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4a211cd2c988c7bfaa0ee28b2703d084ac17331263231847c23e210630162e8347539c5103fad19638a8abfc2bd2c4d0b08dd3d81be24d248d685dc80831f761"; + sha512 = "f890c9c046244c476250ec89821f5de5a2e0a2acf12be2ece12b192276163dd9c86c046e8d22280592fc0b22e799b3681a3138a624564f45e3ce3e17dab20119"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "1d445fb767d74fe9d242722346e0475e6ed18c0d7110cab12596265e68916dc7f09017da7a2fca79b249c3da7eb140a13377ae4fb6c69a7f2f0f55198f705f23"; + sha512 = "360cb88f79705ac8b6e50a52ef23b10923a15c952795f1bc885cff09d99e23f200b7e67ca8637fad0447abfdb07ee9526f26ffbc424cc6c9bda399da0e4ef0b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "2bd07a9e4e4f4bc17765a06616f0c5449968c111430d82f2b506c316305b1ad417d17c9812642f0651cba5f32b4b3ea4330254ddfa2ea9b08f2e980348f4bc39"; + sha512 = "03cf616b1bcf80c2dda6a6eba15f28b9e5c8741aa37c383c3b16b6f1ddc834d51fd144ce3484709335e06119769bc021da6d1006cb385929451d6db1f1480a4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f0274b0bddf3ab7b69071482aa3be4b7ab712ed78c3f5f4aa51b64f1ba8c93408b64223c73139a4c4fe186d7bc0b69169d98c9ebd859c1c8881aeaf8050a1eb2"; + sha512 = "de16b1013dba1726a146c3212310da5e51f6dc706ae1e5fbda60e1181ab19510a485908bad50b6a4d87ed1e56027627777bb005bfc2a5e104df9f7d1e95cd7db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "973c4d852d71cbae5430afedf33adb1cd143d2e333e06cbe697400c1ee2ae30c6e8361f78c99e131917150152b2fc30acc2b5cb274147ec5badc466c7d3ad67e"; + sha512 = "15826e8a03c1c0496a7d9ffcec580f283b789c594f6dfa64de2ac8bc86398d2cd267a84a274a94063d980cbf984741f1754c644451dcb1e56d06c1c8393d1294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7ce4970144e5f1d09daf747629b737567bf9fdacc21f5477ecd176dce714a7b9a8a22e195d772f47ea9bfe97c4c8b1bfb515aa785786c47c2c070f58ab02376c"; + sha512 = "619cef2ed7c9a8fa67723548aa826926f0dbe34996a1c6132571173a15c15dc7a8f9165296f4a94e1b8beebf67cdf79c388fdc898a013cf25985b4fdb4a5c200"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "33d364d036646bcac7e6ab694fe180a548bfe6de420fe1a7ca684177da8086d70e1264720e508251163819e9bb59a54e2027431056e4c75688a0b587ca5fc010"; + sha512 = "3815642e4bab2ffeab6208d9c6901c80c89a42dc8453a97ff288da7847f033402bd48c0eba8a8e62f0c696fba75f95e7dc9795089894e99c70306cf4e40d37fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "46b8645a1148b0a8d2c8c2dd5baa36459fc9ba4504b875c2f0252cff8202dd0a1c45cbc13422a2d36650db3e07e5f8ecb214d74b14dea728f76d721c53bf1486"; + sha512 = "b6a740e7273be146958a99a5a4e16f7c1c7e21b8df76d22473c6ca16e510d7f37fd9fdcb672c2d6ad29aa354a20ee3a7c5a9aaa03b9332ea3f5b460e7d271565"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "cee1cd38ea9fbb4151ef7a2f5df2f67a6feac721ae6bc2ca580f933685f71cc25062c9f00a9d25402ba63249170c1357047248488d0aaf65acd685715f97c011"; + sha512 = "e3fab302b21d5f6de8b41faec14cfd842def6f2a65259cd8d5b0b481fca33bece3e7fa4610c60013153b676dc9e53d790734d27837e4701b393e322c5eb0f602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4d34d3f28d1ac26e940b8f335469aee541358c19ada123dca3b87d420d7bcef8ba430d02b2445834cf495660faa4dae3bd66e0330f15c43170bdadb63c87be13"; + sha512 = "28f62c0a906283c1ebfd47e598918349c066c33512d3fff2daa44885faadbfa8b00309254b754d758d86acf23bd4ebde9142e56302c23ffcdbbe2baac6fd6e47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "ceba1c862b0610e67053c1671907d1a1f80eb381648349340c18169c0ef6d7d6d4f65a7476dda42329f7a681b1d3b3924d0cd9addb7c5117a414e492392c208b"; + sha512 = "c9e00425a869501867f20b22c85e72dce9798437ee8afe718eb21c06acadd9d618d614e25463f84d0a31901261d92603374f9b2b91879e19973d50942ae6774a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7a6fb8b6ad17fb89796d93164c39e8e446af972dfe14153a75495dd9aaff329dac58d708ff4f7c85ddf8a65cc441b71d07482e0eb0e240552c7b50f03f3ad463"; + sha512 = "58811c55d4a5f41e3ef8b378c00a9a08adfbb48294eb20c32dbaffd972e1df1ae55191a8ad5c4705002f07d3b7d3eda90ec759b805995c14c29fdb8707517378"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d846ed4044aaacf02e02078d00f5ecefa59f4f91ff174526e96597aa73a46f4ea4d2595f39e5ea17583ffbe9ebc046265c73a5dca7155ea72814ae4ca7c697ce"; + sha512 = "428b34c8dd2c926dbbbd2a8ccd72ea7f023e5fb0e9cb664810d29df1008ab744eeefdd34f6f6de1596f3fd7da9d2e3b23d5c216c8a9ac94b96aefe5fe987828e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "1deeb8bd99d8e3c86ea16b08583dd6467cdc8b255f99c0782268d5319e9013910eecd121f0ec770b53189c488a239966eb5850790e5c0264351fad8ba9a587b1"; + sha512 = "5f1d54165939ef8448a5abb734f8bb914626964493e9ace1a483f5d6003c0fb087e6cc1d76afdc15c1fe563ec64f022233204be92a5705d8456a6cf75219cb4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "8f8553f1eac30e497f124e5407b1658691e8456ca0d2307e4e8244024c6ec6ef4695644e169d840f832b4bbfe2ffa7dd0b178bb2b9500ceb7a7b515dc8d68af8"; + sha512 = "4eed64845ca603e21de1e60632b7d75e4bff5a5a2af792131de4141a2454fc8922109f67c13c9cd97032e3cb2cfa4d5a0ca3cb3e64faf2754fe44d8a161c464e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "129207de0d362fccb2dcb82ec62c0802fd8fcdc5fbda638c7f8c2d3bcf38c43a25640b20bd118efaa9dde93a2b305eb8b194b38da5c97b42bb272b732a1b1597"; + sha512 = "7525926461a5e89d4aad85bf3176ff36c39fa18131ead378ddce015688830051dcabb4eb3dd05922d84ea2fdb666dc8a2f8751c6bb3405b4c6e1f7a5241dcfed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "08e733d738d1e4a48eb8493d7fbfeb14a4fcd3db41bc0d39d7440a3751b9bfa9ef2b1c517efa88af649902464fbb04a77375d8eb1cedf325aa781710c704a1bd"; + sha512 = "3ccda6fade937406e9ad8c609e1cbecc2ebc064d0793e9facf3910569ad5f8997d8e9165a60d59de645d29bf1411a439904af504a5daf519774bcd76a371b567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "f9ebb1e5c03bf7a2e51e5f4228df588ef17f5d3aa406a1d1d307e49235a2b45100fa62d183878db4c217593f4d92dba3454be89cc80bd615bb3b8fc6dd471cfe"; + sha512 = "d1a6c8a42fb947547d460d8d244f0b091f609aa3590fab7a785a5a9aebffcbb96fd6254797b19ea3b0bacc8ba086db210ead35260cac69d980432fc0a7a7b9e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "1d8aedf181de567499aa9455a819d31e657da1d5d437f67df0eafb02d7f846a79bbd7e030c59a3f2c1c5766f668149f97881d0bfe3a98394796fe21b628df374"; + sha512 = "b0052bbd85357bf6bd3d550021013d3f97cde943be85c08835e9d51b829f9fa66fb3a34937f806552373bcce2f36d949ea872f0eae115e7b1d13382502fd2c3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "748901b2df6a1ab54dec6f5236fb4fcc2f762b5522dabc87b0e59890cfa895c9ad4e8d81662a9fbcf720549c88d4b792200ba1ae2a2f2e0819e9f183fb83a8e4"; + sha512 = "8f8f91ee726b3526b0d375f6075e466781fae463e55f8e7140b859e4418466c3653a3a39ef69c5395393840e8d09188d1be503ef7ac9cd2f34bce7fb6fc8719d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8143fe0b4fa7a26296b77eee23015df6eadc48bdae8ecd69fa1f731fed9ea7d2d544093c928641b55628c54e72ac48b974f6d2002bb56a613c745992297b577a"; + sha512 = "895f1e28b998d27c99ae8cfd8f6bdb94dc526d5dfe39d537e5ece92a76b8ea3a9905197c40967e7e90bed60567628dfb23219843dcb313bc65b8dc1300dca51d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "2f9edd32302639e730ea4e28749ead3aedfee8716ec06ba4283e4401e1f6608870e26886b957aa758efc1fff52ac92087e95230fdfc024a062a0813c2a941e63"; + sha512 = "3b206e9d0b2fea0fc445617fce9c9908d0d4ca15e68ac04fbab74dbb7239c986de7f5e0a5ab601f25b3481a20eb9fe1f39aaa535ba24fd6e1c76fefe81e26474"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "a725ad54dc31276d7f58d122218d381fbbc3642853958315c04abdb4ed5eab917a81c903b6a72f324896442c87608296e98a12892c81774e53d674862ebb380d"; + sha512 = "8a9293278b5a426aeb3f1da45fc5c8d8508297a81534c33ed3d032fcb0a0c67eb4cac72b591f4fed9b159934b1e3f84a6996f665ec7955f37b6acef78886ac3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a5d06b692b11f42da8465f787eace49d2ab1c5c9b575f3471042f2db1c499cebe1b3929cf131a6451cfa388cba4cb995fc51f3a30059a76879db9f78e8e1bde7"; + sha512 = "edc302624c544c455f1799b271b0c6590131f0e01e4cf1691fb8f6fa3b470ff9a5b4db301ca87ae97ede4482782d802e24233d20d84dc8adc2b18deb25b249e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "92fbea5af2bdb838af9c13d6938eb4f977fbe867dd90dfd5328f947917503feaeaef63d66cb7297aa049f486056481cc2525e47d7e5fd994908041924b1d88df"; + sha512 = "98259fefb0d9a3ff9d5e80afe251cb001c767736887d6c342d857536a031d013442a271b3aeb1c227c789a5695e134b31a81777ca7d13249451bce4325bc9a8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "03ee4474802ee0971d4d1bad6814be66a5e0bd8adb0f9fd1c7fcf748915cfc0f2b14694135db6011216a114b388cdffa3c7109e66b834bacc7e28aafc0d79a2c"; + sha512 = "f0f8d81d0700d8539a9697001a9bdbfc75a36e3f4a1786d46e5dbdb77f61d69df10097040ea8e5aaf722b7eb578a58300c2feb32bc010443fdbd2e5eeef1eff5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e62f4de36b5ff1ec5d934d514c5257b2614e890efcc8e6e924116494a029c2fdc40ad90924920dfebdf286a63cb61d0bb64ba5fca3e45b4852b0633f3f74bd67"; + sha512 = "97994f92d574726cf0553378f3a0a90d32cf92b8810b33a4c422355ae5dd5ce7f411352f8f45311c24caea005b727a2886bc60589231608604f97dd684e5e3db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "bcf2a75d906ad5e42cb2a77c210cc78afd4c722ecb686fe256dc14daeaf9794e7ecae9668171c6d028aeab0e34ddd41fc65648d87e796e57a9b3ecfd33397361"; + sha512 = "8e212c9b394d887ec8a27e47fab45f15e4d179b82332605360a951fc4bed5693be1136bddd8821ecbd31aca926a1277cf9f1fdcd07e365ada5ad35e19c64e213"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "64093337bf69f005ed5db33d1e06e0c65011c53e1f392026990744e9393f6cfed0a602004eaec16b3e5841f87614a7323ac64b12f0099177f793c2fa9e1fe53c"; + sha512 = "f8ef36d7d4cb44a170fe575d6bf94854549eb311422ea5c6ce9220f6852d76c7d1d9b65f8f959526b6d91e88b1dc34bff6f30d8534fe565574b78b045a652662"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "820e8ca43a53d5224b8f61e47725b775cc2ad4c15d816802bf16609ddba1374d15f1826d67872db16ce071454589b1dfa224a9cfdbaf44722baa5c8fb4c7c07a"; + sha512 = "6a6a67453a7b48f635b2ec0b6fd34ded5d1624a375ff526ec1693affb77d7c503215d91a29c0a266228f2f1780f0f5e6b8ab215e810faa8eb5bed5a36c998975"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "93cdf71a41b7c7d615199d4111892a467afdb861ff9bb374cafaa7f802a026d7b2618beaed80e5f078a0751a1ba0716bd866c683d8720f243228e976c816b865"; + sha512 = "7755a4cd53704f28a137d8588a969475df4ae444e1a15591941cb409528deda93b45bcd4cc0d8a10321402f01ca8439db6ee0d634a1a50f964d824e61cdc789c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d06a02148f2f87cb3f4b961a9d3389b2ae3cc6efd1d78a7132e8258dc4c86ffcad47055950768322a85dda62baced3516666330ce584be89e9562d1b306736da"; + sha512 = "88b173d9b150f4973fb59d3bc51c3cb5f9e2580805310a73f2de993f6cb053c2c8a09d97c6979a7a501610d924a97ed6cd848325ba5142680c2e7e83ed026c37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d7dd2306ff4b79910f1aa09bbd28e7b7e37e64d7e99fd1293e37a76ad6135edeb247fcb57102cf002bdd43361451327d576a1b58def5c99fd09a6e68a26e369e"; + sha512 = "e84b113f5c8a4d5a242c174fb5752e23be54bdd79d19926ac46f29ffd7d0d5d2d35a7f2aba68967c0cf0a352a8bc8f5e7ff50883a1423a99d811a260323475af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "4258156d27a720cd68bc74b70618e88014faa00360e055ea6a254154b5929860f27223b89c460674feeb1e1542dc4baae1b81369e9382c455d8bffee8bbe0585"; + sha512 = "6618cdd88ff48e3ab9b1d5f301d668c5ed1e659c3777cf1d87f7fb33c8698659766291b821f1fda11d13a72e50321a48afdc42438f96a8e827b2cb6712a60e66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "822401e47e96a232a411655367299a9b64aeca133c0eaf18a0d9771a0a8f5f15c761c7889b815339cba391027a807a490f2eb8866e8f81883935249fe1907d36"; + sha512 = "56488e4dc90422b1df30265dedfbb2d0ed9e2569b989d642e83d68f71be8e5c45caa9e7df0849993b7763ed91dba937a66231288cc821cc753e9631ee1cc6118"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fb498b47f79337f55835a343a6141556ae3119095aded17611b315e0ac4206d92774737d0a149b71c62c1e0712110a8eccd18b23e024d9aeda4a2540a0dbf9d4"; + sha512 = "87c044f5b2e86c65f03b164b4875805c01fdbeb8cc1f1a431c3e8dc1c5f7cfe5e836e2c32cf4a6a26621c3a9f06a831edca828b5a343d8547e69684c6da23924"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "d03acc6ef34f1476fbfc5f398a21cabbd47c5c5d17c4d2ad83e0efaf2262deefe413032d6780303ce908b7707cb4f3053480c1f880a28cf15f105e7bec89f552"; + sha512 = "22722fb25b81ae05faad99a81af7aa21489c0fc031ce039c7f917f0d329160748f7ee6378c53e26846c466a472b19f88fb0a71080b37f16fc036f4199b75f67e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9a4f97c1d41b256e5dcda088de88066c3f2db91c5d2c5bbd676c3f1081ef87873d68aa4cdaaf55f12b7fcfab85649aded56fad65a7a05322be794f463da152a2"; + sha512 = "680e8889e1b4b162118dd781cc43a928ab07359d31d61f0e2053223d5eb858d24a12a81dffa3ba562428d958940019b0a775867553cdc5156d2c380f1ff98d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e8eb90ad95e9fbea466d448abc4454bc6ab68b5f60d84cc74d1a7a8da8f6bb9a8837b2542194722ac85589f81bd6da43f683416b9bcf78fcd8511f9274a88e10"; + sha512 = "45d39ff9ef3de3229e1a6799fbbfe8ea9e773041c9f98998aaf07a41146cf8a034a46927df8003d953ecc10ce50b375b311fef5b3cd532952761b6d05c4316db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7eadae35b7f45d91031a7c2984fa0f9e6dfc72ea3a5e53d6c0b2481106ff095c4fcc3e9398a06fe5c2f1a036074b03bdeefef57df32393a39209cd9aff8d5ebd"; + sha512 = "5b6b196fcd7c1a23664e10a0351a5f13e2168ede27627a1aa66a6c6e586095c47de071e917b82092f6df72540e50a93fa95e0c81e0e06687517622ffcb9b8a6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c9ab2805f65cdfbf5ef5ad441c675f3ab6eb7bdcbfb7575b3ca374a6e9409f35be63ceadf495557e29bac58fe368d4410b8ea2ad5d5a26c21a60bfe1f69b9f60"; + sha512 = "44d1554d851e650f2121183059625f3c8f633c50b309cfbad2cd0dd3b3c7cfcda33c8a14ab74fbb3481725c530c5140363dca573a4e686d6921974c191da093a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "7111c65eb5904a33128b6046c76b7936d11c09842b288f234203973c5f129e110fc58d1271482d719afc57479c8283010a285b890d80795cce2ea969272283db"; + sha512 = "b8210e2afd5f13522dd367baf6724a0982ab0a98b548b1f2e6fc3af93d704a4e5929ed4e235f292ed666b6064beb5e1e463d715c8c14bfb47cf9b2687e321b1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0e19ad36251623f60f5d6bb8cd745339cff6231f2bda3f8ac5d87fb0de6b27b4da5fdaa727c34c058d93bc06b3ea335de6dafaf247cbb7bcafa2f483acb7a337"; + sha512 = "96349751178a2cf264e1ec27c74ba725d2c3a9b54641bc4964e5d8237d3d6b6f98c116d44b883aad132ba7c4962c3c1b471fec08394e969dcff42598fdea6841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9328e140e98f3e24057436e6e14eddb0d50dcd55aa1713d22f7ea4f9c8384ce077a61bb2fc9191c948a78cc38e9e8b08188bcc792e9725ecfcc91a5651fac290"; + sha512 = "61b270273fae12b485d93707d358e5a3d7a9198ad147e31c2fac2465f65c9d6a803326fb042ec0a6de2d46cfc61e505b09f6093a7f62e3dd69b8e44e017d7b26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "64cbdd669d1641ec365d4c1aced98d067cbd3a21124ec10472b3db2105db2774c283919652e5fa6c35c5548d8b8c1db055dbb7ec1c83ff05ad369923a37d45da"; + sha512 = "52e497831de58f7abb221b4906f0fb64182a04a93e8d7ee83d42a1391f029e4873dbe977b4e8a405d0acff537d98504f659971075b9b76e33c09a46607a6106a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "16c90f8125882063f4b6429ec810d23375632be9a34a5ec4a3f7d95866ea79d5c59f454a294a4ec78da2eb1a4d8a9dd9c34fcf17f0407aefc9cb8f25a2c8204c"; + sha512 = "8212b67f9447128a4cb9ee0864c50d07fd3595de15d8e3c6bf4a8f3b19bd2288ea1f55b7fe003f75249db6de0a8aa4ad6962b2913657bbdfbbf282cbc14a77e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "31084eac35a7d579efad4ccd8b269c04990065a4a93686d7acaa65d6d3733183229598c173a8372ad6f78907c57a7b65f63a27187817bb9144483c237cb06de5"; + sha512 = "61e8954d14b9b7f06919c23d60eba00213c57709a5013c4a9b3376f7823f5eec262ed891a24857fe5e5efcd0245bcfe474c3838f1463dfa38427c4335ce7f1e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "de1b69cd8b3fcc52275f6ae8a1b2fe85cab48c940ec62c8b667ff9c6ce4d4f32ff51d2aa46d3769a421355832e165b88f3abb4ef89329ae797c0abef4fed130f"; + sha512 = "a58c582cf0a9dd154ab53819197eb4c84fdacb2133e59b367df5111a5807c4ac63d1ca0b2567fa218a64f570b19dda9b70b13a2c15d2359cdf962f241d4ea275"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7ecaa9b96d492165a155821b34401e218a507fa91ca3e9f72ebdb6fabcaaeeaade4c4ea2e0cc2e0f59a217575d63931a9290c03644cc89fc7c217262e13a1935"; + sha512 = "fdd4d7618fda5b950fcdfba0c47c27311881bdd62d1ba2028ba13adabb4beda99351c97a3ac0d3e7c1d9b9fdbe5e32bd04c4863f24e76144f6b21725a5d5d8d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4f80a18eef58ab3acea954a48f48575b9a152f6204db85bb30e423a0b73013f1a10c71a76b2f3add3c03fcbbd87beac7fa510fc6075e23a5ec773db67e8358e3"; + sha512 = "2d6455843faa19b8fcd401a897eb03b76bcb5da784b6aa8598e88d1b3d44ffbccbcd01d9480fdfd61039197f8e6dba86353e400cfa9537568d81debd31428c50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "7c09f13f31226705f63cbac2fd15d00d87dc16ad43839e0593d19ea7d69a40b22abf0d7297576b5574a7844d390c35af951fde2e33d80caec626b5370dff7300"; + sha512 = "6ea49a50bf8e22e6caffc95936cadf3e6373b131b10a5a96faffe786a9a9a4ca8737600cec76c071bab4a20f7c05003f25d3f573af6450a5c995e08e3b939acb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b7af42a5925188a25c5f3e77991c7cad73e36a01e5948d02666cae405a7ba1c30fc59fc62bd5e799725584a7714b4cae97a335bed677ce957bbf6fa92c8f5864"; + sha512 = "7f5bfb9d4c7debcfb8a19c59f464a47af4f729d780b3940420326303d129f93363a6b9d606285d6d1e87b51d538b8573911356be2318b72e9544adaa0c64cc83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "2dcf6f549b08b4e705c4f7048225e1ca9c8b1ff8869a42482e78bbc58b0bf58bc7df8207d93229dbc8fcd5864a1d84c10af244f3d49a6651c514adfd30f933c6"; + sha512 = "f98fa51506a9c5f8da4ce090778eb675ab922970a94f7fcc93b2f0af20b08889238188f8def9f001ca757b68cc321f7f023023b53c2d2c1f87dc645d9a9489a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9500b5068ae3f72f21765cb1cb8ba35bc07d813fa6301bccdee917c00daa9f5cf2be70eb3cb2faa3d363ad3fddcefbaecbce1b7118251a9e06abe80bf9a30cf5"; + sha512 = "54a2ec07da6259d6fcbf38a9bda6636fda9a15dad5188c3a8cf5a80bd813ce5c399d44daba0ba49281a7d503ee38542753560ca322324d86bc528c509b34d3c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "fb8e9abf309a8396edb81ae87ca4cdf2d84f5a9370b565f1b509ee64740f7f6fa1afc1a0eece273131ced6bc22996ff1a72e84a7d5aa09d2f607398cf03bfd39"; + sha512 = "944dabeff41606eff6a49ff87142aab2934cbc658015a8ef05a8416252b8c8c64fd446f5f88516dbea67e269a6514ba7a59038b39b2bb21b909f5342e90b9fd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "35be6d50c17780ac8174302c9b400ade8e7f7ff9e08d8d716ee9d879593c39c2aada3f49dac898d5004d7e5d9538b2e545db265011b1a11c06e1bbfa756badcd"; + sha512 = "22bf40ed5c37609dce3ed3ea4e88ab8bbbea31a2610697ca72446c201f874c7a4fde8c3f0f859e492869a8a3421e917d6eef37f71cba58658c584f30c683e9b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c3ff5e7047c0eaa90ba765f75bde2e7594ca8e63ad8e3688f61573740bad234906b1e20137308be05f5173b4c01d42564c1d3a70609f012593406986fd7e5bba"; + sha512 = "b746405cd39c261ca7e18193fb0714520c59f58a595be513660d609ed3373b36f07444283d8ed1a6106ef0a48de45ba61fd5c8a1798d45088ac886917e883772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3feaafc92c9f4760e1c87f2733127d46eed4a5986862b4b4aae8557cec6b21a95838bc5f768791a2406d8651430efacfead9ccce13ddb3e3b97529a4d17072f0"; + sha512 = "eabc8a30e4683de833a73a49e2d3d6a25d92ca6fbddbab672f13a6ed5094edacda15ee85a1a8582a05b6e3382ad8a2063a6b1f9acd02771711d43a5e43da8f4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "96ed2598748c08571bdb79df888e5a3cd3ae0bab46e039e79b75531d8e23a9cf3dd2445ff51d1718e69d80dc54d9249c142c61640e2c202655183de4f87f63a2"; + sha512 = "938991eaea630be2ad5818f97a9f43808ce7978c07177b5eaf10bfc74d495c1bbd5d66af79c25ad66ecf6b1d35acd94b04b70c5a8efbce5e26d53e45f3db0c7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "8c6a66f77a6996b12498411edbf53d27b9a16c74eb74b586f5d1658edbecc18b427309b3e1e75e66db5a6f58821b5272f81fc01703f7d9e326318fbd4bc32bd5"; + sha512 = "ae6eeef2328c92c26b6eb9c2a600162d99c58fa04bfd526f8b0d3d1b147a9f19b7976342e17415d8cca2df65ef5335c5da0a68378e900c09c941fb18a92ea8ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "3c3c30b44487af9bc0ceed9d200b5d6a9692c6574c29eb93cb163a0205f4833801bae94d565b1853d1186ce6709f3f10043079b802af485ce19d6614a7e7ea2e"; + sha512 = "af171a1f641c50b7f50794d6a1ea0b2d9d2230724c08774ab594b1c9d02ba0660e7f349de65dc4638191b855183b9a0a45fba1ecab5e87199522d6c36103e6f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "833627797838baf083b46f93705ba5e9d1e25a562034efa9b72406b703b77fbd986ba443fe19b2204424a586e361bfecbd7af5bb25d656d34c13c31f007a6501"; + sha512 = "7a2a61748c0f79f6e65da80e013dc9cc4550253298e6abf01b431db16a3373ba4fbdabba25dec3c994435b6e6330aac58067ed95003695bfb7e49fe6af70b094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "21b18f367619c42f637fd6705a73d41f70a64b3f129293b7af7c92f3a97c05536a2d79a23edf8d96e0ffb02715fdf6816be5dbc4c67b658202ba22a53a9c75ca"; + sha512 = "d06298f697163b89f7195393a660534080595b6630b8e2b5c67cb311001bdde4b69cf5a2bcecae4ca90a0abf275736842a33f6d57dbe021458599f0a531b5a13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "89063af404f2d0a4c182625c387ff2455ca987c15b824f88c3a7463befa4b65b487e9da3e0d0b1b7499975d5ac1c8104e64c03f1fbe6236b6f1c429e68d4b6bc"; + sha512 = "b9ac847949d35872b0d56c41d58c26768afc1c6157d87a0e0059c4b4928e7eaeb6aa7564754b739dc757e049ed485a2c94085e8881515ebf18f250cd5c9e8ccd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b4647fb4c7ee30bf3a1c4249779e46031681cde4ea457869bbb474aae05fef56dcf190b6e6f70399430563c000d41b6919884bc3cc44c212d12b7f763b411157"; + sha512 = "88cd61ed1bb4eb1d871d1844e83acbc932685e10993ed64e84c63fea81fd1d5f79937ca9fff154a699334a4f10942415b6cbb90312d5be508d482de064cdbba6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d2dc5d9b2a2fb97ebc9fa1e96a0fe878f5a9dc7795e702d19e93b8af7a48a33230516fa348097b1715503c30ecd1b9f372fe24c5f3cd335d2d83f9ce4962cb53"; + sha512 = "6359356fe1c2eabb3757c6906d925b80a7a069e0dcd7a56b958f614879b942a295bb6345a84365fa21a2cd527bea48d6efe01a603d98571deb6141ae35ff59e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "6ae482acb98e30a89e4cedb2b763f8931e1b2b2f5afc98b686a24eb3fab42e4731b46dcea4428adfae08a72d1eb442058e4c297958f93b6c7ee1435090ef828e"; + sha512 = "7b57efa8b87f662a56cd202102d220fe8f5a72d2e9838528384c4e40206df75e57a26df35544f595460daf471a565c5bfc7071f9a816b11cfeb48f84437d40a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "aa18474baeb710c4322df1e1bd04e6bed566a8f53e8932ccf9abdca3b74fd33b1127e006d9997550b31e1db7d4d6bb86087208d2589a14b47614a9b49ff3002a"; + sha512 = "fbdfe0a1f4ee6831a1d09d9349ddd43d6d540877c1272484429a7ac735a9b326ca5d99fc45a305fa1a36293a4e3eba3d03c4451b0f68a011e58c055d7e89ccee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "8041f361adc88462f3d1f63ad4789081f6750d2d78e063be13f770174fca48c18424422a8954ec2b1fda4d7be14cba964d5d2138ddb6a85d18c0b1e47d274e85"; + sha512 = "8106d80e99497435ffb5a58c0f4002fc1286e223688ebd7c9e406d4181c621abd831819339a6ce65c7a3ebec7a7e8963bf711d7fadc5b94653d83e1fdd13ea75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9136a922d582db8871f72deaf308d6da711b931b20a491f139e4d7b4fa95de0b028814765b84632d485727fd6bb40732ae716582a38bac59d30f709a02070cb2"; + sha512 = "165c134b673a2a9cfb38db68e5020a284bb087b21ae37a70ad8ab25808c1fd68c0f6385a433d4e16bf34cf7fb07510b36edd0563078a644d6c0a44633946be23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "41c6d2f49c1e08f7ea647203f6d5b94f6b8b8c12edd181b5865e13234fcc47275dff9a553a2609fb107e5b0f3edf0a1fbb5cbede97716ecf48b7a83a51b5d4f0"; + sha512 = "c0450269268b5e89de324c3e5fc6a864461a4b29d1fb8646846f8ebd87f661be2a340963a5ae8282cddcca5f05a3ca14f2b155eba99f4357983b5977eac808e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3ca94e9cec360529bbde7cc8c713ce129e8cab654d2551babb91192485b04233932cac5e0256e2bcaa55fa34949116d1d207eb73acc41b1cb86a1231d939e880"; + sha512 = "6cd6dc6545e481c28f9d63e5bf97e8dbeb275821c829c729c2dacae5e16d913424bff0e2c6b3cd65a566708f6b047a6eda29793acdf45de295911596bfa49ef9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "2914d4488a847bccd7aa008d43a659d46cb06e377032c8d3496da32a2c13387b8dc33f21ca6345abe874a9c6c65464262ee4bbddc83dfaf6532ddbfd554e2b50"; + sha512 = "03865af4dd626a188682ce32b4e817af44cb3059bc8ed7620853234a15972556fa57a2b6c6046ae40cc9c714dc09e54c2111adacd2a0a315d347e4322233fd3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "08e5e5b775b90684b6c275eeaf556eb4dc3e331db3f2807dca313273c4fddff37e31fa2ad36ed2dd7bd76e3ce5e7dac97a4bba85e7c4f07fce2d35bbb63e5759"; + sha512 = "9a774f343442ee10b673cc9894fb8e4adb0a02d824dce5bfa8b3c699a1deb17dfc2ebff86126f9e0743075091c37ad170ed49f0c7818b602373f9fff20240b58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "10dcdcb6268a32b84ecdeaf4bed76ee78b9358e9e84f4fc8cf868f080a4425adf228116d03b440a48fd82d0808335c9632b0dc967a417bc44a5bea3edd79bbf6"; + sha512 = "6413054a66903741f6a50c8977dc61866067ea54f915f1d7eaf972dd26cba592945bda62348b3cb397d7e045cc7af36581e374deca2812a5112f0bcbd7703b43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "7057c8e9a2b0b988d275041dcee47d0c6a2d23d765340e68846c66ca545ba6ee735d8d167ccbc57d8054f46bb4c074ccc22f88d51ade9492d6f904671be88367"; + sha512 = "98c9403b1567d02c1571aed5d6b1cdae7bdddc01ef16a2df44fb8efcb728b7c16dfa27231795fcb9ac3b1cdedbb66fcdda70a8971ed08caa89f8a0bb11dea5e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e4f71f9cfcae8afb55757fb1873b5561bbfd110e9deb52b65244d5c7db48467ce035b663cf972f4fa976b52da1b945e551ced73366fb859c17beabc54b0f20c7"; + sha512 = "ac721c8b4e104285cb8eb025916da8ba1c7c0481eeaba2b60e35ceed7d26afa7eea9a83168608daff25c025f2f06208cf36c56a4ece68b66b2baacefdb8b5d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d48c432d4c84a1288f7a98654a95731978aadfb32dbef7e3464cd468abdb4153fc929edad4d4dab9b19bce7cdb8545d5987c7ded1b600fe181f044b3675c6b5e"; + sha512 = "720d6a5c0bfeab99f4360e9e64c4bcfc49c987f1dd040eeb1ff580f1f4b1c4a29fb7a3c88a369574fd966237f817959baf9db7117bd515cd6458e13155128df1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b6231ff9e8cc373328210dcf5389590a2608c60fed17fde5a880412614213feb5066dd9c05cc0ae813f6af1701f4469586b255930449a11cd5bdae1c5ace54b9"; + sha512 = "e06fd7a663dd341f8cc9f60de2edca6af622bbcfffb9b1d9e3b75c07fb6b27f3b0ca9eeccb6173a91f52ee8241f167c4a399160e20377b3738e4cf4b2dfb84b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "919afe9f6850f39a61d825e2e7fb7ce109b3b942fbbfffcb8a9626b67dd9b5c7fbd6f43267c0b58b5fdd1f645366897ec15116eb21ddac93a48f7e3800bf0403"; + sha512 = "d7738a3039202e9cd3b30652b4c069f9b73f88e5db1429e26324ef30f87af88f79452cb5dfa687bb988b513359ae65d7319c8a3dd59207af85b618d51519f335"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "75612a4126aa52560e2cdc29b7c2fa1bd35fec34c9033f0ca276fb1239fe4dd50c1c4b024895c7aa8abb28435e58961adce4bf968922669dfd1abfbccddf40eb"; + sha512 = "cd0c2ea6af241de3d382345fd783b75e15499e0d666df99bb6ec06ae9e9da233e5ebbd181bec6a3b044682456dd78f5405177e4a781160b9a3b110008782f32c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e5f4c69e7656a198f831d693465ae2780d33f0692907ac4ae9781c0a307e8f7a654377af0d76eb9d63d120ac65bd147a858485b4e211f5c119bc92798bd917c6"; + sha512 = "94aff48579b1fff63decdc6640b853907abc508da23e3d7ec13ea01c2fae496e870261fc5616821bb0c2dd5279ceb1be054691f501dd183ee0ea9aae7d24d5b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "547ee4c8ec75ad4ce583abde35a604c1b607dc7ce71cce1a955e4269fbb18dc20af756a07facb56fb194c2afda8170f4114511228dbe058c1126f932d6c94793"; + sha512 = "189f8bc5db155eb0f50d0b60d321ca0dd67e15cd30749d830a21397df0b314608393c08daf70712a6077ea5ac663d5e745a836483750fd26ec1e92dda265c061"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "468cff45ebf0706887b01890431b7cbdcea6eca30fe86a2911de19160b8b068ab45a49801e28ea6413ece5fb6cad4c8bdd3601da2e237b8946bdacbd4e51b764"; + sha512 = "f6f1d2ac3270e639bea54eb04c8f292d17ec2c4e70848a4104219800af1a17f78658eebc39d3c244e351d0511d681ab66a61358523d7edf93d4b317993cdb10c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7daf5b95990a2a4386b04b0d11459e64cd3b101c57e18c514a28b28d1d62d797256b049f94809e423a8102269f7934b0074b2522109b2005c7bf317a705f5763"; + sha512 = "747f109672e47a6a344a09c32b5e2694de1ba125dd29d583a5f6a31859247e659b9ea204af31337dd5a635c0d1d7662efcf37d0d708e0936b59dfe3c975e9990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "91b0e82ca4de76a5efe2a759f8325f784441c1fc118bca51b9ccf832f4866732dfa00b40c64c3cf767787ee5fbb11b9b09bc838c933c4ccf2d8472533cc1d07c"; + sha512 = "5f6ad0ccd20bcd09783de5307a1ac2b149cf63ab922162149d8c0632698de86b78170e378dca7103374ec356bbb03b373bf573512e6b27b95550ed95178dc1f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b41cbce7747ad6937c471f7f54d88e506a415dd6fa145979cdb88c07e1e929922b54ae9e61a674e47c120c9b53e2062d9b8c75b2cb84825fbb52dec2f2ef2751"; + sha512 = "01c8f958ff9c5e9e65459b20c7a42208bc985246445d6ed310f80fc0dae2c8bb5684e118baf1c3dc2947dfd66ca148537d94ae726e3b3d8cc01c4990e42e2f96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "902273fe8c9057b7d7778ac3b21b3230735d60ed3de6b48c9bb9554825c0e8f8131e7dd4a53aa4170f44220c25d64f23bf5f464402db9797a0d30c8bd3e388f0"; + sha512 = "1fcece2f00f98e769fd7023b5cd80eeac27b8f987291bf4041dfd90538482e7184137471cff73aaaff1c307813efa26cea3f7e77082ebe08d11769b35cd21d12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4fac2fc24242045e01bb7fcff75238d2cf4ad85da11efadc0b4a180a402deeeab4f4eaf39f32118a5668c872569e67dcd2b86793bbaa57391cf8c860a7bee345"; + sha512 = "557646065e7370bfe43fffc9a57eec3da2ec8176e2371e948f70c92e54e3cd7d194022dab508c0b384545c121587e41ef19bda7ec8b1827118adf12aa82c653f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "9c6eda370b7fffab80d3a4dc76f19a660f17ddd845251f99fa6bfa79ed5bd8bba601ba4bf07c108186423ade57358461756e82427e1f5db77807336d4eef62a2"; + sha512 = "d7f95cefdf312d4c3ec157208266c9eba7e394cc1deb83e4cb9baa98f99292f6d4996b4c6f663a303556769a8c6b81fa6ee127f84464fbabc8fa0f55763dced8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "38b01f7e48cee6ed453b48bf0924beff15755ff1b4870b625120bb82eb4a36825295b5f314ebac977b4ec1fc0be2f475ca8d288293526c856563829cfb5b52e3"; + sha512 = "9c9d80fe8157f7f844c81a99439d9e35ccd51c8cb9dd4e8c1bc16591aa2e34654440e1b926f3737790c2fe4fa1ef9720180393260adf1dc1b6d22a805ed8edf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "a949c67154859aceacd77a2d090f1ef9e585eb11ec817f8b0ad19a5e661391fe24d33c4a996137ac5ed2c312bad833d07dd140aa8bb0cfc0d223dca8ed4b84bc"; + sha512 = "21fc8ba0d1374fe0dbdba8a0f5ac940085f89886f0eb7ae28aae5e152ce7d68518172238042fd0287ec62127489ae3c9b750334d38676ecc7b60633187311fde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "460430a84436bbafb814c722a66e228e3a9e6fb4b1e250a8cb5955ae43e7de604bdbf374db7788b6bd26e3f6e038d1fe88f250fe37b5a4798d5d8a03f85cd3d6"; + sha512 = "b91dca298f68ef9f1a9ff17ecd58d7fd2f0d47193fb03781027be26ecc75d3391ff47dbd1d9b6796617df00b28ff8b2610858188cd03d87efcf704f2ad4cb0df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "0ba10c70b32ec847e497d20cc8e872ea1b867a8d5c608df1568edbd15475d9eb4e53ce6e7a96e249a9e0835fbd18137d4fc69a5f29e81abd9c154acfdd0db398"; + sha512 = "ff2b2be81f48758bd52a70ec6da9cf2950fa595bd7d3a26a4929ae28a6c612aa6ca1c127318587fe4adc03257e259a1b68ea39b9b4741e7edea53c55ccb9036a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f6fa0f31ac6007420f9e6ba01db67d98e380375aa3fd0cf12ebf94db157dc35d905b76f5ab6e0087fde825cddd8031da860a15c59f6747268b6547546f08e796"; + sha512 = "980175a00523c0ba2b4c67999e5afcc59946b45bc58d6b813e25dd0a5f1678d23d329dc70611bdb55d9ad9debe2adf0a5fb867a9d83d43ab5934ad2bcc132da0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b723e0c609705f4ddb29e3d3349b0195520b842af7ca0a1ccc427da5d0a9dfeeb1b71f2570c5c877b1351886bec5d810ae8ce38525dd771b10f9923fc076de83"; + sha512 = "9648cb55f355c68852430f9a7c5486b0fb5be65c7f258b81906d19119f437e033121f46b884d65f1f64c33f511c605d8a42737a26ff7089306ed6bde4fd5ab4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d0c085a5bb75e5f6d9e1950aba926d5e3b31af7ee96503fc8716091382ce9f85c9e9c6bde4c693034517299ed2a3c650026b0c811d969974de6b79db8f5e74d5"; + sha512 = "2fdc0572a32112310044936c9b81f7238172f9ef2c2e502813b82ac0f61fa96b9d1ec96d396c7baf79c27b44673a72bd9e484d6ab68087993ab44310a52d453d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b5bb0ef8535422d83c24103e72a3fe619347f537230aa2f03b24ea8f29b726cd4fd5c94312466918a166ab8166df22403e3eb1c74a8aeea4bb3c71d4a378f755"; + sha512 = "9b6b6ccaf74e4c3699605d43d51c02f7ccd3f4f28ed93e9b800fc0adcf662f08e554f081cc51e5706c73f308cc289976e5523d0424988b5ae3d5bb1ef6260503"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "3b8b91d953a1f62402d5c8d709ba7ae9d873acdc7a49604453bf862a223453f02b34bc2857e0e3744b608c41fcc906ec2f3771fe4510c9dc0cd5b6d0763e50bc"; + sha512 = "d417c0efde71e18f8dc04f5cb8b61c6b4410579051cf3816b55a52f3165ede2921691ed67307999ba48d6b46ea2acfdf82d063ea349fd7131402155f50dec01e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4446989a2531865b5266c7a5e4066a94399faba26f2349f92797bfad5fafccd658d0af57e2af4f62222b03818a8a57e7f2709d6f87dd97f9db419221c72199ef"; + sha512 = "d4da856a2b142d4a088a0a5b460eaa2466da9280890c62b178d1bcfc18e91e494d7be357915880a0369ecf578b00e087cdf47eb8591d605595e9cc2356cbd086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a77c23a6bc0844a43569e91b2725b580c8f542804f20d81164328e7bf84332513bca2ebf3b60f0d87f64c450e7dfc34e81d0147a449738c7b6754e0cd134790e"; + sha512 = "6a43e2db9823f0ca86628b77df193183182208c27a7c0347fb0cb324b615bae58ca9319038c4ac642428f4ab0f1bea557ca46f313256d849cb10e8da87942247"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 997d6d98405..28a3c085a2f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "75.0"; + version = "76.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "654ce2cccf5b123e25509f71f4526f42052b3cd6eb79694de47f94363af4ab2b98b60d73020bf45c11d5aee9d0b3e246f72a7795cdf770f34a34f8c097d3cb5b"; + sha512 = "d1bd187497c76c624e010ec50a43e68bd91cdfded37f85e02047acdb53027c79c8071632f1a31f35f0a2b52eacf94c905984f2edb7b83e0a74fb0a0565eb18a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "615b948a59066bf7503d66a3fd574fa6523f85765f7e7f84d3929a78ef82b4833be6e810eeb95e266e3609e943703e1c84a0f7a26a542fb5e8a8bb0fcf379065"; + sha512 = "bd9e45046cb566cd3fc94eec9d5587b0270417d68091da1b29eca40645b2aff4f081c2a5b0292a0e06da410a64fd1f617543bf0702852a6fe424680fdf3ec39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "070d250a2a22ae6b97efc618fb65fe93efe209b82aab53f9c13d20c3c8bf3fb9b84e209661d0322759a0dbed68e17c69ce6ef24a53d9dfd3186f1fd987e7c60c"; + sha512 = "d5df04a513a349291d629941e519617cdcdee1c004ec8bcc3c02bf02ad310dad2dc33878268d8a4a6b115b3b02bd558159a8eaddda48e83aca29f2a377225396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "36f7e51b0a1b7eb1c5df858cd0e90c301c162bb0413882dc3e64ed1240b4c81fde26eb0d9f7d813ce92c8bbae1e87a98e97d4a6360d765fb32ffdd84298f7f37"; + sha512 = "753550131ee986f7a770f95959a26b24b17e0a6a5f2e12ec1b7d42b31886e32b9c93a559b7824cd5348f34f1fe26901f5198fca57ab2c9f412ce032882cf7b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "693cc4eedc5ec9a058ecb618ef70b322bc55b5a6159f480b219807940061ec22c92843fd288252ef30341dc1e42d0ad63586f5b9f438011726dc5fe88ad6037e"; + sha512 = "8561ba0236a9524672c7ebacde935d4c3761fe2c5fc0125951d28f53c3d27388d48c108a6fa71064cbfa54cca57a72f6fb49b3b8314d28b875e250b218be4d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9d78aa451a95f5c26685b6065c93c77c7b3f14db6cbc57ceb0b868a30ce2a023d28063d4a14b5617f65c2ebcb6eab7d2ec6ba2eab0909e44ab3f25b2b69471df"; + sha512 = "53b7a939d02ccc0a809079070afd4db528a4cb617a4fbfaa58cca573450be764e3894caf3a40477903151f8116460dc574749f0edf9bfae6981616772b649703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6b898118e72cb2311d6230a2a151505c1927a35060bf703da6ce97a5d0735b06e56b163d5e5d4542931453923cf5e0afb9b527d2392e324a509da5185f2a2720"; + sha512 = "36658c05c6b7b1f64ffe14ded709dbc08f0236f99f9457964c15a36a4ebf8d73bf482ac2f8518927b2d66fc9a1ba19289db1855a6dbc7b9502c2a3c0137bd7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b9a12097e8312c099622c3f506c09507a9f3cb25e36f25967001c37f3840916f58c6693f272725ef3a35b22be916c3f4eea78b3bd0ea4a110647a0db53484cfd"; + sha512 = "890066ff182d6ce79cf0adf307a92a26ced29f633cbaaacd02eb5c1c3f0e2bc2de336a7b22fbb530ec85561d26dc44f93f2ce1f58843e1d87322badbdc92e8fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "b396e1e57c0e1cb7d554eb32ff4cd92db5458c5c232855bce42765aa2ab0d387ccd817f8a06624f84122f74dc1d5818992e9ca18138085a2f164ae3095485e14"; + sha512 = "c6f9bda8a95351d79ecfe1e138ace440aecee6c1dc5ad2d7c6d249e5277b75b27797cdcbfa1b8d3ec2a899974f555b8b20f7c38f03a7979ca917ab050feb6cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "3aa6fb9dc3300b38038873e5fb06e40f4e9adbf30aa6fc4f3cfa7ebc399bd94d3464081f304843e83d4478989874283a8ae1be5704d34f4e43b2a699aab31466"; + sha512 = "b15b1cd34dc4799836d67ce4ed8b166b54e21076313a2f726c7b872aeabbcc40a35c7f859cf78e0f17825fcad38b6d4dfaadf5d27ef89ebea8da0ce427492311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "baf9e2909320fa15c70fc4a37e4e15a89726079d49d2a7edb72dcc4908b59cd8a8ae4917c1f4338063f5b85b119dfdd9c8d0480d71dd4fc45cca77ce465a3170"; + sha512 = "fee05346fed30422b79af7c0626a7763f404f8a3a2617bddd17b95434060bd1c47b47409a0147c130b51d08d98de2232abe8fc7ade9bc58cc1eeccaf0987aee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "a3e16f4ef89e8ffa65981cee1ed53817dc2ed235f2f3f7b9ba035db92ccc58893b10f5719fa7c37a400bfb9da07309f788c142e36e5f7a91e286d7f0d9ec3092"; + sha512 = "beb5d44cabc7a80a0ceb4573e4e6fc2b554c6cc0ae38c9a5699d0d87d5f36aee892c4bee8ca1d103001b3305ef814f9a96a8fd63dc5b495363443f9abb4edc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a68a75844cf22ecccd407f0478bd38b3ed6f19cf8e6b32cef2c9e5e6d03eaa621b60be924a649c729b6cca3dbdeaf518f56676cb0bc295cb50ebb1038571e31b"; + sha512 = "1b8cc942602134a48e0d16a3244e97edafa133c74651ed4545f5e3eb515ad1881276cd2adc204e5c9cfd677dacec79030311483469174415199b9eb679729442"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5759039f87134d0a1653d8175c53a0aa8a71379cc4aad75831282956711e4fe485e62040c3325f24684e2d676fe4208ec4319aa959cb29c9682847b35906589d"; + sha512 = "2738e924257a81bb1ff956a6717e6ef4769e96f5940bb0fad58030e3d2ce65e84ecb2807e6e04ca820eeba61bd386c85716112535cc28d2bd3c9e7a364c734b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "dcb7a5c9b89c524e61f7a99a2926099cb7ba088c7fbce82f3e8450b00554efc587dd7c4b757b6567519f0ec928edf50fcfd438367c37b48a3bff7d1ef66b4d51"; + sha512 = "3d58acd8bafbd11307ca58894992fcf8325a5679585d5c5e09e397b941019a8a8f7bc9b63997bcad2722e8cbba88715b789683b0428632e4ec4b728a36b54099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e788954f6ce821cc68afe9428c02823870533164b36123d7f7a9bce7a4d82392606d397713e8cf28b5360dc5897ca35bd3ff6aaaafbabb7fe5106462e8f687f2"; + sha512 = "aa7aa1b06c1a28e30b532d41b4cf3bbae26c42a24a63afb1999f421577afac4e4591b465b3e659ed5c9278b2c5d2c4c449a84fcfa69b451804d2a0470524ab04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4a2da0b04a3f6cd6a5dff9c4d575d83b8ac195d815d4bc64e1bf59f5993c4b7e26fd56b81d7f0c5f6e5d084365b4d21477f7d554ab06a4f73400b8c484ad0fcc"; + sha512 = "48160d3a437dee94c1070e2742c6bde4a36811e8d2eae87d7c8450476b30b912bc9cbef8a5f7d917ad4be771eeede9d7fa9315e27b154f50049ce80f4911024d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6dd27ff5b7eab20c2548cb0dded8e677334b58040ee4e15a0d1095cafaa209bdde069d03b87ea7133899093375d425621bce7a9a3816f62aa603e20304be56af"; + sha512 = "fc4d0ddd9649dd555b4abd4d90f9d6cff8fe7e702bcf5d2931565c469842f51ee215286f68802304868848f043e54c8224358c8f4060435a4674401d19bd6989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "abff1c0ab591a1c2572e88c25c785f218bfb7b9d86c415f4390830f4d0e2ae97f9ba44d2f0a552356fcdc2d6ef9a238b6d00f1287132df60348728b63fa322bd"; + sha512 = "3cab1a498db5900b055a8bc6398e4dc9770657c41ba9bb6bf0f196566e9c535db99f02e5c51750e7c7185f2f0b1a26e84da51403775c33ef34915b43e3a8b27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9bfa5257fbefdc079f5d372d7feb3f52f52a33137367676e141a3aa57b5fde64a1e6d218a6cf9d81941a89fb3917edb5f1c4883796148fc63a32c55554538796"; + sha512 = "d099758283e38566a4d9db744590f42b5fd28de8e985c2f240096e158995da00711e97d6feb3979bac40a2ad57cf7876da37c4ba69f3467930415d87a2d10c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "5b6ff6a0b422bd399a5ac2893e187e4f46c6afc106aed7177d3f3a6a9f72c5cf283a589ec589625deed0ce4e3d7d1d45cd9d8a6c7015c48b7187edeb1c07b129"; + sha512 = "442e60f0d132d96c58364e0d5f70e43ade8e6508f5d0a76b3d7e5c61bed0bffa5f9bc2096c89879dcb1681bc394699e39d3c31f2d02fa790dd8e38f1b406154c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "03e20bb7811ba53b2ae3f051279c478b4a240ad9ce0381e9a15daa8d04f15b11446456b05c84f41c3f628e3c7166ab2d19b8074c77b7f3190795cc4219be9be6"; + sha512 = "8c0d31a9123d8d8baf94f73505233786f7fd2ce721f8792f4cc1db337a1659badf08393a22159dcb9d8256e43f24661c3975e6a1f801e30d21bc54083f4da041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7cbe8df35f61d82115ca1e4db4dd2e17cc96ba74cdf4e5e48aa4c1f5bdadf4e8b612b6ab58a09ce1352129ccfa68043ae92836b175fc5c328c3696f1f3426107"; + sha512 = "993e5410a946f802a47d8167c83e767fa9973754cfc1365e4cc2698a25524dc27c83f3b202990744dd654d68226c601ad9608ecc49d2c3952e50967e20ece34a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "933a872f25c6377abe21e33fe56a3184e605e299369cf11b84c0fcf420336f119abdc9568eb81b1e51bb58228616cab4c7171cfb8f8e40329bffb377a455c832"; + sha512 = "c2021ecd345cc45fd26ccd8a75ee66cd1eeb506a8e0f6b9811b4149b6bb15121edcdc9a0825703db52beea61f7249f45d23fa3822a9f47701adbc2e86c7ccaa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5da5004a2985fce3a6dff5461f2c0fe174d3ad58e3dd37c4535edcd0883fad6f5a449f9f898c5bde5de3aebd9911e87e82c99bd48a06e9d953e38666e3f8fdee"; + sha512 = "c397cdeebd4527189b898db2640c1a5b8b5bd4fc1664ef384662136232b5dc21f7033686d2624ec421542d1140f46cc95c8364d47e1c89a8653d541fab52e28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c2acae33bbf335d871ef14e27d197f4378e8ad1a94b9ba2df28497e4a72fd554a1d9428692cbd7cd5e3147f575d7517dbca07b3edb5eaa66c390000e7cbf5a7d"; + sha512 = "86940cd36df65d0515634c7abe6c7c81157a8bd3576acd9844784041c2239d25aa455da2fc33ba9b8cac0e5a840546dda0cc04765589dab0608ebe9b3cd53967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ce8ca7ce217bde7b42c9ce6d64874d37306754ccfd61f0b61c898e22f84feba6e30a33468b9766ad96f5ae8e6e674eab93881f36ded52f010216d8efa5f77907"; + sha512 = "9a1404626e2b9716567e0c1b0a7d681acfc47bd488fcc585172fb40c4d18dc1bdd4356244c74d042ad085e0300aff73ff7619d651658655bdf7d668f64e72a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fe32f01fcc01ccefaf7207fdc56da4450fd17928185382cd738d7a22425b5c3761ef60d0a9f7d35d314d0b7884859d614f08903eb20fb0a679f27dd1f4b136b2"; + sha512 = "870b2b135ffe3ece3ef4d16abc74d469421742bb32fe8b0add3a39dbd580aa07e251df4137f3a2950d6992cefcf0eaff162959ad5eeeb7e493c016769ad2751d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "fc1855e6c7bc19f181c7e87909a79e1a5d08ce1fd38f52d65e20331daec8af8b54c1bb7f90eb1c3e53c900f141ae264f55895f6fdd3690a83945a26707eec27d"; + sha512 = "d20a3c1cb0649406d9cfcc22bffb4dacdee124b68c210ff25b1316be76a1ec26b7b9f21ee8d208cb7a6f1f733ae71b70af3fe084b92640cce03989f4d45cc375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a285ac60590113e41f04a85183038ad02f0d7e24fb42fe1a7b313eb6d3fb5b747ac5f90364278f7c8cc3f35d0ddc86c0bfbc7f7fa7ed2adc56ef6c77c5b25ad8"; + sha512 = "fcc4a18ab042f31153e1f5a4d090c920e687687ae8be4259394a771c839e8af167efdf9b0a3cd8ae80f15e70300d24ca894ec1381bd91738b7a5c1160dcf8eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "84ee3198ca0cd8a3b20f4c696f6c08b94d35f9346e4443e1d6d6ef447d94a20fa1d58488a12124440290c4ae00ae827ee59c0cbdb7905210bdfca0c012f7e01c"; + sha512 = "7ce0bce00836d4497a440f3c66421cbab38f5b856a8b0e3dea13b88c167b689a061be7261d9daed1ddebd23f21eb806fbe72c7cf08a2f49c31ea1486287404b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "f3b615fc63b12ade11fad5b5532d81741147156ae84d08b1bc3c0f43f2c204993601e1bb363ce7e3ed7ed3a5d790428ca51e3cb5decf56f159bf7a25e2e43a83"; + sha512 = "41c0639955bb82c8042e0cd9e76c6c6b30c5baf8f94206f1932e8a56cbc21a2de53fc9b31b6dec656822e215d11259a7b2dc158e58d1edce48dbe41f2cda4098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b629b55fe05c53ef814b091ff5222704afb3802630a5f44047bcaa17f8140c834725eff9e51786e55336910c462ac07b956878b551a5a48190b1ccd2904e57dd"; + sha512 = "540f26080c0b85b71e40bb0eb5acd92d8b71cd9ad8dbe72121225afc2b9821519ed6a2d2bc58cc77b445c3fa42ac6e39647c1da8c8a8935617995dcb0376b9d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1794f58a31e91916492319091437ad9e5bbed95b3925854f744e6e635e9fb4c06abe73f9fed429fd04027c12cc29b63363e60a0c099640226a5a626a428b3002"; + sha512 = "ccf845aec06d7274acc7a850702e2dbfe69db8198a44537f7f0eef6b65bdf0cb71682b2a443f0e6a5e8ff310922bd29c39229813cd12ba54f70c0fa3418ff23a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3aa9f95eeeadd81d0ecfa93b1df9b1b455425f430968395bfe65e60a65c6aed3d9316f842673c2638acffedfbf1d93940086f6b7a113496c7d8e580aecd8f25d"; + sha512 = "5eca2e853a3458f5adf0a960cc7ec4f21db344e67e7e419ca19d34b807809bd0c954ae4011b5ee73b02d9ef88686ac57f2a0d1d3af43e6a4def2031b698cd656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "43bb9830e38dddcc59480a7e162214e37ca3516cfa0d773c4851ec60f098837ea2849917eb460ae7e388612619b13cf29d26d9b1908a8734b6fde1add36c65bc"; + sha512 = "4ceee43db5cbd6ef5b18442cba0c7c74998129280e14b20ad41de041b3053b518fe77767a7aed9c62fa2467b2d6ac36a680e276d79edbc959313b260950f7c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8cf151995af5ebfaf9f713dc7373b9ff3d12ce582c4fd062741eb99e291aec68fe636d871709ee0a0bd628af0e9f1a412a12289c539334783c7a5d6b6b0d4822"; + sha512 = "9a5115acf49a15e10a530041029081eff7bd7a6877dac1331391d5321533083162be0dbc5dcede2bb708d8a54d47af3773c89e498d8c7d99c28f7229747c0721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "da133c0af8546ab62c335faded8b35f917af2cc7fafac8cd22db1e3a867b390de60a2bc15adc7687044702907a675eee42b049cde335d41a55894537dd137fd0"; + sha512 = "435de08a8d536491b645d630e81bd9190b61e0073c3b170977a995f9599b0ebd0fe4a18279f0ef40ca242e854fd43ea36dab41a86a73c515a691b621f8b74ae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a1f6063560d70f81cab8d40f1f0e28ea866f284ec94a0093fe874c96795ad3e823c202e82dee2de7578f3ffc1231ac0e8bdcc1a21c44107cb1d4ab56cb56effe"; + sha512 = "e4e4d05239306cbc0f91cf6d1eb890af45c40fff8ac53fa47c6dde6dbaa583d31b6e5e51bfac91d2fddba9f89e51125235b11f766ebc39ec5e55da65e1ba732d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "60123058d668641a6c48a7a6a4247337515493267b3489a16e9f7fa2d0ab1ed8a5382974705a156fc041501560b8f6a2be3a97b47ebfdb5f6f527e63ac5acbcd"; + sha512 = "727b7db843fc1722cb5d837e02388170d06f8c6ef42aba22dde9e237808e5404820c8b14dd43ec5cf2ddfcdf4883bd678d5c9aeb2845e428c096382d8a805afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7693bad7f6505cfd1718e8268611133d26826adc49003eeb6d30bf38ddc1908c39ec270b80e20463c016e4b367ea8035dc8c9707b410299581e1b09df7a08df0"; + sha512 = "c151a281f8aaaf82a0021c20af2d12332674b27f2e5ac9c0ffea070c5c350f96de978a1662b5886f1d3b1d514061747f247ae3ebbd965e3ce940a2494c164243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f5b58f3507852cb2d900d1398c934bb8de725b3578d1037d424f5b81d7cf2e0a247e6be50037e027649dece8cae55c579f81205259c93f22eefb2d67af8b0d57"; + sha512 = "5048f072162e3b2cbfbcc24885aec83599a7c47bad212fbae741fa15b903014a9e29b362f1492b42341498398b009e5d929de0801a22b4333093f9057c47b42c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6504e82cb541bcc9a893c5adcc063a8de3b85e68329d3e5dee0a461a0c614b330d7b59b6f3fa0195a01d69ee011017bdf999f95fbb19ad25136b291feef1ccb3"; + sha512 = "ebd9c280598ebec64a230f6711d4d7839feb005d790c0660fe789e129a1acba78e170686eff21e0bad558dc7e9b0dc98a9139b7fff2426d9050ec0b3ed3e815b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "6d0828ce7c721aecdc66a1df441cd7ad43a1e96487797a414a5a9843bbee6edc1ad2aa23d82edac7b2bb1264a0880b1852bf2cbab184ac1f5f91da99fb4bb06d"; + sha512 = "197ea2000df14ad17191e2e7eaf54bf7bd1df21fbd25c0e18b200d2c43686c4e256be329f57254422a8e156917ea3bf312a38e332b72596b5b93b97f61319be2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a252051af8e299e6b21e9d601e54cbb0413d73eebce693403b522354cb0b6ceb240ef70b50c99ab55379d2a99a0f268483e2b0a02da3f9684a5b7a958b732cd1"; + sha512 = "ce3b86d39f27f1a5f2287cb88bb45be0b70ca8adf7e814e3fd5191fd41ab7e33c427d8ee0d4f5c7c5b279e2079e318239aa3485771bd2f211c9f1ae2e654fc5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aca7eb55987d98d69f024ac41414fc9394c8f05949bde1880d191c3b09bdea4798baedb4a92119faf923e5a36c760360d87ecfadc771a57f6425302483b6dd08"; + sha512 = "022053cf588d2f7aebb564342068d4bf3763dde50f3bbcf433dd2d7e5d90ecb134f9302b44f5bdcc84f56e74c7c965555e931ac7b6d85ce58dafe838026a91b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e23d26cd4f7cd40610ca841fd2b8be72f199eb2102560002c419fb6f00b1f2fffcf5fad6fd06c6e7a0146d2b7525c006e6dc696271f4bd4f5bb3bcefb8980e9a"; + sha512 = "bd57679165653b1557569d20eaa3ca83011e5704b76e3f29730e91d2c7a5fb553ab3563a1f26d38100ff8330d7efbbd133e959c4ae5c534da2e0888dac12ca5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f8ecfe334dbcf6598cc2241c56d6496ccf0755494d11c26e2624803d3f1a6001944d8c9b78c62bd8bdac85fc3d1e60b90212b8bd8b2842e0faf6824a1651a31d"; + sha512 = "72a391de2d665db794e5624f341245a85a85c45d8d2f3c71bcf526b273bbf1a06cdfca5e9d45ec05627570ee496e0899fd7756066f6f40a86df088c4e5025ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9ce50d9746bcf6384627a83538a0e023091b7f264c6364e88de2bd8ebed0e081e1d31681ae0679d2a88f462bf9e04d7e9cd07826822cff3db1a1d338816875ac"; + sha512 = "8707e9ea8665b0f2f773c98b7c457c00c99528676afaebd56570fea1460b11ac016ca257f10397e447581a3a8966db671bf33634255c015104c8435c067fbce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9284d8657a4097696523cc07217908449102f46dba9564f98b2e4889707082be4cf285f889f650ceaa92e06f564daa19691dfcfe95b0b4a865987b767665b837"; + sha512 = "10d74b74ca47e406919ac9589937ecadc55b637678f895d6bb3700aa072c261416591378845fcc2f032755da08a4e996c726fa1694b18883feb9fb90a36ab71e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "68bfe86b27d5d5d71121735a627e29964b2c3dd70e33e12f8ce3a9d380d253c33bede8d33eb7f0185acc68deb388b731ae6b40c7d71ac49c6fb5ee60e44e787c"; + sha512 = "9d7d45b0e1ef893145bce37a137e648b6292febbb08e66a0f0e8b6e9765e19ed3e864483c3892d327f3c75a4f73592a5cb2957ff6c17b20d19bf18179df5b083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b784f5fcc063c98481ee3eae767eb3df60c9ba4464fbb612cd10bbdf1abf54f5b2098700345f2494358de1ced339f1fade979ab6603f036e4a2f76b25c46a33e"; + sha512 = "22730ebd0eec5fe1c9f993c8964c81b31d2bce1b1b7ba901c3a7911d9544659e459fdd19024bb551169d17c9430e15a92c039969379da28a49db2f0b04d799c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ac26df50c827efe7fecac013ae417a4b68d2a49062ec9fd443f5ff6d47646333ccbf6a98e92e0c8c2d5aa293b170336752c92d33999e41e3ed163292a6bf3d0b"; + sha512 = "e7455deffe566f95239e6b1b6eb5a4b20d849ff9f0fa26518d993581b5e76975e41a5bdb54f69be7ff182437ceca868779b67c6a6c118155569dd8792793979e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "47e516fc9fbba8e5b57fa3172df29fccf8d318fe1431233c2d70c5c657d40f2a8af1b20daf5e3d6b3978ee093b1d100dbf7ef8838385791b58ce5463d6899946"; + sha512 = "56e36532e5babf3682edf5f278b971897cbd4854b0864dde5aedffa6a7828048557dee5992f9eabdfdb67c2054abc0dc2e5d0df8ec5882b07d8b266183177e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ae0baee8e59fc4d44ebf57d7f708d3f30126989e4bd32309d8daa4478facfa4a929a96972acfb248eab0a1e04597b2dd521a4fee40f748fb0a4f6108220464de"; + sha512 = "6d1ef5fb7b555d667bc1ced25b7ef49f8832b9c077b113db79ff8509d845d693af33bcccf4039805fc0c69293139a22f24ea3294706097ebde859cd0f9aae8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c0c37e1b36408b0d8a4d34fbba254a6d6b37c80287ddc4abce88a623ba3fd5b92108509bee27bbee500abfc08d364886ce8ed5b816b9450aacd127aeba39df94"; + sha512 = "04626f922214d666f1da224b2ba52960f1697ff76a0b40f92718c536eb07de6b319700566a9c3d702e50b137d54b7a75af474bdf56d39bf80165b8430b636944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8867aa119becc3e88c63096c5ebfb2bea3a396cbbbc18f35725d5983df098543827bf6c069292322507b871263f744ffb411a59437687780a9dcafd276d04410"; + sha512 = "e83f42c7c24b5a0536510ee736114d8e8ab6c6393ce63ca9e2f9d0e0216831b192781d0617e9793c6a8b687429275eafa6f84a8839900858412abff751256a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c10c9dbcbd911c3ce324aef23629f37df959797128fcea7373f3d77fb8b3d538850aed797e754bd15edf59e666412158bcee2c1a9ce8d040d1b457de9ee007f1"; + sha512 = "524261eaf2fd311f92d85df46459bba17b06ca4e1a61a14453c9edbf37c31b1de2d781d466812c250353546bbde2044c79626840297c76a3986fc6ef869db863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "58517b58ac3c51c5aa2fddc0b5a458d100d3eec44e51c6d188a85c2e7538caf37cabb1440f4ebdc97d54d3677697a5fe07235d67ddc5c4287bcef10f9b7dc3bc"; + sha512 = "f9c0665c4f4fa6f4a8f0fcc02b92c88d0c9eefcc7b018dd54c605c6b0f024282e25645ddf14cb2bc82827f7c4c8191a83c38d4d749af45db07bb81df99ec6d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9e07357febaa5b67eafa435d30a2a8f75f2ad25d1e87968cf71b8a265a647ea0020169d6f2cd77c4779dff905774664f84ad26fbcc8b9d4c986dfad52000e175"; + sha512 = "b89f91a5223a2431ea272115b18fba29491d60ab5e0a69af4a1152644596b477876a7c8109ba08c5210b782ad11ddd2b65c775a4fe8cba1126b21cf31e31d1e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "249c45bf3f1b22e355bcfb4f5afa829163d8d1d72a8f192111eff2158b10585152c9c2dcb2fbc9ce66d8351d83d83236a04b42da4607fad92d2b4e25acdd39a4"; + sha512 = "f10771c9b2f8634259b7252488e4fd3f9b249b33ab59ce9a02c77d0c4cdc5c567222a91271d4cf3949decd86602613e9fcf9e5e8a403f91255ad8a69bf2351dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b5860b41a310cddc4dc81074f01deffdbd10ec3f682aaf3d27881f8c190cf5ba39c428b7bae688301f8fb40ca12b3cfdd9377501a3e750ce8995e1331fc015ed"; + sha512 = "49bf1846a330c4d43d554f048bc1c5061c1059d62c57ffa224d19b3b4b2fdc806be73e6bea8409763be182b37ab6a1243652c62f5f3e48a36c3443f509a06c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a1b88f527ce9e4d9f69d4b727313a68432db2d989d360fe5716f896d61e7dc098667720a2c60e33612b43157566f95abe6f1b149f7aa507a9738753e6c3213bd"; + sha512 = "018622ef6cec81de014191bf94f88aa1a7ce732324f70a1524e3866e5500ee93dc6ac48dff4603b2f86b909301ebd2440ab87bf976cf041f6f8ecc4bc7da25fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "74efc375475884fb9bfa9fa4d944dde0f6c734d1c73676d37b80a909618773147f12faa94ed6570a6aab6652c4c5c32cf386ac096acc025ba6c8440d8d345026"; + sha512 = "24685648158e9da5e74bba611884c3d260e7bad4eb3b6b2e70cf57f15d505b87a7886868e88bfaf440f03f37f7da04fb6fcaa5947ac6ecb62a987b24e0be5759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c1d4eafece0ba52022c96fd939651ad047e942fd9128dd8c6bada79f2d0eba01311b4829c805eafbbcc53ec4dee34d14e015742a86ec67de07d84d6950fff41e"; + sha512 = "4fd040d08c704cbcade0a290020d591fc265bcbf63467f93c58603a3f96af06cb3b38d03aae5a32b4b78fe2c4f89ef81112a69bf539fa052b721f549423b42d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "a97b467bd40e1564973b18ad6acb10412da67184daaad25c34b84ec2a8f3a840f01fe4b9720f4774a546a7e035338d9ce297eeb882a3df2b50f6a9cffa2bee13"; + sha512 = "0708208411de209aad6a692dc1b867011d589f2fe1e60dbb5c8448f96735d811aca6a444f7a3ae2d93a2953965b57a728e3af1b2a31ff8c86d1941a21ac2147a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2d84393b851618e1742616ab6f3b1fb21b7f00cd65a98438cf3a1250275b7b184f6eb0cdb1d1425293d1ecbcf4591fba392283596146a5b18f29166111cd8844"; + sha512 = "2c6df617fe9e4c3ba1940aa86e313fa4a5e64db98f4df9abdcef2a5e7832e8586e939646e435c9725e5b97ec80da0f987b620a78faaf445c374a46cdda862f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c5782ddf73e00481ed338ccc989b2c2760f15e2b2960457cd3cf6403d6d3ad5d1b5d34cc6194b3a1ddc83df8d376796802d4e945b8ab47b7b7e1a4d5a4387a6e"; + sha512 = "5f02a673edacd9e9e9171c7324b3b45974bc5374fc5a05835a450b6aad1219dc76ee50dd4084243523fc3e10e7b65a51f33e33009f4393f790a9a8430442d87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cd3a3fde21ab21e08467ebbb45d0a2d32cb901c2b6807edd6298eb75bc089684f9fd26c0741295f2ea82c2e25cb375bcd1e45e26c267c59d12d285a00f0d0b74"; + sha512 = "cf24d386d8ad5a927e86929d053eebaf03be667bee4a4d0a85a76b6030e85f254b8e9b14091cb17ce3082890affa2c75ae2c1c0da8e007fed5189c9c2fb3b95a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "546e36c717f8a0c216c32f53cb56d2fb709702052bd52ac1184860c7cd755f9f0d657b8955c3f6347c37d382600ff9cf5add261dd066e8881e6a3e410fea151d"; + sha512 = "1a8f07e70425bc65552fa82a16eb4009e036de60a6b84aacf7a4d47c2763b00b116f61fb87aa2a5dc28d2e09a82dc3621470b5589b3fba449e2eadf2996686aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "837bde42f6b9c1aaca794be4fcf819fcee3e3456a883743882ed6983e71f98ba25e02292bb01811958a9f21cedac55586deb8066f52939971c348e21ef5ab75d"; + sha512 = "ba8dcd5ad68f8506d4c637be831365fe230209ef58640da8bfec20cde9447daab678229e0a82931c022aa0c6fecdd0e405e92a4bfd51d7627235b689aa78c555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "81a2620aee0f210782aba431e7e9e15ab2a0db49489aa61cf7a6af5944e59c62f38b65aafb198355d5d49aa5c52e1052ba60c03b1772916a972ed06aad616f25"; + sha512 = "fa1f67341221a907f24ce2953fd75a0003c04540a7673173fdc333081c82c24e68c0fcaa85e10264435a9540e356e94f0b4d5b38d892821bd307530ee10f9b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c6b317d17a14c5d5d428410f7e86c7b9089442bcbefdf1a44875373390d649b2f7eff26c09c5cb32fd2f8f42293d289044a7007dae4b075bb1fc522b63f4b18a"; + sha512 = "c282b71b30ee4f2f67d98551eaeb1700d2867e8ae1f19dad417f8774b8a91db63ecc14c37712910b7476e837c4c23f4871a20d2afe37f61ba4ba0ca4b1684569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "12e6c10fcc9419a66aef11e50969fc6adc7084db46d2cc6202a08e1a7225b797fdcdebbfb9dff6a441e3fcc782cb33753361ef37767e5ccff35af2efefd82256"; + sha512 = "70cd918ccbeade126f36dee76600f7c6e78ec3291a12e6d60f684dbf5fba322bb7ab847cda9f101af5b48d9b0374573e8f6295dd8683ff3acf9a89512117d054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c03df00b865bec9765d28bf0171a5eb6a57e3c8cd64a9002f17bf67d4d0c118414d6b25a782aa3eaca50d5997203c40e376562f64a252aac4b26fd8419872feb"; + sha512 = "acf9a4914255bdde374ecdd77b39190c945621c51ab13b2d9e1e8b1655df593c6c7e174113d89e8b1afd223e6a0f63560ef4d991706d5f23db35a939ddf793da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "418b70ec07a966a51c101e9ae341b0c949476452b75ed00677ee87b032d592fef65e6ce746004deb0d89b94cf9e2d18ffaf1d388026bb5024dff0994dc2fb058"; + sha512 = "9457048e428958b55ae221471cfb2874ca16ea9c1e34a33d538b9964e6ed77711283207106814f6d18ab73f8c690e6c20b2c84d361242b228cc92c7ddb675a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5adc26e616a8116fcd5b9579acccbb402fc5c88ac334cbbaca2da48e246c7e44868b6454c75bea355f5cbf6a182346efeb50f7a49b2c3f92c8fa988d50e19e52"; + sha512 = "897b488d3ba0592b902f2cdc4eeb2f454b9b6f67fb5e4c583f5f49fb062483ce1d30e64f6273894c698406f8be7dd8a2af02a67e8d9bf47f8d30a572fb18e7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d173c26b5ba44a98070fff9996efc5a35a3ad90de128c5345a996c83d4a68ca7d09e588bd75530c31abedd9f20f38561e22484a45e20fdf66f1cce682dfbc31a"; + sha512 = "2847545533829f45c22b85368c5fe262e2a43cef0e5d480a540ca47f0dacc8003b8e155b11098944c7012b03feb8ddca216649f645c46da0975183f42580e285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "1b16278f2f6e4df7cd437a7bb6a17b950540dfed646e948585cf0bdeba45630b4d5bdfc249d4fb49bf37dcde8a415053ef4ac3384c2534592ba189264bcf4e0b"; + sha512 = "9b0223b409774a62216c97e522696700dd95b65e1755d889d58137602fe4302d8f5280464636d94c97cfdde8c56e49492005e487730b591d19bc947271754e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7e9c5c578d9669f47f3871a4d47e211d2ec9215633163605239603c0fc51cce1d1d4b5c3c5a06a9c29c16f82c3ff2583fef1b78652c8afbf093557375e912430"; + sha512 = "097ff1df64b7ef62eee3a29672447c42c46dc23741ebe87365c4d41159052ba3560f7a10956dbae6b67daaf80607600d2241dd997573b8ef8c54fa94f064e629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "09dd8df3e07b2bcc59e77c55ff4f9b607c5c2cd343d784a3bfe172cc09fe0fa31ea519bdf671206a16ae73fa9550f08b77cfda0e030dac455de4be16750ce431"; + sha512 = "8a76a933f261708504fb637a93bf4d600514558f08832ceae8db23a404e5d911ef23803436e5513a4b7e4cb85f536e64c5ed801457ad2e1f9c559dfd1f8be807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5a4dc12d716185ea86a8f31018198dc4eae0f791b04a247d2f2807d88747fd52fa39904bcd440c9da2e0225e64445c20da7cd7df75198c173a39aba59326e613"; + sha512 = "bf7d631608e91989a8cb63cc07b8e253cc2c764e9f712eb113c7b735bbe2da04ddcc91d43fc418eb208a75f4027256cfb10d15c21e82b7e3eea096ce6fce9a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7082fcd2db01626e90e6850230b0a2b51c0eb394d47604a76de5d03e30997366f7331a7247e7610dbddb16f50c2a3259a842be248614fd3725f0063138e18d49"; + sha512 = "cfec4b5942c193b37e881569de1d40907d44b7ffdd6a08fdc3dc44ad27151427de0e368a08e4888d9248e07fda8de54f1b7d1eb3e106f0cb41c7fa1a8e4acb10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a85ff07912d369b915d543f9d06cf383a180bd14fd9355fce6d918506d8191da6f89c32fade5a9146700a95dbaa4a181fb513df1b8f28aeb7a09641baeece0ec"; + sha512 = "8f487289fff43075239d79d1d4b8b0e9e7a645a8dca26eff58ec32e534a870b5b67232ea6d43dc58b1b4bae9be8af65793f185e4b5747d9c374fe7802b92c9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "5313549c22fba2a3bad6550a000e59c15595dc0bd684a14ba025fe2c4de9097a1dd47566b8f256f569b74a21d20538ae89182d5278af01c674f50e00d49c873a"; + sha512 = "a3ed83d4c34fe6d24c2d33c490d6d2de6fe56382bb87807f530bef967c25bfb9a00a1958ca13f2936357e3f1d75b029dd2bb89a13171574bc022f7da8b4f49f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3f2b038b17553c962d2d964d342bb0884dc4acb4204fddfa90f8ed3dceba1aac40d537745aa32629402a7077a97cb01efd1225009ccef5412e14fd08d2aefeee"; + sha512 = "54c9f36ff4f00f1bfa3f947930988ce6985bf4e2682613a8368ab60d07abd02d3171cd2457987b2bcdd7d0929003580af9e4683b7e0f529b1ff3661004aafff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "1bd4ac5a59a06a71fc5bdf976e76da9535d0adb74da0aad922ce5ff6101bc48a7e6727c3f2d37161e1ae48be2ec47c2b7f6cb614a883739a8fa843fc5a5602b4"; + sha512 = "6dd5f5908e9ca66b7ab9e132dd6db3c5c2ea2e28eb9de211ceb6d2736746fcd50408cd327f098ffe1beb57199af6b60827bc11614c4c781d109ff315ccf9d7c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "817d6e54c256d72469f5e1c6f6ffd8d95669193c3506a36d9cf06756847e074be018ad6dac9ff8e91c7720cc70811df2768124e4df85f34f2963a6a64e9f7d26"; + sha512 = "0222ab139a87a195fcc4489a2d2b1024e95b4b76d4ffd8c63408ab3f4c9ea0e4be019a57e31ef3eee3216fb0217c01cd92cbab9ea33b2d7f0a4660326dd0b8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "f3d691e6f04658aa09b4f864f0adabc9c8dd6a2fc135065126ef124f025a5ce6768ac9792470d60fb436f8d21229a92e1acb6abc848b3b84a2026179c15ae1cd"; + sha512 = "a50634af2bb7d9cdd8ae8fd268b2bd5f24bbe68e7bfcb810e51921a56db7f831e84e73f93001a12f83a269a27df956df03e70aaf6231925b08399bc54aa71de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "679b75df8c1d2d84a7cf9950a65869484cdd20b0a1c016007280d08782c2ae2ef393bc553fa5c3c85177bbf922e62158fd57bab43b222327048753934aff5bfa"; + sha512 = "9e32876027449c3b145cf7088b5b9bf7d941d3086f6d1da1dd13f3f06138b1c7c375dd7561d9342dd7a1aad1adae6da3a2f354927be1318eb79703753dbb0d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e4408eb34923ec1f668b7313ade263d1cdfacf1a748b32a6aa54c3c38886c8e1ea750179b0fb6dd41dc92fb419c9307aa2f32a7acce7248e460fe136af7f175b"; + sha512 = "f4331e2c47373a612083697f4a693d7c05edda3f08518642617aa274e735f7a64ac49f28a0c1681addfe488107367377757b12dedae49a14a4752ca726d0fe02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "30a9c63cab66e47ba4b7f8bad3b798e720d3668f44f230581c564e8887b6674d2df90b8534a1d9b28684b07f1b928585a4c4b46edf1e740e3541b60b5607758c"; + sha512 = "ba7a39e9f8537bb5fff9253d01b3fb2a0c815c3d93fda024d1da6dffcaf313e7c75068c302887355b0e1b498157917be5f290fe81a2c30f8303c33ae2f23d9fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dea4cc3161f0d1a79f91b8eaa426a6fd8ee045d843261e7a2191bbe7addc9fa131b2d9455925381957f90e91145711be13fdc3957ec4bd8fddb8252b6f8bba3e"; + sha512 = "4382a78302dac11f2ec626627c65c528d756364b8332c0124cbfd45ce9ae226d4b42eddf723e306a1b1e0b7bb3fe70c9efd3019f91993ac2e140492900fc0ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d1fa435a17e23f3228a767733e54d24ba000599822fdb507d3a6dc35d92485bb87a3a398c12750080f79ea7e81dcf74dc73cc1747f923c0015f4875bdf3e75c3"; + sha512 = "b23a1f3b7fa906fd6dc25638d8cafdf3adfe63346fdcdcf878b9f0f98c8803631fa608fd75086aa7808fa0d4730ea7a89998e2d695b2d1f140a178f14294d318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5e236fd89a0c099da13c65c00526e93d152258049f9b7c8ff0387ce0ed6b843504163ef82cc205b01e0a0f265602b2d6ca64aa04c811cc0a6e94d1a8dc952e9b"; + sha512 = "b73405a8872f079f5f69cbd9fd69aa60e614a0e22f1f933be9a8a9e7312fca362549f57af17629548694e92679c763786978fb572faf4f9f6cb72d64b2661d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5b6b876f3dc8c2bd22ebb183cd4ee16a9157e14d93951e840d14a11a4067f85975c72873b82e49d797f7e67c00df6898e423a70360558838e8a18d95377af4ce"; + sha512 = "0069f82c583d88e9630fcb70c481969ada68a7ce919c4f5ab12ee442ca77f69d15179a46e5f2e7850a6686bcd6cd896f2e03163ddaa7e88affe6d62856d1fde6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "33ab7bae767308f01bb5d0a5bf7ad73fee8eec71d8393246b704702b81b46240cdbf02c041753e1910bd8171e36f380c77a21afa2f71926f25dcadcb2d6c2b2b"; + sha512 = "1e81c77813d8f489ca2d2d75dcf74ef1085ddb367df885c2d25cc7051d759f26685da89860f67920a49ae4331762be74fbd2293bc2a6e0549187ed8fde643d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "83842f5ca120205597b6eaa5f03e2f1d720a91cf3323fd44723c79c9aa3bb73e2c31054665fb32300f6ce707363a32d5d34859d7407015d3b4456c831b290ecc"; + sha512 = "a753254f0e302af7aea86499c1b03cec34a83691eff48231840a20c0afff1c595fab893d804b83aa0964eb5e570185102a701d31c668764d58c4715b3d0feeea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2d53551b4918ce86842645492072db26fdc50fd4eaa4edffaecf04fbd83bc597c469a5d795c62aaffba4abfd3d130752d96739fdeeb82970c35826d005af16cd"; + sha512 = "e1fa38d89cdc7d7c9a01f8de5ee19316b1ddbdce1f4f868e8ce1bbbf22e68b8f741246a5ba4f2a4e67c959b9575c73acd7b88e918e3be5fa285dc5ed42e9af61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1e42d930aa9903adf8385b695bd1a3aa051d51ad494d1dffc5d2bc04ba95574472daba608c182332195d7d60069b045f2a5c5762b7505e14ed7a639086fef264"; + sha512 = "10270f9783b09b09fd7f43b8f3c4196d332644820796b097ca219819e81bd5fe23ffcd4df988d3f2f3d59fd005e38feece57b7dedb84a78aac6af7965e73421c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "d52c316d21089535252ca626b6774b65e5994a62732203200a39605d7a5bace9c681d1f120e1425936be212a9ac871c24f739dd7d91c0f371029083e3d3afde8"; + sha512 = "1df6b8b479fe391bd128cd9b175ddc233b19b61b3f538ee75ba7728a4b59e4cf1ec09bd9576f82df66e89048b62ebd9cd2206038a0387492cf7b1994c36d84b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "121c1e51d5b58f9ac912d0737c23ec34471a4c8fe99287606a350e70890edf23b28c9c145d8aa0d29d567753d047d484a0156c1f004228682a347145c1bd85af"; + sha512 = "81305694cb1601b45d09aedb7bf6c0ecdda500c95209abaa00feb2cd2aaa1f5d86f5bb18933f00cbb5a6b676710db4e96495b17141cc62dea06c26483d90976f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f7c3039db50db23a43575e5ecda63643214731703179a42007b2ae44ea20649dc9629bce1f9738f35a882841666b1c3a0ff4bcfc38ed0e5005bb2b6b058b44a5"; + sha512 = "13e5c72791ccc0ee12844d8a9ffdb5ac60a2a9d79bb3f25818f4f1b3b606137b5eb3c8911f81d654028cef48a00d9cf10841465c7fe0304000357c62d964ec44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d9853f385468a9644684f3accd7572f081395071ab62b4bb8adaebc9213cb8bad8772ba613a404f9a2f0e75469a6d224264ce5d00ea97fe2f16f8d0a044b3104"; + sha512 = "06a1ba2fc944a15375029ff12ed9f566ccf6a795ea8e63743be8084c7e11004d72693c65b8a330cf945a530fde5298c69c83a0f549edca8fa50d85a904ee744f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "1bff545fa7dfc083f07c8546b5d2c18d1bab3ce4844fb1bb667d151c081c639b3fdbc2122e45230ab45bd5251364b45d937d24a7b285b69139f4dc544e525c7f"; + sha512 = "4b4c8871d5da372ddd15ac410ecfae08385a74b68e142b64e4e463d58b1e60583025f3855375b5adffb8a218839f86cf538a96dd285dabde96f8695af2ed1a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cd724a5c402333792e5d739ba274c87cef983d3c29f6371cc1788a6b285031c5150b21cab235b603b240da3551c044abbc283f8313c8dd8b0082677b65406fd8"; + sha512 = "e33d927f88d4e0a67b28f27ed32696cadba6241fd3bb48800e68248173bcd7085adfd3dd3700c8d4ddf5be3df93403e20e9c0d57db9ff5d6a141ed58b74c26b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47770c4421d2ec0035b0b3c6158462042f792f4ac87887c6704be2f3d34c8409c3e0570c6827f87e72c4697f89e5f0e0c574b9e90704798e9fbeb80c20968aa8"; + sha512 = "680587ff748248a665751f004b02d0b0d4e28f90f672141961d47cff6239823431b863e8ba702cad8f43fa70b295ad69b47954d2abe2fcec423e68f704fddc6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "9d23f45405e98eb5d6534d19e09237f7488cd9a6310acf85935c0f40132a91ba2f355a15a46742796d1f397d65e4f17d599aa81ccba57f2acb76da80c2d95af1"; + sha512 = "3f740ce2af373a3154372796edc4e85f8bf87b83cf4895328dcdb357aa4214e7711cdacbed596c4d7a1ce1ccc16bfba32fdf2d38749f3144faf747d05e76e208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "4f27d129114a4db3f597fc253447c6f27bcfb566fb197dc4dc26a984f1abbd868242b1c0d077e6d514efe1e2e083378304ff490eaba26f669ccfb5a744d3899d"; + sha512 = "ea9b71eee4f6e967753acf4e9f0a4014eeadadc6d1bcc5fad11a5975b778f92cade729338636d86a783ca08b0363942d7d9b7e4ad65fc3186760189ead9bf0ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "522852f4ced9302068b6251a33735846cbec73bbbe9ab0371e8456d3665bcddfc81bc4c258ecf4f0e5bc8f6f15ed27d3e4f88ffe471e9e8af4beeae85aabc949"; + sha512 = "bab4ceb14749b67877a99b96f47aa7a9d6d65281e78fc416d3bc3e5296ba2133d7548ccfd4ab32637c976d178fc911f55b6acc60dc6658b4193e1c6146bb641d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1192630fffc7bbc3232c8328e066f8392f967da5a2254ba726243ed7a681c321747a39397dec8b11c5ddc4d725445712ffbb238677856b2ad2ddea41c8db090f"; + sha512 = "e33adfe91886dc66f09cce26dc33ea26cdf432915674541a8fbde09cb41d2b14c0ebb3c41683cb1c29908dd652c83c92bacea3b8cab9bb3e8d9d6010a19f9646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3a327e31faf8eae17c60f7787bd53249957e5177d38ac2138cade1454ec4bd870c429215f1e0a5b9cd124aa660cf4d77a091ee579d865470c5cdae0703086b02"; + sha512 = "1c5b5d518914fb69b6a978fbb8530589c0aa117da1f2f7398696fe29c6177f0ee932f88bfabeab049bdc80d6e457835a492853ee9095b10f12b68172004a2b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "297291ed06c290fbd9ad6172afb790e8f8a619ff0330337f5e777d1e4ef17ef52ff1cb94b2966161639a28221dbc9ce2eb28bd9ad14029ebcb878f79053386f0"; + sha512 = "90d385bf3faaea5ec6884c4042a72e6a23c68f1454309bc933670d0fed7a5aac2210ab4c6b23755d883fed385ae0f11639a932c2540687b219aa009067a3ab89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7dec33f42715250c9a765c7f3f4f177101c69f7150661fc844c4742434a8d063fe1bc9149adf81c2729e848584fd6f68d1cd3d697159a1d5b4ed46d8dd9ae9ed"; + sha512 = "7fbc20a9cef66a6760fa314f2d074d2c597b420fee45fbc8c61a85f963130564e18d47a97833299283faf5c959d12f70e4f99089dabcbc3d83f3bfbefaec0f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b5d8c78df21e8f8f1d96ddb042dcbae44b4d622d6d39a0a3d7967e89004e5e229aee84842b6fbacc90ae3c65bbc252a9a879b552a2546ae168d7f07cc312d207"; + sha512 = "2dc3dde5159c64b61a4599a0ee2aaf3e4d9e71d7a3913e086c0c187cca48e8bbaebf7d4253dab7a3cb4fbce55a1119e3f4c30026671b92b70059b8b3256e72db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8888a897dec9005edb469d27f40ce9ba3446c4ba713401f40955483f329114271c34a832afb93b48e0e41adfc1910e4813f79fd619a085ea15443743a72eeba6"; + sha512 = "73bfdcc5482d5793c0c5673738ae08cb6a2187e61d8ee057ef89f4ceb801bfeec48b8c0a9f48bdd996bca8ae4a232afc61c6539a1c22c7bf96d06180364cecc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "713522e5c5305d111bd1eb55bba42cf201da74641593506b191ed1ab3eace55c1ac9c9a86182d667d7eae2bb4cf6fc9ddfa1ce4c8d31dcfdb0f2fab587fa6a8f"; + sha512 = "baf1441e6f6ce7a31ce5ff12b600b61068bdbb9beebfe74f6c9b97ed2533ec734bc34b702caa9e9c59bb4563bfdd64c2612151793067cef3ffa1fb0ada312e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "021b66ac6720deb68e45b1bdca86d8aa7db2e74cfa7391daee108cd002dbabc3f6302f380e6c029c7b56781dfd9bd34f8cdc1135851297e4dac9dc56f762eb69"; + sha512 = "60b276043c2ec3456b6b06acd2edf6f3df5149824d20c33974f3ac77fa0ef81a03f99f337add0209bb88b390fbf4dec08a30da207ad72ef91c9a89cd36e4452d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "feef8046d08aba827f6dd2510cadea53a89983a4889c9c2baad3d88123639b90c8052b552e2bcfb03b6e9fb43ebda29815825ef7fd4d9ca867f238cfaa0ad1da"; + sha512 = "26eae1d8a6f9e988695d59d418749fde988e48514d7c183039ee998b400f480dae16e9d5a590ff4364954e57a4008e7104cece212fa81fe73666d2bf3f0c0020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "49b0adb7c5dc8e1b7ecc121f65e8a6853f497a9cc151b4eb9ff6631af33b12f7b00186ac2d13390cfcadd9fbd1b361a597ec1d9da62b1a0466d85d8e313be4fa"; + sha512 = "55aee2c68a1cb6b7e374f2622c8aa30a8f26e14ea0f0119d97bbe6e807c15c7df94ec74c0f31ef071ea7b112c3bd8ee501c7d7b33ab5eae9a8126b2fc9673047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a74988338fec99d50f5a16ab6c59630ec1e535338da3f23f05c7967bdeff41cb058c238ab2e873f96cab93db821ab066e6222397761578a12fa73b42c0ffe3e9"; + sha512 = "dbd5aa229d0123a26290330df078967bff4d0484bcdcc3eb499a7cdc82176b49a2362a0ab08e2b55286141b25c8cd4970308cf48a1143a5af788eced5b84b83b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b4abd3f7abf1869bf360f5987e13c37b142b4c8afde51c790feb2563351a4754f385e0880ed51a1cd7aa3a5ed907e3cc22ff3c707d2923c47459c977cfedeb08"; + sha512 = "5082bef600a311f560daa09b31945961766a0ec63ebf9f38a0f0e76560fca2a99594c1f26fd0b57a2dca0c94d1991a91501ee3e931740e59010c93d46d3e8a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8a9c61dd9329c983c394c33c97c962c703fcf51a283dce09bb781d96879450adae5d8d78ca9d0d1892380fcac7ab95651e37133a0f836865a13946e2cb8a7e39"; + sha512 = "87ef420353069862cd539aa8e53f93f50330e0c68bfa4a56913e9245bd4a972bcd271a7c159218f9ffb78c9d9be3046206f20fad4faae3d76e4e9687530ea6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a1b7dc0eab0d4a8c713e27620235617a244ecadd62a125de8b1b60de7811a4d7e65051569ad4391b2a312107cb750c74d4c541c580f3af86b88b2fb84d93ce67"; + sha512 = "d02362e93a290f34063fdfa7af8fea71a6cb92b964b872bfac8f5b5665dc6ce9cde7a38a445de1074fa8673cc2c0243af69e2663542c5c2fb8e53f2c41518cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "181aaa954ff9024a4efc211bba348461c28b892b1cc04eb50989cc8da78d88a350341de520b4a60da096ae399c28ad05802aeb73cf133171e8a4ea2693cce5f9"; + sha512 = "0064c56cf6cfc38a5eff201f16df5c9037da8089655df5c88a348ffbeaf933941d5ce99b3618293d2154774b483298b4c28616c6e175fe0f6c9124ce00bb16f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "893fa9700ca874b2a460d830f2e10f7999a6b521a351a88bf480232ca0270581f4ab334ac2d4721e3f5fbaec0105497afd5ef09b13f3b96a1e84556db79d0ef9"; + sha512 = "bf5cd434f45bd057de94bdc219f25e4da878a0be58c4a864a22961ac5677d0a679204a069220cdfb353d319d493e10d3423888999de6701e33227b1dde16e43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fbe8cefe9e626d07f360b1ab30fd04c8628669f5164d5dbfd12cca72e17e6454de367e170565e0d7f1c30e300d315f54d7c6cc06c8367e6d0c428a994e9ba067"; + sha512 = "402f980bbffd145e9f6f832ad4bff8c6dbb0db9a77a303ffe16c44b449668e621c2edf75e41686cc69684069efa10b7853d57ed5ee928298bad5ed27c253eed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "7ea337b8f3cf536749cca253e063ab326e66a0a33ee0bb7863ba7c46d7d9ceef443bfec0551770346701f23f5adc2750225e8961d6fbbb48492afe7ec39a1272"; + sha512 = "baae62b09a0a7fef88f64b43b854dc8c4ff583765338c4dd1e00db9c7717adfb3d8817c776cfc88f88ae6865d490a08bf4d0c97824ae3280835769ca04fd8c71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c97d9ceb5a98acf54bf37c1397973c2872a039812bc591979b44497e7f2db1cf7bb5fab75b4a0cb70df2d48eee4cf5fc55def69c22da9a0b5964e2af81bd0457"; + sha512 = "161da9aa8cd66a9f691b218f5d11cdae19fbfb04f44a77e266731afdb7202af98f165e33107af15ee6ced477b0ae07d78f91f57d14fec0e9a6de24847cc73976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "15081d21ed77c376257e23cec42ba26023792cceb634b0d0b928471e1abeba17d9245ba5454452b17e786e576e19e8e47f20478002a3df2e15c56e8cb19faaf0"; + sha512 = "150677eb9c0aafb0486dce2c846e0997f6eb1ccfb022a9ec2914628fa2affc32801fc34f0397fdade3cbe3afd1897ead515bc240043dd1cc7b879d92566a47c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c352989e6ed3eeda8ce724ff110bb09c2ad3ce4a5b1f45bd9335c1186dcc1c310efdd24c9a2adf7a0f31278b3989d79a683f7f770670c8b1419967ccc2e0704a"; + sha512 = "b03e12ebeed5af0150715176e32a7da3ce20a57d227f3ef6da369f6fa27059cb23a8af0b4e165027598894c572d02e4d58e8fdb9a48b86d3bdc35385a249287f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "ba27396ca8f76533033bc78066074c3aebcd687f1621b14db92a4952b226bebec0bd399f697dac92b71e14e91fefedfa6d4188dc067bbd575e07317182408510"; + sha512 = "7122e4f914f5e8d42393a86e61baeecbcdf6fff646ddb38cbb2d7324a0be90d60bf609824f2dcc696c107f856a867e0ac9717fc098b1db3571bf60fb6d3b8a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f18b4acc47fcb9135ac28206011b6fb3fef5dd6640fab3e88d8e8f9dc23b19d427fcd461f70a00750c1739b3e3f6874c171dacd9c54b213eb9076dbb9a511b5b"; + sha512 = "f35b295657bbceb293cf1bb88a140d629f0b1fc654cf3f1ebcb5d9de84f40b17a9a7bc8973dc6699c4c6609e5cfbb858df52c0153ed4dcde6eff2e25c38f7ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e4bec63583908fd225b903e45007e29f357e00fe7901524d5fa15bfea04211f55d2557c1ccc1fba28eff1f2dfc5b364cb7c52d438428c26f09aed3592f817c50"; + sha512 = "4a4a37fdce02108118cca5fddc2f2ebfeddb8a4fad97ef0584fb85748e09d43abe79b0d3f7b5250deeaec8ec0b2e698771100dca486831fdde09f41d8d77b093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "dca1a1062e47b8644a7e1a772f6abec1ff615d8857d74d576baf9a515fbef814f6d2e89878a3ea2aa4a7efb6931caecb3845f6eefec91c70299c463c2141689c"; + sha512 = "6c4969572ce922eca81344f1b05747d3935f88486082bdc64c814825af2cfdf27eac7f8f0c25edfd4d249b9f469ada0b062abd0aff02b9849c7055e40bec5b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "efa6f443a092585defac47cb75d8ce85faec76c2624ecbf4cec3b4e8ffe4e582de0fb55f4901bcebedb0d991d709338bba212117fe59b3c6496fc5f35c1a7694"; + sha512 = "a5d1daf151be8d23dde730945343bfd507ba29314ab8acb71e4d5e71b534eadc573eb4eec1bcae0ab0bd72735cd891b72d8d931b634680881bf65f63a4a7abab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ea76707fa795234f36088749cdc5a139482577d4488d476856cba926e40ce24d020f76a526efeebfd8a5840b9ebb2a93d71ce9be9fa8cd9255e6940074f22a8b"; + sha512 = "87b6c4a1dfdb49bc9430d9740612d24ec9f61d74bd379caebef6d19fb3492cfd1a4c8112126ab509af1f35e3f6e10062a786a0e5397b424e057e9d13c924fd7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "73bde105b324df05adbc581e59c1b723b1dc0ecd2b35b9029ececdb83acbd5cb9946382f78c9bd02a480635c58c9578ec982d61793ae7e64e5cf940c09c5a508"; + sha512 = "e2b96ab462227f70f4208b52b144d852e657edd3fc9885ba6b4217461a414a6aac6dedc206b4fc82d269c768662ce94ccc6cb3e0f096250d074b3d91ffa98c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e237486d9cc6418d213a006e07c23ecaa3732496d169f7a24a568866e1ec1276aa9096c16aa696baffe689096b8321c83e9d47a119257effd77c3b1b938323bd"; + sha512 = "1fcaff37d60936b68a6f2e368c414c69718e114bcdcf8f71114f5e3dfea1eb2fbfc8b5e237406576daae74f8c4371d8a824d2542dcdd36221c931a86c9ea7175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "be2a1bd69573ae49b011f266402a5f185a4eb8eb3e9b506a606b1444ef54091b36023e6d2dea2d118fa4ca5cc58dcd1afdf2e5dcbc3d38a7ceb776e6e06756b3"; + sha512 = "5146346331ed881f0f85f42bb43f4b4884cdeb659b392db28f7a534c685a579405fa482ad14c6c4e20422e8e22b07f2fc35ead1f3756539dcee797fb0df8c1dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "405ce0eb8c7694ed2d9bb5548f8e56d63c14e59025cda561bd49f0deda1bf0b280c344138d154510ac8ed124e4ec95528f84212fe1634bf16477615971148f17"; + sha512 = "eb043d50e735f1b99eab7cedef601aa302dce2b0270f08a9e93c1b1fa9b85da87305aa94e8db638e81dd8f6d9bed96b6c22f87928026cb042964bbb51420fff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "21d7c5343f62cb8a841872470013d9b836eecb0f780794108f56120c4bf26ddfe923400e630f6d981913d06875e7473dedaa3d4cbc2f9173db80ef34c3a6e0f4"; + sha512 = "eb0553646d6b53a41bff160379845b0a21c28815ea523ab0de21230ce6c519b7ee07c9d97ce26f2078f3c66448dcd1c09e978bb1f748e548d1b5c2e0fe4e7f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "a8c070f164ebda582055628b324e03971602f15741314ce26024eec0539a92341020b7fee16cfd849189c5c106a0b3dc1fcb04d3177d7a4b06bd0cd2db74b614"; + sha512 = "b43efaa2e45de94e9be8b8b9bea50966b0fa089dff9e25671577c724f45d0dba502044c2da7de32cf1431a38aaa92c2e5856659fb7f1ee557e38616beb4a9c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4bc7b360f3fb9a8115541da54f867c693e7c8c98bf24685ae9ac1c052c4cf54126ccfaa3aa2c714a0450ffee0b6198370b1092ac99ba13c289bc46a202ac1189"; + sha512 = "5fd68752ab6309af0bbc6d523e2e251c8378ac0a6c2ba0627b37ddf7dbb1efc444901a254944f4384a6fc10ccd1909f6312c0fd7c9e700ba5f223ccdf76d30d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "c9a1c9b03d3e7089a12f2ccceaa525b5c9ce62dc1e602a3899914e8adae571bfe12dfe7b2b5e54a4b2de01c869c33fa1f7478d1bc6d54e4dcb284ce1da7b32bc"; + sha512 = "1c128e7fffc103347329cbd65037e798292d5b0e843f878ffc44d9d53c32f1d9a917acd694cb3662ba0089e79063421705f30d39e9736c88b9c439660147b949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0adc5cb03da1e36650c90de0cd82065a014bd944da4ba29f80f2fe74eee91fbff13378011c938bd79c110bacd0e04fcb5ad6ee7995fd76bd5ee98cacf32c2c98"; + sha512 = "890812041bb3ab8cb0ddc6a54222fec9f4e342f9734f3c92f9d0452122cceff739eb46d92ebef5d2571509e4c7821704a64da1ec3dfe8150193a6dc5b4aa8477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "fe743972968881f327812dd0a81ffb8564e0fa7a6f739a3a59dd039f560078827ddd36ba057b80792347b1cb19e262f34c276f6ce788453089ca0d8cf8d69a55"; + sha512 = "13703e62dd8d6728553524723828cf7bd8db672febeff63324c93e300a9ed6c2f3b1919d6f4bf8f1f74164df278a0c95ac98c348531581b717ab09e921490a91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "0715da694820f26550e0becaa151c19d366954fcfc2af7084b880cd12b2f031b6508e69b3ff687941f71c0b3467f5d118ec3f79be2cea6cdff22d2b5e4f050ff"; + sha512 = "929b2e3ca70c8d9ee11405b1366faf957cde5075dec5631a49ebc724d4912291b1f3826ee01e5c90e2d68c09b2664599ed73e4f597298ffb066ff8419a8056d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2de6d3cea7077ddc896cdb95104a122b85f001013c0f59902b049423fdb370d5090a8630501009803592935fd5f90ade7625ef64b3b0bfecc712141b10f2366f"; + sha512 = "83900bd13db0731508e516bfafb5bb540a43f6b8ba9c9e2e9c0878d67e9cd8f9b6b496e5b77ccf314346ea3089f6d95c1902b9280741ac3325638e972794872a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a0a1a9e7c2fda1bc92bce084472d432d4007fdc96707d7a926e884521c4ba8993374ef55179b7da7267d14699f079f5722974edf2713d449a59b76f01fb897cf"; + sha512 = "a62767e00ba2c0d522f503331c2b6eb4cc82d3abb4879711c2d9f611c8454f2cbfa5e76707e6ec6ce54df8d40f64da6ad8af2e15079ea75b3b8ec55e6273ef2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4008860591482c70b0194e565f3f1fbb30b1607b486c8a3afc3e3d9465e24c3cc0da2c889905a7cad349484a386d7a2082e86e29f41fba84073cabcd75c5e358"; + sha512 = "03a47578e51da36b51bbaa98e36927a1a5b3f216ff6ed60c337d905f414902c7638cdd361b5d8f4c29960dc93b19343b18567c7b40106f0e7e95fa941c0dae88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2628e52d65223c5a1941d94435398041cdbc7d5588a2227a9f17227800576a56975d5db2283d295e82e63e10c4ce6d3bc7999329fa26dd3c8d44dea025f96640"; + sha512 = "c4cb00f4383f73c65930ff3626342cb53695ca4aaa29ec5f80400ed4d18e4dc87dc44445069c62265112980ac7a061d0839f542a792aa5d294561b201445b677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9b78d17bec3f243154cca1ae1d955282e8700dac9bd93890be6fe92852af67a1f81eaa5dc2465e2881398508af90f67fcb2c90d54edb1fe874f9717bd25dbe2b"; + sha512 = "72fc61f2429fbef846eec40e53f50bd95d3b6b728d78e2199408b052b0d85ea66fbd6d2a114cd046311f88b419eeb7447b062cc9c5824cbae572debe872656db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01e4dbb561a962b4332cde78df74a229d6aae4cfe56bd471262fedd9fc16a948415e6f993724ed53eb878a999020b22f761f4ee3e6f006ae8447513201ed27d1"; + sha512 = "9192d46b8b16129243ee2f5af47cd0f8fdf9af3ac953ae6481452cdd1f4da9ad9b75aa9c1b96416cba47dc16ca867db3135da810f32df5a33bed233a3b68f447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c17fff73a4f72378dc3173ea0ecde0492937a6fcee4108935126256f0ab085eb934be830907f1f4464205673023ed3cb21794cd540533f4e8defb42325b3bc93"; + sha512 = "89a5c07f1c1b7b389bf7074feb6b7c29470bfb143b720503783c35cabb36fbd0e5c3fe31349e1004728f128db36148ad6dd07f389099fab17c8a6d078c37675d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "22c90601b8162512ac045ffcc3d186dcf4e0d9d2330885e07f7df72224a840073415de0100419b981c08b73ba4c92da01edb49d1dcc9efb1abc0ce47b94da012"; + sha512 = "1bc60805513cfd6ab6d563108fecb176766e77bf10203c942ada3878d062e6a75c54129505fa63f16aeb72f4a1c6b360f7e65e8f23433d20fe134692e53f4210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a185e91441e302b9111d558c3ea0d7601347e843393e00adda74a903ad0f93a23ded2c8e61c5eb628996c0ef5b0fd63209fa9fd98f3a0040a9a8d419214e5df6"; + sha512 = "811449cc14b5bc3185c56a8ea2b640a3fdfcb60b309ae9ccb5498196677e1431719897e3e239dec4ee964575187430c1a0a1b4fa48fbd29dc874a1edceb7fd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e8d5066dcaa0c7168f804d1f1047435bb188c6daaf3f8aa472654b617c7d4471f7469ac2560782b6463c315ccd9ad60efacc8582110bec9279cdd16dc7da7d09"; + sha512 = "940563e7a93a08372790ea3f0403c4facc900a6ec680c0e7d71fa10978fbe484c448f1e7bdc8096e26528a969178273223592daba724296f423b1293b79aa5fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "dcdb08020fca5a43581b1900316cf7acba285a87b9cc0532ecaca8f85d1ac3b188eeb9d65ba68557d4350b7f2e0fee478dd5a9ababfd3c40ef1f7b4c57f08a39"; + sha512 = "ab8d456745a815934736ae25cf597dd6eec2dc25320dfe99c6af804823ad71b482b19eae071be08763c82678e7c966bd86ab1bc285925945b6800ab725dbebe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d7005ab40feaa6053af8624130ba4e5d60e54978452b6e63a658afc8321c9f4a7eed5406f07a16961f6051e794943c6ac6582e1723cb8a518332557a94dedcc4"; + sha512 = "a8b4532eda52b3543767a28fb9550b21324c72976b71fd2101665e0ca89c63c4b1d8272a9f425feacb3bef188b43edacf603ac87fa1a3dd19c374d22877ac02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b6e0894cae9d257ce4d0becdcb65f9fe3693a947cfadfc88eb51ee93a4ade9924895a7f252317d145304d5bdc866294c437a5f03c15982fef8a970145678aa0e"; + sha512 = "a68193718025329d73e07b7199fc6a11e4834cf3f0ca327efbc182d0b33bff342e8a3012ae180fec2167f842781ae9c6d63d29e312e2385ee06e4ef25c851fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "fc7a97902679402185813d666ea65cfa059e4121c126a4b82f2fc70ac04790b7e73441c4a3e7c49ea6292e049792368f7abb9924c74b52ca342d832231e80c51"; + sha512 = "5ba2c7da5741d45b376de87c9d3abd65de5a74885cac25ba0c7c8a81d681c0dd0fb870764208b62aecbc93122daea5cd7dba1fec41a1d97eda0dc674f16dd6cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c96cfd08d2b3bcfc3380cfa4e7945c92ad6c1a1ca1f47db6977769792752a4f64ee99f90f6f904811ff3f1b7b2d07ba570ad1b80337d22e34c6bbb6ed0e511cd"; + sha512 = "941cbc8f65b1b307f998c853010bd373541aa8043f1fc97e261453f7d49ed7ad9880e0cd85fd1bdb5b4b038272e210d9eeb7a5a24f27f1212ffbfde494c87b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7e10f521aa2ea9900d03a2874861f079171a62860f3508edd7dc51c39db88cef7a603ba0c6ca69469c2593182b027d354b6a8c13209beabd51a8690717d11eb4"; + sha512 = "0c0dd5ce17626e96c3e88a9771272f60e93c7ad4f1f40710d8b70d4f40a58010933de89a2b381dac94831db786621a35ef6894f46f1b19026c0eb7ce0b172459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "43413c027b618cd5ddd36fa42fa26f99a294ce2f6f33937a299b55d698b64b6e85d04954101ef27e7a739c00407d7457322e3b32d38a90df87529372c19e1b67"; + sha512 = "169b6a1a48b2711ecdccdd6a685ee10b5f602d0300cac13b56feb331901be88edf6e8386ce6e4bfc108f419de305a5603445f5b7561b37358a75adb8e8d418e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fb59faad43d729eeff12e1eeab15c0712f2429892574c526c1f59326518c9c652475177c9aba14aa591e4c449b133a6a8fcbef7bbc8d0c89b2b4d5dffd053abe"; + sha512 = "96dda02dda90aaa1de2bd31e04d87b37a179773d1f3f8094d33fcdfa6ffc78616f9d7539b4405911a6dfd31382cba91ce34ca6680c36e7aec22493d3bf6f15fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "406097bb810d60a16a88b675f6a893af84e0de905c222534b0e09802ae5b57912d000188920b06c4ffba198af0d096e42f9984222a94f53d45db64f41a4f3f9b"; + sha512 = "326b8b65388b6e7d8215a665fd6acd9ad9fd5a03edfd6ee428dc53b217df7b108a351094530621c5b78f3cfaed90092c17e1d1c9656a37a10c108aa441ae0e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "519f9777303a5dc6eca8933406ff0ffbf7654c75305c16e13f1600550d924569ded9dc6ba606050c9bacc31ecbc0d6e43dd91dbe8cb3b587ab71d20467564cd5"; + sha512 = "70a56009e39e06b701de62c7df02d3d648e04ffe94d2718f2f2cc4ee24f19e832decf0371425ab9791ed5db6a5b56d5f221163d3bd67bcbf6cd48617114353c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "92500d0b49090382e261baa0fdd4620e5d9e4a047c9c7098ad3f7ce34a5e97bde419a87019517125239144d21589b428c11138aec691328530fd41d5a78cc5db"; + sha512 = "33a770a0ea0c177c1d839056f4045e41e8e2102e840c99c48abd2cb49733d44af2753f040696e859eb724dfbb6dddc3357bf505620f74c0c29b92211d8ab9572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6b8f3655d962612a047bb7d961ba74b362da0bcf740362e8f31a2263b0898da90e051951cf5894bd8a493f40d2d89fd50d6060eecc78908518f8611218a27eb3"; + sha512 = "233af09f6a4ebb88aa678362c85244f1465d5da57e193b26d676543d0d1df9e673b25096da705178d1784cf3682fb6a1d12564525b77723eca0924bad7ecb0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4f2e2012136c9821792241f2189550843320b52c44905d9902c7ef3f2be21f26dd79f930b719f752d3d4b5e7ab6ca8429d12ba6120f6bc365bf9e2f496ea85e2"; + sha512 = "6be29acfa925e3524c83ccd6915523cb8a37143855361b46fbd71465002f8791426ea9985d34486db17edffcf53d6197b7115cc0dd38a2be16502d07d3b26cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7ce2ab97b3483b9632d24a979bbe051d8db539329359f91dc9df4446db0b4c1201dcbc6422e1406400dd3df007e5c3af6bcc8279966cf7448671608cc05a4231"; + sha512 = "46b2a7b8370fc173101dd1e78ce12e363f80a852d55b2e6be9f5b31232888750e07937afa60bee2571e0b3b18ca2987ffbbad8c6065d4bb71064c34acc46c3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "65edb310b0c94dbaa2f5ece2eb6593a4fa7d89b2fc9e4d3bd8c77bd43dd4517d09895a7a325b9d6a1b5fda965e9d6e3c10f7e4b889b582ad4aacc2061db6a443"; + sha512 = "934144d99326a139d994518e5aa763cf32035a7d310fa94eba7b4a2b7cf40eaff732dc20100f7bba35dbf415b7a5fc22c5122ef40a65732566063d4517321ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4e29357906cafb6df7dfddb4c668479d8e52722a4771e043a1d9e0c254e434251768a716f7791c6969e34c5004f276d1b3ae8b8c77176bb1ba76409295126671"; + sha512 = "a892ced0d9c5dac7cda65cd67abc1232d5be3ba8ebc2c98181f504b68d43018fc392e0e5b4b12ed22f1ca1b6469be83f68b12e60fad28fd42eba18d9b8d4d7b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c84cdabcb498c6a387a08b7ead1cdadfb68c173a955e34f4118a4d56417918649b7ffab2eeb88ddfa276656367f8429e17ddad4b909b1f39e120e41d1caca56c"; + sha512 = "229175292f435f3cb1db7ba671933508ba7b4daba1aa5db0ed9f03fe8bb83778a0b951b0248a27b4e4a7beaa374f9bc4eef3b2762596b22bd45045efc3038be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3fdf243217a00baef75aa36b9bcc257e1741fadc8070f5e50a4573c3c4b6b86eeb4405fab327b057e5d92543a0643429fc1159d3b77fe30ad918d8757d8970b1"; + sha512 = "44d585391132de3c4df67bdec4a5062bf71af4ae32084e0602de93d75c279e8ee76a022aa19926eee03a31022b4d7eb9feab8e349c2a6547b85f8a42f5b122d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f8c32ef45297c86935bc8b99a9d6b8e4804320f76e085e70f988def0ec003f221666e8f7e34e1866c52c38dc45a3b6a39397ac1e81a7033a74652a1d42d32355"; + sha512 = "f0b04a81888f8cac58e311f9f4fe16111a414f541bd1a5b3dc2fda028cf85b3a701ae5b91d223a3d6542580c1bec5459dd4dfe90cac517d3f974c1084ed6be1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "10dfc0655723a00be5b5e32a280ffc660cf464df0be0686601b2bb502730ea5ee6f7c23c3f40616e9df3c5eb17638b841cc70e8b2271b442cc8b95927191dd62"; + sha512 = "c3fae910a582dbcb5b8609dbfce0d759d776667e34c737755968f1a531e83b58b098b8a88bd948ee820ab76328210631b7d85ff65a88be630f795522831a7014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "57e77414cd484560716ef659271e28c14a8f02f7189bc858b4293a72ac07cb0acc77a6e719c25b7a9b76cd4da6b3b56df8a75236b6ddef0ace9f87113f4f8d72"; + sha512 = "fd5feca0a4a107b018329ab2fc1d7eab9c0e51d2660d8356cba4792cf73f1176fd19411580f98a469f47eb6bacb2c311134194ee612caa7ad8a5a0021b062420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "396fe91815427866908619b33df4fcc503e0b30f03c567a9d4baa51bfae19d91de816cfbca4bd94a48447c7abdfb56d52a294ad0b8fff8134d935db9d6a81221"; + sha512 = "c54d20862ec7c09e4ceaca3afb120938beb7ec0bf1c38e651355fad1247c61e75acbd0fe6b96a17fc19136720ba55755a8bb04726c714c812a333c9e300b9463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "87237a320372b1c34c583335335b5b8e85eaf0dd774883b0b0c74e883854c1cd14d459cc8b84db2dade7dc92b36d176c8f30bd17658f6e5660660b0f167fc715"; + sha512 = "a594904a68ccd42f5e6c0a829100fb99e37732a29775273ac202fbb65785549bbdf638e8ddbcf6b7269161cafd229354b5b350be8e2f2360892bcf17ef777e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ca5ca4be8242e1fe9a9714b117965b67ebe86b578381ea4339f378dfe74e08f268b63346b5d3bcf30cf1c108a933609d8cbb393caa7f7646557d265c2b40decb"; + sha512 = "45b5fca122f7900da176ff3d55dd70a1a2d594fd9119b75760dc094b7a254e21aa6455c8370650f1b17d69ec1e81749881635d176dc72a45eec8f632d3a2e0f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "99322a06d7122438715b92f176b07203246c1e15a0a42dae4349f424232778f3d2b9bcd17a7b239b8eb6273a6ada8e259480601258275f16c567d9cee51fd16f"; + sha512 = "06b3fd1f4cf030377854ea39bfe0818322123d53299a3f5d7308db32683f3992240099491422858c3104079b566958dfa60b58248c0c6adcd0153d584429fca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "95a86989879b65c85032e9b8ffa9290d9a6fa1be409786b9782b284e4c0fb894719fc464ef7e6b96554e2cb852a3276a8e042bbff02a17bdb44aaf9ddc170361"; + sha512 = "2cb1d03ced3d88344e24bda60687e9a0c34aade38fd635a63ffea3f072188bf6f5ab76cc7c54188280932c225f1e5c9b7c6cea4d2ee0b1798335e84b7826c886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "aae0652f74e82b0cdd752cb8f0747fd4f36f04fcdc50c3cd9d084c6418694cd3015e8de87d851605f5cac0b0159ddd8f9521755d81adbee0e561926b2ea1d393"; + sha512 = "6fa6eb60bef978b82e6805c3a083ee40418125416f139bfae2695c2a4b28e34081a984e8c8e092e449e28fae28d812ac2c76b808da83f79c2be4e7f5361f4536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "df038e62ba6284245212f23c5458b2df14547ed532ba66adfed2297041ae7acf693a6e01a6af9c16f4a2e141806d9baf3c4fce91bf3316e635da7211ba9b057f"; + sha512 = "e412938a9ff5bca8b770a83a2f7b9a03f92fc155df9088f60d758aa41c47bb348e331e34c8b04b1b2b5c796ec34261aebedc697c058bc5457265ee7b87d2d773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "1bcc2f2e8f5e389c29fd0e7f4a5a376d91268e326758b396c9d829e59d1315a52df0449fe49e81170713f1161946c2ed224560dc96329f30a5d13c8413f26823"; + sha512 = "8a4d50ceae88d1ccb354135fa10df40a2427bc0e704dca5b7ceafafbfcb3970eb57d4d6eb427330a2198894e67e2da2532adcdf5f900f5e8ed15727e1dc4fa84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d957e4942ead1634d792555f57c6dbe54972fd9a97071e63901b422ed6b723426b27fe85afc8c33d75087a502112a4b4b2e0dc3f3a04a9d44a48ec867dc78cb2"; + sha512 = "cb1be90d64caa7ac445cc7a6b3549350eaf8859e7a4e662e602eee4218de98944360bcd828b62bdcf18a5a602b153a1e4cfb0bdac92a802a8b071f349c88262a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e3209382cf01d827f3e68230c46c6eda837798f92812c93ac19e81a77a0d72f3a5b53681320b71d886d8d4339fb2eb51d056bb4bc41466116aa51ffd50ff05d1"; + sha512 = "69fc97339bd8fddedf12ac5f545c2f768cb071c4786f08c43fe61775e43b2dcf065d84d23ef9b9fb3f09c6df6364413f61fec0fa1cdeea2b4b769e3ef0bf124f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8719acd4bca1136668c6a90b3f7caaf29bd773acaab2776f2b7daca3c9028c33e73dc2c15c82d44064e92b61def23ca889a2ad09043c5bc5ad91db3214af1919"; + sha512 = "b8013f7c0e1cfad11ef950015444105b1e8512d778fe4b2a7567e0613a1191a7a929c5fdca9c15ab846da05f189fea1b0c137784ca1061b43f7ebada27376a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "681e276d7ff6a6f91be59994e53f9f6f082e16f9d22ec7e1d1b65813e91c6c2661f28989b0331100b6f0d4cdbbb0589204b0ed80bf5f0bc0d18016e905a71148"; + sha512 = "154bfde5424cca1af2e624596755fe95a1504be0ce977162117e937b6ab6ec6b03b1cdb470ef62c710129d19a16c42fac334477f8638de6472b742ab2395b262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "71ee272a7d02758187a9ef2d0a722760d04d9bf0fe11c90e841e15dc9019f44ba22483b6698e3f8eba9620e34d2678db2dbc2974c1ab5c7f0f79934aa4142432"; + sha512 = "6c3d36ba9e4682600c2a99d6837dfe76032d6d1618c0ddb8dab5633c2961d413959e9fe0a9c0fc7ef4bbbc41af469a92fab566d24458c43c1671cd3288dcaae8"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch new file mode 100644 index 00000000000..2fe30980a35 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch @@ -0,0 +1,23 @@ +diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp +--- firefox-76.0.orig/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:01:29.926544735 +0200 ++++ firefox-76.0/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:12:00.845035570 +0200 +@@ -62,8 +62,6 @@ + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", + nsIAboutModule::ALLOW_SCRIPT}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn +--- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100 ++++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100 +@@ -36,7 +36,6 @@ + content/global/plugins.css + content/global/browser-child.js + content/global/browser-content.js +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e419137c4e9..d33535da376 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,14 +7,14 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "75.0"; + ffversion = "76.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0m3ibm6dy9cpvsxkzkzwj7na5rm5qz7sm3bpx604ibay9pccvgv59jxapisvmswzmlz2nv02l6p2gxlz3b0lbcg7rd5zasia92y7j99"; + sha512 = "3dq9h84w1qqidabbrl34jgyjr8bbmbf5wddjazpr7znfm49fn2xyg8fmm5lx9dakghk3wp8yhfi36gmk08fzlrm47v6h17dm9hkh0hz"; }; patches = [ - ./no-buildconfig-ffx65.patch + ./no-buildconfig-ffx76.patch ]; meta = { @@ -35,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.7.0esr"; + ffversion = "68.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "29qbcc78hz1rsnz735a5miwfj0c3r1c5qm2043vyd9qz879vsh4ab82k7wncm3xa04kqdff26zh1rpbbjmdr7gwn4q8nmjzzs7wzpd3"; + sha512 = "2rl5irkamxi8caa8krj0wng93lb82kk9mf09mgci87mj9hy6fxzcrlmiiffp14s03rv0raagrn4w54pbx1336mylq6saxmfhpf676hk"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0afa8ca7b83..52773bf291a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,13 +2,14 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native , fx_cast_bridge , udev , kerberos +, libva }: ## configurability of the wrapper itself @@ -64,8 +65,8 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optional stdenv.isLinux udev - ++ lib.optional ffmpegSupport ffmpeg + libs = lib.optionals stdenv.isLinux [ udev libva ] + ++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index d75be65c196..edb5b2759e2 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.11.0"; + version = "1.11.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0b0qlki9bp9mm41lrh6rc6qqvm4nsz8da63sby3a1f2xm9b9vvg2"; + sha256 = "0cxmmw002f5rvxzyhlhzqm2ipf64w4vspf298p6c5kpg535m8cvs"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix index 87248013a9a..f87acc8722e 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix @@ -76,7 +76,7 @@ mkChromiumDerivation (base: rec { the web. It has a minimalist user interface and provides the vast majority of source code for Google Chrome (which has some additional features). ''; - homepage = https://github.com/Eloston/ungoogled-chromium; + homepage = "https://github.com/Eloston/ungoogled-chromium"; maintainers = with maintainers; [ squalus ]; # Overview of the maintainer roles: # nixos-unstable: diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 776ed8f4471..7a542a71d1e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -5,6 +5,7 @@ , libuuid , gstreamer, gst-plugins-base, libxml2 , glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2 +, libdrm, mesa , nss, nspr , patchelf, makeWrapper , isSnapshot ? false @@ -37,6 +38,7 @@ in stdenv.mkDerivation rec { atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf + libdrm mesa ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index d441e539aaa..b34cd3306c0 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.2.1"; + version = "2020.3.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1wyvf4bilhiwabqgdwmnhifwc845m4g17pz7xmndzvqwmfd7riw5"; + sha256 = "1vbxm5z72y9zfg4carmja3fc1vhkanmc25pgnlw550p1l14y6404"; }; - modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p"; + modSha256 = "1mnfp8nhbllv8msglci1hq4026rqsc1yibrh2xnwwbf2f3yqx8h0"; buildFlagsArray = "-ldflags=-X main.Version=${version}"; diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix index e2452b2b441..e0cc780841b 100644 --- a/pkgs/applications/networking/cluster/chronos/default.nix +++ b/pkgs/applications/networking/cluster/chronos/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; - broken = true; # doesn't build http://hydra.nixos.org/build/25768319 + broken = true; # doesn't build https://hydra.nixos.org/build/25768319 }; } diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1318ff003de..628ae10f11b 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.106.3"; in +let version = "0.114.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0pwkkgdcj9vx6nk574iaqwn074qfpgqd1c44d3kr3xdbac89yfyf"; + sha256 = "0486wcfizi8xljr29mznc4p11ggz4rvk5n53qvb30f7ry4ncc8n5"; }; goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "1yv2b44qac0rms66v0qg13wsga0di6hwxa4dh2l0b1xvaf75ysay"; + modSha256 = "0j7w12rrnsv2h5v0bqh6sjq9anm51zs0p3nzlhwsksw9c98r9avk"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index b18e1f08dd4..ee1b08f8be4 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -1,6 +1,22 @@ -{ stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils -, conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig -, ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip +{ stdenv +, lib +, makeWrapper +, socat +, iptables +, iproute +, bridge-utils +, conntrack-tools +, buildGoPackage +, git +, runc +, libseccomp +, pkgconfig +, ethtool +, utillinux +, ipset +, fetchFromGitHub +, fetchurl +, fetchzip , fetchgit }: @@ -47,7 +63,7 @@ let # Note: marked as apache 2.0 license url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; sha256 = "12xafn5jivl8lqdcs25b28xrc4mf7yf1xif5np169nvvxgvmpdxp"; - stripRoot=false; + stripRoot = false; }; k3sPlugins = buildGoPackage rec { name = "k3s-cni-plugins"; @@ -126,8 +142,8 @@ let installPhase = '' pushd go/src/${goPackagePath} - mkdir -p "$bin/bin" - install -m 0755 -t "$bin/bin" ./bin/* + mkdir -p "$out/bin" + install -m 0755 -t "$out/bin" ./bin/* popd ''; @@ -153,6 +169,12 @@ let nativeBuildInputs = [ git pkgconfig ]; buildInputs = [ k3sBuildStage1 k3sPlugins runc ]; + # k3s appends a suffix to the final distribution binary for some arches + archSuffix = + if stdenv.hostPlatform.system == "x86_64-linux" then "" + else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" + else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; + # In order to build the thick k3s binary (which is what # ./scripts/package-cli does), we need to get all the binaries that script # expects in place. @@ -181,8 +203,8 @@ let installPhase = '' pushd go/src/${goPackagePath} - mkdir -p "$bin/bin" - install -m 0755 -t "$bin/bin" ./dist/artifacts/k3s + mkdir -p "$out/bin" + install -m 0755 -T ./dist/artifacts/k3s${archSuffix} "$out/bin/k3s" popd ''; @@ -202,12 +224,20 @@ stdenv.mkDerivation rec { # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 # Note the list in that issue is stale and some aren't relevant for k3s. - k3sRuntimeDeps = [ - socat iptables iproute bridge-utils ethtool utillinux ipset conntrack-tools + k3sRuntimeDeps = [ + socat + iptables + iproute + bridge-utils + ethtool + utillinux + ipset + conntrack-tools ]; - buildInputs = [ - k3sBuild makeWrapper + buildInputs = [ + k3sBuild + makeWrapper ] ++ k3sRuntimeDeps; unpackPhase = "true"; @@ -225,11 +255,11 @@ stdenv.mkDerivation rec { --prefix PATH : "$out/bin" ''; - meta = { - description = "A lightweight Kubernetes distribution."; - license = licenses.asl20; - homepage = "https://k3s.io"; - maintainers = [ maintainers.euank ]; - platforms = platforms.linux; - }; + meta = { + description = "A lightweight Kubernetes distribution."; + license = licenses.asl20; + homepage = "https://k3s.io"; + maintainers = [ maintainers.euank ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch b/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch index afe2c356aa4..1e39792df5c 100644 --- a/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch +++ b/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch @@ -55,10 +55,17 @@ index 72d3c07ece..3e5455b262 100755 echo Building containerd-shim make -C ./vendor/github.com/containerd/containerd bin/containerd-shim diff --git a/scripts/package-cli b/scripts/package-cli -index 4c66ce32df..6d1e0c03cb 100755 +index 4c66ce32df..280b428bb8 100755 --- a/scripts/package-cli +++ b/scripts/package-cli -@@ -55,10 +55,10 @@ LDFLAGS=" +@@ -49,16 +49,16 @@ fi + + CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} + +-go generate ++CGO_ENABLED=0 env -u GOARCH go generate + LDFLAGS=" + -X github.com/rancher/k3s/pkg/version.Version=$VERSION -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} -w -s " diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 2467ed93b32..c01e1c8c004 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash zsh; do - $bin/bin/kompose completion $shell > kompose.$shell + $out/bin/kompose completion $shell > kompose.$shell installShellCompletion kompose.$shell done ''; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index b4983a602e6..027809c61e5 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -34,7 +34,7 @@ let postInstall = '' for shell in bash zsh; do - $bin/bin/kops completion $shell > kops.$shell + $out/bin/kops completion $shell > kops.$shell installShellCompletion kops.$shell done ''; @@ -52,12 +52,12 @@ in rec { mkKops = generic; kops_1_15 = mkKops { - version = "1.15.2"; - sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3"; + version = "1.15.3"; + sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df"; }; kops_1_16 = mkKops { - version = "1.16.1"; - sha256 = "04ji1703z6b3rd4wmccah68api0jj2bndzkgdzqi855gccqbmi5g"; + version = "1.16.2"; + sha256 = "1vhkjhx1n3f6ggw5cy1avs3sbqb2da6khck9zqd4s7almjbpc2h2"; }; } diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 569baf6000a..3d3674dbe0f 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeval"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; rev = "${version}"; - sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv"; + sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; }; modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; @@ -17,7 +17,7 @@ buildGoModule rec { description = "Validate your Kubernetes configuration files"; homepage = "https://github.com/instrumenta/kubeval"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski ]; + maintainers = with maintainers; [ johanot nicknovitski ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 010d8cf4d21..ced4c45d059 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "luigi"; - version = "2.8.12"; + version = "2.8.13"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1p83mxqs7w5v27a58ps7wji5mlyfz66cpkbyrndix0pv9hdyzpxn"; + sha256 = "0x14549iwj7r1knc0hmic9ny9hp960yjjqi4mxl78jb69gd3bhmf"; }; propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 9c5727ec735..02a2270e45b 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "minikube"; - version = "1.9.2"; + version = "1.10.0"; # for -ldflags - commit = "1b78a7b8a99ad6a3c62b8d22f57120d614d17935"; + commit = "f318680e7e5bf539f7fadeaaf198f4e468393fb9"; - modSha256 = "1pxs6myszgma3rzz0nhfjbnylv6m0xzlinvmlg0c4ijvkkzxg3v5"; + modSha256 = "1g94jjwr5higg1b297zwp6grkj7if3mrdafjq9vls9y2svh11xr8"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "025v45427d885qkjjg7ig8fgrvjalnf1lajsj0cnbwbih2m69svg"; + sha256 = "0n7px2ww00jllgm6qdax09q80gqk2qi23jfk90mnwphwjrqrggfp"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 3dcfbf6fd7e..0c932396e9e 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -48,7 +48,7 @@ in buildGoPackage rec { ''; postInstall = '' - wrapProgram "$bin/bin/minishift" \ + wrapProgram "$out/bin/minishift" \ --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}' ''; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 19272c37ee8..b547434d8da 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -61,8 +61,8 @@ in buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" + mkdir -p $out/bin + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" installShellCompletion --bash contrib/completions/bash/* installShellCompletion --zsh contrib/completions/zsh/* ''; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix new file mode 100644 index 00000000000..7c948fbcdfc --- /dev/null +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli }: +stdenv.mkDerivation rec { + pname = "ssm-session-manager-plugin"; + version = "1.1.61.0"; + + src = fetchurl { + url = + "https://s3.amazonaws.com/session-manager-downloads/plugin/${version}/ubuntu_64bit/session-manager-plugin.deb"; + sha256 = "0z59irrpwhjjhn379454xyraqs590hij2n6n6k25w5hh8ak7imfl"; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ awscli ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = + "install -m755 -D usr/local/sessionmanagerplugin/bin/session-manager-plugin $out/bin/session-manager-plugin"; + + meta = with lib; { + homepage = + "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; + description = "Amazon SSM Session Manager Plugin"; + platforms = [ "x86_64-linux" ]; + license = licenses.unfree; + maintainers = with maintainers; [ mbaillie ]; + }; +} diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 95ad965c346..8ad0e8711f2 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = - let stern = if isCrossBuild then buildPackages.stern else "$bin"; in + let stern = if isCrossBuild then buildPackages.stern else "$out"; in '' for shell in bash zsh; do ${stern}/bin/stern --completion $shell > stern.$shell diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 50a5129226a..516c4e51402 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -26,7 +26,7 @@ let postInstall = '' # remove all plugins, they are part of the main binary now - for i in $bin/bin/*; do + for i in $out/bin/*; do if [[ $(basename $i) != terraform ]]; then rm "$i" fi @@ -88,7 +88,7 @@ let buildCommand = '' mkdir -p $out/bin/ - makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ + makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ --set NIX_TERRAFORM_PLUGIN_DIR "${ buildEnv { name = "tf-plugin-env"; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 26c969c671f..245bd2fffbb 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -1,29 +1,26 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, terraform, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "terragrunt"; - version = "0.23.2"; + version = "0.23.14"; - goPackagePath = "github.com/gruntwork-io/terragrunt"; - - src = fetchFromGitHub { - owner = "gruntwork-io"; - repo = "terragrunt"; - rev = "v${version}"; - sha256 = "1r3q7faxys0h147cr9154pcix1qgj36v41ja9hhbggm4c7vig4s1"; + src = fetchFromGitHub { + owner = "gruntwork-io"; + repo = pname; + rev = "v${version}"; + sha256 = "1znb9d4n9zv3dq10dw17kb1h04gj8iz6gwx1a741fcf4ygp8zpy1"; }; - goDeps = ./deps.nix; + modSha256 = "0pjqsb6lxk73prc6jxj07iwd1wyy5gqz24kigb308r3n0c2vcnky"; buildInputs = [ makeWrapper ]; preBuild = '' - find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %' buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}") ''; postInstall = '' - wrapProgram $bin/bin/terragrunt \ + wrapProgram $out/bin/terragrunt \ --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform ''; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix deleted file mode 100644 index 16105dbadcb..00000000000 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ /dev/null @@ -1,525 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "d96ccb2ba7586bb79a416471882d347754a78ce5"; - sha256 = "18f1l28665x1a8j8a5bh2i7wb2vrwj050d1g5qda50isgqaybixd"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/agext/levenshtein"; - fetch = { - type = "git"; - url = "https://github.com/agext/levenshtein"; - rev = "0ded9c86537917af2ff89bc9c78de6bd58477894"; - sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130"; - }; - } - { - goPackagePath = "github.com/apparentlymart/go-cidr"; - fetch = { - type = "git"; - url = "https://github.com/apparentlymart/go-cidr"; - rev = "b1115bf8e14a60131a196f908223e4506b0ddc35"; - sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3"; - }; - } - { - goPackagePath = "github.com/apparentlymart/go-textseg"; - fetch = { - type = "git"; - url = "https://github.com/apparentlymart/go-textseg"; - rev = "fb01f485ebef760e5ee06d55e1b07534dda2d295"; - sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "572908275ed4e38fef7ccb7d507f2faacaa7ab36"; - sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs"; - }; - } - { - goPackagePath = "github.com/bgentry/go-netrc"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/go-netrc"; - rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; - sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; - }; - } - { - goPackagePath = "github.com/bmatcuk/doublestar"; - fetch = { - type = "git"; - url = "https://github.com/bmatcuk/doublestar"; - rev = "2437321e1473408f122a95f65df3d8841fec4fba"; - sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp"; - }; - } - { - goPackagePath = "github.com/creack/pty"; - fetch = { - type = "git"; - url = "https://github.com/creack/pty"; - rev = "3a6a957789163cacdfe0e291617a1c8e80612c11"; - sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b5d812f8a3706043e23a9cd5babf2e5423744d30"; - sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "6f77996f0c42f7b84e5a2b252227263f93432e9b"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "beaecbbdd8af86aa3acf14180d53828ce69400b2"; - sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; - }; - } - { - goPackagePath = "github.com/gruntwork-io/terratest"; - fetch = { - type = "git"; - url = "https://github.com/gruntwork-io/terratest"; - rev = "a02960d4ef0711ae95ae2651271b4e073f88da4e"; - sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "8a6fb523712970c966eefc6b39ed2c5e74880354"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "eda1e5db218aad1db63ca4642c8906b26bcf2744"; - sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-getter"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-getter"; - rev = "f9ec369200fd2163b8f452e5e45696d83ae3f4b6"; - sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "886a7fbe3eb1c874d46f623bfa70af45f425b3d1"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-safetemp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-safetemp"; - rev = "c9a55de4fe06c920a71964b53cfe3dd293a3c743"; - sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd"; - sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl2"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl2"; - rev = "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25"; - sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj"; - }; - } - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "abec0acf40d8e31ac612a244cf3886fb3bcce0bb"; - sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - 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 = "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3"; - sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; - }; - } - { - goPackagePath = "github.com/mattn/go-zglob"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-zglob"; - rev = "2ea3427bfa539cca900ca2768d8663ecc8a708c1"; - sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-testing-interface"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-testing-interface"; - rev = "6d0b8010fcc857872e42fc6c931227569016843c"; - sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"; - sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "ffdc059bfe9ce6a4e144ba849dbedead332c6053"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; - sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/zclconf/go-cty"; - fetch = { - type = "git"; - url = "https://github.com/zclconf/go-cty"; - rev = "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200"; - sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90"; - }; - } - { - goPackagePath = "github.com/zclconf/go-cty-yaml"; - fetch = { - type = "git"; - url = "https://github.com/zclconf/go-cty-yaml"; - rev = "bc34c981dadb5ed30af852693e3aba8fb6546f42"; - sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "9c377598961b706d1542bd2d84d538b5094d596e"; - sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5c40567a22f818bd14a1ea7245dad9f8ef0691aa"; - sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "f17229e696bd4e065144fd6ae1313e41515abbdc"; - sha256 = "0q1fij8izg7xcnx7wqh0zdnya11k3d9a5fqm0yb2r93jhlf3x128"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "910be7a94367618fd0fd25eaabbee4fdc0ac7092"; - sha256 = "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "ed3ec21bb8e252814c380df79a80f366440ddb2d"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; - sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33"; - sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; - sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "49b8ac185c84c5092be0953fb92b7660db9b8162"; - sha256 = "0ccsm8p9i83f0s0z5c7jwyzj7jgcg60zf20hzrmp705669wn5y67"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "e9c39defab7fc4be8ec95d4ce422dbeae4070400"; - sha256 = "01wjr07xnb9s32y2jc6d0rba3jxwccd2wydm6cql41yhyr3x84rd"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; - sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301"; - sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc"; - sha256 = "09phrrsafgq6hnbw8cawvx44bdpk1p584fys17x1bwn0j0451zzs"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "afd67930eec2a9ed3e9b19f684d17a062285f16a"; - sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal"; - }; - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 12865bd6ca7..5ff47f4859a 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation { homepage = "https://www.dropbox.com"; description = "Command line client for the dropbox daemon"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index d0825404f01..5ee80250dde 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.5.9"; + version = "3.6.0"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0dvjcazvrgxfxg1gvznxj8kx569v4ivns0brq00cn2yxyd4wx43s"; + sha256 = "0nlvhcvd3bbvd3dapqix7h29pchbd9gv5n3hmrig9yi98yv8q53r"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 8bb38230d5c..780385b28f3 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,10 +1,8 @@ { stdenv , fetchurl - , dbus , gettext , gnutls -, gtk2 , libfilezilla , libidn , nettle @@ -16,33 +14,46 @@ , xdg_utils }: +let + # we can drop this when wxgtk is built with gtk3 by default + # see: https://github.com/NixOS/nixpkgs/pull/73145 + wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; }; + +in stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.46.3"; + version = "3.48.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "15bkg9qs07h4pzkxba1gymp8f264dk0zrzd9brx48fcwm7qbzigi"; + sha256 = "0msxl8ihbycd56hmn1q8sl1gzmsxc7j8ar9k4zsryd0ayyz7wv05"; }; + # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 + postPatch = '' + sed -i src/interface/Mainfrm.h \ + -e '/^#define/a #include <list>' + ''; + configureFlags = [ "--disable-manualupdatecheck" "--disable-autoupdatecheck" ]; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus gettext gnutls - gtk2 libfilezilla libidn nettle pugixml sqlite tinyxml - wxGTK30 + wxgtk' + wxgtk'.gtk xdg_utils ]; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 1d045afd4c0..6cfc5ed3a99 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.7"; + stableVersion = "2.2.8"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -25,8 +25,8 @@ let }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1rq1cb07mvakqny848nvwgasp8f6pxdy790gd98xh55xrbi8jvxp"; - serverSrcHash = "1cf3inppj2050mgmx5sgf540iz3m3nbh53p26dx8m67x2xfyb934"; + guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7"; + serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 5465a27bbf2..ac6ad4f22fe 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,23 +1,19 @@ -{ stdenv, fetchFromGitHub, zlib -, ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +{ stdenv, buildDunePackage, fetchFromGitHub +, ocamlfuse, gapi_ocaml, ocaml_sqlite3 +}: -stdenv.mkDerivation rec { +buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.2"; + version = "0.7.21"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "1l6b4bs5x373pw210nl8xal03ns2ib1ls49y64s3lqjfh5wjmnjy"; + sha256 = "0by3qnjrr1mbxyl2n99zggx8dxnqlicsq2b2hhhxb2d0k8qn47sw"; }; - nativeBuildInputs = [ dune ]; - - buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; - - buildPhase = "jbuilder build @install"; - installPhase = "mkdir $out && dune install --prefix $out"; + buildInputs = [ ocamlfuse gapi_ocaml ocaml_sqlite3 ]; meta = { homepage = "http://gdfuse.forge.ocamlcore.org/"; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 04c87b7c25b..d6e9b2e7439 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "1ryfa3bzd8mrq2k5kjfwmblxqqziz6b9n1dnh692mazf5z4wlc3z"; + sha256 = "1nv5aq5lpkpskkzw05hr2lshkzcs4zqj5kfv4qjlbwigmp6kwh9l"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 035878b8e00..9c286d00832 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -4,6 +4,7 @@ , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c +, fetchpatch , libgcrypt , epoxy , at-spi2-core @@ -26,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54"; }; + patches = [ + (fetchpatch { + # Allow newer versions of libsignal-protocol-c + url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch"; + sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2"; + excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ]; + }) + ]; + nativeBuildInputs = [ vala cmake diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 13013dc4c75..025b66852f4 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "VoIP and Instant Messaging client"; desktopName = "Jitsi"; genericName = "Instant Messaging"; - categories = "Application;Internet;"; + categories = "Application;X-Internet;"; }; libPath = lib.makeLibraryPath ([ diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index bd9d706d4e3..e5862769882 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.1086"; + version = "1.4.1159"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "0war4hbjs1m7ll6rvpl3lj44lb0p5fi0g2siinnxpjffz2ydi97p"; + sha256 = "1k4ip2glkjsbb28gzffahi81kz90qkf213j89gsmcvbdjf4kp687"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index e3fc384f0f0..58d6230f26a 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -7,7 +7,7 @@ , AVFoundation ? null }: let - version = "1.16.3"; + version = "1.17.2"; rev = "v${version}"; in mkDerivation { @@ -17,7 +17,7 @@ in mkDerivation { src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - sha256 = "0qd4nvbrjnnfnk8ghsxq3cd1n1qf1ck5zg6ib11ij2pg03s146pa"; + sha256 = "04pbv1zsxy8dph2v0r9xc8lcm5g6604pwnppi3la5w46ihbwxlb9"; inherit rev; }; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 390b61d8d36..d036050a476 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.15", + "version": "1.6.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index e1dce803b40..0db687dff0b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -610,11 +610,11 @@ }; } { - name = "minimist___minimist_1.2.2.tgz"; + name = "minimist___minimist_1.2.3.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz"; - sha1 = "b00a00230a1108c48c169e69a291aafda3aacd63"; + name = "minimist___minimist_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz"; + sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index a30df623050..3b4f968c129 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,12 +8,12 @@ let executableName = "riot-desktop"; - version = "1.5.15"; + version = "1.6.0"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "08yk5is6n9ci1jml0b94a3swdybx01k5klbl30i1b76biyn75m77"; + sha256 = "16zm6l4c7vkfdlxh6gdw531k5r4v3mb0h66q41h94dvmj79dz2bj"; }; electron = electron_7; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 78fc4b45f6b..3aeb715ac67 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.15"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "09a9l1l65m2c4ldycjhnqn0mmblm3j65vc9rcjfkdxqbd6bh86h7"; + sha256 = "1mm4xk69ya1k3gz6jjhc4njx7b3rp157jmrqsxr5i382zs035ff7"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a062d679f7f..a4594a20caf 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.6"; + version = "0.6.7"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "1r0w9knxa2kx5my9xgmcnhq14287ixwbqxqip5ispj78d27g4zfq"; + sha256 = "13wz2c0n89aglqjfqlma1z4jr5xnp2qlg8cqng3v9axpkkynk996"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 319f400d95d..1e1f952586c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.1"; + version = "2.1.4"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0032csgzwfby5a8q8w9iks7ggv1dcqli3qyhksbzly2xzxmfzqaj"; + sha256 = "1swmmklw2mcgag0c8zh4rk5cjfx6z2yl0nxd5yc43hg9hx76yqqi"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index cbd32347c4e..ed320d9679d 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; # hack: needed to fix build issues in - # http://hydra.nixos.org/build/38322959/nixlog/1 + # https://hydra.nixos.org/build/38322959/nixlog/1 # should be an upstream issue but it's easy to fix NIX_LDFLAGS = "-lz"; diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index 578ac9b0479..727f89da9a2 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,24 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { +buildGoModule rec { pname = "ipfs-migrator"; - version = "7"; - - goPackagePath = "github.com/ipfs/fs-repo-migrations"; - - goDeps = ./deps.nix; + version = "1.5.1"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; - rev = "4e8e0b41d7348646c719d572c678c3d0677e541a"; - sha256 = "1i6izncgc3wgabppglnnrslffvwrv3cazbdhsk4vjfsd66hb4d37"; + rev = "v${version}"; + sha256 = "18pjxkxfbsbbj4hs4xyzfmmz991h31785ldx41dll6wa9zx4lsnm"; }; - patches = [ ./lru-repo-path-fix.patch ]; + modSha256 = "1magqgbb6prnihr8lr6jc2fcgsbqqc9y317mkdnvq9qs6bj0a6qj"; + + subPackages = [ "." ]; - meta = with stdenv.lib; { - description = "Migration tool for ipfs repositories"; + meta = with lib; { + description = "Migrations for the filesystem repository of ipfs clients"; homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix deleted file mode 100644 index b4ae5ef827e..00000000000 --- a/pkgs/applications/networking/ipfs-migrator/deps.nix +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - goPackagePath = "github.com/jbenet/goprocess"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/goprocess"; - rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; - sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random"; - rev = "384f606e91f542a98e779e652eed88051618f0f7"; - sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random-files"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random-files"; - rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; - sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768"; - sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2"; - sha256 = "17bqkd64zksi1578lb10ls4qf5lbqs7shfjcc6bi97y1qz5k31c4"; - }; - } -] diff --git a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch b/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch deleted file mode 100644 index a933a7b5358..00000000000 --- a/pkgs/applications/networking/ipfs-migrator/lru-repo-path-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ipfs-1-to-2/go-datastore/lru/datastore.go b/ipfs-1-to-2/go-datastore/lru/datastore.go -index 7eb18eb..cd8dcb7 100644 ---- a/ipfs-1-to-2/go-datastore/lru/datastore.go -+++ b/ipfs-1-to-2/go-datastore/lru/datastore.go -@@ -3,7 +3,7 @@ package lru - import ( - "errors" - -- lru "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/golang-lru" -+ lru "github.com/hashicorp/golang-lru" - - ds "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore" - dsq "github.com/ipfs/fs-repo-migrations/ipfs-1-to-2/go-datastore/query" diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index b94fc1addb0..1f8838e4c29 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,22 +1,29 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "ipfs"; - version = "0.4.23"; + version = "0.5.1"; rev = "v${version}"; src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm"; + sha256 = "11l55hlbixv1i25d3n216pkrwgcgac99fa88lyy3dailvminqxw7"; }; postPatch = '' rm -rf test/dependencies + patchShebangs plugin/loader/preload.sh ''; - modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm"; + buildPhase = '' + make install + ''; + + passthru.tests.ipfs = nixosTests.ipfs; + + modSha256 = "13mpva3r6r2amw08g0bdggbxn933jjimngkvzgq1q5dksp4mivfk"; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 4538edd2e76..a05ec290629 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -78,7 +78,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 the-kenny lheckemann ma27 ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 lheckemann ma27 ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix index 62be1a4118c..fe611892ae6 100644 --- a/pkgs/applications/networking/maestral/default.nix +++ b/pkgs/applications/networking/maestral/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.6.3"; + version = "0.6.4"; disabled = python3.pkgs.pythonOlder "3.6"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "SamSchott"; repo = "maestral-dropbox"; rev = "v${version}"; - sha256 = "0h1vbx00mps2msdhsab1yz64c8sprwrg38nkqyj86mkb6jkirq92"; + sha256 = "06psbjd205qj6vx7k7ywhclz1bs5zp43xnf275hf0k80h3b064sn"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 7d7f660df7c..8b2a6f05c4e 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -2,18 +2,22 @@ python3Packages.buildPythonApplication rec { pname = "afew"; - version = "2.0.0"; + version = "3.0.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s"; + sha256 = "18j3xyzchlslcrkycr2i59jg73cb6yh5s7l3qnl6sa7vgxcbhq7c"; }; nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ]; propagatedBuildInputs = with python3Packages; [ python3Packages.setuptools python3Packages.notmuch chardet dkimpy - ] ++ stdenv.lib.optional (!python3Packages.isPy3k) subprocess32; + ]; + + checkInputs = with python3Packages; [ + freezegun notmuch + ]; makeWrapperArgs = [ ''--prefix PATH ':' "${notmuch}/bin"'' diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index e1eb8863a08..736d7530be1 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { homepage = "http://www.mutt.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index f6bf60166ca..26f47dba461 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ flokli puckipedia the-kenny ]; + maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 39950bd58c5..800f7ff9e62 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.7.0"; + version = "68.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ar/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ar/thunderbird-68.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "549c2fde5a7da05f1d0da28e6e203fffef5cc7d39073baef204da5ce221fdb12da53da64b29dc84cf4518eaee7394db71cee6e22611d5d86938df1b9b3bf8e0b"; + sha512 = "a45860fc124ef1c3ce15b1c91ab1d920beff2d6f886a646b6162bc5687e8910d559de6d616a36e7bdbd99fe18aa39720b44fcd4fe14e6d5fd4872750f209a740"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ast/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ast/thunderbird-68.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "92fa156e6dd72d9c0a6b0b6889e7486d97922cad3d8c8a4e572b048ff5694cd4fcd7f7f91eff718417760b72a50d045e5508befb8404f9343ec73633c8c43040"; + sha512 = "21e025c3e28b46e1d6af0fa10f3ab5b6b86543bb422c2b3d4928ae733cf3387ab092a20af15f05bdcebf0108c376973982d099371a4b2c2f9a892defe144e160"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/be/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/be/thunderbird-68.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "1ddce136d33b7eb6065cc1fa02f3e167b76a546308a19edf51f1102e569b259cb2bbd98d720050d48669ae04610cde6c09400ae6a9f467d611f3a5d332dcf203"; + sha512 = "5cb35465afbf6ba68aab98197ab6997e925d5e34db6deaf3b047fb679f32372e0524ac03d7988898f34c493349283088a3b4c0cfff679774760916673e49b757"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/bg/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/bg/thunderbird-68.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "31aeab60348dcb199e3fee7c167eccb8e02e98a62c0a30ad48d2963fda56a1cf25ff71eb9f16bc186db481fa90d795191c6aa29eef33742adab6e2df0c2e5282"; + sha512 = "a06dea6a215003ef5663cea4928cf201ee71cd021565f3a2f9317f21679047adc7f6c87427d65c4f919facb30e8dfaf941e308173f23c6c0b3e92606fa0220b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/br/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/br/thunderbird-68.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f1555dbb5e30ad7d9d7468473f042424e9abd159a85325af55fdda74963c54e780f76093d15a2fc23a555b22896c6a76ad4c449846611222b63d13745cb577b7"; + sha512 = "194f7332e6c67dea103bae4001b555296b2a64259060bb63329aee95f774e4f3f82c9bf133a456989b43f05682eba7e73e16235f1530012aeb7cf323bc16a381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ca/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ca/thunderbird-68.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "44e0a8cb1feda921b6a3afb6ef0f72d2ad3aaf681f908673c015ef43a660914df5a8b61a6d987c3ddb0b6abc6cd778e0ddb07c56c737a74848942e26d4ee45a2"; + sha512 = "99952f59100fe127fb274df641e02185a9416c315d5b023e990ca39fe6edb014a2e6e8ae702cce4d3133635a4c8488c42a72a6b3111147fc19dafeacae396943"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cak/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cak/thunderbird-68.8.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e907643f6c7065117fd131d24b452734c229fad3bace6d445de15757ffbed875fdc69dcfc535cbe7b00b38df30c0b69b378b50560382e57fabff166c71d7ea33"; + sha512 = "9e4d9dd67fa7480c2897175d08ed250a14bb2595c9a69f74db7b7723d08e6218021a0916d637bb682f7e0e3e316cafcfe9a09408e5cced018616c00a752ccb0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cs/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cs/thunderbird-68.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1b65fe735bb61d2dbcd2d23ede39e7770a66feb6f898ec31cb7c198fdf95796d4f42876730fdb993767026c4c315a9be9cb53229cc21a5328ff443bc463ca4c3"; + sha512 = "53d653b9eda30f7b5ce75ebd31a2bb9e5bde683ca65549cb5d67ed4173eb4f44524f2bd148a0b41368e183b2ec513b7b7c698fcdeb2679ffd6391f133db2a0c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cy/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cy/thunderbird-68.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "77a3beb1ce6e78fb1d5138a7f0021462efb96e7f1d13cae2213670016a4a89dbd4a46bbe0e588ad15957ec71d053643cbd01033d9cdcc4e91b9e0303726abc27"; + sha512 = "ba01e95181c8b0e04989681cffacbc48a57a7861ce7f60377e219823fc5c70096bdf4f0a38401a35fd442e28c62b0bbb38328e62800db82ea7d097b919f60d55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/da/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/da/thunderbird-68.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b9d12257b5b4fae31cb70edf36ff02d48dc56481b37fa3f3a65bacadc38d772e407d7c1382899179299c23d70e55652c1d05f8ada855621a9db5f300b9c983a7"; + sha512 = "5b79cff38ae706023ef74799e66fb3e47e0cc4b1986f7df9b420dc27881c91db881311da9ac8c8d45c2a1c04a2e8b16b9a1d06e724e891f8a4e6323eedfd984b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/de/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/de/thunderbird-68.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c84cd6e76e18207ed02209bb333e922e3dc928c0f0ecd0243f4f8024d49c3ad1f4c3268dde921ced90a77cacffcd41eac82beab65d226dedcd07fd7a2f821a00"; + sha512 = "de71986c0fecd12358a6ce01c708b7cfc1ebbc9a3f748f301bec76c1c4b23f584de224bfb8cca0bc59f545aa29990de0175af5a3005b33b77786c8b69065427f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/dsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/dsb/thunderbird-68.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e29bd848258aa5b04eb60391183bead511ad8bdee038994a84982d068312c97b2e490cb5abe3821825101ed313c503c5c679e42d79011aab89bd116af7807276"; + sha512 = "e18851b7c709feb8c3bde88db8d9c297174ea3a7ff512f8a5d35d515e3693717f55631b4ab60fd134f0af056257e0b21947a400d305f91c904dc0848fa9ce5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/el/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/el/thunderbird-68.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b203b8cb46f51f5dd176aabfc720eadc41ed081094c8feed87658885025ba4aef422ac19f4b4773976c42c4f8ce38aa80b39bc75f56c42ec59f5313ce4b98111"; + sha512 = "10816787adb0d02712b1a200f0b7547d8b03ff44056690dcf41a8a74c0dd1faa86a073c5036527a34626e83f47742caa213bc953a0d80e3598b2a743bcfc4d78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-GB/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-GB/thunderbird-68.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "998aaa3ea0dcc387568802f367ea1637806a1dc19929ac8875ab4823c691c84004f62c6450b3c4439b88e017774ecbd4abfa38f72661fd9ce97208fe920060e4"; + sha512 = "295a440863622a263a8c157da9ae4d39f73c83d9e9fab3e8fad792480c84a1fdf0e073398c137c359e0dc078bd755bd024f2f15bb5129218df4cf54d02b9e565"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-US/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-US/thunderbird-68.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "583e9a08aff1d3e4be47e5a9f31b7595109e25a4062a36e8640468a354e29a47f389062db5fa134af6c231af5fb1caaa31368584fa662105100419a64134f0ac"; + sha512 = "cce266a330866ec3368c7d3f596868a87e1e3d786ddb848402456c5d80e5dec60a93a6feeee596b1ad91492e1d07aa5cc5703b09f0703d44575db7a050d58864"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-AR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-AR/thunderbird-68.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d976f3b916430388af3a50f58253cd4ddcaa5adef935b3965c71f38e938a8e3ad28f7ea8d83d4a9e0d0c85d29a1613547a95d4c9c4917159dce06d700e3f8122"; + sha512 = "78d7897c537807068ce92d6520086f921aa6530d893c7d1b662530bfee5a5082740ba4cbbecd7e8e57f5f600e8a288b259ed3d89a97f3e88d5e5ebc47b5bd6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-ES/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-ES/thunderbird-68.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e51afeb81b39f6f3e7c501a0d5ca839d87794ed3a7f04ce552175a7f1227fee9667dec917a0c13d509687e31d6d87516bd5580dfe0158a964b13e4c26c82fb52"; + sha512 = "df97856ec0f8cf1fd82ceeb93529d8560cfe80416db769eea290ea1c28dcdc60799822ef1cdde744dfe4fb9622d16f32b0ed992293481762cf45c44a5bd846e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/et/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/et/thunderbird-68.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "60872a5306f154af3e2b9e58dfecf6135927464c92a3a6cac7c44fb934cc074eefeef6bbb6242e7403aaad3e1fb850d475efb07aaa80a07043f213960b92bd3b"; + sha512 = "9028d26dc4393043b39c7c918163d50aba07d6c1c57916b7e1c607b92be0c16dd8d62ff41b0ff26991b70f63a9fc684904c266e1a18ca8fc3e5abf5c61c6d372"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/eu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/eu/thunderbird-68.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f774a38904b5881d0a5bdf0ddad71fa7f85db82daf7879de54d337e8dae17021267b1a289676a11daf1e96572f2734f74a29327f23636e8b38aed084b874bd7"; + sha512 = "adf9c6eedb1b086fa72af21b44a55bd9d8a1b3f4c45db4c232384abd570564e62fc9068dc1391b0bbe0adda4043c7893bf1cb15a9c3019230eed6f66001bcb97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fi/thunderbird-68.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "0d977cbd85d7f1360e985844cc8ee433414abc3d10b8a33b2fbb9a03fdddcf3a91018edc12a12d96cc680d2c119e0c020549bd40cc10db9eba4188805e40dea8"; + sha512 = "a436504ebc04f1214226a0555838fe5eda6e12dabd3b09e9c83e85cc8b6b7bfea00389202c9680bf14d147e8e0a9200de01fdb1bac2197b8d7e8a392aa3b617e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fr/thunderbird-68.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "dc6d20875579d8e788a236885859faee3ca61d83aa051a48bfe18c484afec986353c1493e7e68181a83fea7a42ee62c29d3f71cc053873743959513dddf6e8ce"; + sha512 = "16d02c3e7d6342fed0f785c0f6a65c06a04eb6915bf67c7ff7d80a59ae9f4e069c329d54a9dbc8add6b84755e18aa485db7950dd1e3231a6ac135d799b27656a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fy-NL/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fy-NL/thunderbird-68.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "add2c509cb15cebc5dc77957c44e26a80ee52eda82f395308303216ebf14d13c09338f7bee14bad46ad0ffa8187008e7f4cc101c712029ff15b3ce14904c0a69"; + sha512 = "c5ddf9105d06b2b5cb45299d88bb7b753832d54a653a62d68695c88aa9cfa0d6e12f510139e924d142b867a5b1e10f7e9704c503fcc93dcb8d97d1b071a69b7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ga-IE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ga-IE/thunderbird-68.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d1771c8282253a80ed62dca8f49797796f202da66e2a607d27dee89a1a8fe556dda440bc03d441b8b63bf732cd9c0960ebf9b9cc047de9c07e901a1051dfc94b"; + sha512 = "6479f7692fda207c51435691cbd6281a24fc6ad47101827516bad3c2b40ca8c0bb592aacd9936a22d9305ff8ffd53c376a79479ce82dee3af1eacf47a068b130"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gd/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gd/thunderbird-68.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ea0f6d6287ef4e771c49b4891a4d9dff8b9766e444087456448e9ebe32c17e41d5cd9c9a17747250c393e389720a6ecb3bc6df98dc5c81f26504fc9cd6ea3e03"; + sha512 = "43b94bbd76809f67078ae5248df2d25b399be35ca7d5261236b6149142083483d2871edf17eec7fd42812fa8f5d775bc141ffb8d0fd43d14f39d3d150dc83a41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gl/thunderbird-68.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "487af69af4e9844a97d72e14a9de8f8aaf8f45efee6f72ad0d5b310019d6fe73c74288b3e4c7d2a83f6e30cb5b3fbeab2d2200d406814e6e25936ccefdbb5f14"; + sha512 = "be4c49d737b2b6bc1a19c0e63df9558c04b448be44a4552fd4fe3d3d28d8cab59bc1bc05cc72acecc8e398fd75ef9785e61848c8f3e39b55b7a534dd337845ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/he/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/he/thunderbird-68.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "13f43a849b765ed9743947c9e03fe9cb7bffcf120446ec80e8622ae1ecc7994497617464e7597a1e883520598f5de2404e2901b8d30cc91fad78dfe58763da20"; + sha512 = "4f0a83e57ac97d3e278c727f49ffff615333812dd9708ebbdd687fc35848be8074705aca6f09b5bb868eb6535c61252272729241cfe46a96e500f7ab6604849c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hr/thunderbird-68.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "bbcb86e67a1975920a3e0fd4298b817103fbf88eea05e822eeb89f60f4690164c90940e32082cbcc19fb9222f53c30b32c39eb041a768b1f8cdf61ae866abd13"; + sha512 = "08a8f8d273b1fceec0151813439be41d6ff1b2b42b28711a782caab04800e1acf61019f0fa8c7be27036ece8184b4b7f587b58f436c0eb8c73f35aa13be8afba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hsb/thunderbird-68.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "23c9d885024b178a37de1f968def6e338fb1e44d2414f01d6b8757e3be082ab4b5950ca6bfb0cfb93093ebcf57d061cfeb2c7c8c46ac56274ff495b83a7754e7"; + sha512 = "1f64e9193fc44201e7bae329af94f7c18e6c0c0d30edf01b66dcca43e996f12622e795890e394c207ba20fc84198836b69e2fb1c61ae83c1875b1e424b5b3b97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hu/thunderbird-68.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "8076d47c0b15fb565ecda807c789d5eba41b1209df356fe2184d4550a115b7ea986bb51fb6e9e8a4a279ed6025b7acb8f5c7ca88e5ccd72e4556fdaaf95619fc"; + sha512 = "4e8741809e8eb3b45a7931d4f5bdbceb1e7018a4f4cef97d32d16d00eb3713d85d70a2a4987830f1480633b07fa839cc8ed73fc1fa2d4b3a2944cf03221a3240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hy-AM/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hy-AM/thunderbird-68.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "825f0066a329fc3e35c6a2c9038a28c1e673b93767a020a6f4297dff5b769882d6550eb2cd293b232123223fbbb0f0e0d54893c98ae9f2e35072071a26171967"; + sha512 = "07f817b7c3229ea993d65861b75c21f37e53e20db2645e68c90a1fc87fd151603580a1ecc67c9007284ab21167e781581a7727a885b760524ffa7079f44986c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/id/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/id/thunderbird-68.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "253cc87eee92b10d9b74e7885e43d5d9b146694bed63ebbb1b5e63730b18feeef53de4581ae824ded77a5770c45fce8b46d90621212d4b0e1ab32ba5fc7df1b3"; + sha512 = "3753ae5cd20cc6a65ff1b1e5484fb596dc08d1a08e6747295904106db0f231006328e0a906d0f2d7fa98c53352cc61351eeefc32b8f35bde2ffe1b8c800d7640"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/is/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/is/thunderbird-68.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0e0784865fa1f0b57f5287674c94993263a03b8876fa6a053cb9bd52cef89a93a07dace1d2425ad669656ebc86a083e37faa456ee52481844e8e8e7fe87f3c85"; + sha512 = "26b1a7169221df476224ca5e1d9e5b97e9cbb8d84bbc12fef19685916f7b8e95e784aef6a86e7fc0078f9bddcc617823f2ca2af9de4412431e878f6efbff6fb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/it/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/it/thunderbird-68.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0eca59d5adf138f2be6b9c2cd11e51252e550b711f3f6584e6971ec3564630eebb7f1774dfed4f79c6b38f3218420825300bb447b0bddd0e16379aa787edd0f8"; + sha512 = "96049256ede8fb4ad1a6f20e3bf2d8513b21536c9dfd2acfd1679c41d25cafe5f938ed7cdc2bd0b11bdcd0a13d730f1d8056e85791211561ad4b3c1017ba23b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ja/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ja/thunderbird-68.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "6a112e7ae24616115f6b5dadc72bd30d8dd046b8df16ebae1d609199d9467259f83b354659a1358d70d2e1ad8c52e71db9991f95aff6f2864649d539b9f0f139"; + sha512 = "df162eff6af3bad1cf1a9ac359f977410f612885f005c989e928af3464d3cebe7511712cdea4e3951bdf4a69a40fc68e2b4f5efb35f25375f04bfae79ab70eaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ka/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ka/thunderbird-68.8.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e2c71035f910648cc83d92af69bd96f3a7668be2ac4ddfcd40c97762a1fa4e94c7d67b9ff588b27783ff943330ee07940fe0f8bf1671dfd87dd34a23b78b55cf"; + sha512 = "74186db28403463f9bf8b41242ce7122d410106c21e369977b73d6e72aec9bdeafb3b47665b0450f5b5eaf75c515759e3d6752d0743a2b598c4c7158c47bc7c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kab/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kab/thunderbird-68.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4e1a72147657fc0706f3cd4c4511fc22949fdb5e90e5d17a080b5c814240451d030ccb4c287ec6901d1dfd8a7ebfd74d59e617ca73530fd20c0b4fad539f9154"; + sha512 = "933fe5f2ae31ee322c4da4c985ed775f8a15b0290f22c2e9e6ecce2f856b0d1236a78659ba3909c9ef97fd4de9634d1ed6aa452174fc987ccdc42b0b65de565b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kk/thunderbird-68.8.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "61cbaa5aa674a4b6a34869f271d93234d874fdf49231b0ebf3c882863b294a0e2e0447bc81c8980c7f27c5dda4e8c29ace091c7097870d4109aa1f4718379099"; + sha512 = "b7ae4f00d7c91e8609ba99592feedfe8f53d4257eacf0a6f206cf768cc4ba16abb54c86f9865416f617b1417601ce4408ba939d065a0a8d3e95aa38ae17444bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ko/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ko/thunderbird-68.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b2d3be58c8af63b3a94888e8365cd7253858733686ee30776c61ccbb8e05db57882158ad3a9aa5af6e319c875e870bb52dae9dd8c834ea5643e811dd948b6fd2"; + sha512 = "6f2d017af8755980f39fefe0d78b22115f33c7397917fb713c8e4fe34e88c7f4d0d6ce58767336dfe3f99d3b4a06b34305f92e4d414fc755a885c954eea97cad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/lt/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/lt/thunderbird-68.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e878eefffd3ada9d49c3a692fe1a968159d8fd23ec8660cb71ce8019034e10c905f1acb79c6122384c7b18f3da3d1e6b91e31807c9d88ae799175fae2ef18005"; + sha512 = "8fc98daf3fe5eb8844d02cb56656aabd260d309ec6ac59055ba0f10f7470292bf942be1647b038103ff99c12cb34e3e03bad2fc8dfbebef0e356ecbfbe93b354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ms/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ms/thunderbird-68.8.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1d6094b7ea3fbdd40d278a60684b2e2357c1608e3403037a761038460dd1c89149f3f010a9f93d795f3f408acb81c3b6fa2b5ce206f5550352db6391895fb0f3"; + sha512 = "5582840bff43eccb907187930286c47c54a10a9a2af1af3e23b61b5ad56ed3eff32e9b488f00a1e2fba7a47fd647e55f0562adf4c01b1fe843f8708e1dee859b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nb-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nb-NO/thunderbird-68.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "0deb1e4fb220c9b17bd68ddec7bf4569ee8425528a6586f5cdadd17f7c1948f933070700d36d7c6cc9442c172d6bb302d2681716abac131c9777d8b57d4f0a4c"; + sha512 = "aae8ce8c919cc9621e99af620959427e732d5bab1515676b9ee7b7bd2a6d46af7163677f6601a52e2aa246f619b2206b7239663660e4bbe8dd2ab558e55c073d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nl/thunderbird-68.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "24c5100339da2ea1df96d515c1529f02b0132385e141520d7a2c94d194ca71a634310eb26f3a88ea0cd6a8ad0a56f33ce5055bce19c68e3465037afe33a85550"; + sha512 = "7d166e84b3406ee0c5caf2309aa005c22779a78e7074f4a061b9e6df50722a95be3977802fafe10bc367f90e8a4e77895b28e2b6a2650b066d2d644962ad3557"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nn-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nn-NO/thunderbird-68.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "525675451d274d17d3b5dbd1d3b75d3475b3c29f32b5d0813c71d5cff6c8002f35038ee7801c245d0b2cefa596ba4288c4287a6fed66905b6497591cca96be61"; + sha512 = "ffc39e7398220dcf4deadd24aa63a0838326bf2b24c58d0507c00169b322f0e56c5d803c1b78c9bfbd8aa345122c928fe688780e6d5ef238de9e399f40998bfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pl/thunderbird-68.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3ef251ebd90637c11cb64f00f429611a2621fc5841e91fa51d7a3ba97d1244ddcf383c8b0011abb009935a59bab58a3bba52e3c4db05483b28c400dbd500ba42"; + sha512 = "f6f2302693af1f466733244f1cde764b0aed0b64afef085e91ba9f24c341007d8e8ab4ca58e777c307ae33bc5c1a78670317393b601d6fb2851095386d7dcb1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-BR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-BR/thunderbird-68.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fe80b879e307d6ca192bae16e13df892bc837e0e216562c4a4ddf7ae3c526e2967cdf8f8291e53a450f70759025303b2195f7e2acf683cca9d8620a00d8ed69f"; + sha512 = "f14380f5b22e9743a0e3b0c390ba4ea1decbb7aa85c1bcecd42f967e5f90416f8904b28b3c5f4b8fcebf55fb07505b96d9b9d8a39d99da5f8725b6bf48e05ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-PT/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-PT/thunderbird-68.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "437e5390889424f126a1a229bf8c66881ac4a98d300f6308e242c5f2386d443c1977c52f78fe9e2b620952d181c14c35692718ff447d267c000e1ccc8cdafd5d"; + sha512 = "215fe20e131557f54091c80e7b2c09c07bcdfb57bbc145964ca37e66b39add37348ac0a08b6c46a6186e25a864447c8cbe2f485fa04687c4cf8e169a731bb8fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/rm/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/rm/thunderbird-68.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d76f9f0e992da2e28e69b20a1ae532c8e98415825d41ee5716c34639abd1a3bb456d8645a108d17423bfac848f8e8a340358ccfc2635794cc703764d6f8de0a9"; + sha512 = "dfb3e49c940b0332753fa9d2347ba833c8243d1f006fd7e463d514c38cd27a14069ccdcfa60847bc6bbdfac1cec95629a2ae699cd702ef1f40e4898fda4961f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ro/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ro/thunderbird-68.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0485cdcdf247ed4bd67420fe7919f7f9d845e3c369c80960d92e448c48e3ce7e55c03ddbce16aed6de84da70a5e7610d8be5f55c5f53dc4568ac712b92a7153c"; + sha512 = "57d7bc23aaf3365b1a76f1bb8006f725a620d14773886dce9aa9bb4625fc062af08bb6bbd40248601569d7aab2a31794bbb79f7b208f36507c7a919d14872a8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ru/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ru/thunderbird-68.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "96b28866dd1e4b68846cd88adee09e4edb60af8d506f42838f3f5f1dadd59ef5339e8c331b2a8b6ed0d1ff482ed48d83861b9db174b28dce5ce90b619b3a237d"; + sha512 = "5e85808686c79ebd323990ea2957c10714281d3f0d4a9b097d2e3820769bf1406f4400ac541eccb5a817a6aa639048d1767c2cf4bfd56a3262ac83ce01516275"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/si/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/si/thunderbird-68.8.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0ea525527ab09277fce4202f488778d838090d2d59fcb2f049b1869ff0a6d50f54eb22449dbd1063aa6b15d5e559dc119e36dbf97d8a7bbf22e9ac4971393a1e"; + sha512 = "c4b3b8d62c0369c95c7f498eb319e839688b27cb23a49d15d9a4e15251d7555be7f65ec9a7b19237921dc71ec6dd5cbec02aa4bfc6c16382f917e0f66b1032bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sk/thunderbird-68.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "26280b266d2a7956321854ec57737d8cd4ff6ecc938ca07304431e6f351f73ea43e2213e28797d0bc994e0174da41108421a957054a00adca97cc630c107e4b9"; + sha512 = "3cd7c89db92dee5ea3ce44df89749d5822659e7b83bcdf56ebcfe0ffd295393c9f5acea5bb836b5bb0a0a6a69e6ce1406efb39d2943357086e14a3802d9181f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sl/thunderbird-68.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3cf380bb8bab8917e3643eaa337e8382e73802d725ca6134e73fc9d991d9e137b6681fb2aaa86aa83cf6766c3f536406298a4962b97175cf63bbf81142b75618"; + sha512 = "d08549134713d50842b82d24ddc8f8fb5ff098c41d3baec30198e43435ac73cc620e7d9375a9aa9622e991c38e4e36241183a026b6aa63420038694d74833180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sq/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sq/thunderbird-68.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "daeeb1a66f65e2da8ef2a6e3c59eb07bc341bebd19a79cce606d787d16f674e2d52decb17ae12125a7df78ecdb7c7a693644b17aa726ce1fd424fd30bb05ae43"; + sha512 = "9c6849fa77de94df39d9e2615aa3392dea0f8adf7e61b0171243fa202b6747a4208279b0c0ce4b05f57544caa69a40641a3b145726d304df549f2b4e75d939d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sr/thunderbird-68.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "01a71c036d95587adb010cdd0f0641c4559af557c3596b16e43d11accddf64290d06ed5b35ab8d0b640b9242157b04a899ded266a47ad7bf2a07e3b923bc6fb7"; + sha512 = "b52b146a4a54c4987d430eae6d7e922a0a43e57d38ef2956e84b4ab50bae2a896ad1350f98171f57b2e4cbf4a69f0b1123a540e4cc582721cda391b2ae7c7616"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sv-SE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sv-SE/thunderbird-68.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "28abf6b95fc03abd0f8d5008a1a3ba5b46138a616750b20e8f7be08fc2307cc75ef0e1ac3b8e29e37542553de502d07c092a771cc94c9b794da6a5bd268e3c6e"; + sha512 = "73767026562ca540c6d3f77792a29b55938ba5d43bfc59d5a020809e020cc9e7c9fcedad8f0653be71e54c44b54374aa1e1d4f5a6e44a40436cf0a9b59e484cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/tr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/tr/thunderbird-68.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a7cb235bf1db3dfc5f7bed0fb92c327fedeb2f319c602bc13727b3c452305345a053405f77895611d294578a96eb8dfe7c7e9f008c531fa2acddfc81679391b6"; + sha512 = "4ce31c5bcd8075d3f6edff2f8266c2c6546e4f19b8c00486b4dd15b68d7ea898b6e76a5745087c0c4a41b3462e4d8facb7ee0e9e988b8b76ff2374206fa3cd62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uk/thunderbird-68.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0fd2ea32ce4ef03150db5234561546f45724e399fb12967a4ecde42149a81f4609505bd1da5cf85ae745e71768b93738c2885c4c7ace9b7b0063d6ace566bbb5"; + sha512 = "affb8eb4049a2452a4f17a405d6228e6debc87802b77bca55848b66fe136ab0eab6bdb64817f43fc25652109fadf1dc830fd7c22339702684916d7cd95147e1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uz/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uz/thunderbird-68.8.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4394e70e02ef67428b74af0b1d35ea06964b71a23d5a0d73afa2e6fdbe8d23286abde651b17a48a2353a1ac762d5a8b169f8e699a79644f00340b05e204f05c8"; + sha512 = "e4a6abf7ee0d6c2c0c7484911b025cd40b4f2d0fb5715a6333430336047deda5721f19abb3c5bf49ad3d16b0d128a495525fbf0a23bab7b1bd8ffd8539d17054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/vi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/vi/thunderbird-68.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e1eeb7b46a9ece66fc40d2d58d2781fea4cca320a97b6cfeddd02f3f6907b44539f4400390467a794cbadde50c8ffe350fb08d8012f207db60d36a61d205a368"; + sha512 = "f58a50ed7505be5903af948025cc2cb15cd6a3370fa6789f784c3d2cf512f7d51a03d7961ede14e6ecad87cdc207932c90741cdfa7325ba67bc44ff150f39b53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-CN/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-CN/thunderbird-68.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ab6839f46e41c14fbc588a59044496feb3e8a35aaaa1f0777212636e9b4dc5a6640b34a3f1e833239d5597f468960a947c0591373938306dd8bedd6c6e13283e"; + sha512 = "609d4b4cd3ff7f1501e7ca6e247ed29e8376b8bafeb140cc134565fffaf65b6051c158d8f4b90fa2e15b3aeb9bb92897f708a00d666ec2eca490c7dd856b28c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-TW/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-TW/thunderbird-68.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4923f6c790335820811bad56494d24a5899c1586ab2344b3e2fc81a91651d9de5b378ec6ac0ec68597ee83a8dc0f24ef084a41bfcd98dbde128cf4831646db70"; + sha512 = "78bbba535a4cc284e7fde8c96739c29fb6998a5aa71a4ba424121cbcd0a44168412e54a0590cb6a1d7d9bfaabe0ddd343ce4cc4dbe63e4c88d99451ac6823143"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ar/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ar/thunderbird-68.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "91b19e61a360062d71e090d7eb8dd78b1ff73fd3e7733573ff1ce6ef4e98c13fb297c219fda8c43c9d80299625ea8bf9566e25a5546f28d010737a399488f3fd"; + sha512 = "1e5d29f706216ddcc8887e17826af397b54fbfe75d4b5c14a644e6c834eec60522ba401392977aaf40a6357713af68f274442288a01db65430acbd7549625c07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ast/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ast/thunderbird-68.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2edcc3b6d7c51c79b1539fe8fa4da53003af0379727ed658ca7523d608c96c251e8be6fea004098609d5b854ebfe6cc8b81830f8e1d359386edd2593f3eff6c7"; + sha512 = "24bab81e6d36189635ae8f0da6f0153f1ef32eaaee388dcdb9f9cb5049c586b01e8de2c79372784645ba42749e48f1d77f7a91c857df69ff72566969a68619dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/be/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/be/thunderbird-68.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "84a76ba8031d25f6b097f66e4b0c74359ac313f25016c3b82e547d8e973814d8398697572014590f23ea094aad7941c13cb4130b618a776f6c4973356cccb30a"; + sha512 = "70a4a9881cdb15b68c5fdcd85ce6234644119bbeb1a3dfdeb47899515303bc65013cde6fbec7d4b2997acca18abe298e9fcf7c7e236931a9f06b7f9c4a5032ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/bg/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/bg/thunderbird-68.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b489ff67e47eb1d431f5b2f59f0d6b8cfcded889e167cea3a2d602057264a402769e44191ac015e15930faacf7acd9f1fccb87abbd438e3629db7b795b8fe43d"; + sha512 = "80a0c836a7809ba49d067fb76fbb639d653f0a38cd77034d3265807da06c3212eb5c7cc522793fdb22c80be65f763a25ba55775d67a6e8716f7ece9dfcd6796a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/br/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/br/thunderbird-68.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "3ffa33885f86bbf13f4c2a2bb15b864aec851b5558eba88e7a64e8b8b111169bf4e163e590491702465ec8436274ee72dd140a0bda2c9ba39754145de5501388"; + sha512 = "81bb47202578f138e135c7f4bc30af3a3ccbd3dbf127dfbb47bb6ff4fbb09c2fd54c68bc65d81e5c3e72cbda749bb0d69cba442e0f7a5336ffa6eb10ab9af4a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ca/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ca/thunderbird-68.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "fad5eeda16877f0bfa5edfec10fd8fe5baf16a112aaf56c908c718159b0bb6b72ac314b93584536ca369d054059612fbf86c396d076158b6efc7a9d9cd2fff93"; + sha512 = "61ae36d17fbbc8f91f517992966b59a687ce6e6c72f18cc3a8e8c6d29cb4dac18a7edaea2132bb258e77a0e6690df622aa35f9f0700d713c6411ef4363ba9028"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cak/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cak/thunderbird-68.8.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "f4a0605533cfd5b0806c8412514de4478c520f52903a07c809df136b443ff0734be917444cec2d4c73301d0821d77e585c96bf314ab17deec4b4bd5036e83a97"; + sha512 = "eb0a3dccaae4cdc70fb3a1f5c25cde379ac3d9be65b3125428532ddd8e4ff8c7d65733a2eb101435ae14ac06d1a4ea32c1cba40d8c114b4b8025287ac7fa85c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cs/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cs/thunderbird-68.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "319f3a63a352a2f7831bb6d2d046d238db4c136cdc256934ac19fd4e8421344c98b4900c57a12f49af77d1844ffc8e8c7129c4ab9557d590affd59aaa0229ba4"; + sha512 = "8b8cdfb5f0449e48ce50ab27f75dbb9cdb05ecc9df58dca52be3b72dc523d06248c14656f4a072645e5292e8b06a82b274307b7d4dec99228de7353b539937cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cy/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cy/thunderbird-68.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4aa1974543b568168d06ec8c0004127cabab481fa798a67878a9bd5c1955d98d14d770383ef5e6af35dadc106fb20da46a1744a7156b3bfc582e416a32df1673"; + sha512 = "a265e96a1ba45a57999a905f21e45edb457004cc2a337d2b84e2d55d2b2a0f71d1f20d524701a2287f3038f76fd814b051d46b1f130a40713d745b701e66570f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/da/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/da/thunderbird-68.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c587a13d45f5a5e94108252d8dc98548583ac7f27b35f3fc28100df0a15f696c04c68a4f786d7b9c3ee461db6120c14aef2b6ee14cfcabbe855f16ed00660861"; + sha512 = "4ff53dc463e51d14ae4cb7935f44cf2d2624e98469d7dd1285c7a8c512ee8c73aecf0067c6a695024a6e0588b9f567ef3ed12ea9c72bb6e525af348a52144ea2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/de/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/de/thunderbird-68.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5c425faa2c44d30b695ce6713b59e5720bbd8294aea20d1c7431f26173da0f6ca85b1cdb9f178e54ff670e109bc6c30abf21110df0c7029b5d5a01373c8b1510"; + sha512 = "aac47bce113450818c44d4c17f05be4a57bb33a7e41fc1fbf50b9123ebaf229d673484190538c6fdb6b1a02ad42e33f1644d4ee625707bd3776eb86e023366b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/dsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/dsb/thunderbird-68.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6ad04e1e43d0a7e4821c584a78b476262e77aa5f6c7d170806eb02d74b0d831f53e66568917837d11c11cb5ed19b796c23ba6d496573ca1da7029fb1eedbad9f"; + sha512 = "35e4a54a82175a1f214a87718800a42743f81cd39e14971da9729cdcd863dbbb70d61d60d58387951cd3e470c764df22b225a4cf9ce894b97699073ca475d46e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/el/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/el/thunderbird-68.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e9c7d89bbc736527ea9918151886705fec533969582ff37fe8e1acec3b6c1938fb33da4285c02ea92c2a87df1c6700c9c2223ca391ba342eb2e4e1fad8e06f8f"; + sha512 = "b919a771034e06e8b30ba9662930d7961fab757d2d6dd4603239063127702051a29c6401a983a0d0e4b232b16cf5780f8d1cb53037a22b0b2175653eb86e893a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-GB/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-GB/thunderbird-68.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ead179d699feabcf14373aa4e02ec96f52e96f8a1413294f690d70608f2cf83fdfbccd1031f0430a0f3805bb230943d8aea269195d0f092334040d0c092cf9b7"; + sha512 = "70c979be649771596478d0ec9f33398baa862e12aadb5369af42a62c732f1cf40c3e1184ddabd12ac1cb4b21759d2b00f24c59e7f89ca6e221a62837813f9785"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-US/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-US/thunderbird-68.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "18309ddef56d0e7e50f3b5895e1c21c206b432da141c7517f9220686ada6523f7b0181e98a6722205bfe09d9023c4d2beeeb11ad60a7b6ec4242441bd60afcd0"; + sha512 = "a0750ff269b11f52d8b001274257c7e4e35fe356e7ee0d31bf929c9336e7abef5f8670d19541f45900192ee72417d8b90a388e17896dc279e78a15c5faeae929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-AR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-AR/thunderbird-68.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d0a1ce2264c3663a529df667f800bb7e7ae446e09a5b0b09934e00ca18e523baca3943edf1bc2e3269a1b41399a47bd989b487e8650a0ce9a66b94b8bcb37726"; + sha512 = "ad524e9198f42cc06bcd6b6ea86ba64b4faca80e9fb5df45e34d49997d131973426edde698d3e6e9fd89f133e527ba7089f1c5b753f6614e597a74b80edb5626"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-ES/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-ES/thunderbird-68.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5dc04a48b1997e0291265533351818b1912d73b9b002c8978f729006f7b406c03c27edf736a99d898ad9cb8328b40d732b27ca51e3f621740146b81968f87d8d"; + sha512 = "8bba8a570e58ba7e3091af1c1cea4fe6e4cef3ef2bd0ce14ea13087c80d3c01efe43e60497977be6ece54ecfd92d0f6c30afd0d561129e7589c18bf318e415c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/et/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/et/thunderbird-68.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8fdb9911b0da646fca7256fc0e004530339f6631fe3a91e1c0857b52d3d7f786a6fb8bf83cfea9e3c4e0faf6093d0b3afcd46a0dd1ce5c1357a40ff217393d6b"; + sha512 = "ad6b225169aea7b8634b57f7d1afe04b99a358a9f010915f2bf9fdf898c0f6dbbf5990e114a220584c1aa06bf750c9fd426587c07292dfc7082caeed1b5f7cc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/eu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/eu/thunderbird-68.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "788cee146a94621d373e8d815daef246d58b46ab1e935b01dee3955fe695af43e7a482f287d611e98a376b137b5bcd5b92baed5ab322a39ef30d8815abff6640"; + sha512 = "73f6ab9d2f285f1848f25af22339988b2993fb12a9e458ca7c6c67e57aaf53b660e182c4a99f6f1a424ac0336fb7c9e5e72209444dc4e99a1b74df0062e61f50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fi/thunderbird-68.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b65e042905882d1c7fbc88bffb512b32fc91475b99c3b1bf6a4e10ed355f9bb3223a3c709273b0ad84c30ad3c6c405c07cb3e04eeb8a4938ec22bae3af4dfbe5"; + sha512 = "10f42882594f3cb3bc02afcfdac7171139cc11915440b7888ff9edd2d9b0a0a2cbc9fa6faba0f8044d085397e6a7f4fd4b5190990e5f67592ccb85dc24f0cc9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fr/thunderbird-68.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a85af36139d6f7ab6028acaba61a8dd47c2fd6ef9114b5ae8783c78c85e16c606d72b05c15a299d1a0beb518301aeb65d3493d518b270bfb97f22c88d23bbc0a"; + sha512 = "bd50ba42353e3cc3b709d1f6f0f16b998dce896ac2b08df9e75eee715e90df5f84b128861af69a2587c1b288774b273d2ae2fca6337723e105fe6b42da0fdaf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fy-NL/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fy-NL/thunderbird-68.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "60cc189b7eedc72327d3fce18809403014cc6b2c4dc53617cc8cd589dade6be25ade584416f9be18830f3c7a6060fad3e19bb930a591f17fdb3437b4597f48a6"; + sha512 = "c5200ec273a85489e3975f87e0050a2de6e2033f7e5ef1bfe7416c4cb0abab8047cbb04b6b8018adf2d9ec9c2a2c362317a92bb90c43c2dab52bb4a8bab50ede"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ga-IE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ga-IE/thunderbird-68.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "95b337d681a5292c0343bb545232b666268e5fbea0afd6b96122ff00e504da0a5628126a11495ba54d4e8500615d35b34de13851ad43f180bd9b5b1f584c7ec9"; + sha512 = "cb4886d2a9f20f6deb600dd3338268b160934e42a0b73e74600c35694c83253bdcb4d77ddb5292294d38da23801fae7559dc6601fa40b873c7c71e2cc64707e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gd/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gd/thunderbird-68.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "483a1bcc1a0066a962ed91c8f4c6f948623e3555d2977c593a473c5c08e12baf05fc4c043ef5db1fc839fb9f550764abe457f2d33e23ffc748ea6aa50d675101"; + sha512 = "49fba7937ca3ab596ccd656267d7ebb5592623a1a8a9143fe25f84424fb2a9d27f72f3fafeca57e204911208671e9fad7acac97d4202a9adf89a7640ba001411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gl/thunderbird-68.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0a88fc59510fa06757dd1b6994be0ceb8a0ad2cd1246077838756a0d65d6c01a64f8c48fc8ac87690686bdfea8c7d0b44e5fd96feca4c3aa59d6fb43eaeed3f2"; + sha512 = "b80131b5ced22d861fd2e6682149e2fde2d3106d2b4d4f528d8620b400acda0db497500bc489b7806a942dffe5001798a05a440d0b00a56879ccdfe81390d353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/he/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/he/thunderbird-68.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9c2ae42cf2d43e4ae9d0dad829871b44321b2cf49cde1f17568f96c4d6a69793d78c9b7a72cb29b71c108718906ab749f006f7c727d6f3892efa3d56d0852449"; + sha512 = "601f99613725276d801c8d0dee9ad25f98ffe8ccba42620551f5a41e02b6abede34547857f43a265f12be01ccf4b3e4b4479e1ec6f8ab5d3b5890f230d4b43b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hr/thunderbird-68.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "9e9a949fe54c23a0f73bcb05a4fe2b212c6701cbd1d68ae10dba2b62de07fcc5dad5210de0ec3c3f684f06828f8fd1c420712396e5132da6053de42f319d6454"; + sha512 = "b9c681c4b2edf89f789cfd6bb703670aa62d8e48bd6afd8147409a1154d01f1b59933acdcd0f1f6b88ddf131031a64237958ffc25572dc818b1e06f9c8cace4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hsb/thunderbird-68.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0d3c5ca3ce6a9becaad63b2d7bf3e1d4491cad18201e1ddb634ad80d4d9d9d26c95b02034888f24ce50c5390b1197fe3bbd69525bcffd5192d95ed35203515de"; + sha512 = "a512ed1d095bc1077836486aa40a6f223fc2c37cada6bd59d5ebafb8bf17d47bca0acf7ef007dc6adf8141db2b81b6a6304bc85b36b929bb2b1375898e67472e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hu/thunderbird-68.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4519acbc2d00cb1f97d73f17b37db4625fd16f7f25e628d5309bdddee2012feb2133ce599bc69eabb22a18f015a00c8e98d6804140ea1ae41d66f59164355f32"; + sha512 = "3333452d03a2e8436bdd8e7ed0195553d0dc86e74d55903aee4484d5e920bf81f979c4a482d5e44be6dd6bbdccd85d7d50dfe5d58c6590c5ea95c8b5164c71ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hy-AM/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hy-AM/thunderbird-68.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "f60cca5cef19516a5c6e4b22962567c0c0d22035ee7583b0d93a4db0db7f625ed0cfaddc78f56621371d0a8b6341948cbf9171debe81c222d170af2c759eef36"; + sha512 = "e6a01f614533824e9d69a4feee3ff483ec57f42415a1854db4125479d38137102465050de140d113daedd6d0a4ede83f5c3aa5e9c27fb77f368c70079eb90c44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/id/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/id/thunderbird-68.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "75adaedcce7dae3998a063794552d3e5fd69e037422e44fafcc7871a05cabcb592c9ddb637c1f7b0639e03f6d0d99b262679087df2d6806fe2a202121cdb5563"; + sha512 = "4c505da3cd0a57cd0d24199ad3df92b5ba28f0bbc3410e05000f1fc7d93bc0228b6c16e1ed4852d84e2f8bc25c15886312bc471538ec12ad3fcfc8bc7cf1f852"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/is/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/is/thunderbird-68.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b80488a594bebecaa139a2bbac76e3daa0d3a9f3257cfdc2f6954f8cbf427c3b3ec1db3d1f55b9c5e8c37242778e53904b92adff1cb7e1907142008e69607ee8"; + sha512 = "0088ca68a63d53f242e82c3d304417a3503a78301b6a4c1198671e55b5fcbcbf75b874ed783ac907dd5ed3415b955481fa699e0aeba0062de7de58e4ffa0eee1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/it/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/it/thunderbird-68.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c8a0f75f6467f6428103c98e97afce1690a0d986ea6466dbfbaa2eba2853d8f7a1e65c568d10884d6d4412fcbab39e8743d3e3233ac16f69ab57a5f698c3ac5c"; + sha512 = "1f70db3fa112f208a395202b18387fafdd8abceabce2717d33b295cae441353b759400d8ea5aacce07481f841523d932004105eed61551ec6271c796fdb6aec0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ja/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ja/thunderbird-68.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b1abc4fb9e7af1695ca2a4fe88d2198876212923ae10977b0caedffc96dadd891fe6068fd8d53c7cb7667854523197d1378791fb71c12eb817dd9b6e338eb3a3"; + sha512 = "3e43f8d7e52ffe9b7e7b4817756997f68171d08717020406410ffe999a55c9d4f83f1f30c7cedde4732923bf3ee3385828e6d0ec49f7e69d87cb97cd9f083d25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ka/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ka/thunderbird-68.8.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "11e56137a0e5f9f6cc4b24e02861e6ee4c451280076e9efc46e1f28066862b3bd494ff7388f6be736be3dcf6412c5dbd141546dd37d6351aed54790deff841f9"; + sha512 = "3a1a8eb0c49bf963e9586c42128d2574dd04ef775749506e09f4d8d8256ffa5690f5c5e21d1cfa304c298388028e333ea5cb1964b6ff9b97a1f17c00e581ce3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kab/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kab/thunderbird-68.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b930bd22990497a66cc9aff96f0c9bbfae4396fd9b4397893db9c72b59b602b45f6ab7388b8899890e151bf8dd1e0b788d668cdad607f4326794825508d36ebd"; + sha512 = "d977575e4723c643c04209a875f15e6b7a00133c938dfceacb4a896bb65846348511ea2078971eb3b8fe413c484aab035134411d615d7c153b69452139d155a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kk/thunderbird-68.8.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "17b7ec790013cdbad015d3045ec8d4c5ee6d92b1ea9be18e2b9a5d7776f53c7b621193e7dec418f86be25e3d876e4a9cf9c8ceef0cac4051461afc1a51498353"; + sha512 = "5cb567862e9627b9c684045dba9342afa6f1f78064a941f19eb90e8c6ce30d102a611dae85ec3c6ca271ec57fe0fd2b7df07c1aaa8f5bc93c4501cfb0161b55f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ko/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ko/thunderbird-68.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1030a289a2e0793553ec3bfa8ac1b3ff3bfac3766318f5ffd9e6eff1979481b327a90a2207a5c16ca33719675c65e20d58ea8074fbd5fe9877fd334114e9b5f2"; + sha512 = "e3e83cfffcd472b22f60c3e65b458e534c7c76d8c6b637c69b7e1a062b11e3c7461cb8f3fda21e7f0f3a9512c2d713bc0d40a84e235dc6807ed6d7e96d9a4095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/lt/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/lt/thunderbird-68.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "e433d8933c1d4a41e70ae2a8bdb6f1a502d478aad1308e1f0e8489149371893deea61fe8339717eb22996d844a5a6bbef916ec6c468a57cfbb7a54751bee2408"; + sha512 = "5f1438e9c1a71dbde9abd06b34c8d384fd3923ace38ab643fb0b16352c54efa94db83d4a86573b59c7f9bb418e23a6c158f3a3744b2114f0c535cf49e90f3439"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ms/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ms/thunderbird-68.8.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "31343703e214decf4f25d724507dc706cb6c47d6247989cc2019841175099a0c328fca562fbd257f0003ec6a6fc8cdcd632c141de13e910a6a7b9c75733998bb"; + sha512 = "87e8e1fcef966a7a14700ea4113f28945bc25eb1351a67d2eaf55b9d54864de98cc86e494d3ef81a075c9bda8f6018ed3273796e422dd304abbfe1740ad4cd2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nb-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nb-NO/thunderbird-68.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e79708c309dd16d23bba5bc0e29a4f5b426a7dcb7dcd56b86c40875abd0d7fa532d9ca8c8b5019552fa0d07e5c4686a66f0a4173e2fdbf8865d3921c8b29f327"; + sha512 = "9ce730dbf2e80c8badbd9c8f3277648deb44b00fb44d367bfc9ff8894ea7a945774aba9241300b01b04617040bcc82f7e65ae024483205a707cd1b63f585e0e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nl/thunderbird-68.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8c268bbe04c30a3dbef069add7b6e47fc576a60d0709020d0aee03b0be634f0fbfd4928489fe7b984a8c54fb1ad9ae951b9dd0c0ba04483b35a242bbbe3bbc19"; + sha512 = "aada9422ada20cb8561da823b6a240a30c155cea774b369649f8423f6659d6bdee0d2b6ecba2dd0c64837e04e6e6a60235a588d1850fe5ca8a6b7a9d1dfa5fc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nn-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nn-NO/thunderbird-68.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "9c73e09e4680f3c258e7d25691dffaf805ca6946335c9c30ef091a739d7f87e0f36f5328875ceb2b7f0f2cee2bf16fe1401411f11f4e5e45ca86837c4e207d79"; + sha512 = "adb4a038f4cd87ba6ef425911eed240adaf23a23d8719b5401b463578f9de7ad049a76ea1b9b9460afe7b18aa86a9be4e39eccfa42d0be7609077fda9c3381fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pl/thunderbird-68.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6dcb19a95e0bd8dd783a420c3f06e0980c5706c065397d4ee424969bd84daf783752d55153808df5811f656d28adeb15f826b1d4f2b9e356846c6b1c01b89a04"; + sha512 = "40fd0b0123f768e66f669566395e151a696a54445daf5ac30cc6e4dc42e1aa20545c12ed29bfcd0b3881928242b0d12bd7426497b7401ae6876a1a076a6d8dab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-BR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-BR/thunderbird-68.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "99deb6fe54bf1f9bb1858f2c454e44246b34bca6aaeb5322db57d048acdea5de853d439d4f079c3e2587174364ecb05861cac461a34dfba495eb747bb8fc98ac"; + sha512 = "603f026cce3a097fc424e754393f9699f3a8639ccf8669e58ffde5eb7363071fc87ffcb2fbf1f04866cb403a0d08d3c8bfa801a0ea9e4290d63b106f657d7aba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-PT/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-PT/thunderbird-68.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fd0fe715c0e816e6a92b9cb6a2afea50952851161cdd217f764cdafdc529f7cf0c5a6913546b81fc1d9532de74eecf13517c6eb8380ab5f920487df4c26d331b"; + sha512 = "3fed3c60cf4c77bc1336db22c65a0f84e4f2a4ca0476f016d289f5951b48e96394365c98e5025b42d51b8990a46151d2cf00eb3381ed98ac96bf3760b640f91b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/rm/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/rm/thunderbird-68.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5ff0306c7c6f88976f3080d34690e4607a74730509f9f43a0ba56fb9e5b9cdea8e85a4137333c150110fa110ab6d98cbbf265ea07ca439f199841a82af500152"; + sha512 = "87ec8c6e2358df02baf3bd6a2241c4e83a4441be6c9ff465da9fb0a992d316ba1a3f2e5b41d7186769a8c8e4894c04158a4497a70a4c6c82a630954d5758c1fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ro/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ro/thunderbird-68.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9240e285135f27f82402cd0d3374f28d293a29c904a503297014802554e8257bf95c8d0cbcf18841c44d1012e0d3d8067ab24186317cb4f42f96dfeeb65255b9"; + sha512 = "0b740488109c97bf3a54d87de45f14063ba356d26da56651de7902de4264755f9837f8910a3b524ada953e6e1387d43c0f60572673af2d1cab0e6c7bdebca67c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ru/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ru/thunderbird-68.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0c90806ecfe1e4b2e4d17ba01a5945bf5c0d3a0e7b5caaecd36456286f5a1ea597b743743acfbaef585cdc4bada86e6f194608ebe9dd2308f24d093fbba49fa5"; + sha512 = "16f07bcc8bb6f49754fe6741ce2ce0f77d44dc6641a37b9b9fef601604abbd9c44861d4540e544daf67c871955cdcf141ad1db3ac2cdcc0fc371638bb0aa8058"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/si/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/si/thunderbird-68.8.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a10ab6a050df683057d4532c0c1ebfbed80de96f6831ae60e53f4e4fe95a342ce97b545c7a658fa092a7b9d4c2196f4bb296e4af9b0c7e4183f112ab50b464e6"; + sha512 = "cbaeb62f5ca1ac9ea731e291d5988044ab86f7c26eec99ea4741f0db200685bb88b1358c4d29f1d641d01947dfd1ce5eccd971131e49f4373fad1074f15c004c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sk/thunderbird-68.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1aa04c5702a89099645616f7aee86a507cc5c54f3a62696eaef17d6ca161ded644285d77782ff940c2ab128d2ff9f4c5b385999da9de678837ecf91d00f88f16"; + sha512 = "933e45cb5ee1832ad27aefed0ed99077957374727b00a227ae79a004add3fc395917e351d90ae522cf98fce50aafdccc86f3a74e5b4b7ec2e3fa5a9fd498a5df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sl/thunderbird-68.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "afacff8423baa933c6e4b2282fc112636876dd97e607e9a63675fc5232907bf7b06dc50e1377aeedd3cc56dded6f3d71b47aa774dbea12217f6243c6182a2bf8"; + sha512 = "b46ec4da60c666ad13fd31269c3e06e5b50b6f5d37ef89a4cafbcd7d30f60dc0b5de5ce318930ac0aee404c2a72eaeb97698bd2a1d077ec29dd0335256af6e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sq/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sq/thunderbird-68.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6036f12337b129025c34906b8df0663ae210294d3914cceb9f97be907f058e9eaeafad2aa2e2c2ee79f83be3659a242ab2135cf7f240b34eee24dcf555aef40f"; + sha512 = "fc4bfd6355fc462fbf196f326291d98659a1c0ba4a5d4d829ec9b184917e524d925b301b2e1aaf3f03b334786c4974f8e2f218c5f96d1ce71a6642c2f46a53c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sr/thunderbird-68.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c48be7ba5b42ebd244c59a6188be08236974fabdf7cc30f3473add6b215c6c7ea80fd4ad4d739d7e62fe2f1043afb288d2a6f7e838bf0e17fcc68b5340806e45"; + sha512 = "ef76ee6b540bed79743d223e80f997eb8c6bfb92085659df72d8360c3883ac4862b990334ed9412a2fde7eda01ea0a1bfc80adaf581feb54d5031c2352dda89f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sv-SE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sv-SE/thunderbird-68.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c943304a7f40e715d1fb1194ba7f306538b917788306f02be10a86e1d01baf091b1bc58b417aad7775fba58cf90ddd8412a56cfbcf2f12e4f7581be34c328205"; + sha512 = "f431dbcba41510823b489a80699af68c32801b3a994ad5b596fea564f007697c26e2ce3c8cce39f9b56eb102adf6cf701ae8cbefb7bee84e37fcfb91a39a49db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/tr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/tr/thunderbird-68.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "53d5c9d7db4a44ea3858c55377c0ab8f8d359440f86634a0ff5eefdaf0553dd2c7a9ca66112a2cd4fe3a8e6094cf9c1f16fe01119ab11f1a039f471fcba37609"; + sha512 = "021b6f44f576e1b35e6e74d0ca40ab8b48def0f8f0159e7864929322cea2aedaadc3c9aa5e7294c1f91898b4eefed6f1032cf26afb560629308cd2ae081c56fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uk/thunderbird-68.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "8204e0ca96902f16b92a6e02c09a788362359af3a6566f8246055727d5a74736d0b9f8570a4671a1f69233a993e25676c730001dfef9a92d034edcb8b12a5f7f"; + sha512 = "a2a14df4f815368a798f035a6d9a917bb88ed7e954e1ada08d1dd526b0c8e93653da2cfb7568912f1416eaa2912ce394d334a3fc38da32c5dd8cc9e8db920b4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uz/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uz/thunderbird-68.8.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "496d82507602cff8e48f43b9c63a696d24020b804ffda45f2027103c5f3768543db0f03051ef062e0076c16b78b31759f7d4a4878a45e7dfac1cc0e4e9d046cb"; + sha512 = "2c63ab4db77702e8e975809f71e1a64fc2acf0bbafc8d24bb407ad5d3b79a9a20041320cf1716b2555b3d6843acc12762a07db4857acd6c1009f645198290a25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/vi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/vi/thunderbird-68.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f360794ecb21ed3f90552797269ab6e89024591903eb53dcf6216b25bb4dbcdf94c2526672b94ba979717f90cce5bfb6329efb3b5a2b9bec7c3d4d06d339ac9e"; + sha512 = "f68610e7f1df34209212d8db6620fd038b1e8f6a5ef430b8b23fb1bb9a3f51ce5da8b98e576561693d0dc125e5d428246e4cbfd38ee991e3d3695dcbeeffa05e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-CN/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-CN/thunderbird-68.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ec7274b2870206647fd853c30db4e30b3856896ce9c89d5d825363e9d4327d23a230c899abbb740036a8e060f1532007ba5936af010feea85318bdeb18f29e0d"; + sha512 = "42bab5ba6dd11f185ed09b1826c1578b9f90caf8612558e6d4bc09038181f9559bece41eac9fb2060a21ddc11cee9522794fbfba3126b750ad1a283e3557be14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-TW/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-TW/thunderbird-68.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f0fb6deda0813516753386ae69ddb7b6dce95ce89c6dfba3ba5828d80d9fe92e3eaf014e89ab56c4548d39932bbfe12d4b9c6c8ff66b77a9ebe4f7476a9f6be9"; + sha512 = "6f6f5365976c0eae38f26e83248c9cff718433ad4d9757732d87289a876f3c0023df71907ff43434ee0dbf5ba8ee737a44f33d832979dc1e260edb003702f817"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 19c572af279..2ba2d2fca63 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.7.0"; + version = "68.8.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0glskn3djf739v2dphs663a2lfg5b0lbk1vlwwbzwfj9wfshvk7l07ijp84143bamvgb0lhhh0c9zx4gy5jj3x1j4196m3s1c1n7rzs"; + "18963ccclfvz85bkiy7dpxgzkf71yh4qjbr8hblwyha9d3h8xnm29mi1dd3a2bz05qi3ly1v3k5mrhcbivhy2can2ippsal6j8rky0s"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index b0f6859e69c..8a0980286df 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.7"; + version = "1.4.9"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk"; + sha256 = "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix new file mode 100644 index 00000000000..77d08692f62 --- /dev/null +++ b/pkgs/applications/networking/onionshare/default.nix @@ -0,0 +1,113 @@ +{ + lib, + buildPythonApplication, + stdenv, + substituteAll, + fetchFromGitHub, + isPy3k, + flask, + flask-httpauth, + stem, + pyqt5, + pycrypto, + pysocks, + pytest, + qt5, + requests, + tor, + obfs4, +}: + +let + version = "2.2"; + src = fetchFromGitHub { + owner = "micahflee"; + repo = "onionshare"; + rev = "v${version}"; + sha256 = "0m8ygxcyp3nfzzhxs2dfnpqwh1vx0aws44lszpnnczz4fks3a5j4"; + }; + meta = with lib; { + description = "Securely and anonymously send and receive files"; + longDescription = '' + OnionShare is an open source tool for securely and anonymously sending + and receiving files using Tor onion services. It works by starting a web + server directly on your computer and making it accessible as an + unguessable Tor web address that others can load in Tor Browser to + download files from you, or upload files to you. It doesn't require + setting up a separate server, using a third party file-sharing service, + or even logging into an account. + + Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly + any other way people typically send files to each other, when you use + OnionShare you don't give any companies access to the files that you're + sharing. So long as you share the unguessable web address in a secure way + (like pasting it in an encrypted messaging app), no one but you and the + person you're sharing with can access the files. + ''; + + homepage = "https://onionshare.org/"; + + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lourkeur ]; + }; + + common = buildPythonApplication { + pname = "onionshare-common"; + inherit version meta src; + + disable = !isPy3k; + propagatedBuildInputs = [ + flask + flask-httpauth + stem + pyqt5 + pycrypto + pysocks + requests + ]; + buildInputs = [ + tor + obfs4 + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tor obfs4; + inherit (tor) geoip; + }) + ]; + postPatch = "substituteInPlace onionshare/common.py --subst-var-by common $out"; + + doCheck = false; + }; +in +{ + onionshare = stdenv.mkDerivation { + pname = "onionshare"; + inherit version meta; + + dontUnpack = true; + + inherit common; + installPhase = '' + mkdir -p $out/bin + cp $common/bin/onionshare -t $out/bin + ''; + }; + onionshare-gui = stdenv.mkDerivation { + pname = "onionshare-gui"; + inherit version meta; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + dontUnpack = true; + + inherit common; + installPhase = '' + mkdir -p $out/bin + cp $common/bin/onionshare-gui -t $out/bin + wrapQtApp $out/bin/onionshare-gui + ''; + }; +} diff --git a/pkgs/applications/networking/onionshare/fix-paths.patch b/pkgs/applications/networking/onionshare/fix-paths.patch new file mode 100644 index 00000000000..ddd0c75334b --- /dev/null +++ b/pkgs/applications/networking/onionshare/fix-paths.patch @@ -0,0 +1,134 @@ +diff --git a/onionshare/common.py b/onionshare/common.py +index 3373462..7fd245b 100644 +--- a/onionshare/common.py ++++ b/onionshare/common.py +@@ -87,66 +87,16 @@ class Common(object): + ), + "share", + ) +- if not os.path.exists(prefix): +- # While running tests during stdeb bdist_deb, look 3 directories up for the share folder +- prefix = os.path.join( +- os.path.dirname( +- os.path.dirname(os.path.dirname(os.path.dirname(prefix))) +- ), +- "share", +- ) +- +- elif self.platform == "BSD" or self.platform == "Linux": +- # Assume OnionShare is installed systemwide in Linux, since we're not running in dev mode +- prefix = os.path.join(sys.prefix, "share/onionshare") +- +- elif getattr(sys, "frozen", False): +- # Check if app is "frozen" +- # https://pythonhosted.org/PyInstaller/#run-time-information +- if self.platform == "Darwin": +- prefix = os.path.join(sys._MEIPASS, "share") +- elif self.platform == "Windows": +- prefix = os.path.join(os.path.dirname(sys.executable), "share") ++ else: ++ prefix = "@common@/share/onionshare" + + return os.path.join(prefix, filename) + + def get_tor_paths(self): +- if self.platform == "Linux": +- tor_path = "/usr/bin/tor" +- tor_geo_ip_file_path = "/usr/share/tor/geoip" +- tor_geo_ipv6_file_path = "/usr/share/tor/geoip6" +- obfs4proxy_file_path = "/usr/bin/obfs4proxy" +- elif self.platform == "Windows": +- base_path = os.path.join( +- os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor" +- ) +- tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe") +- obfs4proxy_file_path = os.path.join( +- os.path.join(base_path, "Tor"), "obfs4proxy.exe" +- ) +- tor_geo_ip_file_path = os.path.join( +- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip" +- ) +- tor_geo_ipv6_file_path = os.path.join( +- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6" +- ) +- elif self.platform == "Darwin": +- base_path = os.path.dirname( +- os.path.dirname(os.path.dirname(self.get_resource_path(""))) +- ) +- tor_path = os.path.join(base_path, "Resources", "Tor", "tor") +- tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip") +- tor_geo_ipv6_file_path = os.path.join( +- base_path, "Resources", "Tor", "geoip6" +- ) +- obfs4proxy_file_path = os.path.join( +- base_path, "Resources", "Tor", "obfs4proxy" +- ) +- elif self.platform == "BSD": +- tor_path = "/usr/local/bin/tor" +- tor_geo_ip_file_path = "/usr/local/share/tor/geoip" +- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6" +- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy" ++ tor_path = "@tor@/bin/tor" ++ tor_geo_ip_file_path = "@geoip@/share/tor/geoip" ++ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6" ++ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy" + + return ( + tor_path, +diff --git a/setup.py b/setup.py +index 9af72fc..53ca47b 100644 +--- a/setup.py ++++ b/setup.py +@@ -70,41 +70,41 @@ classifiers = [ + ] + data_files = [ + ( +- os.path.join(sys.prefix, "share/applications"), ++ "share/applications", + ["install/org.onionshare.OnionShare.desktop"], + ), + ( +- os.path.join(sys.prefix, "share/icons/hicolor/scalable/apps"), ++ "share/icons/hicolor/scalable/apps", + ["install/org.onionshare.OnionShare.svg"], + ), + ( +- os.path.join(sys.prefix, "share/metainfo"), ++ "share/metainfo", + ["install/org.onionshare.OnionShare.appdata.xml"], + ), +- (os.path.join(sys.prefix, "share/onionshare"), file_list("share")), +- (os.path.join(sys.prefix, "share/onionshare/images"), file_list("share/images")), +- (os.path.join(sys.prefix, "share/onionshare/locale"), file_list("share/locale")), ++ ( "share/onionshare", file_list("share")), ++ ( "share/onionshare/images", file_list("share/images")), ++ ( "share/onionshare/locale", file_list("share/locale")), + ( +- os.path.join(sys.prefix, "share/onionshare/templates"), ++ "share/onionshare/templates", + file_list("share/templates"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/css"), ++ "share/onionshare/static/css", + file_list("share/static/css"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/img"), ++ "share/onionshare/static/img", + file_list("share/static/img"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/js"), ++ "share/onionshare/static/js", + file_list("share/static/js"), + ), + ] + if not platform.system().endswith("BSD") and platform.system() != "DragonFly": + data_files.append( + ( +- "/usr/share/nautilus-python/extensions/", ++ "share/nautilus-python/extensions/", + ["install/scripts/onionshare-nautilus.py"], + ) + ) diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/2/default.nix index 755ef4cc33b..2e9f08ce98a 100644 --- a/pkgs/applications/networking/p2p/deluge/2/default.nix +++ b/pkgs/applications/networking/p2p/deluge/2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages -, gtk3, gobject-introspection, librsvg, wrapGAppsHook }: +, gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -18,7 +18,7 @@ pythonPackages.buildPythonPackage rec { gtk3 gobject-introspection librsvg ]; - nativeBuildInputs = [ intltool wrapGAppsHook ]; + nativeBuildInputs = [ intltool wrapGAppsHook glib ]; checkInputs = with pythonPackages; [ pytest /* pytest-twisted */ pytestcov mock diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 39740f53475..964752f3b85 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.2.2"; + version = "4.2.5"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1iqgwhgwa2kx85zj1rwfnnclr1433a7m2gbs3j7w6rx39vxnzhcc"; + sha256 = "1n613ylg6i9gisgk0dbr2kpfasyizrkdjff1r8smd4vri2qrdksn"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 151d652de52..2e14bd0eb0f 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.72"; + version = "2.73"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "04si7xwbpvljdbngmzlfvkn51wih3aqcb5g6r76wdh3pfpppskhr"; + sha256 = "1ncrfc4wgf02la2h3zpdcz07b980n9232lg5f62q7ab79fjrcrfr"; }; installPhase = '' diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index 1bf99165858..e432818bec7 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; homepage = "https://github.com/davidmhewitt/torrential"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e9c5f274143..ed1129b238a 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString enablePlayer '' --prefix LD_LIBRARY_PATH : ${vlc}/lib ''} + + mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 + cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop + cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm + cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index dc75de6299f..ed63a72f210 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A helpful tool that lets you debug what part of your API is causing you issues"; homepage = "https://github.com/jeremyvaartjes/ping"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 3e639c28349..8830881b69f 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "1ry21zw5ghba4xjx8dvimlpprgap7n8j9lqhjsciahbvc16vx5ks"; + x86_64-linux = "09ajpsmgrgjhw7b91id76w84kwk2d678n0b81zzpwq7sgjcm0sb0"; i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.5.4"; + version = "5.5.5"; src = fetchurl { urls = [ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index be8810dfa7f..66f4d386572 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "0d2559v0z1jnq6jlrvsgdf8p6gd27m8kwdnxckl1x0ygaxs50bqc"; + sha256 = "0905374k4x647052sr27m2hgjcavbxdl0xd8n02vm5xa6whz239j"; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 3e41649d8cc..92f76e5e6d8 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "084yw0fd3qmzzd6xinhf4plv5bg8gfj4jnfac7zi1nif8zilf456"; + sha256 = "11s39xcy80rarkddw31v621zpai1vdr52iam367l69mcbc40xg36"; }; nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 883a152fdf9..9b06676b017 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.6.4"; + version = "2.7.0"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - x86_64-linux = "1c1yksjag58p7yjm72iiz82p2r01lq7kxvq7z5phmq5z6gxdg4a8"; - i686-linux = "167baz9fzmzk50jffzvgmgyw1zw3955r3cb73z23qvw8zqzdqydc"; + x86_64-linux = "17vw4kyggmi8phm91jx1skkd7vrdhbahibv6d6zm14q87r01a56f"; + i686-linux = "0yvy3lif2g4jchcp5q1r5b8ndj8009pcq5js7r0kl20bmmcmzklg"; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/networking/sniffers/whsniff/default.nix b/pkgs/applications/networking/sniffers/whsniff/default.nix new file mode 100644 index 00000000000..d2e5803d58a --- /dev/null +++ b/pkgs/applications/networking/sniffers/whsniff/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libusb1 }: + +stdenv.mkDerivation rec { + pname = "whsniff"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "homewsn"; + repo = pname; + rev = "v${version}"; + sha256 = "000l5vk9c0332m35lndk8892ivdr445lgg25hmq1lajn24cash5w"; + }; + + buildInputs = [ libusb1 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/homewsn/whsniff"; + description = "Packet sniffer for 802.15.4 wireless networks"; + maintainers = with maintainers; [ snicket2100 ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index c7766889f50..db33e7e6bb2 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.6"; + version = "3.17.7"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "0bq4pi0rmfsyiiapnhkkhikg2a2jzqlna4gvk6gw7wl0r8a111cs"; + sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; }; binary = appimageTools.wrapType2 { diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 57925a3292d..2fde398b2f5 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { subPackages = [ "." ]; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ installShellFiles ]; @@ -23,7 +23,7 @@ buildGoPackage rec { let rcloneBin = if stdenv.buildPlatform == stdenv.hostPlatform - then "$bin" + then "$out" else stdenv.lib.getBin buildPackages.rclone; in '' diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 94fec82fdf7..fa3290f7485 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.4.2"; + version = "1.5.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0pfzpbdir2agwsyfjh1rxlyyd225xmyrr4k2g4vlg5r12kpcjwya"; + sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj"; }; - modSha256 = "0qjhb55nd8mlnswbk8bgl2sb9angmv8fnympmmyqj1dqa7lcs87z"; + modSha256 = "1vs7lxlqd7jr4r9xkk7w7k6gxzjmm7ic0a1scfpx8rcr5swa9cq1"; patches = [ ./add-stcli-target.patch diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index cb13d296c2f..557e69b1ee1 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "08i1l835zlzb3qmsnsd5vhsrr82li6fnp5jqxiybbqr5wjz67ssd"; + sha256 = "13vvkn1hna1d1mj8ffg7psrv6ha2jcjrf50qrsb0v0p8hszibavy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 1e1f686ab19..4f8c115600a 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "aesop"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1bqykr1mwanfm55w1v9ipqcqgzj8kbjvlm4d5b2swvhng77gnf3d"; + sha256 = "1zxyyxl959rqhyz871dyyccqga2ydybkfcpyjq4vmvdn2g9mvmb0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 9bf3b42c3ff..f7028ad6765 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; homepage = "https://github.com/dahenson/agenda"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch index ebf2f0900d9..ebf2f0900d9 100644 --- a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch +++ b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 0154e21b374..c8cb294b0dc 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "gcc" "cc" ''; - patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; + patches = [ ./10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch ]; installTargets = [ "global_install" ]; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 3e3765ca77f..28a470162ce 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.3.3"; + version = "2.3.5"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "1jc668hg26vb1q50abm6k566v9qimgs9skkwmlgi5h37vxm3ai1x"; + sha256 = "15d51sqb3k59jjishsw1fq5ib50jmhlk194y3nga329damfv8bmy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index bb85ae2e12b..2a2f55a27a4 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Personal finance manager for elementary OS"; homepage = "https://github.com/cjfloss/envelope"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 85b688b0c4d..d4f08b141a6 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,14 @@ -{ fetchurl, stdenv, gtk, pkgconfig, libgsf, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +{ fetchurl +, stdenv +, gtk +, pkgconfig +, libgsf +, libofx +, intltool +, wrapGAppsHook +, libsoup +, gnome3 +}: stdenv.mkDerivation rec { pname = "grisbi"; @@ -7,12 +16,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha1 = "crv3bga72v6fw07wad0nkrgdg4war66j"; + sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libgsf libofx intltool libsoup - gnome3.adwaita-icon-theme ]; + buildInputs = [ + gtk + libgsf + libofx + intltool + libsoup + gnome3.adwaita-icon-theme + ]; meta = with stdenv.lib; { description = "A personnal accounting application."; @@ -24,7 +39,7 @@ stdenv.mkDerivation rec { management and other information that make Grisbi adapted for associations. ''; - homepage = "http://grisbi.org"; + homepage = "https://grisbi.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ layus ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 1a056e9be81..a34eadde36e 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.3.2"; + name = "homebank-5.4.1"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b"; + sha256 = "1m1hpaby6zi8y0vmj2ljklp34a55l2qsr7pxw3852k2m4v5n9zsx"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 02c645f3d84..1962528f6b6 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Track each task's time in a simple inobtrusive way"; homepage = "https://github.com/lainsce/khronos"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 05fb0592406..6ac092f27e2 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = with maintainers; [ the-kenny jwiegley ]; + maintainers = with maintainers; [ jwiegley ]; }; } diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 8afd459c42b..fed00000af3 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create simple and beautiful presentations"; homepage = "https://github.com/Philip-Scott/Spice-up"; - maintainers = with maintainers; [ samdroid-apps kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index 1a63fdf0f3f..1f1d44e7494 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plot out your own timetable for the week and organize it"; homepage = "https://github.com/lainsce/timetable"; - maintainers = [ maintainers.kjuvi ] ++ pantheon.maintainers; + maintainers = [ maintainers.xiorcale ] ++ pantheon.maintainers; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 967f91d962e..fb7f88829f6 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,17 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.40.7"; + version = "0.42.1"; + + desktopSource = { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "0xcbkm6z1a0jh3qywlwcjk6l302cxgdfcq8sw30vbnz99cyarpvz"; + }; + + serverSource = { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + sha256 = "012l36z0n3fcdajj3v4w2bcb1619sdhg6cvy3y89b6rxl0h2wdiw"; + }; in { @@ -28,10 +38,7 @@ in { inherit version; inherit meta; - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0xi3bb0kbphbgpk2wlsad509g0hwwb259q2vkv0kgyr4i4wcyc1f"; - }; + src = fetchurl desktopSource; # Fetch from source repo, no longer included in release. # (they did special-case icon.png but we want the scalable svg) @@ -76,10 +83,7 @@ in { inherit version; inherit meta; - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "15bspngnnbq6mhp1f82j9hccg0ymhm6i4rddpgz3n7dw5wxdj0sm"; - }; + src = fetchurl serverSource; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 898244970c8..848e0ca3c01 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -20,6 +20,5 @@ python2.pkgs.buildPythonApplication rec { homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index d365596b9c3..287649ddbe1 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "0d514ixz062xyyh4k3laxwhn3k3a1l4jq4w7rxf8x46d3743zrf7"; + sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 20cf2cf6286..84908d304df 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.11"; + version = "4.1.12"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1y62xn1pim38ibaf2mbl8b7aq20jdaac6lgggb9r402w9bj5b196"; + sha256 = "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 1078cf4df68..ad54fc8d7c4 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor the-kenny ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index f1a71804e3f..33b858799e2 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -43,6 +43,6 @@ mkDerivation rec { # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; platforms = platforms.linux; # should work on Darwin / macOS too - maintainers = with maintainers; [ bjornfor the-kenny fpletz ]; + maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 9569dd89797..dfd7fabcc6e 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://greatscottgadgets.com/hackrf/"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ sjmackenzie the-kenny ]; + maintainers = with maintainers; [ sjmackenzie ]; }; } diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index de6b8504091..e275db4ad91 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -39,6 +39,5 @@ stdenv.mkDerivation { homepage = "https://github.com/EliasOenal/multimon-ng"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index e3fdb9718e4..fd9ab82b321 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tlf"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "0f97hxiwc6blp5haik871q6zzvwy0b3p2jg8ad2dvaxg07xc76l0"; + sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj"; }; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 850f73c4922..d75572e5e57 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.5"; + version = "2.8.7"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "060npn0q7yrby2zj9hi8x7raivs91v9hvryvf45k1ipyqh8dgri6"; + sha256 = "1grak0vzlzqvg8bqaalyamwvkyzlmj9nbczqp6jcdf6w2vnbzhph"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 31bcfa463b9..e92c216466f 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; - version = "2.0.17"; + version = "2.0.19"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/xlog/${pname}-${version}.tar.gz"; - sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; + sha256 = "0y38gkcm4mgv6wn31pjq6d5bm22m63rpwa55qjmrlywrmw76rppy"; }; # glib-2.62 deprecations diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix new file mode 100644 index 00000000000..0b53e3e85ac --- /dev/null +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -0,0 +1,48 @@ +{ + mkDerivation, lib, fetchgit, + extra-cmake-modules, + + kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, + + qtx11extras, qtwebsockets, + + eigen, zlib, + + cfitsio, indilib, xplanet +}: + +mkDerivation { + name = "kstars"; + + src = fetchgit { + url = "https://anongit.kde.org/kstars.git"; + rev = "7acc527939280edd22823371dc4e22494c6c626a"; + sha256 = "1n1lgi7p3dj893fdnzjbnrha40p4apl0dy8zppcabxwrb1khb84v"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio + knewstuff kplotting kwidgetsaddons kxmlgui + + qtx11extras qtwebsockets + + eigen zlib + + cfitsio indilib xplanet + ]; + + meta = with lib; { + description = "Virtual planetarium astronomy software"; + homepage = "https://kde.org/applications/education/org.kde.kstars"; + longDescription = '' + It provides an accurate graphical simulation of the night sky, from any location on Earth, at any date and time. + The display includes up to 100 million stars, 13.000 deep-sky objects, all 8 planets, the Sun and Moon, and thousands of comets, asteroids, supernovae, and satellites. + For students and teachers, it supports adjustable simulation speeds in order to view phenomena that happen over long timescales, the KStars Astrocalculator to predict conjunctions, and many common astronomical calculations. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ timput ]; + }; +} diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 978615fa459..7502a4ffd2a 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk, fftwFloat, gsl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; - name = "${pname}-unstable-2019-07-25"; + name = "${pname}-unstable-2019-03-12"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "9591edd5389a5bda2c1f606816c7cdb35c065adf"; - sha256 = "02k87qbpx0f48l2lbcjmlqx82py684z3sfi29va5icfg3hjd6j7b"; + rev = "5e3333ee356f914d34d66d33ea8df809c7f7fa51"; + sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEZMINC_BUILD_TOOLS=TRUE" diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 6959b2caab8..528277e05e3 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, python, makeWrapper -, eigen, fftw, libtiff, zlib, ants, bc +, eigen, fftw, libtiff, libpng, zlib, ants, bc , qt5, libGL, libGLU, libX11, libXext , withGui ? true }: stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0_RC3_latest"; + version = "3.0.0"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; rev = version; - sha256 = "184nv524p8j94qicjy9l288bqcgl2yxqqs55a7042i0gfsnwp51c"; + sha256 = "1vvmmbw3m0bdfwp4szr62ygzsvkj0ss91cx5zlkspsr1rff05f9b"; fetchSubmodules = true; }; @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { python fftw libtiff - zlib ] ++ lib.optionals withGui [ + libpng + zlib + ] ++ lib.optionals withGui [ libGL libGLU libX11 @@ -34,9 +36,14 @@ stdenv.mkDerivation rec { installCheckInputs = [ bc ]; postPatch = '' - patchShebangs ./build ./configure ./run_tests ./bin/population_template + patchShebangs ./build ./configure ./run_tests ./bin/* + + # patching interpreters before fixup is needed for tests: + patchShebangs ./bin/* + patchShebangs testing/binaries/data/vectorstats/*py + substituteInPlace ./run_tests \ - --replace 'git submodule update --init >> $LOGFILE 2>&1' "" + --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" ''; configurePhase = '' @@ -50,7 +57,13 @@ stdenv.mkDerivation rec { (cd testing && ../build) ''; - installCheckPhase = "./run_tests"; + installCheckPhase = '' + ./run_tests units + ./run_tests binaries + + # can also `./run_tests scripts`, but this fails due to lack of FSL package + # (and there's no convenient way to disable individual tests) + ''; doInstallCheck = true; installPhase = '' @@ -63,7 +76,9 @@ stdenv.mkDerivation rec { postInstall = '' for prog in $out/bin/*; do - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + if [[ -x "$prog" ]]; then + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + fi done ''; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 246c9876810..5073d0f0f32 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.2"; + version = "2.22.4"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "11mzz483f89pb2s8jmwhl12d0m6k41kmi4xh0i6hq69rxrqi8l4s"; + sha256 = "0gzna5df8nk42l7mc0qbp9h73gwr1030jnw10fawjp6ql6213kdd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 93a02a46bd8..12c86516242 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.52"; + version = "2.53"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "0gq3kbj910jsq591wylzjmd23srjlsssmrckmf46m4ysjqdqd8vm"; + sha256 = "1zchds205nwdqch1246953dr8c0019yas178qbq3jypbxvmgq7pf"; }; buildInputs = [ zlib ]; diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index c54fb3444bb..9512a288d80 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.9.0"; + version = "20.10.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1c6q1vb96jsb37g5qbhzcnasd5pdqjyc190yg3caw3gwrd97889q"; + sha256 = "042ndlns48pa6mn6wyrp4q9c1v0a2vzcnhw5l766zdnxdjyv0acx"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 6bc66596229..9fc1111c7b9 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -2,7 +2,6 @@ , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages -, pname ? "kicad" , stable ? true , baseName ? "kicad" , versions ? { } @@ -20,26 +19,26 @@ with lib; let versionConfig = versions.${baseName}; - baseVersion = "${versions.${baseName}.kicadVersion.version}"; # oce on aarch64 fails a test withOCE = oceSupport && !stdenv.isAarch64; withOCC = (withOCCT && !withOCE) || (oceSupport && stdenv.isAarch64); - kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; + libraries = callPackages ./libraries.nix versionConfig.libVersion; in stdenv.mkDerivation rec { - inherit pname; - version = "base-${baseVersion}"; + i18n = libraries.i18n; + + pname = "kicad-base"; + version = "${versions.${baseName}.kicadVersion.version}"; src = fetchFromGitLab ( { group = "kicad"; owner = "code"; repo = "kicad"; - rev = baseVersion; } // versionConfig.kicadVersion.src ); @@ -57,9 +56,11 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here + # "-1" appended to indicate we're adding a patch postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace "unknown" ${builtins.substring 0 10 src.rev} + --replace "unknown" "${builtins.substring 0 10 src.rev}-1" \ + --replace "${version}" "${version}-1" ''; makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { postInstall = optional (withI18n) '' mkdir -p $out/share - lndir ${kicad-libraries.i18n}/share $out/share + lndir ${i18n}/share $out/share ''; meta = { @@ -124,7 +125,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.kicad-pcb.org/"; license = licenses.agpl3; - maintainers = with maintainers; [ evils kiwi berce ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index f03a0a0ccef..2aa2686a29a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -4,6 +4,7 @@ , librsvg, cups , pname ? "kicad" +, stable ? true , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice @@ -18,7 +19,6 @@ assert ngspiceSupport -> libngspice != null; with lib; let - stable = pname != "kicad-unstable"; baseName = if (stable) then "kicad" else "kicad-unstable"; versions = import ./versions.nix; @@ -35,17 +35,16 @@ let python = python3; wxPython = python3Packages.wxPython_4_0; - libraries = callPackages ./libraries.nix versionConfig.libVersion; +in +stdenv.mkDerivation rec { + + passthru.libraries = callPackages ./libraries.nix versionConfig.libVersion; base = callPackage ./base.nix { - pname = baseName; inherit versions stable baseName; inherit wxGTK python wxPython; inherit debug withI18n withOCCT oceSupport ngspiceSupport scriptingSupport; }; -in -stdenv.mkDerivation rec { - inherit pname; version = versions.${baseName}.kicadVersion.version; @@ -63,7 +62,7 @@ stdenv.mkDerivation rec { # wrapGAppsHook added the equivalent to ${base}/share # though i noticed no difference without it - makeWrapperArgs = [ + 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" @@ -73,47 +72,40 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--set KISYSMOD ${libraries.footprints}/share/kicad/modules" - "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library" - "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template" + "--set KISYSMOD ${footprints}/share/kicad/modules" + "--set KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ] ; - # dunno why i have to add $makeWrapperArgs manually... + # why does $makeWrapperArgs have to be added explicitly? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # not sure if anything has to be done with the other stuff in base/bin - # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest - installPhase = - optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath" - '' + - '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + # kicad-ogltest's source seems to indicate that crashing is expected behaviour... + installPhase = with lib; + let + tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; + in + ( concatStringsSep "\n" + ( flatten [ + ( optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n" ) + + # wrap each of the directly usable tools + ( map ( tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" + + optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\"" + ) tools ) + + # link in the CLI utils + ( map ( util: "ln -s ${base}/bin/${util} $out/bin/${util}" ) utils ) + ]) + ) ; # can't run this for each pname @@ -123,10 +115,11 @@ stdenv.mkDerivation rec { # and can't git commit if this could be running in parallel with other scripts passthru.updateScript = [ ./update.sh "all" ]; - meta = { - description = if (stable) - then "Open Source Electronics Design Automation Suite" - else "Open Source EDA Suite, Development Build"; + meta = rec { + description = (if (stable) + then "Open Source Electronics Design Automation suite" + else "Open Source EDA suite, development build") + + (if (!with3d) then ", without 3D models" else ""); homepage = "https://www.kicad-pcb.org/"; longDescription = '' KiCad is an open source software suite for Electronic Design Automation. @@ -134,12 +127,20 @@ stdenv.mkDerivation rec { ''; license = licenses.agpl3; # berce seems inactive... - maintainers = with maintainers; [ evils kiwi berce ]; - # kicad's cross-platform, not sure what to fill in here - platforms = with platforms; linux; - } // optionalAttrs with3d { - # We can't download the 3d models on Hydra - they are a ~1 GiB download and - # they occupy ~5 GiB in store. - hydraPlatforms = []; + maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ]; + # kicad is cross platform + platforms = stdenv.lib.platforms.all; + # despite that, nipkgs' wxGTK for darwin is "wxmac" + # and wxPython_4_0 does not account for this + # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), + # seems like more trouble than fixing wxPython_4_0 would be + # additionally, libngspice is marked as linux only, though it should support darwin + + hydraPlatforms = if (with3d) then [ ] else platforms; + # We can't download the 3d models on Hydra, + # they are a ~1 GiB download and they occupy ~5 GiB in store. + # as long as the base and libraries (minus 3d) are build, + # this wrapper does not need to get built + # the kicad-*small "packages" cause this to happen }; } diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 7cdf9373e08..4dde2a0a122 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -13,21 +13,27 @@ with lib; let mkLib = name: - stdenv.mkDerivation - { - pname = "kicad-${name}"; - version = "${version}"; - src = fetchFromGitHub ( - { - owner = "KiCad"; - repo = "kicad-${name}"; - rev = version; - inherit name; - } // (libSources.${name} or { }) - ); - nativeBuildInputs = [ cmake ]; - meta.license = licenses.cc-by-sa-40; + stdenv.mkDerivation { + pname = "kicad-${name}"; + version = "${version}"; + src = fetchFromGitHub ( + { + owner = "KiCad"; + repo = "kicad-${name}"; + rev = version; + inherit name; + } // (libSources.${name} or { }) + ); + nativeBuildInputs = [ cmake ]; + + meta = rec { + license = licenses.cc-by-sa-40; + platforms = stdenv.lib.platforms.all; + # the 3d models are a ~1 GiB download and occupy ~5 GiB in store. + # this would exceed the hydra output limit + hydraPlatforms = if (name == "packages3d" ) then [ ] else platforms; }; + }; in { symbols = mkLib "symbols"; @@ -56,6 +62,9 @@ in ); buildInputs = [ gettext ]; nativeBuildInputs = [ cmake ]; - meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + meta = { + license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + platforms = stdenv.lib.platforms.all; + }; }; } diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 174532d6962..2b7c91751e5 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-04-25"; + version = "2020-05-06"; src = { - rev = "3759799d1e03b2da6a0dcd72273e4978880fc8f1"; - sha256 = "0ba14fla8m5zli68wfjkfc4ymvj4j8z92y3jigxs8hys0450bybi"; + rev = "c92181621e2e51dc8aae1bd9f4483bb3301ffaa5"; + sha256 = "0s50xn5gbjy7yxnp9yiynxvxi2mkcrp6yghgdzclpm40rnfyi0v5"; }; }; libVersion = { - version = "2020-04-25"; + version = "2020-05-06"; libSources = { - i18n.rev = "fc14baa52ca56a58b0048ab860bf31887d3cf8eb"; - i18n.sha256 = "05nayab7dkjyq7g3i9q7k55hcckpc0cmq4bbklmxx16rx4rbhzc6"; - symbols.rev = "0f9ff2d17237f90bb649bf0a52b6d454f68197e8"; - symbols.sha256 = "1a54428syn2xksc00n2bvh1alrx2vrqmp7cg7d2rn8nlq8yk4qd5"; + i18n.rev = "f29cab831eb823165fa2c5efab5d9c9b443e62e2"; + i18n.sha256 = "0cc0zvpml75yxphay3281f762ls08fzvv538cd5hmkr8xqlj3vbi"; + symbols.rev = "d4245ae8cf633095a0994ab01492bd56cd124112"; + symbols.sha256 = "11pynjgji3skw42q5mryz98f8z418k43jy6s2k90w6jv638z3cb0"; templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; - footprints.rev = "61df6d8853b4c68cca0ac87784c0a33cff9394d3"; - footprints.sha256 = "0blmhk8pwd4mi6rlsr4lf4lq7j01h6xbpbvr3pm8pmw8zylhi54v"; - packages3d.rev = "88bcf2e817fe000bb2c05e14489afc3b1a4e10ed"; - packages3d.sha256 = "0z9p1fn5xbz940kr5jz2ibzf09hpdi1c9izmabkffvrnfy6408x6"; + footprints.rev = "3bff23ee339bc48490bb39deba5d8b2f1f42733e"; + footprints.sha256 = "0430r8k49ib6w1sjr8fx42szbz960yhlzg4w80jl5bwasq67nqwd"; + packages3d.rev = "889a3dd550233ec51baed4a04a01d4cc64a8d747"; + packages3d.sha256 = "152zv4j51v8skqlvrabblpcqpbn5yf3grisjj8vnwf7kdd41chb2"; }; }; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 7e0894fb337..de01b095e38 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -2,14 +2,14 @@ mkDerivation { pname = "librepcb"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "LibrePCB"; repo = "LibrePCB"; fetchSubmodules = true; - rev = "56bc60d347ff67df0fe1d57807d03f0606de557f"; - sha256 = "0z6jn5zawp0x5i9zda7l787jnsv3yl8aqwnpii3g4hsnf2q3hhrh"; + rev = "ae04eef5a71b5ba66ae2cee6b631c1c933ace535"; + sha256 = "0wk5qny1jb6n4mwyyrs7syir3hmwxlwazcd80bpxharmsj7p0rzc"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 113c6307c40..8c1b3bd0369 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.6.8"; + version = "5.7.0"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "0csimmy1nvkfcsxjra9bm4mlcyxa3ac8zarm88zfb7640ca0d0wv"; + sha256 = "0ny5ln8fc0irprs04qw01c9mppps8q27lkx01a549zazwhj4b5rm"; }; buildInputs = [ python3 boost ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index ea3b0585099..743bbf163c2 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0n2ncssjcmp3x5kbnci7xbq5fgcihlr3vaglyhhwzrxkjy2vpmpd"; + sha256 = "0aw538shvpfbk481y0gw3z97nsazdnk8qh8fwsb6ji62p2r51v6f"; }; - cargoSha256 = "1pkg0n7kxckr0zhr8dr12b9fxg5q185kj3r9k2rmnkj2dpa2mxh3"; + cargoSha256 = "0zg3q31z516049v9fhli4yxldx9fg31k2qfx4ag8rmyvpgy9xh6c"; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg leanchecker leanc; do + for link in lean leanpkg leanchecker leanc leanmake; do ln -s elan $link done popd diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 3476b5ea9d9..14944f5e19b 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, makeWrapper -, jdk, jre, ant +, adoptopenjdk-bin, jre, ant }: stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.5.6"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tlaplus"; repo = "tlaplus"; rev = "refs/tags/v${version}"; - sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891"; }; - buildInputs = [ makeWrapper jdk ant ]; + buildInputs = [ makeWrapper adoptopenjdk-bin ant ]; - buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist"; installPhase = '' mkdir -p $out/share/java $out/bin - cp tlatools/dist/*.jar $out/share/java + cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java makeWrapper ${jre}/bin/java $out/bin/tlc2 \ --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index c7da7b16da8..277fb1984c4 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC libxml2 diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index 898d6a48635..1c698a5e542 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -10,7 +10,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC xkeyboard_config diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 617ac865713..d0967485c01 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC ] ++ (with xorg; [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 7831640b124..94d72eec6ae 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -11,7 +11,7 @@ , glib , libssh2 , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv + opencv2 openssl stdenv.cc.cc.lib unixODBC diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 842265cf3d5..84adb2358d2 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "00pz0s99pihjdjy8pl4ckg2qciyp32k439lmjb5iazwck512ar92"; + sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index af4e225ca32..741330e4ad2 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.15.0"; + version = "5.16.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "10cd1k5vg8ra5fnpqpdbl04qwx6h2mmmqbn71pl8j69w9110dkys"; + sha256 = "0jlf3y8b1gdv5xz37yk9b5g2b65zkk45p15x0ypvd2blpzy80537"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index fadd60d9ebb..d345827ed4e 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020.1"; + name = "gromacs-2020.2"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz"; - sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.2.tar.gz"; + sha256 = "1wyjgcdl30wy4hy6jvi9lkq53bqs9fgfq6fri52dhnb3c76y8rbl"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 642982830f7..46cc32fa168 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.elmerfem.org/; + homepage = "https://elmerfem.org/"; description = "A finite element software for multiphysical problems."; platforms = platforms.unix; maintainers = [ maintainers.wulfsta ]; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 3b3f1da1309..ee1198c176f 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 ="194s9rjh3yd2c3rf3zwxsxr2lwqfswjazj39yiyccy0wcxmxpv34"; + sha256 ="1gd2i7gja4k9j4xac8jnls3v41d6qqhmqradz2jbsxwm2sk3cgcf"; fetchSubmodules = true; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { section in the NixOS manual. ''; homepage = "https://github.com/stsdc/monitor"; - maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 121a6cf64ea..8debc642b45 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,35 +1,27 @@ -{ stdenv, fetchurl, fetchpatch, openssl, zlib, asciidoc, libxml2, libxslt +{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt , docbook_xsl, pkgconfig, luajit , coreutils, gnused, groff, docutils -, gzip, bzip2, xz +, gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown }: stdenv.mkDerivation rec { pname = "cgit"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${version}.tar.xz"; - sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; + sha256 = "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss"; }; # cgit is tightly coupled with git and needs a git source tree to build. # IMPORTANT: Remember to check which git version cgit needs on every version # bump (look for "GIT_VER" in the top-level Makefile). gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz"; - sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; + url = "mirror://kernel/software/scm/git/git-2.25.1.tar.xz"; + sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - patches = [ - (fetchpatch { - name = "prevent-dos-limit-path-length.patch"; - url = "https://git.zx2c4.com/cgit/patch/?id=54c407a74a35d4ee9ffae94cc5bc9096c9f7f54a"; - sha256 = "1qlbpqsc293lmc9hzwf1j4jr5qlv8cm1r249v3yij5s4wki1595j"; - }) - ]; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit @@ -39,7 +31,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ + -e 's|"lzip"|"${lzip}/bin/lzip"|' \ -e 's|"xz"|"${xz.bin}/bin/xz"|' \ + -e 's|"zstd"|"${zstd}/bin/zstd"|' \ -i ui-snapshot.c substituteInPlace filters/html-converters/man2html \ diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 597e0672073..adec2a361b5 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "054mag8jgxkvx2f95ha10n45v4xv5lms69w76g95z18m62qhjcyl"; + sha256 = "08fy3677yq52x40rab49ijhw4r25ls2807dbv9wpna6w07n7r8v7"; }; modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn"; diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 07c63ea0119..a5097697a86 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-subtrac"; - version = "0.01"; + version = "0.02"; src = fetchFromGitHub { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6"; + sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k"; }; modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index 0a3360b33b0..d843cdc307c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "06wni47s8yq274bh5f7bcy0sah23938kjiw5pdxnma5kwwnrccrr"; + sha256 = "079kavm3n776wvmy25jq1g4qdvmhh3d3x1vdpb1f6pw5rkky8lyw"; }; - cargoSha256 = "06ndja8212xy4rybh1117wijsyj70w4z8h6km538a7598s49vzdk"; + cargoSha256 = "1ii5l7z9avg0gzlaav2gnfbr8wkbp008i5rz6k6bs2sfqnpnn5k6"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index b93163e239a..8894c4f0f7a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "0pl5z0gx2ypkrgq7vj1cxj5iwj06vcd06x3b3nh0g7w7q7nl8pr4"; + sha256 = "0n025bnisg724d9pjcindxagj1ry63sxr0pplpkh2f2qffzm78pi"; }; - cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466"; + cargoSha256 = "0ikyp6pdlw2c1gr1n1snjbdmblm0fs5swx5awy36jskii99q6kr1"; buildInputs = with stdenv; lib.optional isDarwin Security; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8b8dbef12ab..9c1a01f42ae 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -343,6 +343,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens globin ]; + maintainers = with stdenv.lib.maintainers; [ peti wmertens globin ]; }; } 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 f215b7986f8..5ed4b0d3727 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "06x4a7ynq6vznjwdm0dhzlj9353skxz65xabwr5xxa85zp2a7vcm"; + sha256 = "1vcdgzr71m9rlkaq5pc2vnli3hdh7vv8g3ji5ancnlk3zcqc78xy"; }; - cargoSha256 = "08z3z1m0ik62gzj146a4imk4xx5n8sbvjs0w7gkclvlsvm9dp8q4"; + cargoSha256 = "04g089y6k0p36h08v6swcg1ig2kcadkidnlc0rh04znmv0bkn84d"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index 8c915762b6e..64a4f8a823c 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -36,7 +36,7 @@ buildGoPackage { installPhase = '' runHook preInstall - install -D grv $bin/bin/grv + install -D grv $out/bin/grv runHook postInstall ''; diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 9dbb497c8c9..22ffd442fdc 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; homepage = "https://hub.github.com/"; - maintainers = with maintainers; [ the-kenny globin ]; + maintainers = with maintainers; [ globin ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index d356991815e..2cd4adce939 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation { description = "A patch manager implemented on top of Git"; homepage = "http://procode.org/stgit/"; license = licenses.gpl2; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index fc33478964f..75f6a960841 100644 --- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let - version = "1.0.17"; + version = "1.0.18"; in stdenv.mkDerivation { pname = "svn-all-fast-export"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "svn-all-fast-export"; repo = "svn2git"; rev = version; - sha256 = "13gmrxh4i34scv51h9x38v8jqfjykbbd9w7zzqjnxzvzpzsczg9a"; + sha256 = "1b5yx2316hbyvw3v30vn1ljma9yd21nd59wis1gi34g92lgvqcd6"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index 1683a9bea13..b61ae80bbee 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation { homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; license = stdenv.lib.licenses.mit; - - maintainers = [ stdenv.lib.maintainers.the-kenny ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index cdd7cd01d06..80f236559f9 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; + sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index e85d1f037d7..9488bb8ff78 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "16c30nwlgm0xcma9q34ygjsk6m33izmfgn7a0mzhfzyakymdi45g"; + sha256 = "19wn16m9sy8fv31zl90av5la60l5hsf5fvvfpgiy0470rkagvz6j"; }; patches = [ ./import-ssl-module.patch ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 570fb2ce56f..34a3d804707 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,5 +1,6 @@ { stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam +, fetchpatch , sqliteSupport ? true , pamSupport ? true }: @@ -8,11 +9,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.11.4"; + version = "1.11.5"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "18k6kcdq0ijpzgay2aq1w95qkgfvrn1dgh4cxyj9c4i0pwb3ar7f"; + sha256 = "0iqxwg53wjwi4vpq2h6fwmniazsi4cf68fcjrs459qbz4d6x8xa9"; }; unpackPhase = '' @@ -22,7 +23,13 @@ buildGoPackage rec { sourceRoot = "source"; - patches = [ ./static-root-path.patch ]; + patches = [ + ./static-root-path.patch + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; + sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; + }) + ]; postPatch = '' patchShebangs . @@ -44,7 +51,7 @@ buildGoPackage rec { ) ''; - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data @@ -52,7 +59,7 @@ buildGoPackage rec { mkdir -p $out cp -R ./go/src/${goPackagePath}/options/locale $out/locale - wrapProgram $bin/bin/gitea \ + wrapProgram $out/bin/gitea \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c8b906c055a..c5ee8f39443 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.5.4"; + version = "6.6.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0hrxkhxp6kp82jg1pkcl6vxa5mjpgncx0k353bcnm4986ysizhj4"; + sha256 = "1k94dyynsnm90mp7q9h6baq6q9zi539b1qszf3mqvd5i0id9kjcw"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5e3eac19df3..7c84acc8f05 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -65,7 +65,7 @@ in buildGoPackage rec { "'/run/gitlab/shell-config.yml'" ''; - outputs = [ "bin" "out" "ruby" ]; + outputs = [ "out" "ruby" ]; meta = with stdenv.lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 40860b13e4d..2b4fddaa9c8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -18,8 +18,8 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/ + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index a35778ac023..48667ad8be3 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -34,13 +34,13 @@ buildGoPackage rec { ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data cp -R $src/{public,templates} $data - wrapProgram $bin/bin/gogs \ + wrapProgram $out/bin/gogs \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 027c156be35..b3df290bfb0 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "catt"; - version = "0.10.3"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "08rjimcy9n7nvh4dz9693gjmkq6kaq5pq1nmjjsdrb7vb89yl53i"; + hash = "sha256:1vq1wg79b7855za6v6bsfgypm0v3b4wakap4rash45mhzbgjj0kq"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 4fad80c27ab..c2259ce8379 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.15.8"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "01lx1ki1iglg1dz6x99ciqx5zqlbj7hvfb12ga9m68ypjm0fcphl"; + sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x"; }; propagatedBuildInputs = [ ffmpeg tqdm ]; diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index 82774ada09e..eb572bac4e3 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -1,32 +1,27 @@ -{ stdenv, fetchFromGitHub, fetchpatch, clang, - pkg-config, curl, mpv, yajl }: +{ stdenv +, fetchFromGitHub +, pkg-config +, curl +, mpv +, yajl +}: stdenv.mkDerivation rec { pname = "jftui"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx"; + sha256 = "1az737q5i24ylvkx4g3xlq8k48ni91nz5hhbif97g4nlhwl5cqb6"; }; - patches = [ - # Remove this patch with next version - (fetchpatch { - name = "curl-capability-check-fix"; - url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch"; - sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ - clang curl mpv yajl diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 4816f17618b..2364f9ec02c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -3,21 +3,21 @@ }: let - version = "1.15.0"; + version = "1.15.1"; # 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" ]; - sha256 = "1zr63fqx4qcrnrbg1f97w9mp3yzzxf0dk8pw60y2d4436vanfba4"; + sha256 = "0c9661sdlld8b1g2pk8lbn3gz7cikh9bjqss11ffkriwii1x9fw0"; }; 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" ]; - sha256 = "01pdydll37inkq74874rqd5kk0maafnm1lqcv41jzgzjrfkky8d9"; + sha256 = "0rm1zykqagy2g8hb7pjrc6akdsym8pgdnx66hnna161jbah3sssy"; }; in mkDerivation { pname = "makemkv"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 2e97505f3f1..7db27888782 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "45.0.0"; + version = "46.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1m9ih6bgl3nrjgr0rxvfbvw8s9ska7ps1ypc2ynvyxba4gjkkyyf"; + sha256 = "1vyfvpsllnzhzaaz3s9lqlnkmnqchyhxj2d47bfyizs982r5kg24"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index a89b4ec0889..ce069520332 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -2,7 +2,8 @@ , yad, mkvtoolnix-cli, libnotify }: stdenv.mkDerivation { - name = "mpv-convert-script-2016-03-18.lua"; + pname = "mpv-convert-script"; + version = "2016-03-18"; src = fetchgit { url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; @@ -24,8 +25,10 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - cp convert_script.lua $out + mkdir -p $out/share/mpv/scripts + cp convert_script.lua $out/share/mpv/scripts ''; + passthru.scriptName = "convert_script.lua"; meta = { description = "Convert parts of a video while you are watching it in mpv"; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index e318c7afa67..f19db554d04 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,28 +1,39 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gobject-introspection, mpv }: +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv }: stdenv.mkDerivation rec { - name = "mpv-mpris-${version}.so"; - version = "0.4"; + pname = "mpv-mpris"; + version = "0.5"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; rev = version; - sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i"; + sha256 = "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk"; }; + patches = [ + # Enables to "make SCRIPTS_DIR=... install" https://github.com/hoyon/mpv-mpris/pull/38 + (fetchpatch { + url = "https://github.com/hoyon/mpv-mpris/commit/f1482350868bf20e4575f923943ec998469b255e.patch"; + sha256 = "1lqy867wpmj6hv3zgi6g679a7x3dv5skpw24hwd05b28galnyd4l"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobject-introspection mpv ]; + buildInputs = [ glib mpv ]; - installPhase = '' - cp mpris.so $out - ''; + installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; + + # Otherwise, the shared object isn't `strip`ped. See: + # https://discourse.nixos.org/t/debug-why-a-derivation-has-a-reference-to-gcc/7009 + stripDebugList = [ "share/mpv/scripts" ]; + passthru.scriptName = "mpris.so"; meta = with stdenv.lib; { description = "MPRIS plugin for mpv"; homepage = "https://github.com/hoyon/mpv-mpris"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; } diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 624c06414fd..53def80e7da 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -9,6 +9,6 @@ symlinkJoin { postBuild = '' wrapProgram $out/bin/mpv \ - --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=" + x) scripts}" + --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=${x}/share/mpv/scripts/${x.scriptName}") scripts}" ''; } diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 219954ff9f2..91468ea1ee6 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: +{ stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ opencv ncurses portaudio ]; + buildInputs = [ opencv2 ncurses portaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index df72e200e62..268905e3a4c 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.7.14"; + version = "1.7.16"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "1rjifqvs59w2aacfird02myqfd34qadhacj9zpy5xjz25x410zza"; + sha256 = "1pnbdxaqnliwqfvv08gi7gdcvflg5vcbgk4g0fw75prgw54vnd9a"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index b3c05818638..9c0435a351c 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "20.04.01"; + version = "20.04.12"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "10svbhsd5q8z1k055kcfibil97qifwzn3xmnf5b9sxa7ky4bkmqr"; + sha256 = "05yyv9192f722j8fhfjrphxadgp3crvbq4pi23ln560zh9s1m8r4"; }; patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index a12d0845890..782b81cc238 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.3.1"; + version = "1.4.1"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "0scc0mzvy56b1l6iyvrzb28l8vzrxpfkn4lcwr8nnyjb7ams2xms"; + sha256 = "1q3h48qwf7vs2wnbkwv0xnm6s65mkcyqdz7z6z3vrsmif2sb19l2"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 310d41df36d..19ba8ced497 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -57,6 +57,6 @@ edk2.mkDerivation projectDscPath { description = "Sample UEFI firmware for QEMU and KVM"; homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = stdenv.lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 7ce4390ba30..4210994f435 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,10 +1,12 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, utillinux }: +{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }: with lib; buildGoPackage rec { pname = "containerd"; version = "1.2.13"; + # git commit for the above version's tag + commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; src = fetchFromGitHub { owner = "containerd"; @@ -14,13 +16,13 @@ buildGoPackage rec { }; goPackagePath = "github.com/containerd/containerd"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = [ go-md2man utillinux ]; + nativeBuildInputs = [ go-md2man installShellFiles utillinux ]; buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" ]; + buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ]; BUILDTAGS = [] ++ optional (btrfs-progs == null) "no_btrfs"; @@ -28,23 +30,16 @@ buildGoPackage rec { buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries + make binaries $buildFlags ''; installPhase = '' for b in bin/*; do - install -Dm555 $b $bin/$b + install -Dm555 $b $out/$b done make man - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manFile in man/*; do - manName="$(basename "$manFile")" # "docker-build.1" - number="$(echo $manName | rev | cut -d'.' -f1 | rev)" - mkdir -p "$manRoot/man$number" - gzip -c "$manFile" > "$manRoot/man$number/$manName.gz" - done + installManPage man/*.[1-9] ''; meta = { diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 7d866cd71bb..4c3d9ffc937 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -3,25 +3,24 @@ , btrfs-progs , buildGoPackage , fetchFromGitHub -, git , glibc , gpgme +, installShellFiles , libapparmor , libassuan , libgpgerror , libseccomp , libselinux , lvm2 -, pkgconfig -, which +, pkg-config }: buildGoPackage rec { - project = "cri-o"; + pname = "cri-o"; version = "1.18.0"; - name = "${project}-${version}${flavor}"; + name = "${pname}-${version}${flavor}"; - goPackagePath = "github.com/${project}/${project}"; + goPackagePath = "github.com/cri-o/cri-o"; src = fetchFromGitHub { owner = "cri-o"; @@ -30,28 +29,48 @@ buildGoPackage rec { sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; - outputs = [ "bin" "out" ]; - nativeBuildInputs = [ git pkgconfig which ]; - buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror - libseccomp libselinux lvm2 ] - ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = [ + btrfs-progs + gpgme + libapparmor + libassuan + libgpgerror + libseccomp + libselinux + lvm2 + ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' pushd go/src/${goPackagePath} - make binaries BUILDTAGS="$BUILDTAGS" + sed -i '/version.buildDate/d' Makefile + + make binaries docs BUILDTAGS="$BUILDTAGS" ''; + installPhase = '' - install -Dm755 bin/crio $bin/bin/crio${flavor} - install -Dm755 bin/crio-status $bin/bin/crio-status${flavor} - install -Dm755 bin/pinns $bin/bin/pinns${flavor} + install -Dm755 bin/crio $out/bin/crio${flavor} + install -Dm755 bin/crio-status $out/bin/crio-status${flavor} + install -Dm755 bin/pinns $out/bin/pinns${flavor} + + for shell in bash fish zsh; do + installShellCompletion --$shell completions/$shell/* + done + + installManPage docs/*.[1-9] ''; meta = with stdenv.lib; { homepage = "https://cri-o.io"; - description = ''Open Container Initiative-based implementation of the - Kubernetes Container Runtime Interface''; + description = '' + Open Container Initiative-based implementation of the + Kubernetes Container Runtime Interface + ''; license = licenses.asl20; maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index a4c2be05061..996d52bacab 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$bin/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f1b3475d9bc..f7c49526fb1 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git @@ -78,7 +78,7 @@ rec { sha256 = sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ installShellFiles pkgconfig ]; buildInputs = [ makeWrapper removeReferencesTo go-md2man go libtool ] ++ optionals (stdenv.isLinux) [ @@ -147,9 +147,9 @@ rec { --prefix PATH : "$out/libexec/docker:$extraPath" # completion (cli) - install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + installShellCompletion --bash ./components/cli/contrib/completion/bash/docker + installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish + installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker # Include contributed man pages (cli) # Generate man pages from cobra commands @@ -163,16 +163,7 @@ rec { echo "Generate legacy manpages" ./man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in ./man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" - done - done + installManPage man/*/*.[1-9] ''; preFixup = '' diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index dde0b481497..cb3518d7d3d 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = null; installPhase = '' - install -m755 -D ./go/bin/proxy $bin/bin/docker-proxy + install -m755 -D ./go/bin/proxy $out/bin/docker-proxy ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index cb8cc7ee1de..79d1b606bcb 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.20.0"; + version = "0.21.1"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "073pp4q5dnyr126k8k7qdkqclqx18hj12app4gj2is0413gia8z9"; - aarch64-linux = "1w5f522imq5dnjrdidnrq7jlwcdrsiz32shv9bh66dhy336sd8qw"; + x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb"; + aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0falk6y9y0pimgav1yg6ydn6wsslz0my01qd9by8ipk3f3776531"; - aarch64-linux = "1j4x4p4zz1ydvpzbbmxszyqv28qbl4v3hiwdj2f67f1jn1cv9l7z"; + x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk"; + aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk"; }; in diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index e157ca825af..7d62b1b9fa2 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "1bn7nhv5pag8fdm8l8nvgg3fzvhpy2yv9yl2slrb16lckxzha3v6"; + sha256 = "0r11kbyp1ambgcj35gvjjmxrsrdg7b9jb9sq3kih4lik7zyljp25"; }; buildAttrs = { diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 8ca193194bc..4a9fa078752 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { goPackagePath = "github.com/containers/libpod"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; @@ -40,7 +40,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm555 bin/podman $bin/bin/podman + install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/podman installShellCompletion --zsh completions/zsh/_podman MANDIR=$man/share/man make install.man @@ -54,5 +54,6 @@ buildGoPackage rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 0b905c0c709..99233696b3e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -28,21 +28,25 @@ let ] ++ extraPackages); in runCommand podman.name { - inherit (podman) name pname version meta outputs; + name = "${podman.pname}-wrapper-${podman.version}"; + inherit (podman) pname version; + + meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; + + outputs = [ + "out" + "man" + ]; + nativeBuildInputs = [ makeWrapper ]; } '' - # Symlink everything but $bin from podman-unwrapped - ${ - lib.concatMapStringsSep "\n" - (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "bin") - podman.outputs)} - - mkdir -p $bin/bin - ln -s ${podman-unwrapped}/share $bin/share - makeWrapper ${podman-unwrapped}/bin/podman $bin/bin/podman \ + ln -s ${podman.man} $man + + mkdir -p $out/bin + ln -s ${podman-unwrapped}/share $out/share + makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ --prefix PATH : ${binPath} '' diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 87385024967..95db2a1d9e9 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/opencontainers/runc"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; buildInputs = [ libseccomp libapparmor apparmor-parser ]; @@ -38,8 +38,8 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm755 runc $bin/bin/runc - installManPage man/*/* + install -Dm755 runc $out/bin/runc + installManPage man/*/*.[1-9] ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 4477e7c7b1d..f6a1a3bc6a9 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { patchShebangs . sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go - ./mconfig -V ${version} -p $bin --localstatedir=/var + ./mconfig -V ${version} -p $out --localstatedir=/var # Don't install SUID binaries sed -i 's/-m 4755/-m 755/g' builddir/Makefile @@ -54,16 +54,16 @@ buildGoPackage rec { ''; installPhase = '' - make -C builddir install LOCALSTATEDIR=$bin/var - chmod 755 $bin/libexec/singularity/bin/starter-suid - wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} + make -C builddir install LOCALSTATEDIR=$out/var + chmod 755 $out/libexec/singularity/bin/starter-suid + wrapProgram $out/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} ''; postFixup = '' - find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true + find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true # These etc scripts shouldn't have their paths patched - cp etc/actions/* $bin/etc/singularity/actions/ + cp etc/actions/* $out/etc/singularity/actions/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index e3e6bae6cfe..db3fb1c96eb 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.19.0"; pname = "tini"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 3d058903200..41e6c425a81 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "8.0"; + version = "9.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw"; + sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; }; nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 47541a3fdb5..7dc715e126c 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://herbstluftwm.org/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index eec7d88dbc7..3888e10f258 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms +{ fetchurl, stdenv, which, pkgconfig, makeWrapper, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon , xorgserver, xvfb_run }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws"; }; - nativeBuildInputs = [ which pkgconfig makeWrapper ]; + nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; buildInputs = [ libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { sed -i 's/which/command -v/' $program done - install -vD -t $out/share/man/man1 man/*.{1,man} + installManPage man/*.1 ''; separateDebugInfo = true; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index b124ba0ea0c..7be037ca833 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -4,19 +4,14 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; version = "4.18.1"; - releaseDate = "2019-01-27"; src = fetchurl { - url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "07gk5m90v0ih7c18vcwx7p7innsccd09j2vkr99a33wk71xrww1z"; + url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.bz2"; + sha256 = "1cxwsrdzp18r5hj0ymg9fbzp1mhkj4m9h6i0b9cdg79cjbacba9k"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; - postUnpack = '' - echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION - ''; - # fatal error: GENERATED_config_enums.h: No such file or directory enableParallelBuilding = false; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 3ee50bf16ec..b059423c23c 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation { description = "A tiling window manager for X11"; homepage = "https://github.com/stumpwm/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; broken = true; # 2018-04-11 }; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 66596d9de04..66681ef0850 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -2,7 +2,7 @@ , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, dbus, libevdev -, pango, cairo, libinput, libcap, pam, gdk-pixbuf +, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland libxkbcommon pcre json_c dbus libevdev - pango cairo libinput libcap pam gdk-pixbuf + pango cairo libinput libcap pam gdk-pixbuf librsvg wlroots wayland-protocols ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 3e12e3fcc55..fe78e1a9ff9 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -2,7 +2,7 @@ , sway-unwrapped, swaybg , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus -, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf +, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 , extraOptions ? [] # E.g.: [ "--verbose" ] }: @@ -33,12 +33,14 @@ in symlinkJoin { nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); - buildInputs = optional withGtkWrapper gdk-pixbuf; + buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ]; + + # We want to run wrapProgram manually + dontWrapGApps = true; postBuild = '' - # We want to run wrapProgram manually to only wrap sway and add swaybg: - export dontWrapGApps=true - ${optionalString withGtkWrapper "wrapGAppsHook"} + ${optionalString withGtkWrapper "gappsWrapperArgsHook"} + wrapProgram $out/bin/sway \ --prefix PATH : "${swaybg}/bin" \ ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ diff --git a/pkgs/applications/window-managers/tinywm/default.nix b/pkgs/applications/window-managers/tinywm/default.nix new file mode 100644 index 00000000000..0e30857267b --- /dev/null +++ b/pkgs/applications/window-managers/tinywm/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchFromGitHub +, libX11 }: + +stdenv.mkDerivation rec { + pname = "tinywm"; + version = "2014-04-22"; + + src = fetchFromGitHub { + owner = "mackstann"; + repo = pname; + rev = "9d05612f41fdb8bc359f1fd9cc930bf16315abb1"; + sha256 = "1s7r4f2d3lk1i8h089v2vyrr02hh0y9i3ihl9kqgk9s87hqw8q5b"; + }; + + buildInputs = [ libX11 ]; + + dontConfigure = true; + + buildPhase = '' + ${stdenv.cc}/bin/cc -Wall -pedantic -I${libX11}/include tinywm.c -L${libX11}/lib -lX11 -o tinywm + ''; + + installPhase = '' + install -dm755 $out/bin $out/share/doc/${pname}-${version} + install -m755 tinywm -t $out/bin/ + # The annotated source code is a piece of documentation + install -m644 annotated.c README -t $out/share/doc/${pname}-${version} + ''; + + meta = with stdenv.lib;{ + description = "A tiny window manger for X11"; + longDescription = '' + + TinyWM is a tiny window manager that I created as an exercise in + minimalism. It is also maybe helpful in learning some of the very basics + of creating a window manager. It is only around 50 lines of C. There is + also a Python version using python-xlib. + + It lets you do four basic things: + + - Move windows interactively with Alt+Button1 drag (left mouse button) + - Resize windows interactively with Alt+Button3 drag (right mouse button) + - Raise windows with Alt+F1 (not high on usability I know, but I needed a + keybinding in there somewhere) + - Focus windows with the mouse pointer (X does this on its own) + ''; + homepage = "http://incise.org/tinywm.html"; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = libX11.meta.platforms; + }; +} diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 84020505a63..5cc99c6412a 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { inherit targetPrefix infixSalt; - outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; + outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); passthru = { inherit bintools libc nativeTools nativeLibc nativePrefix; @@ -259,14 +259,15 @@ stdenv.mkDerivation { printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages '' - + optionalString propagateDoc '' + + optionalString propagateDoc ('' ## ## Man page and info support ## ln -s ${bintools.man} $man + '' + optionalString (bintools ? info) '' ln -s ${bintools.info} $info - '' + '') + '' ## diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 9a64b84f076..31c0c8e92e5 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -42,9 +42,11 @@ in stdenv.mkDerivation (fBuildAttrs // { inherit name bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget; deps = stdenv.mkDerivation (fFetchAttrs // { - name = "${name}-deps"; + name = "${name}-deps.tar.gz"; inherit bazelFlags bazelBuildFlags bazelFetchFlags bazelTarget; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + nativeBuildInputs = fFetchAttrs.nativeBuildInputs or [] ++ [ bazel ]; preHook = fFetchAttrs.preHook or "" + '' @@ -120,9 +122,9 @@ in stdenv.mkDerivation (fBuildAttrs // { ln -sf "$new_target" "$symlink" done - cp -r $bazelOut/external $out + echo '${bazel.name}' > $bazelOut/external/.nix-bazel-version - echo '${bazel.name}' > $out/.nix-bazel-version + (cd $bazelOut/ && tar czf $out --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner external/) runHook postInstall ''; @@ -130,7 +132,6 @@ in stdenv.mkDerivation (fBuildAttrs // { dontFixup = true; allowedRequisites = []; - outputHashMode = "recursive"; outputHashAlgo = "sha256"; outputHash = fetchAttrs.sha256; }); @@ -146,14 +147,15 @@ in stdenv.mkDerivation (fBuildAttrs // { preConfigure = '' mkdir -p "$bazelOut" - test "${bazel.name}" = "$(<$deps/.nix-bazel-version)" || { + (cd $bazelOut && tar xfz $deps) + + test "${bazel.name}" = "$(<$bazelOut/external/.nix-bazel-version)" || { echo "fixed output derivation was built for a different bazel version" >&2 - echo " got: $(<$deps/.nix-bazel-version)" >&2 + echo " got: $(<$bazelOut/external/.nix-bazel-version)" >&2 echo "expected: ${bazel.name}" >&2 exit 1 } - cp -r $deps $bazelOut/external chmod -R +w $bazelOut find $bazelOut -type l | while read symlink; do ln -sf $(readlink "$symlink" | sed "s,NIX_BUILD_TOP,$NIX_BUILD_TOP,") "$symlink" diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index f43205f24c5..d75d3cf943a 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -3,6 +3,7 @@ { pname , version , internalDeps ? [] +, peclDeps ? [] , buildInputs ? [] , nativeBuildInputs ? [] , postPhpize ? "" @@ -16,11 +17,12 @@ stdenv.mkDerivation (args // { name = "php-${pname}-${version}"; + extensionName = pname; inherit src; nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs; - buildInputs = [ php ] ++ buildInputs; + buildInputs = [ php ] ++ peclDeps ++ buildInputs; makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index abba76bd1ac..43f7c5acd5a 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -373,6 +373,7 @@ print_results() { "url": "$(json_escape "$url")", "rev": "$(json_escape "$fullRev")", "date": "$(json_escape "$commitDateStrict8601")", + "path": "$(json_escape "$finalPath")", "$(json_escape "$hashType")": "$(json_escape "$hash")", "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false), "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false), diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 74fdc320835..e93c98419a6 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -47,13 +47,18 @@ tryDownload() { finish() { + local skipPostFetch="$1" + set +o noglob if [[ $executable == "1" ]]; then chmod +x $downloadedFile fi - runHook postFetch + if [ -z "$skipPostFetch" ]; then + runHook postFetch + fi + exit 0 } @@ -69,7 +74,13 @@ tryHashedMirrors() { --fail --silent --show-error --head "$url" \ --write-out "%{http_code}" --output /dev/null > code 2> log; then tryDownload "$url" - if test -n "$success"; then finish; fi + + # We skip postFetch here, because hashed-mirrors are + # already content addressed. So if $outputHash is in the + # hashed-mirror, changes from ‘postFetch’ would already be + # made. So, running postFetch will end up applying the + # change /again/, which we don’t want. + if test -n "$success"; then finish skipPostFetch; fi else # Be quiet about 404 errors, which we interpret as the file # not being present on this particular mirror. diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 7d23a3a7f8f..a0c48468dfa 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -65,7 +65,7 @@ in , # Shell code to build a netrc file for BASIC auth netrcPhase ? null -, # Impure env vars (http://nixos.org/nix/manual/#sec-advanced-attributes) +, # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) # needed for netrcPhase netrcImpureEnvVars ? [] diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 93770d71a10..a6b47930c27 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,14 @@ -{ stdenv, cacert, git, rust, cargo, rustc, fetchCargoTarball, buildPackages, windows }: +{ stdenv +, buildPackages +, cacert +, cargo +, diffutils +, fetchCargoTarball +, git +, rust +, rustc +, windows +}: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -58,6 +68,10 @@ let cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; releaseDir = "target/${rustTarget}/${buildType}"; + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + diff = "${diffutils}/bin/diff"; + in stdenv.mkDerivation (args // { @@ -110,7 +124,7 @@ stdenv.mkDerivation (args // { srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock echo "Validating consistency between $srcLockfile and $cargoDepsLockfile" - if ! diff $srcLockfile $cargoDepsLockfile; then + if ! ${diff} $srcLockfile $cargoDepsLockfile; then # If the diff failed, first double-check that the file exists, so we can # give a friendlier error msg. diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index e54363a1dda..8483f9bbd1d 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -4,6 +4,7 @@ , version , attrPath ? pname , versionLister +, ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false , patchlevel-unstable ? false @@ -23,13 +24,19 @@ let version="$2" attr_path="$3" version_lister="$4" - rev_prefix="$5" - odd_unstable="$6" - patchlevel_unstable="$7" + ignored_versions="$5" + rev_prefix="$6" + odd_unstable="$7" + patchlevel_unstable="$8" # print header echo "# $pname-$version" >> ${fileForGitCommands} + function version_is_ignored() { + local tag="$1" + [ -n "$ignored_versions" ] && grep -E "$ignored_versions" <<< "$tag" + } + function version_is_unstable() { local tag="$1" local enforce="$2" @@ -68,7 +75,10 @@ let # find the newest tag # do not consider development versions for latest_tag in $tags; do - if version_is_unstable "$latest_tag"; then + if version_is_ignored "$latest_tag"; then + echo "# skip ignored version: $pname-$latest_tag" >> ${fileForGitCommands} + latest_tag= + elif version_is_unstable "$latest_tag"; then echo "# skip development version: $pname-$latest_tag" >> ${fileForGitCommands} latest_tag= else @@ -95,4 +105,4 @@ let ''; in -[ updateScript pname version attrPath versionLister rev-prefix odd-unstable patchlevel-unstable ] +[ updateScript pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ] diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 36735ff99ae..294f210c21f 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vnwya5g7fg0jhdrg9drxnx83lhk8qa2nvcrmd1sdfanlz4qfhjf"; + sha256 = "0n4rbrq5zww6gjjmicyw5hlvzi8azc6m4sisak15snkp6v4f93qr"; }; nativeBuildInputs = [ diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index b557118ddc2..a9a64fb4029 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.05"; + version = "5.06"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm"; + sha256 = "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix new file mode 100644 index 00000000000..838a8d4c769 --- /dev/null +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub, fontforge, python3 }: +let + inherit (python3.pkgs) fonttools; + + common = + { version, repo, sha256, nativeBuildInputs, postPatch ? null }: + stdenv.mkDerivation rec { + pname = "liberation-fonts"; + inherit version; + + src = fetchFromGitHub { + owner = "liberationfonts"; + rev = version; + inherit repo sha256; + }; + + inherit nativeBuildInputs postPatch; + + installPhase = '' + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true + install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true + install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true + install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true + install -m444 -Dt $out/share/doc/${pname}-${version} README || true + ''; + + meta = with stdenv.lib; { + description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; + longDescription = '' + The Liberation Fonts are intended to be replacements for the three most + commonly used fonts on Microsoft systems: Times New Roman, Arial, and + Courier New. Since 2012 they are based on croscore fonts. + + There are three sets: Sans (a substitute for Arial, Albany, Helvetica, + Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times + New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono + (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and + Bitstream Vera Sans Mono). + ''; + + license = licenses.ofl; + homepage = "https://github.com/liberationfonts"; + maintainers = with maintainers; [ raskin ]; + }; + }; +in +{ + liberation_ttf_v1 = common { + repo = "liberation-1.7-fonts"; + version = "1.07.5"; + nativeBuildInputs = [ fontforge ]; + sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; + }; + liberation_ttf_v2 = common { + repo = "liberation-fonts"; + version = "2.1.0"; + nativeBuildInputs = [ fontforge fonttools ]; + postPatch = '' + substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ + 'font = ttLib.TTFont(fontfile)' \ + 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' + ''; + sha256 = "03xpzaas264x5n6qisxkhc68pkpn32m7y78qdm3rdkxdwi8mv8mz"; + }; +} diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 015b084aed7..210858c5aed 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.047"; + version = "1.051"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0v50m6hiv19f7i4idi987j1six6493y6hj3r9djifg075v9adxx9"; + sha256 = "1cqlljbzvrxamswcqx8jbr61q4kji7yil5ic1mh60x4yfsk9x5wn"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix deleted file mode 100644 index 1cb0eb349e4..00000000000 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, fetchFromGitHub, fontforge, python3 }: - -let - inherit (python3.pkgs) fonttools; - - common = - { version, repo, sha256, nativeBuildInputs, postPatch ? null }: - stdenv.mkDerivation rec { - pname = "liberation-fonts"; - inherit version; - - src = fetchFromGitHub { - owner = "liberationfonts"; - rev = version; - inherit repo sha256; - }; - - inherit nativeBuildInputs postPatch; - - installPhase = '' - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - - install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true - install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true - install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true - install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true - install -m444 -Dt $out/share/doc/${pname}-${version} README || true - ''; - - meta = with stdenv.lib; { - description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' - The Liberation Fonts are intended to be replacements for the three most - commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. Since 2012 they are based on croscore fonts. - - There are three sets: Sans (a substitute for Arial, Albany, Helvetica, - Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times - New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono - (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and - Bitstream Vera Sans Mono). - ''; - - license = licenses.ofl; - homepage = "https://github.com/liberationfonts"; - maintainers = [ - maintainers.raskin - ]; - }; - }; - -in { - liberation_ttf_v1 = common { - repo = "liberation-1.7-fonts"; - version = "1.07.5"; - nativeBuildInputs = [ fontforge ]; - sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; - }; - liberation_ttf_v2 = common { - repo = "liberation-fonts"; - version = "2.00.4"; - nativeBuildInputs = [ fontforge fonttools ]; - postPatch = '' - substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ - 'font = ttLib.TTFont(fontfile)' \ - 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' - ''; - sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; - }; -} diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b47c01d973e..a39a8720635 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200405"; + version = "20200430"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0qv4340avm5s0640r8aznbfwjzvm6k64840qggyg9jfcy6223pdy"; + sha256 = "1dgxf3fi4x5iy504xncj1jba8cd51axkn2j1cfb220rpc6mzv25l"; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 3c1b436fe32..e937f3a0f70 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/9d50cd974714cdcfdaabd089923b571a66bae55a.tar.gz"; - sha256 = "1hv4pxp47850l36ci2ywmc75c95fvdqr3swz9qymy25gd6rbfs9f"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a734b1438c8379ed3945412538ff4ec49823564c.tar.gz"; + sha256 = "0y1y818n10fh0qq7cg67p9l293js78fyahk5f6s9w3c21xn9wn8r"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index d7d6c062e0c..2b2d2d19065 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "20190731"; + version = "20200407"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0vqr4zm53zn7z75ynmf59xfrlhpyk8f41xd6i4v8j0f7k6hfdvpi"; + sha256 = "1zmqim0l4lz5xbq7w2wi48fzsvg2msyw6c80dzw4vxll31frpy18"; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index d45c759f880..e54d2354139 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - pname = "matcha"; - version = "2020-04-08"; + pname = "matcha-gtk-theme"; + version = "2020-05-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0gmdscw9gv19k80ciai6zziih2nccr5snz5na48gr4k5rhq9mzqx"; + sha256 = "0fp3ijynyvncy2byjjyba573p81x2pl2hdzv17mg40r8d5mjlkww"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A stylish Design theme for GTK based desktop environments"; + description = "A stylish flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix index 1ec260f5033..9d74ae22250 100644 --- a/pkgs/data/themes/nordic-polar/default.nix +++ b/pkgs/data/themes/nordic-polar/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "nordic-polar"; - version = "1.6.0"; + version = "1.9.0"; srcs = [ (fetchurl { url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz"; - sha256 = "0cym8rcg8jpfraqlfrmymkm0jrsk1s9p7z6vcil4vxbyim9q9w16"; + sha256 = "1583mx8frkl5w26myczbyrggrp07lmpsfj00h1bzicw6lz8jbxf1"; }) (fetchurl { url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz"; - sha256 = "0s4wf9nqpa75km905jh03gl2d2hjcdvfacmkdz3njviqm6pwqxsv"; + sha256 = "1n2qys0xcg1k28bwfrrr44cqz7q2rnfj6ry6qgd67ivgh63kmcq6"; }) ]; diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 4979738231d..aca72c2fb48 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,32 +2,32 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "1.8.1"; + version = "1.9.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic.tar.xz"; - sha256 = "0jvc6l093gj9azkrjswdc1kqlyc6drnhsxgpzylzcgjxvxyi9vmd"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz"; + sha256 = "12x13h9w4yqk56a009zpj1kq3vn2hn290xryfv1b0vyf2r45rsn7"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-standard-buttons.tar.xz"; - sha256 = "049hcvccjds465v78sk3cjg7zck36l1zpyrf4p8xinj2h3b74zr8"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz"; + sha256 = "0f38nx1rvp9l6xz62yx6cbab4im8d425gxr52jkc8gfqpl5lrf0q"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker.tar.xz"; - sha256 = "1qaj4x451ic8mx4aak1axw29jm6ymwgh5w3n3mw5kjm1fwg4b5dz"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker.tar.xz"; + sha256 = "0frp0jf7hbiapl3m67av7rbm3sx8db52zi3j01k2hysh6kba7x33"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker-standard-buttons.tar.xz"; - sha256 = "19wczzppimp7sql9v0sq1sc5j0ix51270c58j22mg01kd2h2iivy"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-darker-standard-buttons.tar.xz"; + sha256 = "0grfsjr9kq0lszmqxvjvpgvf4avm34446nqykz1zfpdg50j7r54b"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent.tar.xz"; - sha256 = "1jvjjxiz8q9583f3gidky65s2g5pd5bkvbx0jvwn0p0kz8vlzmzk"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent.tar.xz"; + sha256 = "0zndldwavir22ay2r0jazpikzzww3hc09gsmbiyjmw54v29qhl9r"; }) (fetchurl { - url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent-standard-buttons.tar.xz"; - sha256 = "0wqn0aszddq8nbh6c667rwhy7c1zky23a9q3d8gci421n20l6lyd"; + url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-bluish-accent-standard-buttons.tar.xz"; + sha256 = "1b9d2fvdndyh7lh3xhmc75csfbapl4gv59y7wy15k2awisvlvz07"; }) ]; diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 25d6218e4bf..3fb3af9436e 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "0n64cml2h8dw2m2m6j90d515saqapqzjz6xcv4kr544ibv62hn61"; + sha256 = "1srl6wm6fjdc5pi9fjl5nghn4q40hn5jcxxl8qjvz8lkczylynnb"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/data/themes/shades-of-gray/default.nix b/pkgs/data/themes/shades-of-gray/default.nix index 171f7010897..718fb2b5d4c 100644 --- a/pkgs/data/themes/shades-of-gray/default.nix +++ b/pkgs/data/themes/shades-of-gray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "shades-of-gray-theme"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "WernerFP"; repo = pname; rev = version; - sha256 = "153isyxly7nvivaz87zk2v1bqzcb3wk0j9vhgxzcz6qkf754q61s"; + sha256 = "13ydym0i3032g5dyrnl5wxpvxv57b43q7iaq5achpmaixgn58gs8"; }; buildInputs = [ gtk_engines ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 56ff4b106e3..96910052ac9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0hplck17rksfgqm2z58ajvz4p2m4zg6ksdpbc27ki20iv4fv620s"; + sha256 = "1bkhzgdinsk4ahp1b4jf50phxwv2da23rh35cmg9fbm5c88701ga"; }; patches = [ diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index df780009152..06d921cce6d 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: +{ stdenv +, fetchFromGitHub +, jq +, libxml2 +, go-dbus-generator +, deepin +}: stdenv.mkDerivation rec { pname = "dbus-factory"; @@ -17,13 +23,15 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ]; + makeFlags = [ + "GOPATH=${placeholder "out"}/share/go" + ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 9fb18d04df8..325f62f3781 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -1,25 +1,28 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - alsaLib, - bc, - blur-effect, - coreutils, - dbus-factory, - deepin, - deepin-gettext-tools, - fontconfig, - go, - go-dbus-factory, - go-gir-generator, - go-lib, - grub2, - gtk3, - libcanberra, - libgudev, - librsvg, - poppler, - pulseaudio, - rfkill, - xcur2png +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, alsaLib +, bc +, blur-effect +, coreutils +, dbus-factory +, deepin +, deepin-gettext-tools +, fontconfig +, go +, go-dbus-factory +, go-gir-generator +, go-lib +, grub2 +, gtk3 +, libcanberra +, libgudev +, librsvg +, poppler +, pulseaudio +, rfkill +, xcur2png }: buildGoPackage rec { @@ -37,8 +40,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig deepin-gettext-tools # build @@ -109,14 +110,14 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* + remove-references-to -t ${go} $out/lib/deepin-api/* ''; postFixup = '' searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index e148df51a87..094f3447c6b 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qttools, - deepin-gettext-tools, dtkcore, dtkwidget, deepin +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, qttools +, deepin-gettext-tools +, dtkcore +, dtkwidget +, deepin }: mkDerivation rec { @@ -37,7 +45,7 @@ mkDerivation rec { -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index adc05e1ea7e..be2846fc87e 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -1,9 +1,40 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative, - networkmanager, qtsvg, qtx11extras, dtkcore, dtkwidget, geoip, gsettings-qt, - dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api, - dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus, - systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which, - substituteAll, tzdata, wrapGAppsHook +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, deepin +, qttools +, qtdeclarative +, networkmanager +, qtsvg +, qtx11extras +, dtkcore +, dtkwidget +, geoip +, gsettings-qt +, dde-network-utils +, networkmanager-qt +, xorg +, mtdev +, fontconfig +, freetype +, dde-api +, dde-daemon +, qt5integration +, deepin-desktop-base +, deepin-desktop-schemas +, dbus +, systemd +, dde-qt-dbus-factory +, qtmultimedia +, qtbase +, glib +, gnome3 +, which +, substituteAll +, tzdata +, wrapGAppsHook }: mkDerivation rec { @@ -107,7 +138,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Control panel of Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index fdbb7856b06..b89b2c25446 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -1,10 +1,38 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, - dbus-factory, go-dbus-factory, go-gir-generator, go-lib, - deepin-gettext-tools, gettext, dde-api, deepin-desktop-schemas, - deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, - libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, - pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go, - deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }: +{ stdenv +, buildGoPackage +, fetchFromGitHub +, fetchpatch +, pkgconfig +, dbus-factory +, go-dbus-factory +, go-gir-generator +, go-lib +, deepin-gettext-tools +, gettext +, dde-api +, deepin-desktop-schemas +, deepin-wallpapers +, deepin-desktop-base +, alsaLib +, glib +, gtk3 +, libgudev +, libinput +, libnl +, librsvg +, linux-pam +, networkmanager +, pulseaudio +, python3 +, hicolor-icon-theme +, glibc +, tzdata +, go +, deepin +, makeWrapper +, xkeyboard_config +, wrapGAppsHook +}: buildGoPackage rec { pname = "dde-daemon"; @@ -29,8 +57,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory @@ -123,7 +149,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index f2edb83537d..68f2caa6319 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -1,94 +1,116 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, - qtsvg, polkit, gsettings-qt, dtkcore, dtkwidget, - dde-qt-dbus-factory, dde-network-utils, dde-daemon, - deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin, - plugins ? [], symlinkJoin, makeWrapper, libdbusmenu }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qttools +, qtx11extras +, qtsvg +, polkit +, gsettings-qt +, dtkcore +, dtkwidget +, dde-qt-dbus-factory +, dde-network-utils +, dde-daemon +, deepin-desktop-schemas +, xorg +, glib +, wrapGAppsHook +, deepin +, plugins ? [ ] +, symlinkJoin +, makeWrapper +, libdbusmenu +}: let -unwrapped = mkDerivation rec { - pname = "dde-dock"; - version = "5.0.0"; + unwrapped = mkDerivation rec { + pname = "dde-dock"; + version = "5.0.0"; - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; - }; + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; + }; - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; + nativeBuildInputs = [ + cmake + pkgconfig + qttools + wrapGAppsHook + deepin.setupHook + ]; - buildInputs = [ - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-schemas - dtkcore - dtkwidget - glib - gsettings-qt - libdbusmenu - polkit - qtsvg - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - ]; + buildInputs = [ + dde-daemon + dde-network-utils + dde-qt-dbus-factory + deepin-desktop-schemas + dtkcore + dtkwidget + glib + gsettings-qt + libdbusmenu + polkit + qtsvg + qtx11extras + xorg.libXdmcp + xorg.libXtst + xorg.libpthreadstubs + ]; - patches = [ - ./dde-dock.plugins-dir.patch - ]; + patches = [ + ./dde-dock.plugins-dir.patch + ]; - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt - fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake - fixPath $out /usr dde-dock.pc - fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service - fixPath $out /usr/share/dbus-1 CMakeLists.txt - fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp - fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp - fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp + postPatch = '' + searchHardCodedPaths + patchShebangs translate_generation.sh + fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt + fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake + fixPath $out /usr dde-dock.pc + fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service + fixPath $out /usr/share/dbus-1 CMakeLists.txt + fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp + fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp + fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp - substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out - ''; + substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out + substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out + ''; - cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; + cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; - dontWrapQtApps = true; + dontWrapQtApps = true; - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; - postFixup = '' - searchHardCodedPaths $out - ''; + postFixup = '' + searchHardCodedPaths $out + ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; - meta = with stdenv.lib; { - description = "Dock for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + meta = with stdenv.lib; { + description = "Dock for Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/dde-dock"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; }; -}; -in if plugins == [] then unwrapped - else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; - dde-dock = unwrapped; - } +in +if plugins == [ ] +then unwrapped +else import ./wrapper.nix { + inherit makeWrapper symlinkJoin plugins; + dde-dock = unwrapped; +} diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/pkgs/desktops/deepin/dde-dock/wrapper.nix index 8f6d8a67b1a..1690230a99e 100644 --- a/pkgs/desktops/deepin/dde-dock/wrapper.nix +++ b/pkgs/desktops/deepin/dde-dock/wrapper.nix @@ -1,4 +1,8 @@ -{ makeWrapper, symlinkJoin, dde-dock, plugins }: +{ makeWrapper +, symlinkJoin +, dde-dock +, plugins +}: symlinkJoin { name = "dde-dock-with-plugins-${dde-dock.version}"; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index a952a82dfca..4258e2aa859 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -1,13 +1,52 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, - dde-dock, dde-polkit-agent, dde-qt-dbus-factory, deepin, - deepin-anything, deepin-desktop-schemas, deepin-gettext-tools, - deepin-movie-reborn, deepin-shortcut-viewer, deepin-terminal, - disomaster, dtkcore, dtkwidget, ffmpegthumbnailer, file, glib, - gnugrep, gsettings-qt, gvfs, jemalloc, kcodecs, libX11, libsecret, - polkit, polkit-qt, poppler, procps, qmake, qt5integration, - qtmultimedia, qtsvg, qttools, qtx11extras, runtimeShell, samba, - shadow, taglib, udisks2-qt5, xdg-user-dirs, xorg, zlib, - wrapGAppsHook }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, avfs +, dde-daemon +, dde-dock +, dde-polkit-agent +, dde-qt-dbus-factory +, deepin +, deepin-anything +, deepin-desktop-schemas +, deepin-gettext-tools +, deepin-movie-reborn +, deepin-shortcut-viewer +, deepin-terminal +, disomaster +, dtkcore +, dtkwidget +, ffmpegthumbnailer +, file +, glib +, gnugrep +, gsettings-qt +, gvfs +, jemalloc +, kcodecs +, libX11 +, libsecret +, polkit +, polkit-qt +, poppler +, procps +, qmake +, qt5integration +, qtmultimedia +, qtsvg +, qttools +, qtx11extras +, runtimeShell +, samba +, shadow +, taglib +, udisks2-qt5 +, xdg-user-dirs +, xorg +, zlib +, wrapGAppsHook +}: mkDerivation rec { pname = "dde-file-manager"; @@ -247,7 +286,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "File manager and desktop module for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix index 850186953f6..ce1a1a8dda0 100644 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ b/pkgs/desktops/deepin/dde-kwin/default.nix @@ -74,7 +74,9 @@ mkDerivation rec { # Need to add kwayland around: # * https://github.com/linuxdeepin/dde-kwin/blob/5226bb984c844129f9fa589da56e77decb7b39a1/plugins/kwineffects/blur/CMakeLists.txt#L14 - NIX_CFLAGS_COMPILE = "-I${kwayland.dev}/include/KF5"; + NIX_CFLAGS_COMPILE = [ + "-I${kwayland.dev}/include/KF5" + ]; cmakeFlags = [ "-DKWIN_VERSION=${(builtins.parseDrvName kwin.name).version}" @@ -128,7 +130,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "KWin configuration for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index a1561f5c092..0a50f7177ba 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -1,7 +1,24 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, - dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, - dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, - which, xdg_utils, wrapGAppsHook, glib }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, dde-qt-dbus-factory +, dde-session-ui +, deepin +, deepin-desktop-schemas +, deepin-wallpapers +, dtkcore +, dtkwidget +, gsettings-qt +, qtsvg +, qttools +, qtx11extras +, which +, xdg_utils +, wrapGAppsHook +, glib +}: mkDerivation rec { pname = "dde-launcher"; @@ -72,7 +89,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin Desktop Environment launcher module"; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 1550987cc73..d54558acf08 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, - dde-qt-dbus-factory, proxychains, which, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, substituteAll +, qmake +, pkgconfig +, qttools +, dde-qt-dbus-factory +, proxychains +, which +, deepin +}: mkDerivation rec { pname = "dde-network-utils"; @@ -41,7 +51,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin network utils"; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index e00ee30ca92..1ca9a80abaf 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, - dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, polkit-qt +, dtkcore +, dtkwidget +, dde-qt-dbus-factory +, deepin +}: mkDerivation rec { pname = "dde-polkit-agent"; @@ -38,7 +48,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "PolicyKit agent for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 7e645473f02..c7efb0f4b04 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, qmake, python3, deepin }: +{ stdenv +, fetchFromGitHub +, qmake +, python3 +, deepin +}: stdenv.mkDerivation rec { pname = "dde-qt-dbus-factory"; @@ -26,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index ddb12511c27..ff785f16c81 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,9 +1,33 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, - dde-qt-dbus-factory, deepin, deepin-desktop-schemas, - deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore, - dtkwidget, gnugrep, gsettings-qt, lightdm_qt, - onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which, - xkeyboard_config, xorg, xrandr, wrapGAppsHook }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dbus +, dde-daemon +, dde-qt-dbus-factory +, deepin +, deepin-desktop-schemas +, deepin-gettext-tools +, deepin-icon-theme +, deepin-wallpapers +, dtkcore +, dtkwidget +, gnugrep +, gsettings-qt +, lightdm_qt +, onboard +, qtsvg +, qttools +, qtx11extras +, setxkbmap +, utillinux +, which +, xkeyboard_config +, xorg +, xrandr +, wrapGAppsHook +}: mkDerivation rec { pname = "dde-session-ui"; @@ -121,7 +145,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index 7697c23ae14..5fa6c93951d 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -1,5 +1,14 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, - dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkgconfig +, qtbase +, udisks2-qt5 +, utillinux +, dtkcore +, deepin +}: mkDerivation rec { pname = "deepin-anything"; @@ -12,6 +21,16 @@ mkDerivation rec { sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm"; }; + patches = [ + # fix compilation error and add support to kernel 5.6 + # https://github.com/linuxdeepin/deepin-anything/pull/27 + (fetchpatch { + name = "linux-5.6.patch"; + url = "https://github.com/linuxdeepin/deepin-anything/commit/764b820c2bcd7248993349b32f91043fc58ee958.patch"; + sha256 = "1ww4xllxc2s04px6fy8wp5cyw54xaz155ry30sqz21vl8awfr36h"; + }) + ]; + outputs = [ "out" "modsrc" ]; nativeBuildInputs = [ @@ -51,7 +70,7 @@ mkDerivation rec { searchHardCodedPaths $modsrc # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin file search tool"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 38aed9cbe63..67ead7d314a 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -1,5 +1,14 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore, - dtkwidget, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtsvg +, dtkcore +, dtkwidget +, deepin +}: mkDerivation rec { pname = "deepin-calculator"; @@ -36,7 +45,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Easy to use calculator for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 335c5727e91..74fa53b715d 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: +{ stdenv +, fetchFromGitHub +, deepin-wallpapers +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-desktop-base"; @@ -11,9 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra"; }; - nativeBuildInputs = [ deepin.setupHook ]; + nativeBuildInputs = [ + deepin.setupHook + ]; - buildInputs = [ deepin-wallpapers ]; + buildInputs = [ + deepin-wallpapers + ]; # TODO: Fedora recommended dependencies: # deepin-wallpapers @@ -40,7 +48,7 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 2105926f682..15f9498cf0d 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchFromGitHub, python3, dconf, glib, deepin-gtk-theme, - deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: +{ stdenv +, fetchFromGitHub +, python3 +, dconf +, glib +, deepin-gtk-theme +, deepin-icon-theme +, deepin-sound-theme +, deepin-wallpapers +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-desktop-schemas"; @@ -46,7 +55,9 @@ stdenv.mkDerivation rec { # /usr/share/desktop-directories ''; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; doCheck = true; checkTarget = "test"; @@ -56,7 +67,7 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix index 9bff5b88268..0124ca8cc9e 100644 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/deepin-editor/default.nix @@ -1,10 +1,18 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, - dtkcore, dtkwidget, kcodecs, qttools, syntax-highlighting, - wrapQtAppsHook +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, deepin +, dtkcore +, dtkwidget +, kcodecs +, qttools +, syntax-highlighting +, wrapQtAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-editor"; version = "1.2.9.1"; @@ -52,7 +60,7 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Simple editor for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index c1aff5ed4dc..432add458de 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: +{ stdenv +, fetchFromGitHub +, gettext +, python3Packages +, perlPackages +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-gettext-tools"; @@ -23,7 +29,9 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; postPatch = '' sed -e 's/sudo cp/cp/' -i src/generate_mo.py @@ -35,7 +43,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 53735791846..eee07470585 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: +{ stdenv +, fetchFromGitHub +, gtk-engine-murrine +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-gtk-theme"; @@ -11,11 +15,15 @@ stdenv.mkDerivation rec { sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw"; }; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin GTK Theme"; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index b6eb3cce26d..464d6f19ced 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin, hicolor-icon-theme }: +{ stdenv +, fetchFromGitHub +, gtk3 +, xcursorgen +, papirus-icon-theme +, deepin +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "deepin-icon-theme"; @@ -11,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "12rzzjp906np95ckbxrd4mb345lm198wz69kxy48f8q1zg78q8iw"; }; - nativeBuildInputs = [ gtk3 xcursorgen ]; + nativeBuildInputs = [ + gtk3 + xcursorgen + ]; propagatedBuildInputs = [ papirus-icon-theme @@ -38,7 +48,7 @@ stdenv.mkDerivation rec { cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index bedc809b2f5..43c18c85abc 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,6 +1,18 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, - qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, - libexif, deepin +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtsvg +, qtx11extras +, dtkcore +, dtkwidget +, qt5integration +, freeimage +, libraw +, libexif +, deepin }: mkDerivation rec { @@ -41,7 +53,7 @@ mkDerivation rec { -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 92153b84d51..983fe4e1c4d 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dtkcore +, dtkwidget +, qt5integration +, deepin +}: mkDerivation rec { pname = "deepin-menu"; @@ -34,7 +42,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin menu service"; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index b95a76a3972..6763292b626 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,6 +1,22 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, qttools, qtx11extras, - dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, - libdvdnav, libdvdread, xorg, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, qttools +, qtx11extras +, dtkcore +, dtkwidget +, ffmpeg +, ffmpegthumbnailer +, mpv +, pulseaudio +, libdvdnav +, libdvdread +, xorg +, deepin +}: mkDerivation rec { pname = "deepin-movie-reborn"; @@ -48,7 +64,6 @@ mkDerivation rec { NIX_LDFLAGS = "-ldvdnav"; - postPatch = '' searchHardCodedPaths # debugging @@ -58,7 +73,7 @@ mkDerivation rec { --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin movie player"; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 9b5d47d8542..0ccc350962a 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, - dtkcore, dtkwidget, dtkwm, deepin-turbo, deepin-shortcut-viewer, - deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, xdg_utils +, qttools +, qtx11extras +, dtkcore +, dtkwidget +, dtkwm +, deepin-turbo +, deepin-shortcut-viewer +, deepin +}: mkDerivation rec { pname = "deepin-screenshot"; @@ -48,7 +61,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 479f2c86d30..76d8847b73f 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dtkcore +, dtkwidget +, qt5integration +, deepin +}: mkDerivation rec { pname = "deepin-shortcut-viewer"; @@ -25,7 +33,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index a868b072506..e71c0cb77c5 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, deepin }: +{ stdenv +, fetchFromGitHub +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-sound-theme"; @@ -11,9 +14,11 @@ stdenv.mkDerivation rec { sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin sound theme"; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index e51927142eb..ae312137942 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,8 +1,39 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40, fetchpatch, - gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, - libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, - libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2, - libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +, ninja +, vala_0_40 +, fetchpatch +, gettext +, at-spi2-core +, dbus +, epoxy +, expect +, gtk3 +, json-glib +, libXdmcp +, libgee +, libpthreadstubs +, librsvg +, libsecret +, libtasn1 +, libxcb +, libxkbcommon +, p11-kit +, pcre +, vte +, wnck +, libselinux +, gnutls +, pcre2 +, libsepol +, utillinux +, deepin-menu +, deepin-shortcut-viewer +, deepin +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "deepin-terminal"; @@ -69,7 +100,7 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Default terminal emulator for Deepin"; @@ -77,7 +108,7 @@ stdenv.mkDerivation rec { Deepin terminal, it sharpens your focus in the world of command line! It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. - ''; + ''; homepage = "https://github.com/linuxdeepin/deepin-terminal"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index f34997f5179..6bba51ac674 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,4 +1,11 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, deepin +}: mkDerivation rec { pname = "deepin-turbo"; @@ -31,7 +38,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "A daemon that helps to launch applications faster"; diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index 82f7214471f..4fa3d6043d5 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, dde-api, deepin }: +{ stdenv +, fetchFromGitHub +, dde-api +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-wallpapers"; @@ -11,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; }; - nativeBuildInputs = [ dde-api deepin.setupHook ]; + nativeBuildInputs = [ + dde-api + deepin.setupHook + ]; postPatch = '' searchHardCodedPaths # debugging @@ -33,7 +40,7 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 64dbdbfd104..8d33ac154af 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,10 +1,16 @@ { pkgs, makeScope, libsForQt5 }: - let packages = self: with self; { setupHook = ./setup-hook.sh; - updateScript = callPackage ./update.nix { }; + # Update script tailored to deepin packages from git repository + updateScript = { pname, version, src }: + pkgs.genericUpdater { + inherit pname version; + attrPath = "deepin.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; + }; dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; @@ -56,4 +62,4 @@ let }; in - makeScope libsForQt5.newScope packages +makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix index a1db0673a46..758c8ff76c3 100644 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ b/pkgs/desktops/deepin/disomaster/default.nix @@ -1,4 +1,12 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtbase, libisoburn, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qtbase +, libisoburn +, deepin +}: mkDerivation rec { pname = "disomaster"; @@ -29,7 +37,7 @@ mkDerivation rec { libdisomaster/libdisomaster.pro ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "A libisoburn wrapper for Qt"; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index 970e48941d4..2caef7ce916 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, - dde-polkit-agent, deepin }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, gnome3 +, dde-polkit-agent +, deepin +}: stdenv.mkDerivation rec { pname = "dpa-ext-gnomekeyring"; @@ -30,7 +37,7 @@ stdenv.mkDerivation rec { fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GNOME keyring extension for dde-polkit-agent"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 90b02a6d930..570b0cc2c11 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,4 +1,12 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, gsettings-qt +, pythonPackages +, deepin +}: mkDerivation rec { pname = "dtkcore"; @@ -43,7 +51,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin tool kit core library"; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 5a3869a2db9..9be222830db 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, - qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, - dde-qt-dbus-factory, dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtmultimedia +, qtsvg +, qtx11extras +, librsvg +, libstartup_notification +, gsettings-qt +, dde-qt-dbus-factory +, dtkcore +, deepin +}: mkDerivation rec { pname = "dtkwidget"; @@ -40,7 +53,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index ecc11feb749..56031f11492 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,4 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake, qtx11extras, dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkgconfig +, qmake +, qtx11extras +, dtkcore +, deepin +}: mkDerivation rec { pname = "dtkwm"; @@ -37,7 +46,7 @@ mkDerivation rec { "LIB_INSTALL_DIR=${outRef}/lib" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index 52bf8e62f1d..1c1afd9d099 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, deepin }: +{ stdenv +, fetchFromGitHub +, deepin +}: stdenv.mkDerivation rec { pname = "go-dbus-factory"; @@ -11,13 +14,15 @@ stdenv.mkDerivation rec { sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 481f7eb2bc2..d0b2d8c07e6 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, go, go-lib, deepin }: +{ stdenv +, fetchFromGitHub +, go +, go-lib +, deepin +}: stdenv.mkDerivation rec { pname = "go-dbus-generator"; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index f57bae89711..0c282aaa227 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, go, gobject-introspection, - libgudev, deepin }: +{ stdenv +, fetchpatch +, fetchFromGitHub +, pkgconfig +, go +, gobject-introspection +, libgudev +, deepin +}: stdenv.mkDerivation rec { pname = "go-gir-generator"; @@ -40,7 +47,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 43fddf78f11..d45351fd6dc 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, glib, xorg, gdk-pixbuf, pulseaudio, - mobile-broadband-provider-info, deepin }: +{ stdenv +, fetchFromGitHub +, glib +, xorg +, gdk-pixbuf +, pulseaudio +, mobile-broadband-provider-info +, deepin +}: stdenv.mkDerivation rec { pname = "go-lib"; @@ -27,7 +34,7 @@ stdenv.mkDerivation rec { rm -r $out/share/go/src/pkg.deepin.io/lib/debian ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 3b7207379c7..fb6bb89d939 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -1,12 +1,35 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, - qtwebchannel, qtx11extras, - gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, - expat, fontconfig, gdk-pixbuf, glib, gtk2, - libxcb, pango, pulseaudio, xorg, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, qtbase +, qttools +, qtwebchannel +, qtx11extras +, gnome2 +, nss +, nspr +, alsaLib +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, gdk-pixbuf +, glib +, gtk2 +, libxcb +, pango +, pulseaudio +, xorg +, deepin +}: let rpahtLibraries = [ - stdenv.cc.cc.lib # libstdc++.so.6 + stdenv.cc.cc.lib # libstdc++.so.6 alsaLib atk cairo @@ -35,9 +58,10 @@ let xorg.libXrender xorg.libXtst ]; + libPath = stdenv.lib.makeLibraryPath rpahtLibraries; -in +in mkDerivation rec { pname = "qcef"; version = "1.1.7"; @@ -90,14 +114,14 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { description = "Qt5 binding of Chromium Embedded Framework"; homepage = "https://github.com/linuxdeepin/qcef"; license = licenses.lgpl3; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available + badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 1bf069821f5..4aa10fb1a93 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, - mtdev, cairo, deepin, qtbase }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qtx11extras +, libSM +, mtdev +, cairo +, deepin +, qtbase +}: mkDerivation rec { pname = "qt5dxcb-plugin"; @@ -43,7 +53,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index ad89957ef1b..cc427611c34 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, mtdev, - lxqt, qtx11extras, qtmultimedia, qtsvg, - qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, mtdev +, lxqt +, qtx11extras +, qtmultimedia +, qtsvg +, qt5dxcb-plugin +, qtstyleplugins +, dtkcore +, dtkwidget +, deepin +}: mkDerivation rec { pname = "qt5integration"; @@ -40,7 +53,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 3050e7b9e13..7d03b00928e 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -1,13 +1,42 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, alsaLib, - coreutils, dbus-factory, dde-api, dde-daemon, dde-dock, - dde-file-manager, dde-polkit-agent, dde-session-ui, deepin, - deepin-desktop-base, deepin-desktop-schemas, deepin-turbo, - dde-kwin, glib, gnome3, go, go-dbus-factory, go-gir-generator, - go-lib, gtk3, jq, kmod, libX11, libXi, libcgroup, pciutils, psmisc, - pulseaudio, systemd, xorg, wrapGAppsHook }: +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, alsaLib +, coreutils +, dbus-factory +, dde-api +, dde-daemon +, dde-dock +, dde-file-manager +, dde-polkit-agent +, dde-session-ui +, deepin +, deepin-desktop-base +, deepin-desktop-schemas +, deepin-turbo +, dde-kwin +, glib +, gnome3 +, go +, go-dbus-factory +, go-gir-generator +, go-lib +, gtk3 +, jq +, kmod +, libX11 +, libXi +, libcgroup +, pciutils +, psmisc +, pulseaudio +, systemd +, xorg +, wrapGAppsHook +}: buildGoPackage rec { - name = "${pname}-${version}"; pname = "startdde"; version = "5.0.1"; @@ -22,8 +51,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory @@ -114,7 +141,7 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/bin/* $out/sbin/* + remove-references-to -t ${go} $out/sbin/* ''; postFixup = '' @@ -122,7 +149,7 @@ buildGoPackage rec { ''; passthru = { - updateScript = deepin.updateScript { inherit name; }; + updateScript = deepin.updateScript { inherit pname version src; }; providedSessions = [ "deepin" ]; }; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index d13460a4bd5..385fedfc478 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,4 +1,10 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, deepin +}: mkDerivation rec { pname = "udisks2-qt5"; @@ -28,7 +34,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "UDisks2 D-Bus interfaces binding for Qt5"; diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix deleted file mode 100644 index 089d9289827..00000000000 --- a/pkgs/desktops/deepin/update.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: -{ name, ignored-versions ? "^2014(\\.|rc)|^v[0-9]+" }: - -let - nameAndVersion = builtins.parseDrvName name; - packageVersion = nameAndVersion.version; - packageName = nameAndVersion.name; - attrPath = "deepin.${packageName}"; -in - -writeScript "update-${packageName}" '' - #!${stdenv.shell} - set -o errexit - set -x - - # search for the latest version of the package on github - PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} - tags=$(curl -s https://api.github.com/repos/linuxdeepin/${packageName}/tags) - tags=$(echo "$tags" | jq -r '.[] | .name') - echo "# ${name}" >> git-commits.txt - echo "# available tags:" >> git-commits.txt - echo "$tags" | ${gnused}/bin/sed -e 's/^/# /' >> git-commits.txt - if [ -n "${ignored-versions}" ]; then - tags=$(echo "$tags" | grep -vE "${ignored-versions}") - fi - latest_tag=$(echo "$tags" | sort --version-sort | tail -1) - - # generate commands to commit the changes - if [ "${packageVersion}" != "$latest_tag" ]; then - pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. ${attrPath}) - echo " git add $pfile " >> git-commits.txt - echo " git commit -m \"${attrPath}: ${packageVersion} -> $latest_tag\"" >> git-commits.txt - fi - - # update the nix expression - update-source-version "${attrPath}" "$latest_tag" - echo "" >> git-commits.txt -'' diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index dfe294ef5c6..1979b4518a7 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { pname = "econnman"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; + nativeBuildInputs = [ makeWrapper pkgconfig python3Packages.wrapPython ]; - buildInputs = [ efl python2Packages.python dbus ]; + buildInputs = [ efl python3Packages.python dbus ]; - pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; + pythonPath = [ python3Packages.pythonefl python3Packages.dbus-python ]; postInstall = '' wrapPythonPrograms diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index d3b0e43e476..bd6c0529925 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,19 +1,65 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib, - avahi, bullet, check, curl, dbus, doxygen, expat, fontconfig, - freetype, fribidi, ghostscript, giflib, glib, gst_all_1, gtk3, - harfbuzz, hicolor-icon-theme, ibus, jbig2dec, libGL, libdrm, - libinput, libjpeg, libpng, libpulseaudio, libraw, librsvg, - libsndfile, libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, - mesa, openjpeg, openssl, poppler, python27Packages, systemd, udev, - utillinux, writeText, xorg, zlib }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, SDL +, SDL2 +, alsaLib +, avahi +, bullet +, check +, curl +, dbus +, doxygen +, expat +, fontconfig +, freetype +, fribidi +, ghostscript +, giflib +, glib +, gst_all_1 +, gtk3 +, harfbuzz +, hicolor-icon-theme +, ibus +, jbig2dec +, libGL +, libdrm +, libinput +, libjpeg +, libpng +, libpulseaudio +, libraw +, librsvg +, libsndfile +, libspectre +, libtiff +, libwebp +, libxkbcommon +, luajit +, lz4 +, mesa +, openjpeg +, openssl +, poppler +, python3Packages +, systemd +, udev +, utillinux +, writeText +, xorg +, zlib +}: stdenv.mkDerivation rec { pname = "efl"; - version = "1.23.3"; + version = "1.24.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk"; + sha256 = "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk"; }; nativeBuildInputs = [ @@ -77,7 +123,7 @@ stdenv.mkDerivation rec { luajit openjpeg poppler - python27Packages.dbus-python + python3Packages.dbus-python utillinux xorg.libXScrnSaver xorg.libXcomposite @@ -102,6 +148,7 @@ stdenv.mkDerivation rec { "-D build-tests=false" # disable build tests, which are not working "-D drm=true" "-D embedded-lz4=false" + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs "-D evas-loaders-disabler=json" "-D fb=true" "-D opengl=full" diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index f068d1994ec..192c179a93f 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.36.0"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1iwi7mnayw1f90s439flh0zkgmj4qx10dzgj38nd5f3wvqmhabk3"; + sha256 = "1ig9zcg8z7yv2c28q0a4q57ckkpmzjsbnancx01rjihrrjbg9ib2"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index c1901110b58..467971b2dba 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1f3cwc05gw75yqficcxns95r96lv7an4aih6d7hng3n3pqfwyfl7"; + sha256 = "12ii8crp4v4bpdxrc2rkxwdxqz3qjizyfgfrmir9pcyxlg0lh2f5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index c6b28e86ab8..ea33bc29324 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11z3lhc5i3z0gqw0qmprsm4rmvhbbm4gz6wy0f73c73x4bd8xhvd"; + sha256 = "15s1almlhjlgl3m8lxg6jpzln8jhgdxxjr635a3b7cf58d35b1v8"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 3d6832316cd..e2ac4cb4b89 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01hjlz9hljk2skrwfqxpy3934wjs6figs71sw8bm8g2vnyaqwq7a"; + sha256 = "18imxv1859gr53z4yay02611p5f1rd2pwnbaq093gmn77l0j9292"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 213b4f61672..88284c540e3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.36.0"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cxy4qf83s8w1ys94rcc4ksf7ywi0hkkpfs0szkkip2v8g3j6kq2"; + sha256 = "0ql3f509bj17riqs0jfpp434s97dzjgkjcd978i4m4y80nq2131v"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 5d31a42301e..bd02a5f0cc6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09bf9r6brmll14z87ljgivw0nr0nggcgjpbx6lg2835zq36vfmi9"; + sha256 = "1ihxa9g687rbb4s2gxd2pf726adx98ahq4kfad868swl7a8vi504"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index b00c6f5dd4e..a722ab9616e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yajq2pxd4fbzngwhn92h55rn02psxih8bbdcdxgg66qdbcyychs"; + sha256 = "114pia3nd8k7j6ll7za7qzv0ggcdvcw6b3w4lppqqrwqvswik8jv"; }; doCheck = true; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 9de452404ce..26cebe076ea 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.36.1"; + version = "3.36.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cn33r9v2raizq1b8s7s0kb506y91iarc0knm0sljcsqs4qgd03v"; + sha256 = "19c2x7h9gq4kh4995y1qcn5pyry4x04lh5n7md0q33zsxcx43bdb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 407f2516532..84be3f52743 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15ahfgqj0rz16y2bdxb7sa4b3b3larg8hn3b41pc5ddnwf9x63zi"; + sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; }; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 394ee86d15a..363d3c49af8 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rmmq74g22qrmsg0mjvpzk5403kkpfw0iznvnwxfqbi0dfkamhn4"; + sha256 = "12i0gp2kwp0b7af135q32qygkhh2025f74dqbaylfbmzacbdpz5c"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 827fd1cd96a..68c09cc9180 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "066m3vd6k6xf3ap1ahrbw5hnx2322wf0qsnywcxjsj6snq9225qs"; + sha256 = "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674"; }; # For convenience, we can specify adwaita-icon-theme only in packages diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index ba8a85352fd..860b7b957b9 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.36.0"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14q678bwgmhzmi7565xhhw51y8b0pv3cqh0f411qwzwif1bd1vkj"; + sha256 = "1iz1ngb26llhqnm2s4p55ysvnav41iv0fx0pbw98k181gy3cikpd"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index d7a4b32f785..db15cf2555c 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "15cwghcbx9x1xmv1dwmwcdxplnhf25w6f4dhx8hk6fjymaks2m74"; + sha256 = "135pw7ifr585grz1rbmynyyrmhd8w880pilg7c4nvq58jl16n1aw"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index f5d60ee917c..0d3c786690d 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15k7k225jfv5a45hmjk94xq90np2r9f5v8yj0xi3166vvlp2n4hk"; + sha256 = "0yz9fsnbnnlj2iidd81i9w7d0dhidrzqkixrnfjfdkhnxk7p9qlq"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 97abd746e1b..6e933e7b9af 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.36"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yvgsfmqm8dxbhay12m20xp6qi9v31wwyv1gz4fx7j4kklhd5jzf"; + sha256 = "0qb2kgyk6f6wr129a0gzhvpy5wdjpwjbksxyfs6zxv183jl9s73z"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index e4efcae889a..79d28ae8ced 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1466swjyw5vjym001qda94x6sisd4xhpyb6vq91grhkyzwf2vqzk"; + sha256 = "05vqhj5z4w4vaphp541zxxkx6x781m371l2gqnq2vhnnqvqfz9g0"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 3f84d0ccd55..94de64c9ea9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1058h1ndl6pmlh8rmbqq5lw15glws3anin88cm7lw4vzasgfavwc"; + sha256 = "12f724inw3sv289xqprvwh8r3qw89z67m74j3hyhkbp1n7f99y9q"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index e5277b07ad5..fb801ca19a6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sfn6bdz8snc2qmi3nzb07vlkdhy9s1ipwxxj0v2i36a7n0gv6ci"; + sha256 = "0mjp2j4smikmr4fa0y8wrw2srlfjahiixzphz3dmc30hx8df92sg"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 6ff33660dc2..2ee07fb09aa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs"; + sha256 = "0jzf2nznpcrjqq7fjwk66kw8a6x87kgbdjidc2msaqmm379xncry"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 6a90bb7657a..821d5707c7c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.36.1.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xm3g3kanfhs1q3xh3x58r55v8906806wvqjbg4c2xvdwyhhimzk"; + sha256 = "0inzmkmxv8xw4px2zjfw7236d08yjcv7znxcjki6dh4pvjivdla1"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 927d70345e7..fe24ac8708a 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -44,7 +44,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "13.0.0"; + version = "13.0.2"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "17arjigs1lw1h428s9g171n0idrpf9ks23sndldsik1zvvwzlldh"; + sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 9914489ad25..b926f9b627f 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.36.1.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pkvxyfm2fl06fpyq2jr147hhpc91y4rgdlxlilg7n8ih982y9gr"; + sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 99e5975eb5d..d38339425ce 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bprm9gfnlrs0k8jvy9pqm1rjq47z5pgahqjjj1i7q2k4a8g09vl"; + sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; }; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index fa53b05c44b..11bad7b89d1 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gcakbq2fci6cf5z8lakydqnynasp74djfy53bh7jjmw0a9yry2c"; + sha256 = "0phcjdxnwgg0a0z9kyidp977jy365pny6bh2qhdyzcpvkqqq8nlb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index db1741e72bb..7bd31f587f6 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + uuid = "arc-menu@linxgem33.com"; + meta = with stdenv.lib; { description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index 1cc06be6ec9..640903bfe4e 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; - version = "30"; + version = "34"; src = fetchFromGitHub { owner = "Tudmotu"; repo = "gnome-shell-extension-clipboard-indicator"; rev = "v${version}"; - sha256 = "1fmgmxv2y678bj0kmymkgnnglcpqk8ww053izlq46xg7s27jjdf6"; + sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s"; }; uuid = "clipboard-indicator@tudmotu.com"; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 3784f109900..5a546bd1579 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + uuid = "dash-to-dock@micxgx.gmail.com"; + meta = with stdenv.lib; { description = "A dock for the Gnome Shell"; homepage = "https://micheleg.github.io/dash-to-dock/"; diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 84662505a37..e97b34460d0 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + uuid = "dash-to-panel@jderose9.github.com"; + meta = with stdenv.lib; { description = "An icon taskbar for Gnome Shell"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index baaca39a4c4..db113924ae6 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -73,6 +73,8 @@ stdenv.mkDerivation rec { done ''; + uuid = "gsconnect@andyholmes.github.io"; + meta = with stdenv.lib; { description = "KDE Connect implementation for Gnome Shell"; homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index c876b22c12c..25ef7ddf827 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + uuid = "no-title-bar@franglais125.gmail.com"; + meta = with stdenv.lib; { description = "Integrates maximized windows with the top panel"; homepage = "https://github.com/franglais125/no-title-bar"; diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index dbc65044c1b..e13941ee045 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { mv *.js metadata.json dbus.xml schemas locale "$extensions_dir" ''; + uuid = "pidgin@muffinmad"; + meta = with stdenv.lib; { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 6a1c87abf93..860a77d2856 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + uuid = "TopIcons@phocean.net"; + meta = with stdenv.lib; { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix index 3ddd5c10283..15871e661c1 100644 --- a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-is-ready-remover"; - version = "unstable-2020-03-25"; + version = "1.02"; src = fetchFromGitHub { owner = "nunofarruca"; repo = "WindowIsReady_Remover"; - rev = "a9f9b3a060a6ba8eec71332f39dc2569b6e93761"; - sha256 = "0l6cg9kz2plbvsqhgwfajknzw9yv3mg9gxdbsk147gbh2arnp6v3"; + rev = "v${version}"; + sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns"; }; uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME Shell extension removing window is ready notification"; homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; - license = licenses.unfree; + license = licenses.asl20; }; } diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 0d73e3b3744..1523da990e3 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bl63npcbr5ymka2y06wps612qynxa4hsqlzn7bvwpz2v53pai1z"; + sha256 = "1pjwaly0f36gn8ashf19b6w1yldmqpa8grdxcyb6h7b0k3bd54z6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 372c12022de..ac15ebadce9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.36.0"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06gsg3s8hyhhsk11f1ld2anzv1czg1429483gbv9lr2p7fnq7pyy"; + sha256 = "1w7fp79hc2v98r7ffg57d6na3wwr355gg9jrdd7w2ad362dfg1kw"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 701008f0c36..fc706b89f1d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-mahjongg"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a5h55amr0pab36y2iqm6ynv6mmb8al1b92rfk18wzfcfz7mhxzd"; + sha256 = "15xfp2acqdnn0pcwg5d77dpv758jjyclwb042wm12gg07rbg3s6j"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index f50969eb52e..ad549a7c682 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16ss2d8s6glb3k0wnb5ihmbqvk9i1yi18wv9hzgxfyhs1rvk496f"; + sha256 = "0pi8kxici7p3jys8673ib0kigpif4mfkq0zlq48rsibhdqfhrlij"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 4fe68a4f8a7..7061610ced1 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xbd0flh77v3x0dh4dsfspykwb6rwvga7kqwn1fq7gk421mq6n52"; + sha256 = "0qf6s3gl5qrs5rwsgx0191b0xyknhz2n9whx5i6ma5yw5ikslmq4"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 5db02c8dfa4..c3df9bd1099 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ysb021mf5sy1ywicys35rn5c9v355rffjrlhxmr3z6yplrljm5b"; + sha256 = "0hgn2iqvnfiiwm57bir28dz61b1kkp1zh6av8f342q153rxx10g6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 474ee5823a7..a4c139f0671 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quadrapassel"; - version = "3.36.00"; + version = "3.36.02"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xk9x1pp71armj47vxja7fsj6gs116kcjkd8xgwf8wi4zr4kgx7g"; + sha256 = "0c80pzipxricyh4wydffsc94wj6ymnanqr9bg6wdx51hz1mmmilb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index bbde1fa3679..0326e38aba7 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07rhmzznfa4asx5gbmvnfpybd5czy7xmzk75xrk4r1qcnr24ml03"; + sha256 = "09l2lbcn3ar3scw6iylmdqi1lhpb408iqs6056d0wzx2l9nkmqis"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 1fea28d24de..cde21551a8a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ let pname = "gnome-flashback"; - version = "3.36.1"; + version = "3.36.3"; # From data/sessions/Makefile.am requiredComponentsCommon = [ @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "16gknn5mj29i8svlncarj92qi0swdlziggxpg9rryqslsy896a2x"; + sha256 = "19y1a4kq6db6a19basss76l4rypiz0lwr32ajli1ra1d1yj9xfid"; }; # make .desktop Execs absolute diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index fce6b71c4c8..b9489526dd7 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = version; - sha256 = "1bjsjkbms9irn7nkzi0hmgr5vwcgh9xzr5vw4sk2n711wj5d96bi"; + sha256 = "0s9wzx7wbynpqgj7nlgs5wwx4w2akz7nli89sy7pxcn4xpnahqgn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 526da0d84a4..f5da7a4b235 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -32,6 +32,8 @@ mkDerivation rec { preConfigure = '' cmakeFlagsArray+=( "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix/iconengines" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ) ''; diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 0e1709d8245..c3e9e2b9c24 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,11 +11,10 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap, libdrm + plasma-framework, qtsensors, libcap, libdrm, mesa }: # TODO (ttuegel): investigate qmlplugindump failure -# TODO (ttuegel): investigate gbm dependency mkDerivation { name = "kwin"; @@ -30,7 +29,7 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework - libcap libdrm + libcap libdrm mesa ]; outputs = [ "bin" "dev" "out" ]; patches = [ diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 40d9c188fa3..c9a61488840 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.0"; + version = "0.6.1"; - sha256 = "03lw7zil6pwvx537ibqrynxjz7d6iq6in7vdskrnnn16kfg6hjg2"; + sha256 = "18d2q5b54df8j2281lash8gm0826c6apn39q4igfz2zfcyqjh1if"; buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix index a0923f0fda1..357f4b23410 100644 --- a/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/pkgs/desktops/xfce/core/xfconf/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfconf"; - version = "4.14.1"; + version = "4.14.3"; - sha256 = "1mbqc1463xgn7gafbh2fyshshdxin33iwk96y4nw2gl48nhx4sgs"; + sha256 = "0yxpdcyz81di7w9493jzps09bgrlgianjj5abnzahqmkpmpvb0rh"; buildInputs = [ libxfce4util ]; diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index ed77699f191..1d119014cab 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.0"; # TODO: remove xfce4-14 alias when this gets bumped + version = "4.14.2"; - sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m"; + sha256 = "1zzc4q1j55hjljksmlyghk58bx7kxyq3scihsr9zgyqc24ww1ks3"; nativeBuildInputs = [ exo librsvg ]; diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 0e36c22872e..c51d3f89d07 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -40,7 +40,7 @@ python2Packages.buildPythonApplication rec { description = "Command line toolkit for working with Arduino hardware"; homepage = "http://inotool.org/"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ antono ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 2c9de761778..005e4186b15 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.6.0"; + version = "1.6.1"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9"; + sha256 = "04myiba6g0vij2ym2dmb0156k20ki2lz13dxwp2bk9kvjn2zg88b"; }; configurePhase = '' mkdir nix-tools diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix index 55ed48e118e..56bf3e657be 100644 --- a/pkgs/development/compilers/avra/default.nix +++ b/pkgs/development/compilers/avra/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = "http://avra.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index be7a4530419..11f4eaada60 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index db91b1648af..977f34692f9 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -22,6 +22,6 @@ eggDerivation { homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index 00d359c96d0..f07b63ea26f 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix description = "A portable compiler for the Scheme programming language"; longDescription = '' diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 7c73e37272d..0c18b8db2de 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -24,6 +24,6 @@ eggDerivation { homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; + maintainers = with stdenv.lib.maintainers; [ corngood ]; }; } diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 5204932448b..896b3a76789 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200315"; + version = "20200406"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0akif1wgsyyqrfkidkwhw47dsx471h3b4zsjhnh4rf6kv7by3q65"; + sha256 = "1dd6fakavnadpm8h8r4d1saf9flm7ilhknfy0q6i5i237psjf7i5"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index db22b668cf5..a04d48dd0e5 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper -, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml +, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig , callPackage }: @@ -62,9 +62,12 @@ let substituteInPlace src/crystal/system/unix/time.cr \ --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - ln -s spec/compiler spec/std + ln -sf spec/compiler spec/std + + # Dirty fix for when no sandboxing is enabled + rm -rf /tmp/crystal + mkdir -p /tmp/crystal - mkdir /tmp/crystal substituteInPlace spec/std/file_spec.cr \ --replace '/bin/ls' '${coreutils}/bin/ls' \ --replace '/usr/share' '/tmp/crystal' \ @@ -81,7 +84,7 @@ let --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' substituteInPlace spec/std/system_spec.cr \ - --replace '`hostname`' '`${nettools}/bin/hostname`' + --replace '`hostname`' '`${hostname}/bin/hostname`' # See https://github.com/crystal-lang/crystal/pull/8640 substituteInPlace spec/std/http/cookie_spec.cr \ @@ -108,6 +111,8 @@ let "all" "docs" ]; + LLVM_CONFIG = "${llvm}/bin/llvm-config"; + FLAGS = [ "--release" "--single-module" # needed for deterministic builds diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 703ff4fa083..8a18b6306c2 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,17 @@ -{ stdenv, fetchgit, fetchpatch, libuuid, python3, iasl, bc }: +{ + stdenv, + clangStdenv, + fetchgit, + fetchpatch, + libuuid, + python3, + iasl, + bc, + clang_9, + llvmPackages_9, + overrideCC, + lib, +}: let pythonEnv = python3.withPackages (ps: [ps.tkinter]); @@ -12,7 +25,17 @@ else if stdenv.isAarch64 then else throw "Unsupported architecture"; -edk2 = stdenv.mkDerivation { +buildStdenv = if stdenv.isDarwin then + overrideCC clangStdenv [ clang_9 llvmPackages_9.llvm llvmPackages_9.lld ] +else + stdenv; + +buildType = if stdenv.isDarwin then + "CLANGPDB" + else + "GCC5"; + +edk2 = buildStdenv.mkDerivation { pname = "edk2"; version = "201911"; @@ -25,8 +48,10 @@ edk2 = stdenv.mkDerivation { buildInputs = [ libuuid pythonEnv ]; - makeFlags = [ "-C BaseTools" ]; - NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error=stringop-truncation"; + makeFlags = [ "-C BaseTools" ] + ++ lib.optional (stdenv.cc.isClang) [ "BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang" ]; + + NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; @@ -38,15 +63,15 @@ edk2 = stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel EFI development kit"; homepage = "https://sourceforge.net/projects/edk2/"; license = licenses.bsd2; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; passthru = { - mkDerivation = projectDscPath: attrs: stdenv.mkDerivation ({ + mkDerivation = projectDscPath: attrs: buildStdenv.mkDerivation ({ inherit (edk2) src; buildInputs = [ bc pythonEnv ] ++ attrs.buildInputs or []; @@ -65,7 +90,7 @@ edk2 = stdenv.mkDerivation { buildPhase = '' runHook preBuild - build -a ${targetArch} -b RELEASE -t GCC5 -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags + build -a ${targetArch} -b RELEASE -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags runHook postBuild ''; diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/pkgs/development/compilers/elm/makeDotElm.nix index 0831d382c4b..b8076d72e48 100644 --- a/pkgs/development/compilers/elm/makeDotElm.nix +++ b/pkgs/development/compilers/elm/makeDotElm.nix @@ -11,6 +11,14 @@ ver: deps: inherit (info) sha256; }; + configurePhase = '' + true + ''; + + buildPhase = '' + true + ''; + installPhase = '' mkdir -p $out cp -r * $out diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 8b5230d2e72..c595c86615b 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.23"; + version = "1.73.24"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "1p7hs4sqnfxw6axdifjbdcllvl1ycx5vf6n7nvq1gampz0yfcl6j"; + sha256 = "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k"; }; installPhase = '' diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 923d8d34251..5947b572cec 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { pname = "lazarus"; - version = "2.0.6"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; - sha256 = "0v1ax6039nm2bksh646znrkah20ak2zmhaz5p3mz2p60y2qazkc2"; + sha256 = "1iciqydb0miqdrh89aj59gy7kfcwikkycqssq9djcqsw1ql3gc4h"; }; buildInputs = [ diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix new file mode 100644 index 00000000000..5e0a25ea60b --- /dev/null +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -0,0 +1,285 @@ +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs +, langC ? true, langCC ? true, langFortran ? false +, langAda ? false +, langObjC ? stdenv.targetPlatform.isDarwin +, langObjCpp ? stdenv.targetPlatform.isDarwin +, langGo ? false +, profiledCompiler ? false +, staticCompiler ? false +, enableShared ? true +, enableLTO ? true +, texinfo ? null +, perl ? null # optional, for texi2pod (then pod2man) +, gmp, mpfr, libmpc, gettext, which +, libelf # optional, for link-time optimizations (LTO) +, isl ? null # optional, for the Graphite optimization framework. +, zlib ? null +, gnatboot ? null +, enableMultilib ? false +, enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins +, name ? "gcc" +, libcCross ? null +, threadsCross ? null # for MinGW +, crossStageStatic ? false +, # Strip kills static libs of other archs (hence no cross) + stripped ? stdenv.hostPlatform == stdenv.buildPlatform + && stdenv.targetPlatform == stdenv.hostPlatform +, gnused ? null +, cloog # unused; just for compat with gcc4, as we override the parameter on some places +, buildPackages +}: + +# LTO needs libelf and zlib. +assert libelf != null -> zlib != null; + +# Make sure we get GNU sed. +assert stdenv.hostPlatform.isDarwin -> gnused != null; + +# The go frontend is written in c++ +assert langGo -> langCC; +assert langAda -> gnatboot != null; + +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + +with stdenv.lib; +with builtins; + +let majorVersion = "10"; + version = "${majorVersion}.1.0"; + + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + patches = + optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + ++ optional noSysDirs ../no-sys-dirs.patch + /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied + url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; + sha256 = ""; # TODO: uncomment and check hash when available. + }) */ + ++ optional langAda ../gnat-cflags.patch + ++ optional langFortran ../gfortran-driving.patch + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; + }); + + /* Cross-gcc settings (build == host != target) */ + crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; + stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + +in + +stdenv.mkDerivation ({ + pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + inherit version; + + builder = ../builder.sh; + + src = fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2"; + }; + + inherit patches; + + outputs = [ "out" "lib" "man" "info" ]; + setOutputFlags = false; + NIX_NO_SELF_RPATH = true; + + libc_dev = stdenv.cc.libc_dev; + + hardeningDisable = [ "format" "pie" ]; + + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + + substituteInPlace libgcc/config/t-slibgcc-darwin \ + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + + substituteInPlace libgfortran/configure \ + --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + ''; + + postPatch = '' + configureScripts=$(find . -name configure) + for configureScript in $configureScripts; do + patchShebangs $configureScript + done + '' + ( + if targetPlatform != hostPlatform || stdenv.cc.libc != null then + # On NixOS, use the right path to the dynamic linker instead of + # `/lib/ld*.so'. + let + libc = if libcCross != null then libcCross else stdenv.cc.libc; + in + ( + '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..." + for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h + do + grep -q _DYNAMIC_LINKER "$header" || continue + echo " fixing \`$header'..." + sed -i "$header" \ + -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \ + -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g' + done + '' + + stdenv.lib.optionalString (targetPlatform.libc == "musl") + '' + sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' + '' + ) + else "") + + stdenv.lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; + + inherit noSysDirs staticCompiler crossStageStatic + libcCross crossMingw; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ texinfo which gettext ] + ++ (optional (perl != null) perl); + + # For building runtime libs + depsBuildTarget = + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ]; + + buildInputs = [ + gmp mpfr libmpc libelf + targetPackages.stdenv.cc.bintools # For linking code at run-time + ] ++ (optional (isl != null) isl) + ++ (optional (zlib != null) zlib) + # The builder relies on GNU sed (for instance, Darwin's `sed' fails with + # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. + ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) + ; + + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; + + preConfigure = import ../common/pre-configure.nix { + inherit (stdenv) lib; + inherit version hostPlatform gnatboot langAda langGo; + }; + + dontDisableStatic = true; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + + configureFlags = import ../common/configure-flags.nix { + inherit + stdenv + targetPackages + crossStageStatic libcCross + version + + gmp mpfr libmpc libelf isl + + enableLTO + enableMultilib + enablePlugin + enableShared + + langC + langCC + langFortran + langAda + langGo + langObjC + langObjCpp + ; + }; + + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + + buildFlags = optional + (targetPlatform == hostPlatform && hostPlatform == buildPlatform) + (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + + dontStrip = !stripped; + + installTargets = optional stripped "install-strip"; + + # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 + ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; + + # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the + # library headers and binaries, regarless of the language being compiled. + # + # Likewise, the LTO code doesn't find zlib. + # + # Cross-compiling, we need gcc not to read ./specs in order to build the g++ + # compiler (after the specs for the cross-gcc are created). Having + # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. + + CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + )); + + LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; + + passthru = { + inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; + isGNU = true; + }; + + enableParallelBuilding = true; + inherit enableMultilib; + + inherit (stdenv) is64bit; + + meta = { + homepage = "https://gcc.gnu.org/"; + license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ + description = "GNU Compiler Collection, version ${version}" + + (if stripped then "" else " (with debugging info)"); + + longDescription = '' + The GNU Compiler Collection includes compiler front ends for C, C++, + Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as + libraries for these languages (libstdc++, libgomp,...). + + GCC development is a part of the GNU Project, aiming to improve the + compiler used in the GNU system including the GNU/Linux variant. + ''; + + maintainers = with stdenv.lib.maintainers; [ synthetica ]; + + platforms = + stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ + stdenv.lib.platforms.darwin; + }; +} + +// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) { + makeFlags = [ "all-gcc" "all-target-libgcc" ]; + installTargets = "install-gcc install-target-libgcc"; +} + +// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } +) diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index c90666d3dbe..d2a2a7a85e3 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation { homepage = "https://www.gnu.org/software/gforth/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index cacff5bfcfd..c70efe1fdef 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index adfd20531ab..a4174c47046 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -24,7 +24,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index c01f53aff9e..06266556cf3 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 4cc41620c2d..305226b3407 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index 30cbb87cce2..b199dc34fa3 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -27,7 +27,7 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows , # What flavour to build. An empty string indicates no diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d7fe37d1103..a15ef7f7dbf 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -32,10 +32,10 @@ # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt -, # Whetherto build terminfo. +, # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.11.20200403" +, version ? "8.11.20200505" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -103,8 +103,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "4291bddaea3148908c55f235ee8978e1d9aa6f20"; - sha256 = "1gs3mxmsdpsgsp7vnawx8mys0qwg4x2zhfrbciy3wv8nv13ar1af"; + rev = "40c71c2cf38b4e134d81b7184a4d5e02949ae70c"; + sha256 = "04h9rcyzm9w3an1z00hjs062dp7dl19b8pkyxjsypr7a2i9dmvkb"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 5179142e40e..1fa8720a400 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "1bcxq7bgn0kf1vdw6id8s3izz6mwf3ivr8iph4miig302qm9lmmr"; + sha256 = "05n8a7b63i9946fvbxphfh8n6ib20qnbv44ghlzcjwca9qvlx7i7"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "17bvms65frxhw0d196qswh3jjqlriidq3xi3mfjjgfh6n17rh608"; + cargoSha256 = "1ga5dinkmibkg53bfr6vc0i4bbgyn2y3d5qjf5bd965c1v7ba1jl"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index c5e42c3afe8..146af98093d 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "An open-source COBOL compiler"; homepage = "https://sourceforge.net/projects/open-cobol/"; license = licenses.gpl3; - maintainers = with maintainers; [ ericsagnes the-kenny ]; + maintainers = with maintainers; [ ericsagnes ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index cf5c878d9c8..9ee5b6fa624 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0xkna02clggcdgl5xxwani62krnf64x6p3hk9k5v9ldh2lhmglia"; + sha256 = "0z3zxsnhmsxplnwfw1l9gr6jgglwp50sr3p5njknv9i6jzk89plq"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index d4f37d4f5cc..4e2810fa893 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.71"; + version = "1.3.72"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0jp7z2lys02d0wmycdlfg9c08ji4qvjaz2wzvrxjyvcwv7d7gnvs"; + sha256 = "0v6c4vjiflwbjjc1lmiyzrilxwbqcz5ll6ls40zhw70zk23xpl6c"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/10/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/10/compiler-rt-armv7l.patch new file mode 100644 index 00000000000..120cfe6feb2 --- /dev/null +++ b/pkgs/development/compilers/llvm/10/compiler-rt-armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 +@@ -474,6 +474,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -595,7 +596,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 4d31229d64c..68f64ef4256 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -48,14 +48,19 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15 - ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 18c25f51815..dd0728b40c9 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -160,6 +160,7 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/5/compiler-rt-armv7l.patch new file mode 100644 index 00000000000..77bf2640c47 --- /dev/null +++ b/pkgs/development/compilers/llvm/5/compiler-rt-armv7l.patch @@ -0,0 +1,23 @@ +diff -ur compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake 2017-05-25 00:53:24.000000000 +0900 ++++ compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:24:24.937433155 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(X86 i386 i686) + set(X86_64 x86_64) + set(MIPS32 mips mipsel) +diff -ur compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt 2017-07-13 04:33:30.000000000 +0900 ++++ compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:24:45.945075423 +0900 +@@ -444,6 +444,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index 55f4eb94e92..624034b5228 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch; + ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch new file mode 100644 index 00000000000..ca2ed632faa --- /dev/null +++ b/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-6.0.1.src/cmake/builtin-config-ix.cmake compiler-rt-6.0.1.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-6.0.1.src/cmake/builtin-config-ix.cmake 2017-12-01 06:04:11.000000000 +0900 ++++ compiler-rt-6.0.1.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:30:01.939694303 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(X86 i386) + set(X86_64 x86_64) + set(MIPS32 mips mipsel) +diff -ur compiler-rt-6.0.1.src/lib/builtins/CMakeLists.txt compiler-rt-6.0.1.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-6.0.1.src/lib/builtins/CMakeLists.txt 2017-12-25 06:11:32.000000000 +0900 ++++ compiler-rt-6.0.1.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:30:44.814964156 +0900 +@@ -452,6 +452,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -521,7 +522,7 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 1bdba107d7d..5ae8bb01f05 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -47,14 +47,18 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 9f3b5e5ba0d..22dbb75d2d5 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/7/compiler-rt-armv7l.patch new file mode 100644 index 00000000000..89d7f1aec91 --- /dev/null +++ b/pkgs/development/compilers/llvm/7/compiler-rt-armv7l.patch @@ -0,0 +1,38 @@ +diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 +@@ -453,6 +453,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -563,12 +564,12 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 055fb01215f..e9853c58ca5 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -48,14 +48,18 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ] ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch - ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 702a0edb663..dc57d0d6bd5 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -169,6 +169,7 @@ in stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch new file mode 100644 index 00000000000..89d7f1aec91 --- /dev/null +++ b/pkgs/development/compilers/llvm/8/compiler-rt-armv7l.patch @@ -0,0 +1,38 @@ +diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 +@@ -453,6 +453,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -563,12 +564,12 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 573c198d6da..1f58cb98e3d 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -48,14 +48,18 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch; + ++ stdenv.lib.optional (useLLVM) ./crtbegin-and-end.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 2d996f0dd4c..0f6179c2d31 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -144,6 +144,7 @@ in stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; diff --git a/pkgs/development/compilers/llvm/9/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/9/compiler-rt-armv7l.patch new file mode 100644 index 00000000000..89d7f1aec91 --- /dev/null +++ b/pkgs/development/compilers/llvm/9/compiler-rt-armv7l.patch @@ -0,0 +1,38 @@ +diff -ur compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-7.1.0.src/cmake/builtin-config-ix.cmake 2018-05-25 06:36:27.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-09 20:26:33.030608692 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-7.1.0.src/lib/builtins/CMakeLists.txt 2018-07-31 03:18:59.000000000 +0900 ++++ compiler-rt-7.1.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-09 20:27:38.893409318 +0900 +@@ -453,6 +453,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -563,12 +564,12 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index c7723a98291..3b92264ad69 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -47,14 +47,18 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index aa58503a77f..013e5bb36b9 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -161,6 +161,7 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 5c26d5ab117..d534e2483d6 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mercury"; - version = "20.01.1"; + version = "20.01.2"; src = fetchurl { url = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz"; - sha256 = "0vxp9f0jmr228n13p6znhbxncav6ay0bnl4ypy6r3lw5lh7z172p"; + sha256 = "084ml6kswgaqjgmib3gq7zjnqsimz3f35w13ff6z0dv4d9csmq4m"; }; buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper diff --git a/pkgs/development/compilers/open-watcom-bin/default.nix b/pkgs/development/compilers/open-watcom-bin/default.nix index 0cd80b6e1df..a9c6b221065 100644 --- a/pkgs/development/compilers/open-watcom-bin/default.nix +++ b/pkgs/development/compilers/open-watcom-bin/default.nix @@ -1,15 +1,62 @@ -{ stdenvNoCC, fetchurl, qemu, expect, writeScript, ncurses }: +{ stdenvNoCC, fetchurl, qemu, expect, writeScript, writeScriptBin, ncurses, bash, coreutils }: let - # We execute the installer in qemu-user, because otherwise the - # installer fails to open itself due to a failed stat() call. This - # seems like an incompatibility of new Linux kernels to run this - # ancient binary. - performInstall = writeScript "perform-ow-install" '' + # We execute all OpenWatcom binaries in qemu-user, because otherwise + # some binaries (most notably the installer itself and wlib) fail to + # use the stat() systemcall. The failure mode is that it returns + # EOVERFLOW for completely legitimate requests. This seems like an + # incompatibility of new Linux kernels to run this ancient binary. + wrapLegacyBinary = writeScript "wrapLegacyBinary" '' + #!${bash}/bin/bash + + set -eu + + if [ $# -ne 2 ]; then + echo "Usage: $0 unwrapped-binary wrapped-binary" + exit 1 + fi + + IN="$(${coreutils}/bin/realpath $1)" + OUT="$2" + ARGV0="$(basename $2)" + + cat > "$OUT" <<EOF + #!${bash}/bin/bash + + TERMINFO=${ncurses}/share/terminfo TERM=vt100 exec ${qemu}/bin/qemu-i386 -0 $ARGV0 $IN "\$@" + EOF + + chmod +x "$OUT" + ''; + + wrapInPlace = writeScriptBin "wrapInPlace" '' + #!${bash}/bin/bash + + set -eu + + if [ $# -ne 1 ]; then + echo "Usage: $0 unwrapped-binary" + exit 1 + fi + + TARGET="$1" + + mv "$TARGET" "$TARGET-unwrapped" + chmod +x "$TARGET-unwrapped" + + exec ${wrapLegacyBinary} "$TARGET-unwrapped" "$TARGET" + ''; + + # Do a scripted installation of OpenWatcom with its original installer. + # + # If maintaining this expect script turns out to be too much of a + # hassle, we can switch to just using `unzip' on the installer and + # the correct file permissions manually. + performInstall = writeScriptBin "performInstall" '' #!${expect}/bin/expect -f - spawn env TERMINFO=${ncurses}/share/terminfo TERM=vt100 ${qemu}/bin/qemu-i386 [lindex $argv 0] + spawn [lindex $argv 0] # Wait for button saying "I agree" with escape sequences. expect "gree" @@ -46,15 +93,23 @@ stdenvNoCC.mkDerivation rec { sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p"; }; + nativeBuildInputs = [ wrapInPlace performInstall ]; + dontUnpack = true; - dontBuild = true; dontConfigure = true; + buildPhase = '' + cp ${src} install-bin-unwrapped + wrapInPlace install-bin-unwrapped + ''; + installPhase = '' - cp ${src} install-bin - chmod +x install-bin + performInstall ./install-bin-unwrapped - ${performInstall} install-bin + for e in $(find $out/binl -type f -executable); do + echo "Wrapping $e" + wrapInPlace "$e" + done ''; meta = with stdenvNoCC.lib; { diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 29992fdae68..16c2fd766bc 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -114,7 +114,7 @@ let # Set JAVA_HOME automatically. mkdir -p $out/nix-support cat <<EOF > $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi EOF ''; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix new file mode 100644 index 00000000000..b3842ba7cad --- /dev/null +++ b/pkgs/development/compilers/openjdk/13.nix @@ -0,0 +1,155 @@ +{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip +, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama +, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap +, setJavaClassPath +, headless ? false +, enableJavaFX ? openjfx.meta.available, openjfx +, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf +}: + +let + major = "13"; + update = ".0.2"; + build = "-ga"; + + openjdk = stdenv.mkDerivation rec { + pname = "openjdk" + lib.optionalString headless "-headless"; + version = "${major}${update}${build}"; + + src = fetchurl { + url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; + sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; + }; + + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ + cpio file which unzip 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) [ + gtk3 gnome_vfs GConf glib + ]; + + patches = [ + ./fix-java-home-jdk10.patch + ./read-truststore-from-env-jdk10.patch + ./currency-date-range-jdk10.patch + ./increase-javadoc-heap-jdk13.patch + # -Wformat etc. are stricter in newer gccs, per + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 + # so grab the work-around from + # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 + (fetchurl { + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; + sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; + }) + ] ++ lib.optionals (!headless && enableGnome2) [ + ./swing-use-gtk-jdk13.patch + ]; + + prePatch = '' + chmod +x configure + patchShebangs --build configure + ''; + + configureFlags = [ + "--with-boot-jdk=${openjdk13-bootstrap.home}" + "--enable-unlimited-crypto" + "--with-native-debug-symbols=internal" + "--with-libjpeg=system" + "--with-giflib=system" + "--with-libpng=system" + "--with-zlib=system" + "--with-lcms=system" + "--with-stdc++lib=dynamic" + ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc" + ++ lib.optional headless "--enable-headless-only" + ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}"; + + separateDebugInfo = true; + + NIX_CFLAGS_COMPILE = "-Wno-error"; + + NIX_LDFLAGS = toString (lib.optionals (!headless) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!headless && enableGnome2) [ + "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]); + + buildFlags = [ "all" ]; + + installPhase = '' + mkdir -p $out/lib + + mv build/*/images/jdk $out/lib/openjdk + + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir -p $out/share + ln -s $out/lib/openjdk/include $out/include + ln -s $out/lib/openjdk/man $out/share/man + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux/*_md.h $out/include/ + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo + ${lib.optionalString headless '' + rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so + ''} + + ln -s $out/lib/openjdk/bin $out/bin + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook so that any package + # that depends on the JDK has $CLASSPATH set up properly. + mkdir -p $out/nix-support + #TODO or printWords? cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040 + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat <<EOF > $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi + EOF + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + if [ "$output" = debug ]; then continue; fi + OUTPUTDIR=$(eval echo \$$output) + BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*) + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + ''; + + disallowedReferences = [ openjdk13-bootstrap ]; + + meta = with stdenv.lib; { + homepage = "http://openjdk.java.net/"; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; + }; + + passthru = { + architecture = ""; + home = "${openjdk}/lib/openjdk"; + }; + }; +in openjdk diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix index 775fd3cd3c4..c6498cb4530 100644 --- a/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/pkgs/development/compilers/openjdk/darwin/default.nix @@ -7,11 +7,11 @@ let }; jdk = stdenv.mkDerivation rec { - name = "zulu13.29.9-ca-jdk13.0.2"; + name = "zulu14.28.21-ca-jdk14.0.1"; src = fetchurl { url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; - sha256 = "1x8ja3x880a1izrwi7bdrwz1ljdvracjx627slzjd2xk8c4211pf"; + sha256 = "1pc0y3fxhlf42a51qbdha1fabci61yzq70kk5c1rzk0ai78d92q8"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index b3842ba7cad..063976d8765 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama -, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap +, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap , setJavaClassPath , headless ? false , enableJavaFX ? openjfx.meta.available, openjfx @@ -9,8 +9,8 @@ }: let - major = "13"; - update = ".0.2"; + major = "14"; + update = ".0.1"; build = "-ga"; openjdk = stdenv.mkDerivation rec { @@ -19,14 +19,14 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv"; + sha256 = "0ic7dcrzk62jc65yrshs6xlclmsha7z52bia5s2bkllw1zpmdmip"; }; nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ cpio file which unzip 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 + libXi libXinerama libXcursor libXrandr fontconfig openjdk14-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; @@ -54,7 +54,7 @@ let ''; configureFlags = [ - "--with-boot-jdk=${openjdk13-bootstrap.home}" + "--with-boot-jdk=${openjdk14-bootstrap.home}" "--enable-unlimited-crypto" "--with-native-debug-symbols=internal" "--with-libjpeg=system" @@ -137,7 +137,7 @@ let done ''; - disallowedReferences = [ openjdk13-bootstrap ]; + disallowedReferences = [ openjdk14-bootstrap ]; meta = with stdenv.lib; { homepage = "http://openjdk.java.net/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/13.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix index 54267a757b8..12d9448595e 100644 --- a/pkgs/development/compilers/openjdk/openjfx/13.nix +++ b/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -1,22 +1,24 @@ -{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen +{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen , pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib , ffmpeg, python, ruby }: let - major = "13"; - update = ".0.2"; - build = "1"; - repover = "${major}${update}+${build}"; + major = "14"; + update = ""; + build = "-ga"; + repover = "${major}${update}${build}"; gradle_ = (gradleGen.override { java = openjdk11_headless; - }).gradle_4_10; + }).gradle_5_6; makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${build}"; + version = "${major}${update}${build}"; - src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; - sha256 = "1si9wpb9malnf8zzz57l6b80088z2370zfxp1b0kk6rs0cnvpr74"; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + sha256 = "16aj15xksc266gv3y42m0g277pfvp71901lrngndcnpr7i2zshnr"; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; @@ -75,9 +77,6 @@ in makePackage { COMPILE_WEBKIT = true ''; - #openjdk build fails if licenses are identical, so we must patch this trivial difference - patches = [ ./openjfx-mesa-license.patch ]; - preBuild = '' swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" substituteInPlace build.gradle \ diff --git a/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch b/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch deleted file mode 100644 index d3bf9e17c22..00000000000 --- a/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/modules/javafx.graphics/src/main/legal/mesa3d.md 1969-12-31 19:00:01.000000000 -0500 -+++ b/modules/javafx.graphics/src/main/legal/mesa3d.md 2019-08-08 01:05:04.000000000 -0400 -@@ -1,7 +1,7 @@ - ## Mesa 3-D Graphics Library v5.0 - - ### Mesa License --``` -+<pre> - - Mesa 3-D graphics library - Version: 5.0 -@@ -25,4 +25,4 @@ - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --``` -+</pre> diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index fb6d663f749..04086321bef 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.13.1"; + name = "scala-2.13.2"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1nq49acx3j6vnw0lhyrfqa23f671y3kc9lja4nki0j73jk2cq639"; + sha256 = "1gvdxwlhgjmn8i5a8kcp19700rscjq9ylb35p8vj7nqys94zjkap"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index d61d5968ea0..0e8cead0b31 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -18,8 +18,8 @@ let params = { sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; }; "8.10" = { - rev = "V8.10+beta1"; - sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404"; + rev = "V8.10.0"; + sha256 = "0bpb4flckn4nqxbs3wjiznyx1k7r8k93qdigp3qwmikp2lxvcbw5"; }; "8.11" = { rev = "V8.11.0"; diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index 8362c704d95..d2787f0948e 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -1031,10 +1031,10 @@ let mkContrib = repo: revs: param: sha256 = "0iwkpmc22nwasrk4g7ki4s5y05zjs7kmqk3j98giwp2wiavhgapn"; }; - zorns-lemma = mkContrib "zorns-lemma" [ "8.6" "8.7" "8.8" "8.9" ] { - version = "v8.9.0"; - rev = "6ac9bb914f6017cdd9a544ff4b0bef73fd33b44c"; - sha256 = "1vdsl5gxpadkjjjw314s4fawzlssdmp4qkwrjz5qdmyl2dcpil4p"; + zorns-lemma = mkContrib "zorns-lemma" [ "8.10" "8.11" ] { + version = "v8.11.0"; + rev = "a573b50fff994f996b8e15dec2079490a5233dc6"; + sha256 = "0jbp1ay6abal66glbablbqsh5hzgd5fv81dc1vzn65jw0iiznxyq"; }; zsearch-trees = mkContrib "zsearch-trees" [ "8.6" "8.7" ] { diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 97fd23208f2..05dcb7898e5 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "coq-community"; - repo = "coq-bits"; - rev = "f74498a6c67e97d9565e139d62be8eaae7111f06"; - sha256 = "1ibg37qxgkmpbpvc78qcb179bcnzl149z1kzwdm8n98xk5ibavrf"; + repo = "bits"; + rev = "1.0.0"; + sha256 = "0nv5mdgrd075dpd8bc7h0xc5i95v0pkm0bfyq5rj6ii1s54dwcjl"; }; buildInputs = [ coq ]; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index aaf867baf25..a049fa94d41 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchFromGitHub, coq, bignums }: - -let params = - let v_8_8 = { - version = "8.8"; - sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; - }; - in - { - "8.7" = { - version = "8.7.2"; - sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; - }; - "8.8" = v_8_8; - "8.9" = v_8_8; - "8.10" = v_8_8; - }; - param = params.${coq.coq-version} -; in +{ stdenv, which, fetchFromGitHub, coq, bignums }: + +let + params = + let v_8_8 = { + version = "8.8"; + sha256 = "075yjczk79pf1hd3lgdjiz84ilkzfxjh18lgzrhhqp7d3kz5lxp5"; + }; + in + { + "8.7" = { + version = "8.7.2"; + sha256 = "15zlcrx06qqxjy3nhh22wzy0rb4npc8l4nx2bbsfsvrisbq1qb7k"; + }; + "8.8" = v_8_8; + "8.9" = v_8_8; + "8.10" = { + version = "8.10"; + sha256 = "0r9gnh5a5ykiiz5h1i8xnzgiydpwc4z9qhndxyya85xq0f910qaz"; + }; + }; + param = params.${coq.coq-version}; +in stdenv.mkDerivation rec { @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = [ coq ]; + buildInputs = [ which coq ]; propagatedBuildInputs = [ bignums ]; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index aeb53a995e5..140bf8ab536 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,97 +1,151 @@ -{ stdenv, fetchFromGitHub, ncurses, which, graphviz, coq, - recurseIntoAttrs, withDoc ? false +############################# +# Main derivation: mathcomp # +######################################################################## +# This file mainly provides the `mathcomp` derivation, which is # +# essentially a meta-package containing all core mathcomp libraries # +# (ssreflect fingroup algebra solvable field character). They can be # +# accessed individually through the paththrough attributes of mathcomp # +# bearing the same names (mathcomp.ssreflect, etc). # +# # +# Do not use overrideAttrs, but overrideMathcomp instead, which # +# regenerate a full mathcomp derivation with sub-derivations, and # +# behave the same as `mathcomp_`, described below. # +######################################################################## + +############################################################ +# Compiling a custom version of mathcomp using `mathcomp_` # +############################################################################## +# The prefered way to compile a custom version of mathcomp (other than a # +# released version which should be added to `mathcomp-config-initial` # +# and pushed to nixpkgs), is to apply the function `coqPackages.mathcomp_` # +# to either: # +# - a string without slash, which is interpreted as a github revision, # +# i.e. either a tag, a branch or a commit hash # +# - a string with slashes "owner/p_1/.../p_n", which is interpreted as # +# github owner "owner" and revision "p_1/.../p_n". # +# - a path which is interpreted as a local source for the repository, # +# the name of the version is taken to be the basename of the path # +# i.e. if the path is /home/you/git/package/branch/, # +# then "branch" is the name of the version # +# - an attribute set which overrides some attributes (e.g. the src) # +# if the version is updated, the name is automatically regenerated using # +# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" # +# - a "standard" override function (old: new_attrs) to override the default # +# attribute set, so that you can use old.${field} to patch the derivation. # +############################################################################## + +######################################################################### +# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix # +######################################################################### + +################################# +# Adding a new mathcomp version # +############################################################################# +# When adding a new version of mathcomp, add an attribute to `sha256` (use # +# ```sh # +# nix-prefetch-url --unpack # +# https://github.com/math-comp/math-comp/archive/version.tar.gz # +# ``` # +# to get the corresponding `sha256`) and to `coq-version` (read the release # +# notes to check which versions of coq it is compatible with). Then add # +# it in `preference version`, if not all mathcomp-extra packages are # +# ready, you might want to give new release secondary priority. # +############################################################################# + + +{ stdenv, fetchFromGitHub, ncurses, which, graphviz, + recurseIntoAttrs, withDoc ? false, + coqPackages, + mathcomp_, mathcomp, mathcomp-config, }: with builtins // stdenv.lib; let - #################################### - # CONFIGURATION (please edit this) # - #################################### - # sha256 of released mathcomp versions - mathcomp-sha256 = { - "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; - "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; - "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; - "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; - "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; - }; - # versions of coq compatible with released mathcomp versions - mathcomp-coq-versions = { - "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; - "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"]; - "1.8.0" = flip elem ["8.7" "8.8" "8.9"]; - "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"]; - "1.6.1" = flip elem ["8.5"]; + mathcomp-config-initial = rec { + ####################################################################### + # CONFIGURATION (please edit this), it is exported as mathcomp-config # + ####################################################################### + # sha256 of released mathcomp versions + sha256 = { + "1.11.0+beta1" = "12i3zznwajlihzpqsiqniv20rklj8d8401lhd241xy4s21fxkkjm"; + "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv"; + "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r"; + "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp"; + "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1"; + "1.6.1" = "1ilw6vm4dlsdv9cd7kmf0vfrh2kkzr45wrqr8m37miy0byzr4p9i"; + }; + # versions of coq compatible with released mathcomp versions + coq-versions = { + "1.11.0+beta1" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + "1.9.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" ]; + "1.8.0" = flip elem [ "8.7" "8.8" "8.9" ]; + "1.7.0" = flip elem [ "8.6" "8.7" "8.8" "8.9" ]; + "1.6.1" = flip elem [ "8.5"]; + }; + + # sets the default version of mathcomp given a version of Coq + # this is currently computed using version-perference below + # but it can be set to a fixed version number + preferred-version = let v = head ( + filter (mc: mathcomp-config.coq-versions.${mc} coq.coq-version) + mathcomp-config.version-preferences ++ ["0.0.0"]); + in if v == "0.0.0" then head mathcomp-config.version-preferences else v; + + # mathcomp preferred versions by decreasing order + # (the first version in the list will be tried first) + version-preferences = + [ "1.10.0" "1.9.0" "1.11.0+beta1" "1.8.0" "1.7.0" "1.6.1" ]; + + # list of core mathcomp packages sorted by dependency order + packages = _version: # unused in current versions of mathcomp + # because the following list of packages is fixed for + # all versions of mathcomp up to 1.11.0 + [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; + + # compute the dependencies of the core package pkg + # (assuming the total ordering above, change if necessary) + deps = version: pkg: if pkg == "single" then [] else + (pred-split-list (x: x == pkg) (mathcomp-config.packages version)).left; }; - # computes the default version of mathcomp given a version of Coq - max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions)); - # mathcomp prefered version by decreasing order - # (the first version in the list will be tried first) - mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.10.0" "1.7.0" "1.6.1" ]; ############################################################## # COMPUTED using the configuration above (edit with caution) # ############################################################## - default-mathcomp-version = let v = head ( - filter (mc: mathcomp-coq-versions.${mc} coq.coq-version) - mathcomp-version-preference ++ ["0.0.0"]); - in if v == "0.0.0" then max-mathcomp-version else v; - - # list of core mathcomp packages sorted by dependency order - mathcomp-packages = - [ "ssreflect" "fingroup" "algebra" "solvable" "field" "character" "all" ]; - # compute the dependencies of the core package pkg - # (assuming the total ordering above, rewrite if necessary) - mathcomp-deps = pkg: if pkg == "single" then [] else - (split (x: x == pkg) mathcomp-packages).left; # generic split function (TODO: move to lib?) - split = pred: l: + pred-split-list = pred: l: let loop = v: l: if l == [] then {left = v; right = [];} else let hd = builtins.head l; tl = builtins.tail l; in if pred hd then {left = v; right = tl;} else loop (v ++ [hd]) tl; in loop [] l; - # exported, documented at the end. - mathcompGen = mkMathcompGenFrom (_: {}) mathcomp-packages; + pkgUp = l: r: l // r // { + meta = (l.meta or {}) // (r.meta or {}); + passthru = (l.passthru or {}) // (r.passthru or {}); + }; - # exported, documented at the end. - mathcompGenSingle = mkMathcompGen (_: {}) "single"; + coq = coqPackages.coq; + mathcomp-deps = mathcomp-config.deps mathcomp.config.preferred-version; - # mkMathcompGen: internal mathcomp package generator - # returns {error = ...} if impossible to generate - # returns {${mathcomp-pkg} = <derivation>} otherwise - mkMathcompGenFrom = o: l: mcv: fold (pkg: pkgs: pkgs // mkMathcompGen o pkg mcv) {} l; - mkMathcompGen = overrides: mathcomp-pkg: mathcomp-version: + # default set of attributes given a 'package' name. + # this attribute set will be extended using toOverrideFun + default-attrs = package: let - coq-version-check = mathcomp-coq-versions.${mathcomp-version} or (_: false); - pkgpath = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp/${mathcomp-pkg}"; - pkgname = {single = "mathcomp";}.${mathcomp-pkg} or "mathcomp-${mathcomp-pkg}"; + pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; + pkgname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' - echo "all.v" > Make - echo "-I ." >> Make - echo "-R . mathcomp.all" >> Make + echo "all.v" > Make + echo "-I ." >> Make + echo "-R . mathcomp.all" >> Make ''; - is-released = builtins.isString mathcomp-version; - custom-version = if is-released then mathcomp-version else "custom"; - - # the base set of attributes for mathcomp - attrs = { - name = "coq${coq.coq-version}-${pkgname}-${custom-version}"; - - # used in ssreflect - version = custom-version; - - src = if is-released then fetchFromGitHub { - owner = "math-comp"; - repo = "math-comp"; - rev = "mathcomp-${mathcomp-version}"; - sha256 = mathcomp-sha256.${mathcomp-version}; - } else mathcomp-version; + in + rec { + version = "master"; + name = "coq${coq.coq-version}-${pkgname}-${version}"; nativeBuildInputs = optionals withDoc [ graphviz ]; buildInputs = [ ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); - propagatedBuildInputs = [ coq ] ++ - attrValues (mkMathcompGenFrom overrides (mathcomp-deps mathcomp-pkg) mathcomp-version); + propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; buildFlags = optional withDoc "doc"; @@ -101,7 +155,7 @@ let preBuild = '' patchShebangs etc/utils/ssrcoqdep || true cd ${pkgpath} - '' + optionalString (mathcomp-pkg == "all") pkgallMake; + '' + optionalString (package == "all") pkgallMake; installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install @@ -110,67 +164,98 @@ let ''; meta = with stdenv.lib; { - homepage = "https://math-comp.github.io/"; - license = licenses.cecill-b; - maintainers = [ maintainers.vbgl maintainers.jwiegley ]; - platforms = coq.meta.platforms; + homepage = "https://math-comp.github.io/"; + license = licenses.cecill-b; + maintainers = [ maintainers.vbgl maintainers.jwiegley maintainers.cohencyril ]; + platforms = coq.meta.platforms; }; passthru = { - compatibleCoqVersions = coq-version-check; - currentOverrides = overrides; - overrideMathcomp = moreOverrides: - (mkMathcompGen (old: let new = overrides old; in new // moreOverrides new) - mathcomp-pkg mathcomp-version).${mathcomp-pkg}; - mathcompGen = moreOverrides: - (mkMathcompGenFrom (old: let new = overrides old; in new // moreOverrides new) - mathcomp-packages mathcomp-version); + mathcompDeps = mathcomp-deps package; + inherit package mathcomp-config; + compatibleCoqVersions = _: true; }; }; + + # converts a string, path or attribute set into an override function + toOverrideFun = overrides: + if isFunction overrides then overrides else old: + let + pkgname = if old.passthru.package == "single" then "mathcomp" + else "mathcomp-${old.passthru.package}"; + + string-attrs = if hasAttr overrides mathcomp-config.sha256 then + let version = overrides; + in { + inherit version; + src = fetchFromGitHub { + owner = "math-comp"; + repo = "math-comp"; + rev = "mathcomp-${version}"; + sha256 = mathcomp-config.sha256.${version}; + }; + passthru = old.passthru // { + compatibleCoqVersions = mathcomp-config.coq-versions.${version}; + mathcompDeps = mathcomp-config.deps version old.passthru.package; + }; + } + else + let splitted = filter isString (split "/" overrides); + owner = head splitted; + ref = concatStringsSep "/" (tail splitted); + version = head (reverseList splitted); + in if length splitted == 1 then { + inherit version; + src = fetchTarball "https://github.com/math-comp/math-comp/archive/${version}.tar.gz"; + } else { + inherit version; + src = fetchTarball "https://github.com/${owner}/math-comp/archive/${ref}.tar.gz"; + }; + + attrs = + if overrides == null || overrides == "" then _: {} + else if isString overrides then string-attrs + else if isPath overrides then { version = baseNameOf overrides; src = overrides; } + else if isAttrs overrides then pkgUp old overrides + else let overridesStr = toString overrides; in + abort "${overridesStr} not a legitimate overrides"; + in + attrs // (if attrs?version && ! (attrs?name) + then { name = "coq${coq.coq-version}-${pkgname}-${attrs.version}"; } else {}); + + # generates {ssreflect = «derivation ...» ; ... ; character = «derivation ...», ...} + mkMathcompGenSet = pkgs: o: + fold (pkg: pkgs: pkgs // {${pkg} = mkMathcompGen pkg o;}) {} pkgs; + # generates the derivation of one mathcomp package. + mkMathcompGen = package: overrides: + let + up = x: o: x // (toOverrideFun o x); + fixdeps = attrs: + let version = attrs.version or "master"; + mcdeps = if package == "single" then {} + else mkMathcompGenSet (filter isString attrs.passthru.mathcompDeps) overrides; + allmc = mkMathcompGenSet (mathcomp-config.packages version ++ [ "single" ]) overrides; + in { + propagatedBuildInputs = [ coq ] + ++ filter isDerivation attrs.passthru.mathcompDeps + ++ attrValues mcdeps + ; + passthru = allmc // + { overrideMathcomp = o: mathcomp_ (old: up (up old overrides) o); }; + }; in - {${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);}; - -getAttrOr = a: n: a.${n} or (throw a.error); - -mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; -mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; -mathcompCorePkgs_1_9 = mathcompGen "1.9.0"; -mathcompCorePkgs_1_10 = mathcompGen "1.10.0"; -mathcompCorePkgs = recurseIntoAttrs - (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version)); - -in { -# mathcompGenSingle: given a version of mathcomp -# generates an attribute set {single = <drv>;} with the single mathcomp derivation -inherit mathcompGenSingle; -mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single"; -mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single"; -mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single"; -mathcomp_1_10_single = getAttrOr (mathcompGenSingle "1.10.0") "single"; -mathcomp_single = dontDistribute - (getAttrOr (mathcompGenSingle default-mathcomp-version) "single"); - -# mathcompGen: given a version of mathcomp -# generates an attribute set {ssreflect = <drv>; ... character = <drv>; all = <drv>;}. -# each of these have a special attribute overrideMathcomp which -# must be used instead of overrideAttrs in order to also fix the dependencies -inherit mathcompGen mathcompCorePkgs - mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9 - mathcompCorePkgs_1_10 - ; - - -mathcomp = getAttrOr mathcompCorePkgs "all"; -mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all"; -mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all"; -mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all"; -mathcomp_1_10 = getAttrOr mathcompCorePkgs_1_10 "all"; - -ssreflect = getAttrOr mathcompCorePkgs "ssreflect"; - -} // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) // -(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_10"; value = pkg;}) mathcompCorePkgs_1_10) + stdenv.mkDerivation (up (up (default-attrs package) overrides) fixdeps); +in +{ + mathcomp-config = mathcomp-config-initial; + mathcomp_ = mkMathcompGen "all"; + mathcomp = mathcomp_ mathcomp-config.preferred-version; + # mathcomp-single = mathcomp.single; + ssreflect = mathcomp.ssreflect; + mathcomp-ssreflect = mathcomp.ssreflect; + mathcomp-fingroup = mathcomp.fingroup; + mathcomp-algebra = mathcomp.algebra; + mathcomp-solvable = mathcomp.solvable; + mathcomp-field = mathcomp.field; + mathcomp-character = mathcomp.character; +} diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index 2df9cbe58c7..d37608658b4 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -1,202 +1,371 @@ -{ stdenv, fetchFromGitHub, coq, ssreflect, coqPackages, - recurseIntoAttrs }: +########################################################## +# Main derivation: # +# mathcomp-finmap mathcomp-analysis mathcomp-bigenough # +# mathcomp-multinomials mathcomp-real-closed coqeal # +# Additionally: # +# mathcomp-extra-all contains all the extra packages # +# mathcomp-extra-fast contains the one not marked slow # +######################################################################## +# This file mainly provides the above derivations, which are packages # +# extra mathcomp libraries based on mathcomp. # +######################################################################## + +##################################################### +# Compiling customs versions using `mathcomp-extra` # +############################################################################## +# The prefered way to compile a custom version of mathcomp extra packages # +# (other than released versions which should be added to # +# `rec-mathcomp-extra-config` and pushed to nixpkgs, see below), # +# is to use `coqPackages.mathcomp-extra name version` where # +# 1. `name` is a string representing the name of a declared package # +# OR undeclared package. # +# 2. `version` is either: # +# - a string without slash, which is interpreted as a github revision, # +# i.e. either a tag, a branch or a commit hash # +# - a string with slashes "owner/p_1/.../p_n", which is interpreted as # +# github owner "owner" and revision "p_1/.../p_n". # +# - a path which is interpreted as a local source for the repository, # +# the name of the version is taken to be the basename of the path # +# i.e. if the path is /home/you/git/package/branch/, # +# then "branch" is the name of the version # +# - an attribute set which overrides some attributes (e.g. the src) # +# if the version is updated, the name is automatically regenerated using # +# the conventional schema "coq${coq.coq-version}-${pkgname}-${version}" # +# - a "standard" override function (old: new_attrs) to override the default # +# attribute set, so that you can use old.${field} to patch the derivation. # +# # +# Should you choose to use `pkg.overrideAttrs` instead, we provide the # +# function mathcomp-extra-override which takes a name and a version exactly # +# as above and returns an override function. # +############################################################################## + +######################################################################### +# Example of use: https://github.com/math-comp/math-comp/wiki/Using-nix # +######################################################################### + +########################################### +# Adding a new package or package version # +################################################################################ +# 1. Update or add a `package` entry to `initial`, it must be a function # +# taking the version as argument and returning an attribute set. Everything # +# is optional and the default for the sources of the repository and the # +# homepage will be https://github.com/math-comp/${package}. # +# # +# 2. Update or add a `package` entry to `sha256` for each release. # +# You may use # +# ```sh # +# nix-prefetch-url --unpack # +# https://github.com/math-comp/math-comp/archive/version.tar.gz # +# ``` # +# # +# 3. Update or create a new consistent set of extra packages. # +# /!\ They must all be co-compatible. /!\ # +# Do not use versions that may disappear: it must either be # +# - a tag from the main repository (e.g. version or tag), or # +# - a revision hash that has been *merged in master* # +################################################################################ + +{ stdenv, fetchFromGitHub, recurseIntoAttrs, + which, mathcomp, coqPackages, + mathcomp-extra-config, mathcomp-extra-override, + mathcomp-extra, current-mathcomp-extra, +}: with builtins // stdenv.lib; -let current-ssreflect = ssreflect; in let -# configuring packages -param = { - finmap = { - version-sha256 = { - "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; - "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; - "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; - "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; - }; - description = "A finset and finmap library"; - }; - bigenough = { - version-sha256 = {"1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg";}; - description = "A small library to do epsilon - N reasonning"; - }; - multinomials = { - version-sha256 = { - "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; - "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; - "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; - "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; - }; - description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - }; - analysis = { - version-sha256 = { - "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; - "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; - "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; - }; - compatibleCoqVersions = flip elem ["8.8" "8.9"]; - description = "Analysis library compatible with Mathematical Components"; - license = stdenv.lib.licenses.cecill-c; - }; - real-closed = { - version-sha256 = { - "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; - "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl"; - "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; - }; - description = "Mathematical Components Library on real closed fields"; - }; - coqeal = { - version-sha256 = { - "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii"; - }; - description = "CoqEAL - The Coq Effective Algebra Library"; - owner = "CoqEAL"; - compatibleCoqVersions = flip elem ["8.7" "8.8" "8.9"]; - license = stdenv.lib.licenses.mit; - }; -}; -versions = { - "1.9.0" = { - finmap.version = "1.2.1"; - bigenough.version = "1.0.0"; - analysis = { - version = "0.2.2"; - core-deps = with coqPackages; [ mathcomp-field_1_9 ]; - extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ]; - }; - multinomials = { - version = "1.3"; - core-deps = with coqPackages; [ mathcomp-algebra_1_9 ]; - extra-deps = with coqPackages; [ mathcomp_1_9-finmap mathcomp_1_9-bigenough ]; - }; - real-closed = { - version = "1.0.3"; - core-deps = with coqPackages; [ mathcomp-field_1_9 ]; - extra-deps = with coqPackages; [ mathcomp_1_9-bigenough ]; - }; - }; - "1.8.0" = { - finmap.version = "1.2.1"; - bigenough.version = "1.0.0"; - analysis = { - version = "0.2.2"; - core-deps = with coqPackages; [ mathcomp-field_1_8 ]; - extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; - }; - multinomials = { - version = "1.3"; - core-deps = with coqPackages; [ mathcomp-algebra_1_8 ]; - extra-deps = with coqPackages; [ mathcomp_1_8-finmap mathcomp_1_8-bigenough ]; - }; - real-closed = { - version = "1.0.3"; - core-deps = with coqPackages; [ mathcomp-field_1_8 ]; - extra-deps = with coqPackages; [ mathcomp_1_8-bigenough ]; - }; - coqeal = { - version = "1.0.0"; - core-deps = with coqPackages; [ mathcomp-algebra_1_8 ]; - extra-deps = with coqPackages; [ bignums paramcoq mathcomp_1_8-multinomials ]; - }; - }; - "1.7.0" = { - finmap.version = "1.1.0"; - bigenough.version = "1.0.0"; - analysis = { - version = "0.1.0"; - core-deps = with coqPackages; [ mathcomp-field_1_7 ]; - extra-deps = with coqPackages; [ mathcomp_1_7-finmap mathcomp_1_7-bigenough ]; - }; - multinomials = { - version = "1.1"; - core-deps = with coqPackages; [ mathcomp-algebra_1_7 ]; - extra-deps = with coqPackages; [ mathcomp_1_7-finmap_1_0 mathcomp_1_7-bigenough ]; - }; - real-closed = { - version = "1.0.1"; - core-deps = with coqPackages; [ mathcomp-field_1_7 ]; - extra-deps = with coqPackages; [ mathcomp_1_7-bigenough ]; - }; - }; -}; - -# generic package generator -packageGen = { - # optional arguments - src ? "", - owner ? "math-comp", - extra-deps ? [], - ssreflect ? current-ssreflect, - core-deps ? null, - compatibleCoqVersions ? null, - license ? ssreflect.meta.license, - # mandatory - package, version ? "broken", version-sha256, description - }: - let - theCompatibleCoqVersions = if compatibleCoqVersions == null - then ssreflect.compatibleCoqVersions - else compatibleCoqVersions; - mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps; - in - { ${package} = let from = src; in + ############################## + # CONFIGURATION, please edit # + ############################## + ############################ + # Packages base delaration # + ############################ + rec-mathcomp-extra-config = { + initial = { + mathcomp-finmap = version: { + meta = { + description = "A finset and finmap library"; + repo = "finmap"; + homepage = "https://github.com/math-comp/finmap"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.8" "8.9" "8.10" "8.11" ]; + }; - stdenv.mkDerivation rec { - inherit version; - name = "coq${coq.coq-version}-mathcomp${ssreflect.version}-${package}-${version}"; + mathcomp-bigenough = version: { + meta = { + description = "A small library to do epsilon - N reasonning"; + repo = "bigenough"; + homepage = "https://github.com/math-comp/bigenough"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; + }; - src = if from == "" then fetchFromGitHub { - owner = owner; - repo = package; - rev = version; - sha256 = version-sha256.${version}; - } else from; + multinomials = version: { + buildInputs = [ which ]; + propagatedBuildInputs = with coqPackages; + [ mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + meta = { + description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + repo = "multinomials"; + homepage = "https://github.com/math-comp/multinomials"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ]; + }; - propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps; + mathcomp-analysis = version: { + propagatedBuildInputs = with coqPackages; + [ mathcomp.field mathcomp-finmap mathcomp-bigenough ]; + meta = { + description = "Analysis library compatible with Mathematical Components"; + homepage = "https://github.com/math-comp/analysis"; + repo = "analysis"; + license = stdenv.lib.licenses.cecill-c; + }; + passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; + }; - installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + mathcomp-real-closed = version: { + propagatedBuildInputs = with coqPackages; + [ coq mathcomp.field mathcomp-bigenough ]; + meta = { + description = "Mathematical Components Library on real closed fields"; + repo = "real-closed"; + homepage = "https://github.com/math-comp/real-closed"; + }; + passthru.compatibleCoqVersions = flip elem ["8.8" "8.9" "8.10" "8.11" ]; + }; - meta = { - inherit description; - inherit license; - inherit (src.meta) homepage; - inherit (ssreflect.meta) platforms; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - broken = (version == "broken"); + coqeal = version: { + buildInputs = [ which ]; + propagatedBuildInputs = with coqPackages; + [ mathcomp-algebra bignums paramcoq multinomials ]; + meta = { + description = "CoqEAL - The Coq Effective Algebra Library"; + homepage = "https://github.com/coqeal/coqeal"; + license = stdenv.lib.licenses.mit; + owner = "CoqEAL"; + }; + passthru.compatibleCoqVersions = flip elem [ "8.9" "8.10" "8.11" ]; + }; }; - passthru = { - inherit version-sha256; - compatibleCoqVersions = if meta.broken then _: false - else theCompatibleCoqVersions; + ############################### + # sha256 of released versions # + ############################### + sha256 = { + mathcomp-finmap = { + "1.5.0" = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq"; + "1.4.1" = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p"; + "1.4.0+coq-8.11" = "1fd00ihyx0kzq5fblh9vr8s5mr1kg7p6pk11c4gr8svl1n69ppmb"; + "1.4.0" = "0mp82mcmrs424ff1vj3cvd8353r9vcap027h3p0iprr1vkkwjbzd"; + "1.3.4" = "0f5a62ljhixy5d7gsnwd66gf054l26k3m79fb8nz40i2mgp6l9ii"; + "1.3.3" = "1n844zjhv354kp4g4pfbajix0plqh7yxv6471sgyb46885298am5"; + "1.3.1" = "14rvm0rm5hd3pd0srgak3jqmddzfv6n7gdpjwhady5xcgrc7gsx7"; + "1.2.1" = "0jryb5dq8js3imbmwrxignlk5zh8gwfb1wr4b1s7jbwz410vp7zf"; + "1.2.0" = "0b6wrdr0d7rcnv86s37zm80540jl2wmiyf39ih7mw3dlwli2cyj4"; + "1.1.0" = "05df59v3na8jhpsfp7hq3niam6asgcaipg2wngnzxzqnl86srp2a"; + "1.0.0" = "0sah7k9qm8sw17cgd02f0x84hki8vj8kdz7h15i7rmz08rj0whpa"; + }; + mathcomp-bigenough = { + "1.0.0" = "10g0gp3hk7wri7lijkrqna263346wwf6a3hbd4qr9gn8hmsx70wg"; + }; + mathcomp-analysis = { + "0.2.3" = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; + "0.2.2" = "1d5dwg9di2ppdzfg21zr0a691zigb5kz0lcw263jpyli1nrq7cvk"; + "0.2.0" = "1186xjxgns4ns1szyi931964bjm0mp126qzlv10mkqqgfw07nhrd"; + "0.1.0" = "0hwkr2wzy710pcyh274fcarzdx8sv8myp16pv0vq5978nmih46al"; + }; + multinomials = { + "1.5.1" = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; + "1.5" = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; + "1.4" = "0vnkirs8iqsv8s59yx1fvg1nkwnzydl42z3scya1xp1b48qkgn0p"; + "1.3" = "0l3vi5n094nx3qmy66hsv867fnqm196r8v605kpk24gl0aa57wh4"; + "1.2" = "1mh1w339dslgv4f810xr1b8v2w7rpx6fgk9pz96q0fyq49fw2xcq"; + "1.1" = "1q8alsm89wkc0lhcvxlyn0pd8rbl2nnxg81zyrabpz610qqjqc3s"; + "1.0" = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; + }; + mathcomp-real-closed = { + "1.0.5" = "0q8nkxr9fba4naylr5xk7hfxsqzq2pvwlg1j0xxlhlgr3fmlavg2"; + "1.0.4" = "058v9dj973h9kfhqmvcy9a6xhhxzljr90cf99hdfcdx68fi2ha1b"; + "1.0.3" = "1xbzkzqgw5p42dx1liy6wy8lzdk39zwd6j14fwvv5735k660z7yb"; + "1.0.2" = "0097pafwlmzd0gyfs31bxpi1ih04i72nxhn99r93aj20mn7mcsgl"; + "1.0.1" = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; + }; + coqeal = { + "1.0.3" = "0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24"; + "1.0.2" = "1brmf3gj03iky1bcl3g9vx8vknny7xfvs0y2rfr85am0296sxsfj"; + "1.0.1" = "19jhdrv2yp9ww0h8q73ihb2w1z3glz4waf2d2n45klafxckxi7bm"; + "1.0.0" = "1had6f1n85lmh9x31avbmgl3m0rsiw9f8ma95qzk5b57fjg5k1ii"; + }; }; + + ################################ + # CONSISTENT sets of packages. # + ################################ + for-coq-and-mc = let + v5 = { + mathcomp-finmap = "1.5.0"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "678d3cc37f5f3c71b1bd550836eb44e3ba2a5459"; + multinomials = "1.5.1"; + mathcomp-real-closed = "1.0.5"; + coqeal = "CohenCyril/bdfc96771644b082e41268edc43d61dc5fda2358"; + }; + v4 = v3 // { coqeal = "1.0.3"; }; + v3 = { + mathcomp-finmap = "1.4.0"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "0.2.3"; + multinomials = "1.5"; + mathcomp-real-closed = "1.0.4"; + coqeal = "1.0.0"; + }; + v2 = { + mathcomp-finmap = "1.3.4"; + mathcomp-bigenough = "1.0.0"; + mathcomp-analysis = "0.2.3"; + multinomials = "1.4"; + mathcomp-real-closed = "1.0.3"; + coqeal = "1.0.0"; + }; + v1 = { + mathcomp-finmap = "1.1.0"; + mathcomp-bigenough = "1.0.0"; + multinomials = "1.1"; + mathcomp-real-closed = "1.0.1"; + coqeal = "1.0.0"; + }; + in + { + "8.11" = { + "1.11.0+beta1" = v5; + "1.10.0" = v4 // {mathcomp-finmap = "1.4.0+coq-8.11";}; + }; + "8.10" = { + "1.11.0+beta1" = v5; + "1.10.0" = v4; + "1.9.0" = removeAttrs v3 ["coqeal"]; + }; + "8.9" = { + "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.10.0" = v4; + "1.9.0" = removeAttrs v3 ["coqeal"]; + "1.8.0" = removeAttrs v2 ["coqeal"]; + }; + "8.8" = { + "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; + "1.9.0" = removeAttrs v3 ["coqeal"]; + "1.8.0" = removeAttrs v2 ["coqeal"]; + "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; + }; + "8.7" = { + "1.11.0+beta1" = removeAttrs v5 ["mathcomp-analysis"]; + "1.10.0" = removeAttrs v4 ["mathcomp-analysis"]; + "1.9.0" = removeAttrs v3 ["coqeal"]; + "1.8.0" = removeAttrs v2 ["coqeal"]; + "1.7.0" = removeAttrs v1 ["coqeal" "multinomials"]; + }; + }; }; + + ############################## + # GENERATION, EDIT WITH CARE # + ############################## + coq = coqPackages.coq; + + default-attrs = { + version = "master"; + buildInputs = []; + propagatedBuildInputs = (with coqPackages; [ ssreflect ]); + installFlags = [ "-f" "Makefile.coq" "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; + meta = { + inherit (mathcomp.meta) platforms license; + owner = "math-comp"; + maintainers = [ maintainers.vbgl maintainers.cohencyril ]; + }; + passthru.compatibleCoqVersions = (_: true); }; -current-versions = versions.${current-ssreflect.version} or {}; + pkgUp = recursiveUpdateUntil (path: l: r: !(isAttrs l && isAttrs r) || path == ["src"]); -select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); + # Fixes a partial attribute set using the configuration + # in the style of the above mathcomp-extra-config.initial, + # and generates a name according to the conventional naming scheme below + fix-attrs = pkgcfg: + let attrs = pkgUp default-attrs pkgcfg; in + pkgUp attrs (rec { + name = "coq${coq.coq-version}mathcomp${mathcomp.version}-${attrs.meta.repo or attrs.meta.package or "anonymous"}-${attrs.version}"; + src = attrs.src or (fetchTarball "${meta.homepage}/archive/${attrs.version}.tar.gz"); + meta = rec { + homepage = attrs.meta.homepage or attrs.src.meta.homepage or "https://github.com/${owner}/${repo}"; + owner = attrs.meta.owner or "math-comp"; + repo = attrs.meta.repo or attrs.meta.package or "math-comp-nix"; + }; + }); -for-version = v: suffix: (mapAttrs' (n: pkg: - {name = "mathcomp_${suffix}-${n}"; - value = (packageGen ({ - ssreflect = coqPackages."mathcomp-ssreflect_${suffix}"; - } // pkg)).${n};}) - (select versions.${v})); + # Gets a version out of a string, path or attribute set. + getVersion = arg: + if isFunction arg then (arg {}).version + else if arg == "" then "master" + else if isDerivation arg then arg.drvAttrs.version or "master" + else if isAttrs arg then arg.version or "master" + else if isString arg then head (reverseList (split "/" arg)) + else if isPath arg then (baseNameOf arg) + else "master"; -all = (for-version "1.7.0" "1_7") // - (for-version "1.8.0" "1_8") // - (for-version "1.9.0" "1_9") // - (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( - mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};}) - (select current-versions)))); + # Converts a string, path or attribute set into an override function + # It tries to fill the `old` argument of the override function using + # `mathcomp-extra-config.initial` first and finishes with `fix-attrs` + rec-mathcomp-extra-override = generic: old: let + version = getVersion generic; + package = old.meta.package or "math-comp-nix"; + cfg = pkgUp ((mathcomp-extra-config.initial.${package} or (_: {})) version) old + // { inherit version; }; + fix = attrs: fix-attrs (pkgUp cfg attrs); + in + if isFunction generic then fix (generic cfg) + else if generic == null || generic == "" then fix {} + else if isDerivation generic then fix generic.drvAttrs + else if isAttrs generic then fix generic + else if generic == "broken" then fix { meta.broken = true; passthru.compatibleCoqVersions = _: false; } + else let fixedcfg = fix cfg; in fixedcfg // ( + if isString generic then + if (mathcomp-extra-config.sha256.${package} or {})?${generic} then { + src = fetchFromGitHub { + inherit (fixedcfg.meta) owner repo; + rev = version; + sha256 = mathcomp-extra-config.sha256.${package}.${version}; + }; + } + else let splitted = filter isString (split "/" generic); in { + src = fetchTarball + ("https://github.com/" + + (if length splitted == 1 then "${fixedcfg.meta.owner}/${fixedcfg.meta.repo}/archive/${version}.tar.gz" + else "${head splitted}/${fixedcfg.meta.repo}/archive/${concatStringsSep "/" (tail splitted)}.tar.gz")); + } + else if isPath generic then { src = generic; } + else abort "${toString generic} not a legitimate generic version/override"); + + # applies mathcomp-extra-config.for-coq-and-mc to the current mathcomp version + for-this = mathcomp-extra-config.for-coq-and-mc.${coq.coq-version}.${mathcomp.version} or {}; + + # specializes mathcomp-extra to the current mathcomp version. + rec-current-mathcomp-extra = package: mathcomp-extra package (for-this.${package} or {}); in -{ -mathcompExtraGen = packageGen; -mathcomp_1_7-finmap_1_0 = - (packageGen (select {finmap = {version = "1.0.0"; - ssreflect = coqPackages.mathcomp-ssreflect_1_7;}; - }).finmap).finmap; -multinomials = all.mathcomp-multinomials; -coqeal = all.mathcomp-coqeal; -} // all + { + mathcomp-extra-override = rec-mathcomp-extra-override; + mathcomp-extra-config = rec-mathcomp-extra-config; + current-mathcomp-extra = rec-current-mathcomp-extra; + mathcomp-extra = package: version: + stdenv.mkDerivation (mathcomp-extra-override version {meta = {inherit package;};}); + + mathcomp-finmap = current-mathcomp-extra "mathcomp-finmap"; + mathcomp-analysis = current-mathcomp-extra "mathcomp-analysis"; + mathcomp-bigenough = current-mathcomp-extra "mathcomp-bigenough"; + multinomials = current-mathcomp-extra "multinomials"; + mathcomp-real-closed = current-mathcomp-extra "mathcomp-real-closed"; + coqeal = current-mathcomp-extra "coqeal"; + + mathcomp-extra-fast = map (pkg: current-mathcomp-extra pkg) + (attrNames (filterAttrs (pkg: config: !(config?slow && config.slow)) for-this)); + mathcomp-extra-all = map (pkg: current-mathcomp-extra pkg) (attrNames for-this); + } diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix deleted file mode 100644 index 01df38375ef..00000000000 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, coq, ncurses, which -, graphviz, mathcomp, withDoc ? false -}: - -stdenv.mkDerivation rec { - name = "coq${coq.coq-version}-ssreflect-${version}"; - - inherit (mathcomp) src version meta; - - nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; - buildInputs = [ coq ncurses which ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); - - enableParallelBuilding = true; - - COQBIN = "${coq}/bin/"; - - preBuild = '' - patchShebangs etc/utils/ssrcoqdep || true - cd mathcomp/ssreflect - ''; - - installPhase = '' - make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - ''; - - postInstall = stdenv.lib.optionalString withDoc '' - mkdir -p $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/ - cp -r html $out/share/doc/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect/ - ''; - - passthru.compatibleCoqVersions = mathcomp.compatibleCoqVersions; -} diff --git a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh new file mode 100755 index 00000000000..f3cdcbc0c10 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh @@ -0,0 +1,36 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p python3 dotnet-sdk_3 -i bash + +# Run this script to generate deps.nix +# ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout + +SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +if [ -d "$1" ]; then + CHECKOUT_PATH="$1" +else + echo "First argument must be a directory, the path to the Microsoft Python Language Server source checkout" + exit 1 +fi + +# Generate lockfiles in source checkout +cd $CHECKOUT_PATH/src +dotnet nuget locals all --clear +dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64 + +# Use the lockfiles to make a file with two columns: name and version number +# for all possible package dependencies +cd $SCRIPTDIR +echo "" > all_versions.txt +for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do + echo "Processing lockfile $lockfile" + python ./process_lockfile.py "$lockfile" >> all_versions.txt +done +# Add extra manually added packages +cat ./manual_deps.txt >> all_versions.txt +cat all_versions.txt | sed '/^$/d' | sort | uniq > tmp +mv tmp all_versions.txt + +# Retrieve sha256 hashes for each dependency and format fetchNuGet calls into deps.nix +./format-deps.sh all_versions.txt > deps.nix +rm all_versions.txt diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix new file mode 100644 index 00000000000..77154485118 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, fetchFromGitHub +, fetchurl +, makeWrapper +, dotnet-sdk_3 +, openssl +, icu +, patchelf +, Nuget +}: + +let deps = import ./deps.nix { inherit fetchurl; }; + + version = "2020-04-24"; + + # Build the nuget source needed for the later build all by itself + # since it's a time-consuming step that only depends on ./deps.nix. + # This makes it easier to experiment with the main build. + nugetSource = stdenv.mkDerivation { + pname = "python-language-server-nuget-deps"; + inherit version; + + dontUnpack = true; + + nativeBuildInputs = [ Nuget ]; + + buildPhase = '' + export HOME=$(mktemp -d) + + mkdir -p $out/lib + + # disable default-source so nuget does not try to download from online-repo + nuget sources Disable -Name "nuget.org" + # add all dependencies to the source + for package in ${toString deps}; do + nuget add $package -Source $out/lib + done + ''; + + dontInstall = true; + }; + +in + +stdenv.mkDerivation { + pname = "python-language-server"; + inherit version; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "python-language-server"; + rev = "d480cd12649dcff78ed271c92c274fab60c00f2f"; + sha256 = "0p2sw6w6fymdlxn8r5ndvija2l7rd77f5rddq9n71dxj1nicljh3"; + }; + + buildInputs = [dotnet-sdk_3 openssl icu]; + + nativeBuildInputs = [ + Nuget + makeWrapper + patchelf + ]; + + buildPhase = '' + mkdir home + export HOME=$(mktemp -d) + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + + pushd src + nuget sources Disable -Name "nuget.org" + dotnet restore --source ${nugetSource}/lib -r linux-x64 + popd + + pushd src/LanguageServer/Impl + dotnet publish --no-restore -c Release -r linux-x64 + popd + ''; + + installPhase = '' + mkdir -p $out + cp -r output/bin/Release/linux-x64/publish $out/lib + + mkdir $out/bin + makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server + ''; + + postFixup = '' + patchelf --set-rpath ${icu}/lib $out/lib/System.Globalization.Native.so + patchelf --set-rpath ${openssl.out}/lib $out/lib/System.Security.Cryptography.Native.OpenSsl.so + ''; + + # If we don't disable stripping, the executable fails to start with an error about being unable + # to find some of the packaged DLLs. + dontStrip = true; + + meta = with stdenv.lib; { + description = "Microsoft Language Server for Python"; + homepage = "https://github.com/microsoft/python-language-server"; + license = licenses.asl20; + maintainers = with maintainers; [ thomasjm ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix new file mode 100644 index 00000000000..803f33f892d --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -0,0 +1,1321 @@ +# This file is autogenerated. +# To regenerate, run "create_deps.sh $PATH_TO_LANGUAGE_SERVER_CHECKOUT" + +{ fetchurl }: let + + fetchNuGet = { name, version, sha256 }: fetchurl { + inherit sha256; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + }; + +in [ + + (fetchNuGet { + name = "Ben.Demystifier"; + version = "0.1.6"; + sha256 = "03rk7imb2k3iass507rkr9chdnyk4h8ppyf20cdz3c2m3v1a5k9n"; + }) + + (fetchNuGet { + name = "Castle.Core"; + version = "4.4.0"; + sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; + }) + + (fetchNuGet { + name = "FluentAssertions"; + version = "5.9.0"; + sha256 = "11mpnl6aar2yn7l6b1k4m3rdnl82ydmqbsja4rn84dhz1qdzfp8x"; + }) + + (fetchNuGet { + name = "LiteDB"; + version = "4.1.4"; + sha256 = "1g9258mv3jm9ps2s5wcxbmszh9nqiiw3d9nrfqis8x72jqiqi6js"; + }) + + (fetchNuGet { + name = "MSTest.TestAdapter"; + version = "2.1.0"; + sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; + }) + + (fetchNuGet { + name = "MSTest.TestFramework"; + version = "2.1.0"; + sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; + }) + + (fetchNuGet { + name = "MessagePack"; + version = "2.1.90"; + sha256 = "1j5wjl7aq7nn5ga3j6zaaivdf2wlfyd7w66ak0i7krgrmv26lb8i"; + }) + + (fetchNuGet { + name = "MessagePack.Annotations"; + version = "2.1.90"; + sha256 = "08sghhwbz8h7ji9lg0klhwcyndxg6v11pq9jac975sb38samnm11"; + }) + + (fetchNuGet { + name = "MicroBuild.Core"; + version = "0.3.0"; + sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Ref"; + version = "3.0.1"; + sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.0.2"; + sha256 = "0d4r744n3bk4v7ddfjpy5ils150h0693bil3c7v27n84037hqndj"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.0.3"; + sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.2"; + sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + }) + + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.3"; + sha256 = "0kvnzb9xjii48kg30ac63qdf0fn1y8j3nblbrfaqv2aiy6kp0iwn"; + }) + + (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "1.0.0"; + sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; + }) + + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + + (fetchNuGet { + name = "Microsoft.CodeCoverage"; + version = "16.5.0"; + sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; + }) + + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "3.1.2"; + sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; + }) + + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.5.0"; + sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.1"; + sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.0"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Host.linux-x64"; + version = "3.0.2"; + sha256 = "0y14y2x3wbi44i23ndmf4323cii8wrqw9s289gcab3s393l71sf5"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Host.linux-x64"; + version = "3.0.3"; + sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Host.linux-x64"; + version = "3.1.3"; + sha256 = "013ibnhsimgqj5l2dqma035xvsvrb47bn65z6xbxgg88383hpgvw"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Ref"; + version = "3.0.0"; + sha256 = "1qi382157ln7yngazvr3nskpjkab4x8sqx11l13xyg56vyyjyyiw"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Ref"; + version = "3.1.0"; + sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.0.2"; + sha256 = "1h6d0nl495k0bh4my43l578l7m8qwah7ll42aax7jrib2py354f1"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.0.3"; + sha256 = "1ykgfnphbkyck0gqbbh5n96w59z2bq47g896ygal1j4nblj3s44v"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.1.2"; + sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + }) + + (fetchNuGet { + name = "Microsoft.NetCore.App.Runtime.linux-x64"; + version = "3.1.3"; + sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9"; + }) + + (fetchNuGet { + name = "Microsoft.TestPlatform.ObjectModel"; + version = "16.5.0"; + sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; + }) + + (fetchNuGet { + name = "Microsoft.TestPlatform.TestHost"; + version = "16.5.0"; + sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Threading"; + version = "16.4.33"; + sha256 = "09djx2xz22w48csd0bkpwi1rgpjpaj3mml16wfy8jlsnc66swmnh"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Threading"; + version = "16.4.45"; + sha256 = "16p61kxsnwanp3nac0gkarl7a94c02qyqjzdkijl5va9k3fa97m6"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Threading.Analyzers"; + version = "16.4.45"; + sha256 = "12m0f037pz3ynm69810p4c96nrlnqihx6w4qyrs0kqsxiajf16jc"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Validation"; + version = "15.3.15"; + sha256 = "1v3r2rlichlvxjrmj1grii1blnl9lp9npg2p6q3q4j6lamskxa9r"; + }) + + (fetchNuGet { + name = "Microsoft.VisualStudio.Validation"; + version = "15.5.31"; + sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; + }) + + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }) + + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.5.0"; + sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; + }) + + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + }) + + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.1"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }) + + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.3"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }) + + (fetchNuGet { + name = "NSubstitute"; + version = "4.2.1"; + sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + }) + + (fetchNuGet { + name = "Nerdbank.Streams"; + version = "2.4.60"; + sha256 = "01554nbs6dj4fjd59b95kaw84j27kfb5y5ixjbl23nh62kpgrd3r"; + }) + + (fetchNuGet { + name = "NewtonSoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.3"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }) + + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "9.0.1"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }) + + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "5.0.0"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }) + + (fetchNuGet { + name = "StreamJsonRpc"; + version = "2.3.103"; + sha256 = "0z8ahxkbbrzsn56ylzlciriiid4bslf6y1rk49wzahwpvzlik1iw"; + }) + + (fetchNuGet { + name = "System.AppContext"; + version = "4.3.0"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }) + + (fetchNuGet { + name = "System.Buffers"; + version = "4.3.0"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }) + + (fetchNuGet { + name = "System.Buffers"; + version = "4.5.0"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }) + + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.3.0"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }) + + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.5.0"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }) + + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + + (fetchNuGet { + name = "System.Configuration.ConfigurationManager"; + version = "4.4.0"; + sha256 = "1hjgmz47v5229cbzd2pwz2h0dkq78lb2wp9grx8qr72pb5i0dk7v"; + }) + + (fetchNuGet { + name = "System.Console"; + version = "4.3.0"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.3.0"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }) + + (fetchNuGet { + name = "System.Diagnostics.TextWriterTraceListener"; + version = "4.3.0"; + sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; + }) + + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + + (fetchNuGet { + name = "System.Diagnostics.TraceSource"; + version = "4.3.0"; + sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; + }) + + (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.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }) + + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.3.0"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }) + + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.3.0"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }) + + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.5.3"; + sha256 = "1z44vn1qp866lkx78cfqdd4vs7xn1hcfn7in6239sq2kgf5qiafb"; + }) + + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.6.0"; + sha256 = "0r9ygjbxpyi6jgb67qnpbp42b7yvvhgmcjxnb50k3lb416claavh"; + }) + + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + + (fetchNuGet { + name = "System.Linq"; + 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.Memory"; + version = "4.5.3"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }) + + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.0"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }) + + (fetchNuGet { + name = "System.Net.Http"; + version = "4.3.4"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }) + + (fetchNuGet { + name = "System.Net.NameResolution"; + version = "4.3.0"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }) + + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }) + + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.3.0"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }) + + (fetchNuGet { + name = "System.Net.WebSockets"; + version = "4.3.0"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }) + + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + + (fetchNuGet { + name = "System.Private.Uri"; + version = "4.3.0"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }) + + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + + (fetchNuGet { + name = "System.Reflection"; + 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"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit"; + 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.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + 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"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.6.0"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }) + + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + + (fetchNuGet { + name = "System.Reflection.Primitives"; + 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"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.2"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }) + + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) + + (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 = "4.5.0"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }) + + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.3.0"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.3.0"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.3.0"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.3.0"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.3.0"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.ProtectedData"; + version = "4.4.0"; + sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; + }) + + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.3.0"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }) + + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.3.0"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }) + + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.5.0"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }) + + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }) + + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks.Dataflow"; + version = "4.9.0"; + sha256 = "1g6s9pjg4z8iy98df60y9a01imdqy59zd767vz74rrng78jl2dk5"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.3.0"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }) + + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.3.0"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }) + + (fetchNuGet { + name = "System.ValueTuple"; + version = "4.5.0"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; + }) + + (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"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.3.0"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }) + + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.3.0"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.3.0"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) + + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.3.0"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }) + + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }) + + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }) + + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.3.0"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }) + + (fetchNuGet { + name = "runtime.any.System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }) + + (fetchNuGet { + name = "runtime.any.System.Threading.Timer"; + version = "4.3.0"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }) + + (fetchNuGet { + name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }) + + (fetchNuGet { + name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }) + + (fetchNuGet { + name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; + }) + + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) + + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.3.0"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }) + + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.3.0"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }) + + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }) + + (fetchNuGet { + name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }) + + (fetchNuGet { + name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + version = "4.3.0"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }) + + (fetchNuGet { + name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }) + + (fetchNuGet { + name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.0"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }) + + (fetchNuGet { + name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + version = "4.3.2"; + sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; + }) + + (fetchNuGet { + name = "runtime.unix.Microsoft.Win32.Primitives"; + version = "4.3.0"; + sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Console"; + version = "4.3.0"; + sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; + }) + + (fetchNuGet { + name = "runtime.unix.System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Primitives"; + version = "4.3.0"; + sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Net.Sockets"; + version = "4.3.0"; + sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.3.0"; + sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; + }) + + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; + }) + +] diff --git a/pkgs/development/dotnet-modules/python-language-server/format-deps.sh b/pkgs/development/dotnet-modules/python-language-server/format-deps.sh new file mode 100755 index 00000000000..c2115edb18a --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/format-deps.sh @@ -0,0 +1,40 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p gawk nix -i bash + +# Retrieve sha256 hashes for each dependency in and format fetchNuGet calls +echo "" > deps.nix +urlbase="https://www.nuget.org/api/v2/package" +cat << EOL +# This file is autogenerated. +# To regenerate, run "create_deps.sh \$PATH_TO_LANGUAGE_SERVER_CHECKOUT" + +{ fetchurl }: let + + fetchNuGet = { name, version, sha256 }: fetchurl { + inherit sha256; + url = "$urlbase/\${name}/\${version}"; + }; + +in [ +EOL +IFS='' +while read line; do + name=$(echo $line | awk '{print $1}') + version=$(echo $line | awk '{print $2}') + sha256=$(nix-prefetch-url "$urlbase/$name/$version" 2>/dev/null) + + if [ -n "$sha256" ]; then + cat << EOL + + (fetchNuGet { + name = "$name"; + version = "$version"; + sha256 = "$sha256"; + }) +EOL + fi +done < $1 +cat << EOL + +] +EOL diff --git a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt new file mode 100644 index 00000000000..169ddfbb7b5 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -0,0 +1,14 @@ +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.3 +Microsoft.AspNetCore.App.Ref 3.0.1 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.2 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.3 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.2 +Microsoft.NetCore.App.Ref 3.1.0 +Microsoft.NetCore.App.Ref 3.0.0 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.3 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.2 +Microsoft.NetCore.App.Runtime.linux-x64 3.0.2 +Microsoft.NetCore.App.Runtime.linux-x64 3.0.3 +Microsoft.NetCore.App.Host.linux-x64 3.1.3 +Microsoft.NetCore.App.Host.linux-x64 3.0.2 +Microsoft.NetCore.App.Host.linux-x64 3.0.3 diff --git a/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py b/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py new file mode 100755 index 00000000000..d67bdf048c8 --- /dev/null +++ b/pkgs/development/dotnet-modules/python-language-server/process_lockfile.py @@ -0,0 +1,37 @@ +#!/usr/bin/python + +import json +import sys + + +def process_section(name, section): + packages = set() + + if "resolved" in section: + packages.add((name, section["resolved"])) + + if "dependencies" in section: + for name in section["dependencies"]: + packages.add((name, section["dependencies"][name])) + + return packages + + +def main(): + with open(sys.argv[1], 'r') as f: + tree = json.loads(f.read()) + + packages = set() + + topDependencies = tree["dependencies"] + + for area in topDependencies: + for name in topDependencies[area]: + packages = packages.union(process_section(name, topDependencies[area][name])) + + for (name, version) in packages: + print("%s %s" % (name, version)) + + +if __name__ == "__main__": + main() diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index b4ec8bd1706..54d1c743bee 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -203,15 +203,15 @@ let installPhase = args.installPhase or '' runHook preInstall - mkdir -p $bin + mkdir -p $out dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $bin + [ -e "$dir" ] && cp -r $dir $out runHook postInstall ''; preFixup = preFixup + '' - find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; strictDeps = true; @@ -235,9 +235,6 @@ let enableParallelBuilding = enableParallelBuilding; - # I prefer to call this dev but propagatedBuildInputs expects $out to exist - outputs = args.outputs or [ "bin" "out" ]; - meta = { # Add default meta information homepage = "https://${goPackagePath}"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b14c26c6947..55934862c94 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -71,7 +71,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1jjw6ar8ddcncwzksyx2xky50sm2jg1zjr7iiqk0vn8qq0fn2gwy"; + sha256 = "0adw72lw3ygls87w6i7hirf26gz991dkm992jb5f0h5nvy6d44pl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -333,6 +333,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; network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; @@ -371,7 +372,7 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; - tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) + tar = dontCheck super.tar; #https://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; @@ -1488,4 +1489,30 @@ self: super: { selective = self.selective_0_4_1; }; + # Needed for ghcide + haskell-lsp_0_19_0_0 = super.haskell-lsp_0_19_0_0.override { + haskell-lsp-types = self.haskell-lsp-types_0_19_0_0; + }; + + # this will probably need to get updated with every ghcide update, + # we need an override because ghcide is tracking haskell-lsp closely. + ghcide = dontCheck (super.ghcide.override rec { + haskell-lsp-types = self.haskell-lsp-types_0_19_0_0; + haskell-lsp = self.haskell-lsp_0_19_0_0; + }); + + # stackage right now is not new enough for hlint-3.0 + ghc-lib-parser-ex_8_10_0_6 = super.ghc-lib-parser-ex_8_10_0_6.override { + ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; + }; + + hlint = super.hlint.override { + ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_6; + extra = self.extra_1_7_1; + filepattern = self.filepattern.override { + extra = self.extra_1_7_1; + }; + }; + } // 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 61919055eb0..9053d2d9e0d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -132,11 +132,13 @@ self: super: { url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch"; sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; }); - dbus = appendPatch super.dbus ./patches/fix-dbus-for-ghc-8.10.x.patch; - # https://github.com/ndmitchell/hlint/issues/959 - hlint = super.hlint.override { - ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser; - }; + # https://github.com/commercialhaskell/pantry/issues/21 + pantry = appendPatch super.pantry (pkgs.fetchpatch { + name = "add-cabal-3.2.x-support.patch"; + url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch"; + sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2"; + excludes = ["package.yaml"]; + }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ca05752930b..008a3b50291 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ 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 - # LTS Haskell 15.10 + # LTS Haskell 15.11 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -378,6 +378,8 @@ default-package-overrides: - can-i-haz ==0.3.1.0 - ca-province-codes ==1.0.0.0 - carray ==0.1.6.8 + - casa-client ==0.0.1 + - casa-types ==0.0.1 - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 - cases ==0.1.3.2 @@ -574,7 +576,7 @@ default-package-overrides: - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 - - dbus ==1.2.13 + - dbus ==1.2.14 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -664,7 +666,7 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - emacs-module ==0.1.1 - - email-validate ==2.3.2.12 + - email-validate ==2.3.2.13 - emojis ==0.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 @@ -897,6 +899,7 @@ default-package-overrides: - groups ==0.4.1.0 - guarded-allocation ==0.0.1 - hackage-db ==2.1.0 + - hackage-security ==0.6.0.1 - haddock-library ==1.8.0 - half ==0.3 - hamtsolo ==1.0.3 @@ -1073,7 +1076,7 @@ default-package-overrides: - hw-fingertree-strict ==0.1.2.0 - hw-hedgehog ==0.1.1.0 - hw-hspec-hedgehog ==0.1.1.0 - - hw-int ==0.0.1.0 + - hw-int ==0.0.2.0 - hw-ip ==2.4.2.0 - hw-json ==1.3.2.0 - hw-json-simd ==0.1.1.0 @@ -1116,7 +1119,7 @@ default-package-overrides: - incremental-parser ==0.4.0.1 - indents ==0.5.0.1 - indexed ==0.1.3 - - indexed-list-literals ==0.2.1.2 + - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 - infer-license ==0.2.0 - inflections ==0.4.0.5 @@ -1153,7 +1156,7 @@ default-package-overrides: - ip6addr ==1.0.1 - iproute ==1.7.9 - IPv6Addr ==1.1.3 - - ipynb ==0.1 + - ipynb ==0.1.0.1 - ipython-kernel ==0.10.1.0 - irc ==0.6.1.0 - irc-client ==1.1.1.1 @@ -1167,7 +1170,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jira-wiki-markup ==1.0.0 - - jose ==0.8.2.0 + - jose ==0.8.2.1 - jose-jwt ==0.8.0 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1196,7 +1199,7 @@ default-package-overrides: - kind-generics-th ==0.2.1.0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - - kubernetes-webhook-haskell ==0.2.0.0 + - kubernetes-webhook-haskell ==0.2.0.1 - l10n ==0.1.0.1 - labels ==0.3.3 - lackey ==1.0.12 @@ -1209,7 +1212,7 @@ default-package-overrides: - language-java ==0.2.9 - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 - - language-puppet ==1.4.6.2 + - language-puppet ==1.4.6.3 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.0.1 - lapack-ffi ==0.0.2 @@ -1276,6 +1279,7 @@ default-package-overrides: - lsp-test ==0.10.2.0 - lucid ==2.9.12 - lucid-extras ==0.2.2 + - lukko ==0.1.1.2 - lzma ==0.0.0.3 - lzma-conduit ==1.2.1 - machines ==0.7 @@ -1508,6 +1512,7 @@ default-package-overrides: - pandoc-plot ==0.2.2.0 - pandoc-pyplot ==2.3.0.1 - pandoc-types ==1.20 + - pantry ==0.4.0.1 - papillon ==0.1.1.1 - parallel ==3.2.2.0 - parallel-io ==0.3.3 @@ -1659,8 +1664,8 @@ default-package-overrides: - PyF ==0.9.0.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - - qrcode-core ==0.9.2 - - qrcode-juicypixels ==0.8.0 + - qrcode-core ==0.9.3 + - qrcode-juicypixels ==0.8.1 - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - QuickCheck ==2.13.2 @@ -1718,6 +1723,7 @@ default-package-overrides: - RefSerialize ==0.4.0 - regex ==1.1.0.0 - regex-applicative ==0.3.3.1 + - regex-applicative-text ==0.1.0.1 - regex-base ==0.94.0.0 - regex-compat ==0.95.2.0 - regex-compat-tdfa ==0.95.1.4 @@ -1751,7 +1757,7 @@ default-package-overrides: - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 - rigel-viz ==0.2.0.0 - - rio ==0.1.15.0 + - rio ==0.1.15.1 - rio-orphans ==0.1.1.0 - rio-prettyprint ==0.1.0.0 - roc-id ==0.1.0.0 @@ -1870,7 +1876,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5.1 - - simple-affine-space ==0.1 + - simple-affine-space ==0.1.1 - simple-cabal ==0.1.1 - simple-cmd ==0.2.1 - simple-cmd-args ==0.1.6 @@ -1962,6 +1968,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 + - string-interpolate ==0.2.0.3 - string-qq ==0.0.4 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 @@ -2006,7 +2013,7 @@ default-package-overrides: - tasty-dejafu ==2.0.0.1 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.2 - - tasty-golden ==2.3.3.1 + - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.0.2 - tasty-hspec ==1.1.5.1 - tasty-hunit ==0.10.0.2 @@ -2390,6 +2397,8 @@ extra-packages: - happy <1.19.6 # newer versions break Agda - happy == 1.19.9 # for purescript - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support + - haskell-lsp == 0.19.* # required for ghcide 0.1.0 + - haskell-lsp-types == 0.19.* # required for ghcide 0.1.0 - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle @@ -2693,6 +2702,7 @@ broken-packages: - activitypub - activitystreams-aeson - actor + - acts - Adaptive - Adaptive-Blaisorblade - adaptive-containers @@ -2784,6 +2794,7 @@ broken-packages: - amazon-emailer - amazon-emailer-client-snap - amazon-products + - amazonka-dynamodb - amby - AMI - ampersand @@ -2815,10 +2826,12 @@ broken-packages: - anticiv - antigate - antimirov + - antiope-dynamodb - antisplice - antlr-haskell - antlrc - anydbm + - aop-prelude - aosd - apart - apecs-stm @@ -2877,6 +2890,7 @@ broken-packages: - arguedit - ariadne - arion + - arithmetic-circuits - armada - armor - arpa @@ -2963,6 +2977,7 @@ broken-packages: - authenticate-ldap - authinfo-hs - authoring + - autoapply - AutoForms - autom - automata @@ -2976,6 +2991,7 @@ broken-packages: - avl-static - AvlTree - avr-shake + - avro-piper - avwx - awesome-prelude - awesomium @@ -3040,6 +3056,7 @@ broken-packages: - barrie - barrier - barrier-monad + - base-encoding - base-feature-macros - base-generics - base-io-access @@ -3144,6 +3161,7 @@ broken-packages: - bindings-libg15 - bindings-librrd - bindings-libstemmer + - bindings-libusb - bindings-libv4l2 - bindings-linux-videodev2 - bindings-monetdb-mapi @@ -3370,6 +3388,7 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir + - cabal-fmt - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps @@ -3403,6 +3422,7 @@ broken-packages: - cabin - cabocha - cached + - cacophony - cafeteria-prelude - caffegraph - cairo-core @@ -3503,6 +3523,7 @@ broken-packages: - cereal-time - certificate - cf + - cfenv - cfipu - cflp - cfopu @@ -3676,6 +3697,7 @@ broken-packages: - collections-api - collections-base-instances - colonnade + - Color - color-counter - colorless - colorless-http-client @@ -3936,6 +3958,7 @@ broken-packages: - cspmchecker - cspretty - css + - css-selectors - css-syntax - csv-enumerator - csv-nptools @@ -3956,6 +3979,7 @@ broken-packages: - curves - custom-prelude - CV + - cv-combinators - cypher - d-bus - d10 @@ -4124,6 +4148,7 @@ broken-packages: - demarcate - denominate - dense-int-set + - dependent-hashmap - dependent-monoidal-map - dependent-state - dependent-sum-aeson-orphans @@ -4163,6 +4188,7 @@ broken-packages: - dhall-yaml - dhcp-lease-parser - dhrun + - di-polysemy - dia-base - dia-functions - diagrams-boolean @@ -4200,6 +4226,7 @@ broken-packages: - DigitalOcean - digitalocean-kzs - digits + - digraph - dimensional-codata - dimensional-tf - DimensionalHash @@ -4404,6 +4431,7 @@ broken-packages: - effect-stack - effin - egison-quote + - egison-tutorial - ehaskell - ehs - eibd-client-simple @@ -4411,6 +4439,7 @@ broken-packages: - Eight-Ball-Pool-Hack-Cheats - either-unwrap - EitherT + - ejdb2-binding - ekg-bosun - ekg-carbon - ekg-elastic @@ -4581,6 +4610,7 @@ broken-packages: - extensible-data - extensible-effects-concurrent - extensible-skeleton + - extensions - external-sort - Extra - extract-dependencies @@ -4637,6 +4667,7 @@ broken-packages: - fca - fcache - fcd + - fcf-containers - fcg - fckeditor - fclabels-monadlib @@ -4708,6 +4739,7 @@ broken-packages: - findhttp - fingertree-psqueue - fingertree-tf + - finitary - finitary-derive - FiniteMap - firefly-example @@ -4822,6 +4854,7 @@ broken-packages: - fraction - frag - Frames-beam + - Frames-dsv - franchise - Frank - fraxl @@ -4905,6 +4938,7 @@ broken-packages: - funpat - funsat - funspection + - fused-effects-readline - fused-effects-squeal - fusion - fusion-plugin @@ -5013,6 +5047,7 @@ broken-packages: - ghc-dump-tree - ghc-dump-util - ghc-dup + - ghc-events-analyze - ghc-events-parallel - ghc-generic-instances - ghc-imported-from @@ -5039,7 +5074,6 @@ broken-packages: - ghci-lib - ghci-ng - ghci-pretty - - ghcide - ghcjs-dom-jsffi - ghcjs-fetch - ghcjs-hplay @@ -5081,6 +5115,7 @@ broken-packages: - git-remote-ipfs - git-repair - git-sanity + - git-vogue - gitdo - github-backup - github-data @@ -5368,6 +5403,7 @@ broken-packages: - hakyll-R - hakyll-series - hakyll-shortcode + - hakyll-shortcut-links - hakyll-typescript - hal - halberd @@ -5384,6 +5420,7 @@ broken-packages: - hamsql - hamtmap - hamusic + - hanabi-dealer - handa-gdata - handle-like - HandlerSocketClient @@ -5835,7 +5872,6 @@ broken-packages: - hichi - hid-examples - hidden-char - - hie-bios - hie-core - hieraclus - hierarchical-exceptions @@ -6001,6 +6037,7 @@ broken-packages: - hoovie - hopencc - hopencl + - HOpenCV - hOpenPGP - hopenpgp-tools - hopfield @@ -6097,6 +6134,7 @@ broken-packages: - hs-rs-notify - hs-scrape - hs-snowtify + - hs-speedscope - hs-twitter - hs-twitterarchiver - hs-vcard @@ -6331,7 +6369,16 @@ broken-packages: - huzzy - hvega-theme - hVOIDP + - hw-all - hw-ci-assist + - hw-dsv + - hw-json + - hw-json-lens + - hw-json-simd + - hw-json-simple-cursor + - hw-json-standard-cursor + - hw-kafka-avro + - hw-simd - hwall-auth-iitk - hweblib - hwhile @@ -6415,9 +6462,20 @@ broken-packages: - ignore - igraph - igrf + - ihaskell + - ihaskell-aeson - ihaskell-basic + - ihaskell-blaze + - ihaskell-charts + - ihaskell-diagrams - ihaskell-display + - ihaskell-gnuplot + - ihaskell-graphviz + - ihaskell-hatex + - ihaskell-hvega - ihaskell-inline-r + - ihaskell-juicypixels + - ihaskell-magic - ihaskell-parsec - ihaskell-plot - ihaskell-rlangqq @@ -6655,6 +6713,7 @@ broken-packages: - json-rpc-client - json-schema - json-sop + - json-syntax - json-togo - json-tokens - json-tracer @@ -6874,6 +6933,9 @@ broken-packages: - language-vhdl - language-webidl - lapack + - lapack-carray + - lapack-comfort-array + - lapack-ffi - large-hashable - Lastik - lat @@ -6902,6 +6964,7 @@ broken-packages: - lda - ldap-client - ldapply + - LDAPv3 - ldif - leaf - leaky @@ -6976,6 +7039,7 @@ broken-packages: - libxslt - licensor - lie + - life-sync - lifted-base-tf - lifted-protolude - lifted-stm @@ -7048,6 +7112,8 @@ broken-packages: - liszt - lit - literals + - LiterateMarkdown + - little-logger - live-sequencer - ll-picosat - llsd @@ -7141,6 +7207,7 @@ broken-packages: - lsystem - ltext - ltk + - LTS - lua-bc - luachunk - luautils @@ -7164,6 +7231,7 @@ broken-packages: - lz4-conduit - lzma-enumerator - lzma-streams + - lzo - maam - mac - macaroon-shop @@ -7242,6 +7310,9 @@ broken-packages: - marxup - masakazu-bot - MASMGen + - massiv + - massiv-io + - massiv-test - master-plan - matchable - matchable-th @@ -7254,6 +7325,7 @@ broken-packages: - mathlink - matrix-as-xyz - matrix-market + - matrix-sized - matsuri - maude - maxent @@ -7335,6 +7407,7 @@ broken-packages: - miconix-test - micro-recursion-schemes - microaeson + - microbase - microformats2-parser - microformats2-types - microgroove @@ -7516,8 +7589,10 @@ broken-packages: - ms - msgpack - msgpack-aeson + - msgpack-binary - msgpack-idl - msgpack-rpc + - msgpack-rpc-conduit - msh - msi-kb-backlit - MSQueue @@ -7529,9 +7604,11 @@ broken-packages: - mtl-tf - mtlx - mtp + - mu-avro - mu-grpc-client - mu-grpc-common - mu-grpc-server + - mu-kafka - mu-protobuf - MuCheck - MuCheck-Hspec @@ -7749,6 +7826,7 @@ broken-packages: - nix-deploy - nix-eval - nix-freeze-tree + - nix-narinfo - nix-tools - nixfromnpm - nixpkgs-update @@ -7823,12 +7901,14 @@ broken-packages: - ObjectIO - objective - ocaml-export + - ochan - octane - octohat - octopus - Octree - oculus - odbc + - odd-jobs - OddWord - oden-go-packages - oeis2 @@ -7868,6 +7948,7 @@ broken-packages: - OpenAFP - OpenAFP-Utils - openapi-petstore + - openapi-typed - opench-meteo - OpenCL - OpenCLRaw @@ -7876,10 +7957,12 @@ broken-packages: - opendatatable - OpenGLCheck - opengles + - openid-connect - OpenSCAD - opensoundcontrol-ht - openssh-github-keys - openssh-protocol + - opentelemetry-extra - opentelemetry-http-client - opentelemetry-lightstep - opentelemetry-wai @@ -7914,6 +7997,7 @@ broken-packages: - orders - Ordinary - ordrea + - oref - organize-imports - orgmode - origami @@ -7933,6 +8017,7 @@ broken-packages: - otp-authenticator - ottparse-pretty - overload + - overloaded - overloaded-records - overture - pack @@ -8231,6 +8316,7 @@ broken-packages: - plugins-multistage - plur - plural + - plzwrk - png-file - pngload - pngload-fixed @@ -8333,6 +8419,7 @@ broken-packages: - prelude-plus - preprocess-haskell - preprocessor + - preql - presburger - present - press @@ -8344,6 +8431,7 @@ broken-packages: - prettyprinter-graphviz - prettyprinter-vty - preview + - prim - prim-array - prim-ref - primes-type @@ -8721,7 +8809,6 @@ broken-packages: - relation - relational-postgresql8 - relative-date - - releaser - relevant-time - reload - remark @@ -8845,6 +8932,8 @@ broken-packages: - robots-txt - roc-cluster - roc-cluster-demo + - rock + - rocksdb-query - roku-api - rollbar - rollbar-hs @@ -8965,7 +9054,10 @@ broken-packages: - scgi - schedevr - schedule-planner + - scheduler - schedyield + - schema + - schemas - schematic - scholdoc - scholdoc-citeproc @@ -8974,6 +9066,7 @@ broken-packages: - sci-ratio - SciBaseTypes - scidb-hquery + - scientific-notation - SciFlow - SciFlow-drmaa - scion @@ -9184,6 +9277,7 @@ broken-packages: - shivers-cfg - shoap - shopify + - shortcut-links - shorten-strings - ShortestPathProblems - show-prettyprint @@ -9302,9 +9396,11 @@ broken-packages: - smsaero - smt-lib - SmtLib + - smtlib2 - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck + - smtlib2-timing - smtp-mail-ng - SMTPClient - smtps-gmail @@ -9552,12 +9648,14 @@ broken-packages: - stern-brocot - stgi - STL + - STLinkUSB - stm-chunked-queues - stm-containers - stm-firehose - stm-hamt - stm-promise - stm-stats + - STM32-Zombie - stmcontrol - stochastic - StockholmAlignment @@ -9785,9 +9883,12 @@ broken-packages: - telegram-api - telegram-bot - telegram-bot-simple + - telegram-raw-api + - telegram-types - teleport - teleshell - tellbot + - tempi - template-default - template-haskell-util - template-hsml @@ -9799,6 +9900,10 @@ broken-packages: - tempus - tensor - tensor-safe + - tensorflow + - tensorflow-core-ops + - tensorflow-logging + - tensorflow-ops - termbox - termbox-banana - termbox-bindings @@ -10078,6 +10183,7 @@ broken-packages: - turingMachine - turtle-options - tweak + - tweet-hs - twentefp-eventloop-graphics - twentefp-eventloop-trees - twentefp-graphs @@ -10130,6 +10236,7 @@ broken-packages: - type-tree - typeable-th - TypeClass + - typed-encoding - typed-streams - typed-wire - typedflow @@ -10242,6 +10349,7 @@ broken-packages: - urn - urn-random - urxml + - usb - usb-enumerator - usb-hid - usb-id-database @@ -10360,6 +10468,7 @@ broken-packages: - visual-graphrewrite - visual-prof - visualize-cbn + - vitrea - vivid - vivid-osc - vivid-supercollider @@ -10542,6 +10651,7 @@ broken-packages: - wraxml - wrecker - wrecker-ui + - wreq-patchable - wreq-sb - wright - writer-cps-full @@ -10552,6 +10662,7 @@ broken-packages: - wsdl - wsedit - wshterm + - wstunnel - wtk - wtk-gtk - wu-wei @@ -10852,3 +10963,5 @@ broken-packages: - ztar - zuramaru - Zwaluw + - zxcvbn-dvorak + - zxcvbn-hs diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 78e44a5ec87..e05f82bf04d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -727,4 +727,7 @@ self: super: builtins.intersectAttrs super { --prefix PATH : "${path}" ''; }); + + # Tests access homeless-shelter. + hie-bios = dontCheck super.hie-bios; } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index ac22f903c9b..49cbe02b71e 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -48,12 +48,8 @@ in , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false , license -# We cannot enable -j<n> parallelism for libraries because GHC is far more -# likely to generate a non-determistic library ID in that case. Further -# details are at <https://github.com/peti/ghc-library-id-bug>. -# -# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449. -, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64) + # aarch64 sometimes crashes for -jn with n>1: https://ghc.haskell.org/trac/ghc/ticket/15449 +, enableParallelBuilding ? !stdenv.buildPlatform.isAarch64 , maintainers ? [] , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) @@ -82,7 +78,7 @@ in # same package in the (recursive) dependencies of the package being # built. Will delay failures, if any, to compile time. allowInconsistentDependencies ? false -, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 +, maxBuildCores ? 16 # more cores usually don't improve performance: https://ghc.haskell.org/trac/ghc/ticket/9221 , # If set to true, this builds a pre-linked .o file for this Haskell library. # This can make it slightly faster to load this library into GHCi, but takes # extra disk space and compile time. @@ -181,6 +177,8 @@ let (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm") ]; + parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS"; + crossCabalFlagsString = stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); @@ -199,7 +197,7 @@ let "--package-db=$packageConfDir" (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") - (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") + (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") (enableFeature (enableDeadCodeElimination && !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") @@ -227,9 +225,9 @@ let setupCompileFlags = [ (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir") - (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") - # https://github.com/haskell/cabal/issues/2398 - (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") + (optionalString enableParallelBuilding (parallelBuildingFlags)) + "-threaded" # https://github.com/haskell/cabal/issues/2398 + "-rtsopts" # allow us to pass RTS flags to the generated Setup executable ]; isHaskellPkg = x: x ? isHaskellLibrary; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f3b7392e1d7..4fe3aac0121 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3328,6 +3328,8 @@ self: { benchmarkHaskellDepends = [ base colour criterion deepseq random ]; description = "Color spaces and conversions between them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Combinatorrent" = callPackage @@ -3439,25 +3441,6 @@ self: { broken = true; }) {}; - "ConcurrentUtils" = callPackage - ({ mkDerivation, array, arrows, base, containers, hashable - , hashtables, list-extras, monad-loops, MonadRandom, monads-tf - , parallel, stm, strict, tagged, ttrie - }: - mkDerivation { - pname = "ConcurrentUtils"; - version = "0.4.5.0"; - sha256 = "1kf5g4d8q28hs4wfd0fvc7k1bfir40z7rzx3lxflci36inr1d6dc"; - libraryHaskellDepends = [ - array arrows base containers hashable hashtables list-extras - monad-loops MonadRandom monads-tf parallel stm strict tagged ttrie - ]; - description = "Concurrent utilities"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - "Concurrential" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -6354,8 +6337,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.6.3"; - sha256 = "1iqzsx33312m75bprp9i9dr11f9dpa8x02296vgmjskmcblh9as5"; + version = "0.6.4"; + sha256 = "1z1bv3dqna9gp6k2rjnbl54hxkaxl4khdlfy52r0cv51ah8969ri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6414,6 +6397,8 @@ self: { testHaskellDepends = [ base Frames hspec pipes ]; description = "Alternative CSV parser for the Frames package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Frames-map-reduce" = callPackage @@ -7199,8 +7184,8 @@ self: { ({ mkDerivation, base, mtl, split, threepenny-gui }: mkDerivation { pname = "Gleam"; - version = "0.1.0.2"; - sha256 = "0n0svc0lq6lgas834y8jfsqygb6qwjwhsrgxz8b7hypiqg3xjbhv"; + version = "0.1.1.0"; + sha256 = "08nabgn7v0rw4aihbihbijqgajrvyc7z7nl67jmka39fh5zm6blm"; libraryHaskellDepends = [ base mtl split threepenny-gui ]; description = "HTML Canvas graphics, animations and simulations"; license = stdenv.lib.licenses.bsd3; @@ -8823,6 +8808,8 @@ self: { executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) opencv;}; "HPDF" = callPackage @@ -12052,6 +12039,8 @@ self: { ]; description = "Lightweight Directory Access Protocol (LDAP) version 3"; license = stdenv.lib.licenses.gpl2Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LParse" = callPackage @@ -12097,6 +12086,8 @@ self: { benchmarkHaskellDepends = [ base criterion time ]; description = "LTS: Labelled Transition System"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "LTree" = callPackage @@ -12679,6 +12670,8 @@ self: { doHaddock = false; description = "Converter to convert from .lhs to .md and vice versa."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "Logic" = callPackage @@ -17512,6 +17505,8 @@ self: { ]; description = "STLink USB interface in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "STM32-Zombie" = callPackage @@ -17528,6 +17523,8 @@ self: { ]; description = "control a STM32F103 microcontroller"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "STM32F103xx-SVD" = callPackage @@ -20296,15 +20293,13 @@ self: { }) {}; "VulkanMemoryAllocator" = callPackage - ({ mkDerivation, base, bytestring, transformers, vector - , vector-sized, vulkan - }: + ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.1.0.0"; - sha256 = "137wzl15g4arhc8c00xnypqn7xpsban6fbyjpw204qg35p8y93qn"; + version = "0.3"; + sha256 = "1b16vbhml17knx2jk22dqv3hjq98p23g9vmqnd4c0igw76ih46nb"; libraryHaskellDepends = [ - base bytestring transformers vector vector-sized vulkan + base bytestring transformers vector vulkan ]; description = "Bindings to the VulkanMemoryAllocator library"; license = stdenv.lib.licenses.bsd3; @@ -23201,6 +23196,8 @@ self: { doHaddock = false; description = "Semigroup actions and torsors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ad" = callPackage @@ -26838,6 +26835,8 @@ self: { ]; description = "Amazon DynamoDB SDK"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "amazonka-dynamodb-dax" = callPackage @@ -29431,6 +29430,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-dynamodb_7_5_1" = callPackage @@ -29454,6 +29455,7 @@ self: { description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "antiope-es" = callPackage @@ -29862,6 +29864,8 @@ self: { testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "aos-signature" = callPackage @@ -31811,6 +31815,8 @@ self: { ]; description = "Arithmetic circuits for zkSNARKs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "arithmoi" = callPackage @@ -32321,21 +32327,20 @@ self: { }) {}; "ascii" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , hashable, semigroups, text + ({ mkDerivation, ascii-case, ascii-char, ascii-group + , ascii-predicates, ascii-superset, ascii-th, base, bytestring + , data-ascii, text }: mkDerivation { pname = "ascii"; - version = "0.0.5.2"; - sha256 = "1kbf6iml4nvkzf78xqvxy67469vznd05ig8aprq7zx5vr9njliby"; - revision = "1"; - editedCabalFile = "0d04wmgahgbgi6y6p8887xs6bxcjdwjhkrrprahylw5y9b95fxi8"; + version = "1.0.0.0"; + sha256 = "0sgn93l08fgaxqgfpxmymqfqh5697cx6765yifpzdr7ayxfpf8b2"; libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive hashable semigroups - text + ascii-case ascii-char ascii-group ascii-predicates ascii-superset + ascii-th base bytestring data-ascii text ]; - description = "Type-safe, bytestring-based ASCII values"; - license = stdenv.lib.licenses.bsd3; + description = "The ASCII character set and encoding"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -32355,6 +32360,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ascii-case" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-case"; + version = "1.0.0.0"; + sha256 = "10j65n9pdm5gxq0bsp06s1k7n4357kyw4xjy0mzncp9d81mbz9w4"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII letter case"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "ascii-char" = callPackage + ({ mkDerivation, base, hashable }: + mkDerivation { + pname = "ascii-char"; + version = "1.0.0.0"; + sha256 = "1y50m20np2id71lvfl3z9ysh5qblcajgqcl5gi1ggg7wvg2r4r97"; + libraryHaskellDepends = [ base hashable ]; + description = "A Char type representing an ASCII character"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-cows" = callPackage ({ mkDerivation, base, random-extras, random-fu, text }: mkDerivation { @@ -32382,6 +32409,17 @@ self: { broken = true; }) {}; + "ascii-group" = callPackage + ({ mkDerivation, ascii-char, base, hashable }: + mkDerivation { + pname = "ascii-group"; + version = "1.0.0.0"; + sha256 = "0a6sx8hxjwzhbd7cz74k3zqw4vr8ykim1ds95zp7rl646mhlv4bk"; + libraryHaskellDepends = [ ascii-char base hashable ]; + description = "ASCII character groups"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-holidays" = callPackage ({ mkDerivation, base, random, random-shuffle, terminfo, time }: mkDerivation { @@ -32397,6 +32435,17 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "ascii-predicates" = callPackage + ({ mkDerivation, ascii-char, base }: + mkDerivation { + pname = "ascii-predicates"; + version = "1.0.0.0"; + sha256 = "1d44m97nqvfzxgxk2l7ch1693kccbx91fbg2hspfmkk3kyq16vk0"; + libraryHaskellDepends = [ ascii-char base ]; + description = "Various categorizations of ASCII characters"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-progress" = callPackage ({ mkDerivation, async, base, concurrent-output, data-default , hspec, QuickCheck, time @@ -32441,6 +32490,19 @@ self: { broken = true; }) {}; + "ascii-superset" = callPackage + ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: + mkDerivation { + pname = "ascii-superset"; + version = "1.0.0.0"; + sha256 = "0cpva5r2bxrbkqg1mifp3gcz01hnzlylyc9gqxcms4xxvi3sj22q"; + libraryHaskellDepends = [ + ascii-char base bytestring hashable text + ]; + description = "Representing ASCII with refined supersets"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-table" = callPackage ({ mkDerivation, aeson, base, containers, dlist, hashable, text , unordered-containers, vector, wl-pprint-extras @@ -32459,6 +32521,20 @@ self: { broken = true; }) {}; + "ascii-th" = callPackage + ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell + }: + mkDerivation { + pname = "ascii-th"; + version = "1.0.0.0"; + sha256 = "1wh9zssgjrxd7z8wg5p0h3advbmc0v9p8lwjhra2c6860xzli9an"; + libraryHaskellDepends = [ + ascii-char ascii-superset base template-haskell + ]; + description = "Template Haskell support for ASCII"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascii-vector-avc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq , deepseq-generics, HUnit, split, zlib @@ -34483,8 +34559,8 @@ self: { }: mkDerivation { pname = "autoapply"; - version = "0.2.0.0"; - sha256 = "0dcndh1rjxyx7889d8n52hngariq6lnidwpjxyhsxd30xb4lwij2"; + version = "0.4"; + sha256 = "0b7la51399kcj9a4z9j49xd9v2zs172vygs3djz5qid7fsl37pgm"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base logict mtl template-haskell th-desugar transformers @@ -34493,6 +34569,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Template Haskell to automatically pass values to functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "autoexporter" = callPackage @@ -34961,6 +35039,8 @@ self: { ]; description = "Tool for decoding avro"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "avwx" = callPackage @@ -36617,12 +36697,12 @@ self: { broken = true; }) {}; - "base_4_12_0_0" = callPackage + "base_4_14_0_0" = callPackage ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }: mkDerivation { pname = "base"; - version = "4.12.0.0"; - sha256 = "0ka18cvw1cjvjdd20n03rjmxfm10083mh19wxwz1f1kqiyc92g3w"; + version = "4.14.0.0"; + sha256 = "108bg791pplf1mlc6x95jza6hq28yc5s8a8vv8fxvn33vwm058an"; libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; @@ -36685,6 +36765,8 @@ self: { ]; description = "Binary-to-text encodings (e.g. base64)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "base-feature-macros" = callPackage @@ -39515,8 +39597,8 @@ self: { ({ mkDerivation, base, binaryen }: mkDerivation { pname = "binaryen"; - version = "0.0.1.0"; - sha256 = "01fiq7q9iw6lipvwpr7bfsqw337ncxagd04g62h8qgvlgysh7vvh"; + version = "0.0.1.1"; + sha256 = "059j67lq63nzyivsmkwblsmbw8f3x079bng9cb174snp8yra8v8k"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ binaryen ]; description = "Haskell bindings to binaryen"; @@ -40055,6 +40137,8 @@ self: { libraryPkgconfigDepends = [ libusb ]; description = "Low level bindings to libusb"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libusb = null;}; "bindings-libv4l2" = callPackage @@ -46933,6 +47017,8 @@ self: { doHaddock = false; description = "Format .cabal files"; license = "GPL-3.0-or-later AND BSD-3-Clause"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cabal-ghc-dynflags" = callPackage @@ -46987,17 +47073,14 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-plan, clock - , containers, directory, filepath, ghc, ghc-paths, mtl, pretty-show - , process, semigroupoids, semigroups, SHA, template-haskell - , temporary, text, time, transformers, unix, unix-compat - , utf8-string + , containers, directory, filepath, ghc, mtl, pretty-show, process + , semigroupoids, semigroups, SHA, template-haskell, temporary, text + , time, transformers, unix, unix-compat, utf8-string }: mkDerivation { pname = "cabal-helper"; - version = "1.0.0.0"; - sha256 = "1lgr2ys50vb8gsn0rwswjbyb4x87ylcfan9qr8qa7a64m6rs5wjl"; - revision = "1"; - editedCabalFile = "0r1lc3rih1n8y5byhls4daa5ka8x8aj4vfrwr8lm41m3l4l19mb9"; + version = "1.1.0.0"; + sha256 = "1f4s46l60s1lcdia7nv2r3y71z5c6pg6ljcc0601abl1aklx303p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47007,11 +47090,10 @@ self: { ]; testHaskellDepends = [ base bytestring Cabal cabal-plan clock containers directory - filepath ghc ghc-paths mtl pretty-show process semigroupoids - semigroups SHA template-haskell temporary text time transformers - unix unix-compat utf8-string + filepath ghc mtl pretty-show process semigroupoids semigroups SHA + template-haskell temporary text time transformers unix unix-compat + utf8-string ]; - doHaddock = false; doCheck = false; description = "Give Haskell development tools access to Cabal project environment"; license = stdenv.lib.licenses.asl20; @@ -48007,6 +48089,8 @@ self: { ]; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -48265,8 +48349,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.4.1"; - sha256 = "1acaqiaws9g65kiznqrgng0fxnlglanz44psl0syrpmw7jmvdwmq"; + version = "0.1.5.1"; + sha256 = "1bbdxhv5gl61qwf65gsrdc5zkwx2a1aar83l2ndmanayjbh6n8cs"; libraryHaskellDepends = [ aeson async base bytestring concurrent-extra containers data-default-class deepseq deque df1 di-polysemy exceptions fmt @@ -48842,8 +48926,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.5.0.0"; - sha256 = "1yzg8p07wjb3zhx3amg2azh06c0rxx2za2pc2dklbvslshnrimm8"; + version = "0.6.0.0"; + sha256 = "1w5cp3jp0dm8vf3zmkfpvpz7jl3pamlnxsl75ds3f4xxyx907qcg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48995,6 +49079,8 @@ self: { pname = "cardano-coin-selection"; version = "1.0.0"; sha256 = "0s0b2bbczsjq31h3xpyvingwpgpzgh3x2sw6bvryyn13wy717hbk"; + revision = "1"; + editedCabalFile = "1cdm1sq8qnna83lxr9s5jsaxwgzd2363fni3xyirldmxnn20j3l1"; libraryHaskellDepends = [ base bytestring containers cryptonite deepseq quiet text transformers @@ -50824,6 +50910,8 @@ self: { ]; description = "A library getting the environment when running on Cloud Foundry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cfipu" = callPackage @@ -51163,8 +51251,8 @@ self: { }: mkDerivation { pname = "character-cases"; - version = "0.1.0.3"; - sha256 = "05vpi3q44ywljkbxrcx9xqxsw86dxh2ipcsbfmn55d9vkl901hry"; + version = "0.1.0.4"; + sha256 = "0097d5p1q2l76jb1qm8zsqm7d3qfcr35v2ip0v52i1ri57b03iya"; libraryHaskellDepends = [ base containers here megaparsec prettyprinter template-haskell ]; @@ -55186,8 +55274,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.2"; - sha256 = "14yrymp96i0lljis3143vqk7bjy83xwdhk62vr8kv9lhv7z168s9"; + version = "0.1.3.3"; + sha256 = "0b4ihkghgzln8rz2czbmagcnzsi3gdsx99d29s74izbib4laxqqm"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -56170,6 +56258,18 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "colourista_0_1_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, text }: + mkDerivation { + pname = "colourista"; + version = "0.1.0.0"; + sha256 = "1iglvl6k8vrq45h5r8r2ng575dgg30jfw1zq19zld72914mmvjdz"; + libraryHaskellDepends = [ ansi-terminal base bytestring text ]; + description = "Convenient interface for printing colourful messages"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "coltrane" = callPackage ({ mkDerivation, base, bytestring, HTTP, http-types, HUnit, mtl , regex-compat, text, wai, wai-extra, warp @@ -60077,10 +60177,8 @@ self: { }: mkDerivation { pname = "consumers"; - version = "2.2.0.1"; - sha256 = "14gs07nl759qfnmi44pyhj24xqmd2xl3ikwhl8s5zykavdpjaimx"; - revision = "1"; - editedCabalFile = "1rh1hk1zr0yd82hsam8fjjs6jsssk49lvaasd3dqyx6d4nl1y63i"; + version = "2.2.0.2"; + sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -63251,8 +63349,8 @@ self: { }: mkDerivation { pname = "crypto-rng"; - version = "0.1.1.0"; - sha256 = "1h7pqps4f25sn28dhbs1jd58gl4ml9scc1s4dixbz8mvyv5aslkf"; + version = "0.1.2.0"; + sha256 = "0vmfxg5anp3bx8k84rmy3fs0z9h7aw8nhlv52z9js9k469xg9c6j"; libraryHaskellDepends = [ base bytestring crypto-api DRBG exceptions monad-control mtl transformers-base @@ -63959,6 +64057,8 @@ self: { ]; description = "Parsing, rendering and manipulating css selectors in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "css-syntax" = callPackage @@ -64911,6 +65011,8 @@ self: { ]; description = "Functional Combinators for Computer Vision"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cve" = callPackage @@ -65709,6 +65811,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-ascii" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , hashable, semigroups, text + }: + mkDerivation { + pname = "data-ascii"; + version = "1.0.0.0"; + sha256 = "1dlcfli1fggalxqg4hvdq3g5c1k1f60mwiyz7sha70sa3lp0pw88"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive hashable semigroups + text + ]; + description = "Type-safe, bytestring-based ASCII values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-aviary" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -68005,33 +68123,6 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.13"; - sha256 = "0v5f2n00v1lsfkjz2isgdx4sfyg2cf9ik0nda3j13xh749bgqh38"; - libraryHaskellDepends = [ - base bytestring cereal conduit containers deepseq exceptions - filepath lens network parsec random split template-haskell text - th-lift transformers unix vector xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring cereal containers directory extra filepath network - parsec process QuickCheck random resourcet tasty tasty-hunit - tasty-quickcheck text transformers unix vector - ]; - benchmarkHaskellDepends = [ base criterion ]; - doCheck = false; - description = "A client library for the D-Bus IPC system"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "dbus_1_2_14" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, containers - , criterion, deepseq, directory, exceptions, extra, filepath, lens - , network, parsec, process, QuickCheck, random, resourcet, split - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , th-lift, transformers, unix, vector, xml-conduit, xml-types - }: - mkDerivation { - pname = "dbus"; version = "1.2.14"; sha256 = "0w304j28vc90dmyz6zqsijjdjj2967grdc8f3zf5jiq50rzgmrr8"; libraryHaskellDepends = [ @@ -68048,7 +68139,6 @@ self: { doCheck = false; description = "A client library for the D-Bus IPC system"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-client" = callPackage @@ -69625,6 +69715,8 @@ self: { ]; description = "Dependent hash maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dependent-map" = callPackage @@ -71117,6 +71209,8 @@ self: { ]; description = "DI logger wrapped for Polysemy"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dia-base" = callPackage @@ -71633,6 +71727,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-solve_0_1_2" = callPackage + ({ mkDerivation, base, deepseq, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "diagrams-solve"; + version = "0.1.2"; + sha256 = "1qzycw3aj4107dqpgir3ak7pnja3a6i4ax15gd2q2fjzmp4p3z24"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base deepseq tasty tasty-hunit tasty-quickcheck + ]; + description = "Pure Haskell solver routines used by diagrams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, filepath, hashable @@ -71643,8 +71754,8 @@ self: { pname = "diagrams-svg"; version = "1.4.3"; sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8"; - revision = "1"; - editedCabalFile = "092kl3hnqlji71nxychw9v1sddxaim6ha00g1afi1ph2zm4f6s7c"; + revision = "2"; + editedCabalFile = "07149rnzc8787mwh0aac5hfg9f41dxgs5wc9yv60fmgk9h5qnw1n"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -71736,6 +71847,8 @@ self: { pname = "dib"; version = "0.7.2"; sha256 = "0r1hk45fdyhygmscnphl4n6dcs0rvgavhbg5si0aqsck4wsnql83"; + revision = "1"; + editedCabalFile = "08lhqgh1apzik4mrz0g0qwnpafgl3hm2cb49rwghzv1bf66wxq4n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72125,6 +72238,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "digest-sig" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "digest-sig"; + version = "0.1.0.0"; + sha256 = "1a855bhy9bs10lj5g38d0ivxc5068qpzi8w9nkc39zwaazaskgh9"; + revision = "1"; + editedCabalFile = "18ll6xlhsh588ryqhljz964i64vmlxx0ssr49k9m0yk5xrffajvf"; + libraryHaskellDepends = [ base bytestring ]; + doHaddock = false; + description = "Signature for digest"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "digestive-bootstrap" = callPackage ({ mkDerivation, base, blaze-bootstrap, blaze-html , digestive-functors, digestive-functors-blaze, http-types, text @@ -72386,6 +72513,8 @@ self: { testHaskellDepends = [ base fgl hashable massiv QuickCheck ]; description = "Directed Graphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "dihaa" = callPackage @@ -74503,8 +74632,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.37.1.0"; - sha256 = "16mbd89mpzcvyrzrn6sbwfnwsay2a9h0jn227py95r68pn2c2rn0"; + version = "0.39.0.0"; + sha256 = "0xxdlxz3hmrsp57p3zdxwbd0wz366x5d9mkfld3i0v4by80x1a1m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76801,8 +76930,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dwergaz"; - version = "0.2.0.3"; - sha256 = "080wwa3ffd8lb5ri324ijkpj8pd6nw7zscz23gc01m1hyavwpqip"; + version = "0.2.0.4"; + sha256 = "01gdh96p5nwca9g5sa0nrv65vaial3jqprngk67n9wxbj74pwr8f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "A minimal testing library"; @@ -77309,6 +77438,17 @@ self: { broken = true; }) {}; + "earcut" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "earcut"; + version = "0.1.0.1"; + sha256 = "0zinq40b549avzgw1s8dbhn7cjsbsg72smr6iaj5aap8cccx6mr7"; + libraryHaskellDepends = [ base vector ]; + description = "Binding to C++ earcut library"; + license = stdenv.lib.licenses.isc; + }) {}; + "ease" = callPackage ({ mkDerivation, base, data-default }: mkDerivation { @@ -78311,6 +78451,8 @@ self: { ]; description = "A tutorial program for the Egison programming language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "egyptian-fractions" = callPackage @@ -78477,14 +78619,14 @@ self: { "ejdb2-binding" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, ejdb2 - , libejdb2, tasty, tasty-hunit, unordered-containers, vector + , libejdb2, mtl, tasty, tasty-hunit, unordered-containers, vector }: mkDerivation { pname = "ejdb2-binding"; - version = "0.2.0.0"; - sha256 = "1lxyjnnwv3r05l8qc979kmrl9kk5h8mdx9ca4wx8r6plsn7b2a51"; + version = "0.3.0.0"; + sha256 = "06zqdnycpzpaymfnimz87v1rc5a8xlnr8mcd49a90ivza967vmmr"; libraryHaskellDepends = [ - aeson base bytestring unordered-containers + aeson base bytestring mtl unordered-containers ]; librarySystemDepends = [ ejdb2 ]; libraryPkgconfigDepends = [ libejdb2 ]; @@ -78493,6 +78635,8 @@ self: { ]; description = "Binding to EJDB2 C library, an embedded JSON noSQL database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {ejdb2 = null; libejdb2 = null;}; "ekg" = callPackage @@ -79687,8 +79831,8 @@ self: { }: mkDerivation { pname = "email-validate"; - version = "2.3.2.12"; - sha256 = "0ar3cfjia3x11chb7w60mi7hp5djanms883ddk875l6lifr2lyqf"; + version = "2.3.2.13"; + sha256 = "0wh955b9wwqwl8jbkzyxxaf8q9y80dbh0f6vaxxzh2cc7zqc31im"; libraryHaskellDepends = [ attoparsec base bytestring template-haskell ]; @@ -83901,6 +84045,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "extensions" = callPackage + ({ mkDerivation, base, bytestring, Cabal, colourista, containers + , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog + , optparse-applicative, parsec, text + }: + mkDerivation { + pname = "extensions"; + version = "0.0.0.0"; + sha256 = "0abvqqzcmfrwla3i7zx09wm74dw50s2rzhxnfs1gx4rs7c9rn4kb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory filepath ghc-boot-th + parsec text + ]; + executableHaskellDepends = [ + base colourista containers directory filepath optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring containers ghc-boot-th hedgehog hspec + hspec-hedgehog text + ]; + description = "Parse Haskell Language Extensions"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "external-sort" = callPackage ({ mkDerivation, base, binary, bytestring, EdisonAPI, EdisonCore }: mkDerivation { @@ -85344,6 +85517,8 @@ self: { testHaskellDepends = [ base doctest first-class-families Glob ]; description = "Data structures and algorithms for first-class-families"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fcg" = callPackage @@ -87168,25 +87343,29 @@ self: { }) {}; "finitary" = callPackage - ({ mkDerivation, base, bitvec, coercible-utils, finite-typelits - , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog - , monad-loops, primitive, template-haskell, typelits-witnesses + ({ mkDerivation, base, bitvec, finite-typelits + , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog, hspec + , hspec-hedgehog, primitive, template-haskell, typelits-witnesses , vector, vector-sized }: mkDerivation { pname = "finitary"; - version = "1.2.0.0"; - sha256 = "1r9knjg3vypzyvlawl5pysvsjv7vf6cadh8d5kqqj6xsk3qdnnp5"; + version = "2.0.0.0"; + sha256 = "19b0sm9lb5k459bhq51srx5rcdgk9rjhfha34a3kcsmlqam9fak7"; libraryHaskellDepends = [ - base bitvec coercible-utils finite-typelits ghc-typelits-knownnat + base bitvec finite-typelits ghc-typelits-knownnat ghc-typelits-natnormalise primitive template-haskell typelits-witnesses vector vector-sized ]; testHaskellDepends = [ - base bitvec finite-typelits hedgehog monad-loops vector-sized + base bitvec finite-typelits ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hspec hspec-hedgehog primitive + template-haskell typelits-witnesses vector vector-sized ]; description = "A better, more type-safe Enum"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "finitary-derive" = callPackage @@ -92623,6 +92802,8 @@ self: { testHaskellDepends = [ base ]; description = "A readline-like effect and carrier for fused-effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fused-effects-resumable" = callPackage @@ -92707,16 +92888,16 @@ self: { , data-binary-ieee754, directory, directory-tree, dlist, file-embed , filepath, free, gitrev, happy, haskeline, language-c-quote , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel - , parser-combinators, process, process-extras, QuickCheck, random - , 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 + , 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.15.5"; - sha256 = "07xd67202qv1fnka0nichpspzpyzlismlwdhlq0rr6nb3xriykxn"; + version = "0.15.6"; + sha256 = "16abw20ziw3ik28dry0nr63glmszzzw92dcz1vzm4q76j9sjl0py"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92724,7 +92905,7 @@ self: { cmark-gfm containers data-binary-ieee754 directory directory-tree dlist file-embed filepath free gitrev haskeline language-c-quote mainland-pretty megaparsec mtl neat-interpolation parallel - parser-combinators process process-extras random regex-tdfa srcloc + 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 @@ -94209,8 +94390,8 @@ self: { }: mkDerivation { pname = "generic-data-surgery"; - version = "0.2.0.0"; - sha256 = "02pnxdhmc5m7i9m269s1pggn6gsqj73flv6d86zfkpnqwwsvd5qs"; + version = "0.2.1.0"; + sha256 = "0mjx8yi4f1wvf5w2wp5vzzrh3z5n6900qsp2lbhd2xzzq4zlvzy7"; libraryHaskellDepends = [ base first-class-families generic-data ]; testHaskellDepends = [ base generic-data tasty tasty-hunit ]; description = "Surgery for generic data types"; @@ -95048,13 +95229,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "genvalidity-criterion_0_1_0_0" = callPackage + "genvalidity-criterion_0_2_0_0" = callPackage ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck }: mkDerivation { pname = "genvalidity-criterion"; - version = "0.1.0.0"; - sha256 = "1qh9why567h36149q2fci3hxc61d23j46xan4kcnhj9p1bv7v4kf"; + version = "0.2.0.0"; + sha256 = "1r28kqqwaaavchdncdwa4q52z3li5515rfa9wz5lcnyrscim62xg"; libraryHaskellDepends = [ base criterion deepseq genvalidity QuickCheck ]; @@ -95825,7 +96006,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc_8_6_5" = callPackage + "ghc_8_10_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap , ghci, hpc, process, template-haskell, terminfo, time @@ -95833,8 +96014,8 @@ self: { }: mkDerivation { pname = "ghc"; - version = "8.6.5"; - sha256 = "13sh7f40pib5v00wd5bdxrwz7m5q398l93kky0z14q47130mpp20"; + version = "8.10.1"; + sha256 = "0j5cmb0bqndmrgr92zysa6yiccammdr2pgm9swwkipm5jz4g6d5s"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath ghc-boot ghc-boot-th ghc-heap ghci hpc process template-haskell @@ -95857,14 +96038,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-boot_8_8_1" = callPackage + "ghc-boot_8_8_3" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th }: mkDerivation { pname = "ghc-boot"; - version = "8.8.1"; - sha256 = "1f1701nkyn6cig2mh8wb5wn3vwddkfmfqz8lykh8k1sm76qx7yva"; + version = "8.8.3"; + sha256 = "0h4nayld1qa08aly5y3z91z4n778g25s92fggvcxga8bxs49sh50"; + revision = "1"; + editedCabalFile = "0rzc0759sy8n7dp4csy464vb8kvaapzvxzjr1scmwh2gk9v3s1lk"; libraryHaskellDepends = [ base binary bytestring directory filepath ghc-boot-th ]; @@ -95873,12 +96056,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-boot-th_8_8_1" = callPackage + "ghc-boot-th_8_10_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "8.8.1"; - sha256 = "14aa5jb5wz1yz12l0ixbbwiqj2rg1vgyd2rlfgm2ixsrryans4cb"; + version = "8.10.1"; + sha256 = "0vhhmsd32p7zn9vhpv4d0k0b55n2dyhzy42xblndrma617kz8gli"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the `template-haskell` library"; license = stdenv.lib.licenses.bsd3; @@ -96108,6 +96291,8 @@ self: { ]; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ghc-events-parallel" = callPackage @@ -96409,14 +96594,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_10_0_4" = callPackage + "ghc-lib-parser-ex_8_10_0_6" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.4"; - sha256 = "10jb935s3d2y1hh710aa96yb9fisj2fngn0i4ls8fdkflh7s81nz"; + version = "8.10.0.6"; + sha256 = "0l416d7zxfpb3dvz5mh8fxg6z9gr56mhv9agkg3r9cgz0k7nfk1a"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -96575,8 +96760,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.2.1.0"; - sha256 = "0z6gr3zs89agyc2iw2lv8rddw78yn6wxzyzkip7gfca1n9f7xwd9"; + version = "0.2.2.0"; + sha256 = "1pygg0538nah42ll0zai081y8hv8z7lwl0vr9l2k273i4fdif7hb"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; description = "Haskell source parser from GHC"; @@ -96632,12 +96817,12 @@ self: { broken = true; }) {}; - "ghc-prim_0_5_3" = callPackage + "ghc-prim_0_6_1" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.5.3"; - sha256 = "07s75s4yj33p87zzpvp68hgf72xsxg6rm47g4aaymmlf52aywmv9"; + version = "0.6.1"; + sha256 = "06nc87f4mcqcddllysb75qj942y5mmdwss7h9z3m0m93lbxxy6a2"; libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -97134,15 +97319,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghci_8_6_5" = callPackage + "ghci_8_10_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap , template-haskell, transformers, unix }: mkDerivation { pname = "ghci"; - version = "8.6.5"; - sha256 = "0h011kixzv5x5bjb2i71bl9dnffc6if7k6jmsncbyvj0vvchrrn8"; + version = "8.10.1"; + sha256 = "14r7h3nj61mhap15r3cq6824b6fib9krj6b6qa77bl7jqdqpfxsq"; libraryHaskellDepends = [ array base binary bytestring containers deepseq filepath ghc-boot ghc-boot-th ghc-heap template-haskell transformers unix @@ -97368,8 +97553,6 @@ self: { ]; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ghcjs-ajax" = callPackage @@ -99023,8 +99206,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200330"; - sha256 = "0xy0ld7kr4cfdl4g4yzvrzl5r60dcj33cxm28a4qz6nqm2yhd4sv"; + version = "8.20200501"; + sha256 = "19rggaymvqy7r61n2rl2nigwdi2hzq5l1afcd5l0k1vbacwgq4jl"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -99377,13 +99560,14 @@ self: { }: mkDerivation { pname = "git-repair"; - version = "1.20200102"; - sha256 = "13xlnfwaf914n4d57c4q6n1dkhw7jz1grrnw6shqvh3v09ywqsnz"; + version = "1.20200504"; + sha256 = "1k5sildrc46mhwxzwxfjxv267322gavcvvs3gc56mz1vfs8ip4b8"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse mtl process split unix unix-compat + filepath-bytestring hslogger IfElse mtl process split unix + unix-compat ]; executableHaskellDepends = [ async attoparsec base bytestring containers data-default deepseq @@ -99391,7 +99575,7 @@ self: { mtl network network-uri optparse-applicative process QuickCheck split text time transformers unix unix-compat utf8-string ]; - description = "repairs a damanged git repisitory"; + description = "repairs a damaged git repository"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -99445,6 +99629,8 @@ self: { testToolDepends = [ git ]; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gitHUD" = callPackage @@ -100570,16 +100756,16 @@ self: { }) {}; "gll" = callPackage - ({ mkDerivation, array, base, containers, pretty, random-strings - , regex-applicative, text, time, TypeCompose + ({ mkDerivation, array, base, containers, pretty, regex-applicative + , text, time, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.4.0.12"; - sha256 = "1ls01s36ixik53c0fyr9sy3bhyh2kfn0yjkh3mp8izgw6l8aydwr"; + version = "0.4.0.13"; + sha256 = "1kw1wmc59fz87z8xwdbg9988ghvhdyfj594cxnd28gw0z04gsz4m"; libraryHaskellDepends = [ - array base containers pretty random-strings regex-applicative text - time TypeCompose + array base containers pretty regex-applicative text time + TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; @@ -105718,6 +105904,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-websocket_0_1_2_2" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , greskell-core, hashtables, hspec, safe-exceptions, stm, text + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "greskell-websocket"; + version = "0.1.2.2"; + sha256 = "1iq8ir7xcqy1vf7x23rl3vp2a165xzmz5c0hwid2n0nj7q3k0i93"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring greskell-core + hashtables safe-exceptions stm text unordered-containers uuid + vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring greskell-core hspec unordered-containers uuid + vector + ]; + description = "Haskell client for Gremlin Server using WebSocket serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -109878,6 +110087,8 @@ self: { testHaskellDepends = [ base hspec mtl pandoc text ]; description = "Use shortcut-links in markdown file for Hakyll"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-typescript" = callPackage @@ -110330,13 +110541,15 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.9.0.0"; - sha256 = "0bh2j0iz55g633lgm9zzlgq6419p0aabcpbhq1p7gj1bf7s2l1wm"; + version = "0.9.1.0"; + sha256 = "1gksjmrz1rbkfm2cw1hfz74ws0hyxv3491fw6j2j5f1gjp46fwf7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; description = "Hanabi card game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "handa-data" = callPackage @@ -113310,6 +113523,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-lsp_0_19_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.19.0.0"; + sha256 = "0cjmjrcd3rg8jc6rfk73jirmvay07jps9gdjd97clxz90w3mm24i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -113339,7 +113582,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_21_0_0" = callPackage + "haskell-lsp_0_22_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -113348,8 +113591,8 @@ self: { }: mkDerivation { pname = "haskell-lsp"; - version = "0.21.0.0"; - sha256 = "0ic9gn5ww8vxmvidj28msark0nybj7fj1j5xsykiac5cgiy5ysnv"; + version = "0.22.0.0"; + sha256 = "0mh2b3dza633plxp370zhvml50kfx4szk4hrzmcfm6aij2di2l0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113391,6 +113634,24 @@ self: { broken = true; }) {}; + "haskell-lsp-types_0_19_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, deepseq + , filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.19.0.0"; + sha256 = "089rxcdz02hq68ihc26r7dwsn8hl7f7096vcb0dyd2jda0ganhm9"; + libraryHaskellDepends = [ + aeson base bytestring data-default deepseq filepath hashable lens + network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-types" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text @@ -113408,15 +113669,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_21_0_0" = callPackage + "haskell-lsp-types_0_22_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text , unordered-containers }: mkDerivation { pname = "haskell-lsp-types"; - version = "0.21.0.0"; - sha256 = "0x5xhn9vy09r0r76wvmzp6nh23y4p2kgm35p8qqqgvnx6w5cvi92"; + version = "0.22.0.0"; + sha256 = "05475d5rwkmsh50q18lans7zzd34jhfdpg80m7aijg829dkphskm"; libraryHaskellDepends = [ aeson base binary bytestring data-default deepseq filepath hashable lens network-uri scientific text unordered-containers @@ -115433,7 +115694,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_12_0" = callPackage + "haskoin-core_0_13_3" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 @@ -115443,20 +115704,21 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.12.0"; - sha256 = "0fqwvs5wwqlq21sk1rw4dz5gnvfb9fkxhfbl3g5sd76c9r6fvrwc"; + version = "0.13.3"; + sha256 = "0lm2zsndiz9id7kmv4mxhakg7jzkz88g0f278bap78z5n9flh8sj"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit + containers cryptonite deepseq entropy hashable memory mtl murmur3 + network safe scientific secp256k1-haskell split string-conversions + text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec HUnit memory mtl murmur3 network QuickCheck safe scientific secp256k1-haskell split string-conversions text time transformers unordered-containers vector ]; - testHaskellDepends = [ - aeson base bytestring cereal containers deepseq hspec HUnit mtl - QuickCheck safe split string-conversions text unordered-containers - vector - ]; testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -115519,6 +115781,38 @@ self: { broken = true; }) {}; + "haskoin-node_0_12_0" = callPackage + ({ mkDerivation, base, base64, bytestring, cereal, conduit + , conduit-extra, containers, data-default, hashable, haskoin-core + , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe + , random, resourcet, rocksdb-haskell, rocksdb-query, safe + , string-conversions, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "haskoin-node"; + version = "0.12.0"; + sha256 = "1x1z0k7n95mzgnlb3vcyp7gbqi727mniavdjijcrzw5vnvlzxnc6"; + libraryHaskellDepends = [ + base base64 bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core monad-logger mtl network nqe + random resourcet rocksdb-haskell rocksdb-query string-conversions + text time transformers unliftio unordered-containers + ]; + testHaskellDepends = [ + base base64 bytestring cereal conduit conduit-extra containers + data-default hashable haskoin-core hspec HUnit monad-logger mtl + network nqe random resourcet rocksdb-haskell rocksdb-query safe + string-conversions text time transformers unliftio + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "haskoin-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, haskoin-crypto , haskoin-util, HUnit, QuickCheck, test-framework @@ -115566,7 +115860,7 @@ self: { }) {}; "haskoin-store" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, conduit + ({ mkDerivation, aeson, base, base64, bytestring, cereal, conduit , containers, data-default, deepseq, filepath, hashable , haskoin-core, haskoin-node, hedis, hspec, hspec-discover , http-types, monad-logger, mtl, network, nqe, optparse-applicative @@ -115576,8 +115870,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.23.14"; - sha256 = "0gvcjmyisnjml6mv43xgpq3hb2047lsk84vjr4hv4zf9h23gwb14"; + version = "0.24.0"; + sha256 = "12ci8vgdd4xh9r8xl4j3b1f63majy8vgvxd2cxw221amhjcsvfvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115589,12 +115883,12 @@ self: { ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq filepath hashable haskoin-core monad-logger mtl nqe - optparse-applicative random string-conversions text time + deepseq filepath hashable haskoin-core haskoin-node monad-logger + mtl nqe optparse-applicative random string-conversions text time transformers unliftio unordered-containers ]; testHaskellDepends = [ - aeson base bytestring cereal conduit containers data-default + aeson base base64 bytestring cereal conduit containers data-default deepseq hashable haskoin-core haskoin-node hedis hspec http-types monad-logger mtl network nqe QuickCheck random rocksdb-haskell rocksdb-query scotty string-conversions text time transformers @@ -118561,15 +118855,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "headroom_0_2_1_1" = callPackage + "headroom_0_2_2_0" = callPackage ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec , mustache, optparse-applicative, pcre-light, QuickCheck, rio , template-haskell, time, yaml }: mkDerivation { pname = "headroom"; - version = "0.2.1.1"; - sha256 = "101zvngl2p89g2ivcnyrb6mbxmv88jcrz7n7lvapsxicqr0nppb4"; + version = "0.2.2.0"; + sha256 = "13kmzfh8r7y7cin93c0dhbcvgr66dcxfwjsylp41xyzq2w1g2aqb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121618,8 +121912,6 @@ self: { ]; description = "Set up a GHC API session"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hie-core" = callPackage @@ -122524,8 +122816,8 @@ self: { }: mkDerivation { pname = "hip"; - version = "1.5.5.0"; - sha256 = "1qy74a471bh849cil9b3f92gxgl3434x8hcvrzn83v3xa6vnh2cd"; + version = "1.5.6.0"; + sha256 = "122zcrid9x831hlv3dvh1afzffz2xg3s3k0dn1vf4b4cpd9w50mh"; libraryHaskellDepends = [ array base bytestring Chart Chart-diagrams colour deepseq directory filepath JuicyPixels netpbm primitive process random repa temporary @@ -123034,10 +123326,10 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.9.0"; - sha256 = "051i5y557g82hd5zcn63f65jyxk07d9wnvfmwdps391zxza8ifki"; - revision = "2"; - editedCabalFile = "0110dyc8lbd8x0cbmxgwwbvzckxkfj84krd5p51p0jaixvrrl53r"; + version = "1.10.0"; + sha256 = "1ya93a1jh40aia3adrg2ipdzyxww6cpnzcdw41r51h8x6f2m0n77"; + revision = "1"; + editedCabalFile = "1563di5mfclj4ms6wd9vszdyghxpqm3r8q9vfkanw9wjlw7kq56q"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-client-tls http-types pcre-heavy @@ -123045,8 +123337,10 @@ self: { unordered-containers vector ]; testHaskellDepends = [ - aeson async base bytestring directory filepath hjsonpointer hspec - profunctors protolude QuickCheck text unordered-containers vector + aeson async base bytestring containers directory file-embed + filepath hashable hjsonpointer hspec http-client http-client-tls + http-types pcre-heavy profunctors protolude QuickCheck + safe-exceptions scientific text unordered-containers vector wai-app-static warp ]; description = "JSON Schema library"; @@ -123748,24 +124042,22 @@ self: { "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed - , filepath, filepattern, ghc, ghc-boot, ghc-boot-th - , ghc-lib-parser-ex, haskell-src-exts, haskell-src-exts-util + , 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 = "2.2.11"; - sha256 = "1xyavrrxm1ihvga2j1k3h96wjpnjb30lk6mgiyrvx3rj7m7yq5bw"; + version = "3.1"; + sha256 = "1c17bcfddajkww05afjzbsdzx9xxxq4dnrb266jlb1zad1saf8ah"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring cmdargs containers cpphs - data-default directory extra file-embed filepath filepattern ghc - ghc-boot ghc-boot-th ghc-lib-parser-ex haskell-src-exts - haskell-src-exts-util hscolour process refact text transformers - uniplate unordered-containers utf8-string vector yaml + 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"; @@ -127168,8 +127460,8 @@ self: { }: mkDerivation { pname = "hpp"; - version = "0.6.2"; - sha256 = "0k8rc2hnan346i3ykam8ps89n56vgcw91d9k1450klyi3l50b5xv"; + version = "0.6.3"; + sha256 = "0gnmkh0m640qc71bp63p4qkcbcyy1j9z0x6svfbd36cpqb6kdivs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127221,8 +127513,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.10.2.0"; - sha256 = "16x7innivjrnsamn6lrjg1a2v0wy1w6r3ariw3ncrwfpcfdmr45n"; + version = "1.10.2.1"; + sha256 = "06vx7llfyidldp5ar80a3dkw14xv19v1s8kc7kf6vs1gb3vx8r5n"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -128455,6 +128747,8 @@ self: { executableHaskellDepends = [ base ]; description = "Convert an eventlog into the speedscope json format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hs-twitter" = callPackage @@ -135128,6 +135422,8 @@ self: { ]; description = "Demo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-balancedparens" = callPackage @@ -135334,6 +135630,8 @@ self: { ]; description = "Unbelievably fast streaming DSV file parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-dump" = callPackage @@ -135510,24 +135808,6 @@ self: { }: mkDerivation { pname = "hw-int"; - version = "0.0.1.0"; - sha256 = "1ishvxf2n0j3m5ly2drpddbjw41zf4gpncizi4anw5f85k3ygyys"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base doctest doctest-discover hedgehog hspec hw-hedgehog - hw-hspec-hedgehog - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - description = "Additional facilities for Integers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-int_0_0_2_0" = callPackage - ({ mkDerivation, base, doctest, doctest-discover, hedgehog, hspec - , hspec-discover, hw-hedgehog, hw-hspec-hedgehog - }: - mkDerivation { - pname = "hw-int"; version = "0.0.2.0"; sha256 = "13ifa28b12hiibhmwas5hn3dmmiz2rihlc837hhii0z1ng03s360"; libraryHaskellDepends = [ base ]; @@ -135538,7 +135818,6 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Additional facilities for Integers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-ip" = callPackage @@ -135612,6 +135891,8 @@ self: { ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-lens" = callPackage @@ -135641,6 +135922,8 @@ self: { ]; description = "Lens for hw-json"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-simd" = callPackage @@ -135665,6 +135948,8 @@ self: { testToolDepends = [ doctest-discover ]; description = "SIMD-based JSON semi-indexer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-simple-cursor" = callPackage @@ -135702,6 +135987,8 @@ self: { ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-json-standard-cursor" = callPackage @@ -135741,6 +136028,47 @@ self: { ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "hw-json-standard-cursor_0_2_3_1" = callPackage + ({ mkDerivation, array, base, bits-extra, bytestring, criterion + , directory, doctest, doctest-discover, generic-lens, hedgehog + , hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect + , hw-rankselect-base, lens, mmap, optparse-applicative, text + , vector, word8 + }: + mkDerivation { + pname = "hw-json-standard-cursor"; + version = "0.2.3.1"; + sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bits-extra bytestring hw-balancedparens hw-bits + hw-json-simd hw-prim hw-rankselect hw-rankselect-base mmap vector + word8 + ]; + executableHaskellDepends = [ + base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim + hw-rankselect hw-rankselect-base lens mmap optparse-applicative + text vector + ]; + testHaskellDepends = [ + base bits-extra bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory mmap + ]; + description = "Memory efficient JSON parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-kafka-avro" = callPackage @@ -135767,6 +136095,8 @@ self: { ]; description = "Avro support for Kafka infrastructure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-kafka-client" = callPackage @@ -136036,6 +136366,8 @@ self: { ]; description = "SIMD library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-streams" = callPackage @@ -138394,14 +138726,14 @@ self: { }) {inherit (pkgs) igraph;}; "igrf" = callPackage - ({ mkDerivation, ad, base, polynomial }: + ({ mkDerivation, ad, base, poly, semirings, text, vector-space }: mkDerivation { pname = "igrf"; - version = "0.2.0.0"; - sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1"; - revision = "1"; - editedCabalFile = "0kqyrvv7wnr35nlyip14g1shjb8zfqg7x4vm0qqhc57vc6s6qqbx"; - libraryHaskellDepends = [ ad base polynomial ]; + version = "0.4.0.0"; + sha256 = "0n3xchwxslrc25sb06y2vg9gwgifpsfs57xhy7z6g2j43r187x1w"; + libraryHaskellDepends = [ + ad base poly semirings text vector-space + ]; description = "International Geomagnetic Reference Field"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -138419,10 +138751,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.10.0.2"; - sha256 = "01jk48kj5z7n547z1lg78c0bphpjyv2nfzjrh4jv7xygkw5asqxb"; - revision = "1"; - editedCabalFile = "0jhgnw5wrpmbp3g6zllwlmmyzyja5ry8i7dss7q8gpbvk2inlfl3"; + version = "0.10.1.0"; + sha256 = "0vbi0cnw0hxm69h90v9rbjaqqfilg4mcrv0rdvmc11jxdiv3qlvw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -138443,6 +138773,8 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-aeson" = callPackage @@ -138458,6 +138790,8 @@ self: { ]; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-basic" = callPackage @@ -138482,6 +138816,8 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-charts" = callPackage @@ -138498,6 +138834,8 @@ self: { ]; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-diagrams" = callPackage @@ -138514,6 +138852,8 @@ self: { ]; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-display" = callPackage @@ -138538,6 +138878,8 @@ self: { libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-graphviz" = callPackage @@ -138549,6 +138891,8 @@ self: { libraryHaskellDepends = [ base bytestring ihaskell process ]; description = "IHaskell display instance for GraphViz (external binary)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hatex" = callPackage @@ -138560,6 +138904,8 @@ self: { libraryHaskellDepends = [ base HaTeX ihaskell text ]; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hvega" = callPackage @@ -138571,6 +138917,8 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -138604,6 +138952,8 @@ self: { ]; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-magic" = callPackage @@ -138620,6 +138970,8 @@ self: { ]; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-parsec" = callPackage @@ -138740,6 +139092,24 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "ilist_0_4_0_1" = callPackage + ({ mkDerivation, base, criterion, hspec, lens, loop, transformers + , vector + }: + mkDerivation { + pname = "ilist"; + version = "0.4.0.1"; + sha256 = "016wa9n4glxcyvbifvfz2khk9i1i5wzfyl952vp1fhwpjrr8aj04"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec transformers ]; + benchmarkHaskellDepends = [ + base criterion lens loop transformers vector + ]; + description = "Optimised list functions for doing index-related things"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "illuminate" = callPackage ({ mkDerivation, alex, array, base, containers, filemanip, filepath , hscolour, html, utf8-string, xhtml @@ -139805,27 +140175,12 @@ self: { ({ mkDerivation, base, hspec, Only }: mkDerivation { pname = "indexed-list-literals"; - version = "0.2.1.2"; - sha256 = "043xl356q9n1nw2bw8a8msymy18d6f7nwcyrrpzak9qr75dsx5nq"; - revision = "1"; - editedCabalFile = "198hmw2m3539vmh3s58d33h6vl5d0fqpdms8rp8cwj196diipjlc"; - libraryHaskellDepends = [ base Only ]; - testHaskellDepends = [ base hspec ]; - description = "Type safe indexed list literals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "indexed-list-literals_0_2_1_3" = callPackage - ({ mkDerivation, base, hspec, Only }: - mkDerivation { - pname = "indexed-list-literals"; version = "0.2.1.3"; sha256 = "179z0df99ixaplr1qv7dawj3h8fq5qhgfn8mg0i4ix6xhpi9kqr6"; libraryHaskellDepends = [ base Only ]; testHaskellDepends = [ base hspec ]; description = "Type safe indexed list literals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indexed-profunctors" = callPackage @@ -139961,16 +140316,18 @@ self: { "infernal" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , containers, exceptions, heart-app, heart-core, http-client - , http-types, mtl, text, unliftio, unordered-containers, wai + , exceptions, hashable, http-client, http-types, little-logger + , little-rio, microlens, microlens-mtl, microlens-th, mtl, text + , unliftio-core, unordered-containers, wai }: mkDerivation { pname = "infernal"; - version = "0.3.0"; - sha256 = "0iixw8np4rh66ql2lm2gkhz9yzkgxw0mch3gxsflqi0a96y2jcik"; + version = "0.5.0"; + sha256 = "0zn4zj9c9jhvchg6yli3ig2c0hnwpk9na2r0bbizjlngzky6vfrr"; libraryHaskellDepends = [ - aeson base binary bytestring case-insensitive containers exceptions - heart-app heart-core http-client http-types mtl text unliftio + aeson base binary bytestring case-insensitive exceptions hashable + http-client http-types little-logger little-rio microlens + microlens-mtl microlens-th mtl text unliftio-core unordered-containers wai ]; description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell"; @@ -140819,12 +141176,12 @@ self: { license = stdenv.lib.licenses.isc; }) {}; - "integer-gmp_1_0_2_0" = callPackage + "integer-gmp_1_0_3_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.2.0"; - sha256 = "1aaz2mdmwbrfxahhycpiz92hdvfn9mm7964wfypf8m0m8libhs6k"; + version = "1.0.3.0"; + sha256 = "06302vwkc99l5gdbk3r25w84gi9cj18jcf8ipi189vpnmw42awwf"; libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; @@ -141445,6 +141802,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "intro_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, dlist + , extra, hashable, lens, mtl, optics, QuickCheck, safe, text + , transformers, unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.7.0.0"; + sha256 = "18ddkcm77jxqpqjaaqs1qmzvn8zgincrybb3d4zcsggrp6llghc3"; + libraryHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable mtl safe + text transformers unordered-containers writer-cps-mtl + ]; + testHaskellDepends = [ + base bytestring containers deepseq dlist extra hashable lens mtl + optics QuickCheck safe text transformers unordered-containers + writer-cps-mtl + ]; + description = "Safe and minimal prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intro-prelude" = callPackage ({ mkDerivation, intro }: mkDerivation { @@ -141588,8 +141968,8 @@ self: { pname = "invertible-grammar"; version = "0.1.2"; sha256 = "1nf7dchcxs8wwd2hgfpf04qd63ws22pafjwb5911lq7da8k1y57j"; - revision = "2"; - editedCabalFile = "0j6zmj0dlhiq4qjrbjbvdsmky1l4z1qwqikixk1b9dpa05n01ykf"; + revision = "3"; + editedCabalFile = "023nln2rhsijx4z7cm914283fm7fv2azk0w65nlbgky7cbmn021w"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -142248,29 +142628,6 @@ self: { }: mkDerivation { pname = "ipynb"; - version = "0.1"; - sha256 = "0daadhzil4q573mqb0rpvjzm0vpkzgzqcimw480qpvlh6rhppwj5"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring containers text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-diff base base64-bytestring bytestring directory - filepath microlens microlens-aeson tasty tasty-hunit text - unordered-containers vector - ]; - description = "Data structure for working with Jupyter notebooks (ipynb)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ipynb_0_1_0_1" = callPackage - ({ mkDerivation, aeson, aeson-diff, base, base64-bytestring - , bytestring, containers, directory, filepath, microlens - , microlens-aeson, tasty, tasty-hunit, text, unordered-containers - , vector - }: - mkDerivation { - pname = "ipynb"; version = "0.1.0.1"; sha256 = "0lwpz0ip7r1rxkirqb6p48ql19fzamqkrnf3khx7bfl5wsxi6yrb"; libraryHaskellDepends = [ @@ -142284,7 +142641,6 @@ self: { ]; description = "Data structure for working with Jupyter notebooks (ipynb)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ipython-kernel" = callPackage @@ -142309,6 +142665,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_10_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text + , containers, cryptonite, directory, filepath, memory, mtl, parsec + , process, temporary, text, transformers, unordered-containers + , uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.10.2.0"; + sha256 = "0ylqbcs7xdhkm0if18f1cmz4144gx0p4r9wgggbzphfx8v8lhz9a"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-text containers cryptonite + directory filepath memory mtl parsec process temporary text + transformers unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -144651,36 +145030,6 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.8.2.0"; - sha256 = "0kv2kmws9kwymx8pm6j8nnlk1d8pwv22hw2ka2kwlipjvmb7mld4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups template-haskell - text time unordered-containers vector x509 - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring concise - containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec - tasty-quickcheck template-haskell text time unordered-containers - vector x509 - ]; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_8_2_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, concise, containers, cryptonite, hspec, lens, memory - , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck - , template-haskell, text, time, unordered-containers, vector, x509 - }: - mkDerivation { - pname = "jose"; version = "0.8.2.1"; sha256 = "1mfnxfzgcxlsjfwzg4syih6wasi7mq25j3dawar9aihvdkpwqlfh"; isLibrary = true; @@ -144700,7 +145049,6 @@ self: { ]; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -145062,8 +145410,8 @@ self: { }: mkDerivation { pname = "json-api-lib"; - version = "0.2.0.0"; - sha256 = "0cay3yrzfbd0vnfq1a2f74nnqwbiwribhnfy90nhvbi6dxxp14a1"; + version = "0.2.1.0"; + sha256 = "1dfi978ypgy1mlg7xmb4qja88pvvzvn2k26il2xiki3pcxnc4hsl"; libraryHaskellDepends = [ aeson base containers data-default deepseq lens lens-aeson text unordered-containers uri-encode @@ -145714,6 +146062,8 @@ self: { ]; description = "High-performance JSON parser and encoder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "json-togo" = callPackage @@ -148203,6 +148553,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-generics_0_4_1_0" = callPackage + ({ mkDerivation, base, kind-apply }: + mkDerivation { + pname = "kind-generics"; + version = "0.4.1.0"; + sha256 = "1ldfi5rvs3mxlbpy0nfyx8mq58xjkk76c13fmvmgqcpgb8gvmrnx"; + libraryHaskellDepends = [ base kind-apply ]; + description = "Generic programming in GHC style for arbitrary kinds and GADTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kind-generics-th" = callPackage ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction @@ -148219,6 +148581,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kind-generics-th_0_2_2_0" = callPackage + ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.2.2.0"; + sha256 = "1cllhh2lvz86nah2knsgcl0cqnvs1x6ggi8cq2jh1wqlarpy1sgk"; + 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 = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -148273,6 +148652,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kleene-list" = callPackage + ({ mkDerivation, base, base-compat, Cabal, cabal-doctest, deepseq + , doctest, QuickCheck, template-haskell + }: + mkDerivation { + pname = "kleene-list"; + version = "0.1.0.0"; + sha256 = "1iqwpy8ds617inr1hljxbhdwjlxcw7jkq5znsvc9p5mv3wnz6f32"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base base-compat deepseq doctest QuickCheck template-haskell + ]; + description = "A list type based on the Kleene star and plus"; + license = stdenv.lib.licenses.asl20; + }) {}; + "kmeans" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -148475,29 +148871,21 @@ self: { }) {}; "kontrakcja-templates" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hslogger - , HStringTemplate, html, HUnit, MissingH, mtl, old-time, parsec - , string-templates, syb, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, transformers, utf8-string + ({ mkDerivation, base, containers, directory, exceptions + , HStringTemplate, html, json, monad-control, mtl, time + , transformers, transformers-base }: mkDerivation { pname = "kontrakcja-templates"; - version = "0.1"; - sha256 = "020vcd04dxaxcd3bb9vwgw1qvxnz5gx590mjkbnnxrcjhl9yd9j8"; + version = "0.11"; + sha256 = "09fivafr368kfj5pp0g9r13jvrihhcwhx9ay2f45qilcpv4qbb1r"; libraryHaskellDepends = [ - base bytestring containers directory HStringTemplate html MissingH - mtl old-time parsec transformers utf8-string - ]; - testHaskellDepends = [ - base containers directory hslogger HStringTemplate HUnit MissingH - mtl old-time string-templates syb test-framework - test-framework-hunit test-framework-quickcheck2 time + base containers directory exceptions HStringTemplate html json + monad-control mtl time transformers transformers-base ]; description = "Utilities for working with many HStringTemplate templates from files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {string-templates = null;}; + }) {}; "koofr-client" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client @@ -148597,8 +148985,8 @@ self: { }: mkDerivation { pname = "krank"; - version = "0.2.0"; - sha256 = "0m41vyfzis6v0x7yys7xwr8yi04fydg6x2d04ispmi8mqjx0vgww"; + version = "0.2.1"; + sha256 = "0lg7g5zzjpzjvdzd7ps3dygiqp33891dph35jrf704hkf3ksmqs2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148612,8 +149000,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers hspec hspec-expectations - http-client http-types mtl pcre-heavy PyF req safe-exceptions text - unordered-containers + http-client http-types lifted-async mtl pcre-heavy pretty-terminal + PyF req safe-exceptions text unordered-containers ]; description = "Krank checks your code source comments for important markers"; license = stdenv.lib.licenses.bsd3; @@ -148777,22 +149165,6 @@ self: { }: mkDerivation { pname = "kubernetes-webhook-haskell"; - version = "0.2.0.0"; - sha256 = "0yxavjq6xxia81yfw7skgdmirbq0wmlvbsklppq6a6y1m6drbyww"; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring text - unordered-containers - ]; - description = "Create Kubernetes Admission Webhooks in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kubernetes-webhook-haskell_0_2_0_1" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , text, unordered-containers - }: - mkDerivation { - pname = "kubernetes-webhook-haskell"; version = "0.2.0.1"; sha256 = "10qf41gx4631793d19wibyhc2nm8wv3qjb53rhlgpxbjy547y2rr"; libraryHaskellDepends = [ @@ -148801,7 +149173,6 @@ self: { ]; description = "Create Kubernetes Admission Webhooks in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kuifje" = callPackage @@ -150964,49 +151335,6 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.6.2"; - sha256 = "07rv00rpxza9pg0jg19bh5pnk065mxadb7qcxw5i822ad22b85yn"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory filecache filepath - formatting hashable hruby hslogger http-api-data http-client lens - lens-aeson megaparsec memory mtl operational parsec - parser-combinators pcre-utils protolude random regex-pcre-builtin - scientific servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint async base bytestring containers Glob hslogger - http-client lens mtl optparse-applicative regex-pcre-builtin - strict-base-types text transformers unordered-containers vector - yaml - ]; - testHaskellDepends = [ - base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl - pcre-utils scientific strict-base-types temporary text transformers - unordered-containers vector - ]; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-puppet_1_4_6_3" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, filecache, filepath, formatting, Glob - , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data - , http-client, lens, lens-aeson, megaparsec, memory, mtl - , operational, optparse-applicative, parsec, parser-combinators - , pcre-utils, protolude, random, regex-pcre-builtin, scientific - , servant, servant-client, split, stm, strict-base-types, temporary - , text, time, transformers, unix, unordered-containers, vector - , yaml - }: - mkDerivation { - pname = "language-puppet"; version = "1.4.6.3"; sha256 = "0g84x311hivlchz23kw0lwqcml3r0wkwh24bqvpgkb2m7rmi8mwx"; isLibrary = true; @@ -151034,7 +151362,6 @@ self: { ]; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python" = callPackage @@ -151357,6 +151684,8 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via CArrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-comfort-array" = callPackage @@ -151373,6 +151702,8 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lapack-ffi" = callPackage @@ -151385,6 +151716,8 @@ self: { libraryPkgconfigDepends = [ liblapack ]; description = "Auto-generated interface to Fortran LAPACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {liblapack = null;}; "lapack-ffi-tools" = callPackage @@ -152320,8 +152653,8 @@ self: { }: mkDerivation { pname = "lean-peano"; - version = "1.0.1.0"; - sha256 = "1h673y0rafh1dh8hy95spr2xwqc64pkkd094p6bd4cqvcmy72nd6"; + version = "1.0.2.0"; + sha256 = "0wvc7cxds6xmwm18bh3i8g7ck11nfpgdg26nyw1rr73rph8sl7ai"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ @@ -153304,8 +153637,8 @@ self: { }: mkDerivation { pname = "lens-toml-parser"; - version = "0.1.0.3"; - sha256 = "1b81v3lncqpmsc0899wk7hnddn359qjwqkmrxcj5yh4ijjqdrrmg"; + version = "0.1.0.4"; + sha256 = "01gxm5p7bhylp1mkad4mng5rkh3wn2cvjcxkqp11pc51f4mkkqml"; libraryHaskellDepends = [ base profunctors text time toml-parser ]; testHaskellDepends = [ base containers dwergaz hlint lens-family text toml-parser @@ -154793,6 +155126,8 @@ self: { ]; description = "Synchronize personal configs across multiple machines"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lift-generics" = callPackage @@ -156337,6 +156672,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "list-duplicate" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "list-duplicate"; + version = "0.1.0.0"; + sha256 = "14b380qv59897ds612vsqplc02g97g6k3gb7s10vgmwy9y8g4x1i"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Group and delete duplicates from a list"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "list-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -156348,6 +156695,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "list-filter" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "list-filter"; + version = "0.1.1.0"; + sha256 = "0q5a93yik9lqqcahav2w7qw3sds2hgk3kfbfhd493gzw85vzxifq"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Special takes and drops on lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "list-fusion-probe" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -156386,6 +156745,18 @@ self: { broken = true; }) {}; + "list-predicate" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "list-predicate"; + version = "0.1.0.1"; + sha256 = "1zl2qk4g4wva7gkwbdrpjfvwhh9xa1fngyhhaa8bdl91559v9yrd"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Predicates on lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "list-prompt" = callPackage ({ mkDerivation, ansi-terminal, base, data-default, hspec, stm , terminal-size, vty @@ -156797,6 +157168,36 @@ self: { broken = true; }) {}; + "little-logger" = callPackage + ({ mkDerivation, base, co-log, co-log-core, microlens, mtl, text }: + mkDerivation { + pname = "little-logger"; + version = "0.1.0"; + sha256 = "1ibcvcjh5wfdzi2p30dy7q1n6ac34mjckybmp8cn0xwyf9zs9zlw"; + libraryHaskellDepends = [ + base co-log co-log-core microlens mtl text + ]; + description = "Basic logging based on co-log"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "little-rio" = callPackage + ({ mkDerivation, base, exceptions, microlens, microlens-mtl, mtl + , unliftio-core + }: + mkDerivation { + pname = "little-rio"; + version = "0.1.0"; + sha256 = "0i0z0rc1wc46rsfn1i11xp5r2sxd5i11vcjzdmbkqadp6ms8ahv0"; + libraryHaskellDepends = [ + base exceptions microlens microlens-mtl mtl unliftio-core + ]; + description = "When you need just the RIO monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor @@ -159008,8 +159409,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lowlin"; - version = "0.1.0.0"; - sha256 = "16qlnpjp69sisbl7p5pzkqay6pfc96hdbxmpv9mc5d5f5w684g8l"; + version = "0.2.0.1"; + sha256 = "0n1sf7panh2c8nhdpalvf74lvjvymn9dy05lkxnqzaz0vq7v5pcf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Low dimensional linear algebra"; @@ -159152,6 +159553,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lsp-test_0_10_3_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.10.3.0"; + sha256 = "1gj6f99k3kd0flh2nbpj5wnhi1ql5rlijw0vf4l53zwxy203r7k8"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default haskell-lsp hspec lens text + unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lss" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , hspec2, language-css, language-css-attoparsec, text, xmlhtml @@ -159988,17 +160415,20 @@ self: { }) {}; "lzo" = callPackage - ({ mkDerivation, base, binary, bytestring, digest-pure, tasty + ({ mkDerivation, base, binary, bytestring, criterion, digest, tasty , tasty-hunit }: mkDerivation { pname = "lzo"; - version = "0.1.1.0"; - sha256 = "0w10f9a5kpx5j9wiq8cvshn6fr1vbh03njdhadas5sy77qd2r1i7"; - libraryHaskellDepends = [ base binary bytestring digest-pure ]; + version = "0.1.1.2"; + sha256 = "0dypzlxkkby937l2m9g4bz50sgchazqsbagbhkic70ak6iyasamf"; + libraryHaskellDepends = [ base binary bytestring digest ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; description = "minilzo bundled for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mDNSResponder-client" = callPackage @@ -161572,8 +162002,8 @@ self: { pname = "map-syntax"; version = "0.3"; sha256 = "0b3ddi998saw5gi5r4bjbpid03rxlifn08zv15wf0b90ambhcc4k"; - revision = "2"; - editedCabalFile = "1cpiarychx4cmv7v71rbd5ccfsjac928isd52sf42mzs2nb492ya"; + revision = "3"; + editedCabalFile = "19p79gjwlpgx210zlc9625vwp6mjmnb9mvxaz1h5zmgir8dwb4lv"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -162151,6 +162581,8 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv_0_5_1_0" = callPackage @@ -162175,6 +162607,7 @@ self: { description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-io" = callPackage @@ -162198,6 +162631,8 @@ self: { ]; description = "Import/export of Image files into massiv Arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-scheduler" = callPackage @@ -162239,6 +162674,8 @@ self: { ]; description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "massiv-test_0_1_3" = callPackage @@ -162262,6 +162699,7 @@ self: { description = "Library that contains generators, properties and tests for Massiv Array Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "master-plan" = callPackage @@ -162717,6 +163155,8 @@ self: { ]; description = "Haskell matrix library with interface to C++ linear algebra libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "matrix-static" = callPackage @@ -164799,6 +165239,8 @@ self: { doHaddock = false; description = "A minimal base to work around GHC bugs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "microbench" = callPackage @@ -165746,8 +166188,8 @@ self: { }: mkDerivation { pname = "minilight"; - version = "0.4.3"; - sha256 = "1qsmrb6bfwrv302pmm26nkkfky10h0mdkflvj3lfjmnz0bv7aw4g"; + version = "0.5.0"; + sha256 = "1qxyl7n2pwfr8ixkak118sr0n3c7l3bj0r48hk51qpwm5x227g9y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167306,10 +167748,10 @@ self: { }: mkDerivation { pname = "mole"; - version = "0.0.6"; - sha256 = "0shsx1sc6rc5jxijvrc4bzqpjw4xdjq5ghlj8jnmm7gp8b6h6y5b"; - revision = "2"; - editedCabalFile = "1qykba99djdhwm0mmkrfbjdyjcx47gi5clxm8kz87ccx9qs72kfy"; + version = "0.0.7"; + sha256 = "03qlvvwciw0mwcki7kk90pvx5qy15fkx5zdalwxk2pldpv5diyza"; + revision = "1"; + editedCabalFile = "116a00rm6jf3s0kyk3kny650jcimcwgvk2w4s7lvwpb678s635y9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -170497,6 +170939,8 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-idl" = callPackage @@ -170563,6 +171007,8 @@ self: { testHaskellDepends = [ async base bytestring hspec mtl network ]; description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "msgpack-types" = callPackage @@ -170898,6 +171344,8 @@ self: { executableHaskellDepends = [ avro base bytestring mu-schema ]; description = "Avro serialization support for Mu microservices"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mu-graphql" = callPackage @@ -171015,6 +171463,8 @@ self: { ]; description = "Utilities for interoperation between Mu and Kafka"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mu-optics" = callPackage @@ -172654,6 +173104,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mwc-probability_2_3_0" = callPackage + ({ mkDerivation, base, containers, mwc-random, primitive + , transformers + }: + mkDerivation { + pname = "mwc-probability"; + version = "2.3.0"; + sha256 = "1rk5n015a24bv49m2qnc66iv5hcw99zk9zflqv99pxxbpia6kiyj"; + libraryHaskellDepends = [ + base containers mwc-random primitive transformers + ]; + description = "Sampling function-based probability distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mwc-probability-transition" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect , mtl, mwc-probability, primitive, QuickCheck, transformers @@ -176314,8 +176780,8 @@ self: { ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { pname = "network-uri-static"; - version = "0.1.2.1"; - sha256 = "0sfyqkm49vgw6x2xkgaa0lv2fmrzwgcz33ch333jsib0qbmji5vw"; + version = "0.1.2.2"; + sha256 = "1dxmfgd3iq9ss9c7irfnwal2fm1kpgqgmb0bc29hcqwyw6gpn8hw"; libraryHaskellDepends = [ base network-uri template-haskell ]; testHaskellDepends = [ base doctest ]; description = "A small utility to declare type-safe static URIs"; @@ -177202,18 +177668,17 @@ self: { "nix-diff" = callPackage ({ mkDerivation, attoparsec, base, containers, Diff, mtl - , nix-derivation, optparse-applicative, system-filepath, text, unix - , vector + , nix-derivation, optparse-applicative, text, unix, vector }: mkDerivation { pname = "nix-diff"; - version = "1.0.9"; - sha256 = "0gqrx0l6f10gwsz645dby2gascd0sanajvd2rkg65c61g8j7pxv4"; + version = "1.0.10"; + sha256 = "0lcm4s28c4dgry3r1wj5zmb59izfi6vvyivxkpgyv9fhqmyiid4c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base containers Diff mtl nix-derivation - optparse-applicative system-filepath text unix vector + optparse-applicative text unix vector ]; description = "Explain why two Nix derivations differ"; license = stdenv.lib.licenses.bsd3; @@ -177283,6 +177748,8 @@ self: { ]; description = "Parse and render .narinfo files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "nix-paths" = callPackage @@ -179713,6 +180180,8 @@ self: { ]; description = "Owned channels in the Ownership Monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ochintin-daicho" = callPackage @@ -179907,6 +180376,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A full-featured PostgreSQL-backed job queue (with an admin UI)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "oden-go-packages" = callPackage @@ -180897,6 +181368,8 @@ self: { ]; description = "Types for OpenAPI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opench-meteo" = callPackage @@ -181156,6 +181629,8 @@ self: { ]; description = "An OpenID Connect library that does all the heavy lifting for you"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "openpgp" = callPackage @@ -181381,12 +181856,12 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_3_1" = callPackage + "opentelemetry_0_3_2" = callPackage ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; - version = "0.3.1"; - sha256 = "1yfhdh1pbilxmi0zjckyh60mrj1j8m10bwb3pbm1cb32rwashj45"; + version = "0.3.2"; + sha256 = "0km45i5zv6v977ivv0rh7273nsnlqlwci79r5qnr9lhxwy8c0xsv"; libraryHaskellDepends = [ base bytestring exceptions ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -181401,8 +181876,8 @@ self: { }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.3.1"; - sha256 = "0jlbrsnk1h9cnrgkxln5qz3rxf235z8sy0sm10cw5hwi1y9kzs5a"; + version = "0.3.2"; + sha256 = "1kkzi5cxv1mdb1i22bzrhr2vq4xb3kkkqs8smc6dps3pqswbxpyg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181421,6 +181896,8 @@ self: { ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "opentelemetry-http-client" = callPackage @@ -181446,8 +181923,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.3.1"; - sha256 = "0p1dl9m82sgcjdv13jbkjk50466yw6228kyy2jvw3fpb4lyfg38n"; + version = "0.3.2"; + sha256 = "0zpp17dgblx8gl6xlban5gcs2y8qfy39k8c3spaif4gbw9qc21yv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181471,8 +181948,8 @@ self: { }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.3.1"; - sha256 = "1399xmmphh3ph7m0fn6yx81p7wvk3s10wg4a0fp0pdmpc7hmyxgi"; + version = "0.3.2"; + sha256 = "0l10bwrzpsn74l9xk6sdbdpjf49kf4ak9s3z95ib56vrhs0nrkz0"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -182609,6 +183086,8 @@ self: { testHaskellDepends = [ base containers either mtl transformers ]; description = "Owned references in the Ownership Monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "org-mode" = callPackage @@ -183171,6 +183650,8 @@ self: { doHaddock = false; description = "Overloaded pragmas as a plugin"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "overloaded-records" = callPackage @@ -183294,6 +183775,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "packcheck_0_5_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "packcheck"; + version = "0.5.0"; + sha256 = "1ch6q58sxzv6dld8dwpkcd7wkakh3swnv6sgsvw9ri8zgygpn4ck"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base ]; + description = "Universal build and CI testing for Haskell packages"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "packdeps" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, optparse-applicative, process, semigroups, split, tar @@ -184687,6 +185182,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pantry_0_5_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.0.0"; + sha256 = "1v5nnmrg62phnwym8cw6bjld8impdmrkq9cwxmyrab48gjwds41l"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -185184,6 +185721,22 @@ self: { broken = true; }) {}; + "par-dual" = callPackage + ({ mkDerivation, async, base, hedgehog, refined, template-haskell + , validators + }: + mkDerivation { + pname = "par-dual"; + version = "0.1.0.0"; + sha256 = "0ys01vw0jyr51wwi0nccb552csc5d21np2pi7pi8jzi0k3g35i1v"; + libraryHaskellDepends = [ async base validators ]; + testHaskellDepends = [ + base hedgehog refined template-haskell validators + ]; + description = "ParDual class for Parallel <-> Sequential"; + license = stdenv.lib.licenses.asl20; + }) {}; + "par-traverse" = callPackage ({ mkDerivation, base, directory, filepath, parallel-io }: mkDerivation { @@ -186345,6 +186898,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "password_2_0_0_1" = callPackage + ({ mkDerivation, base, base-compat, base64, bytestring, Cabal + , cabal-doctest, cryptonite, doctest, memory, QuickCheck + , quickcheck-instances, scrypt, tasty, tasty-quickcheck + , template-haskell, text + }: + mkDerivation { + pname = "password"; + version = "2.0.0.1"; + sha256 = "1qxmmp0r8pkp6334213qai5y3wcg7w0jw9qp3m66mxaspjnfkpmw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base64 bytestring cryptonite memory text + ]; + testHaskellDepends = [ + base base-compat bytestring cryptonite doctest memory QuickCheck + quickcheck-instances scrypt tasty tasty-quickcheck template-haskell + text + ]; + description = "Hashing and checking of passwords"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "password-instances" = callPackage ({ mkDerivation, aeson, base, doctest, http-api-data, password , persistent, QuickCheck, quickcheck-instances @@ -186363,6 +186940,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "password-instances_2_0_0_1" = 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.1"; + sha256 = "1az6j3yh92nr1ksh4f966y7v8v81l9l14r8qfakf5h62iznwqv2q"; + 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 = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "passwords" = callPackage ({ mkDerivation, base, containers, MonadRandom, random }: mkDerivation { @@ -188908,6 +189509,35 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-template_2_8_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, deepseq-generics, file-embed, hspec, http-api-data + , monad-control, monad-logger, path-pieces, persistent, QuickCheck + , template-haskell, text, th-lift-instances, transformers + , unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.8.3.0"; + sha256 = "0ss6xa8lg6fg7ch9b2ps2s0nn87dp070xwm23z33mj2m5jd6n7kr"; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data monad-control + monad-logger path-pieces persistent template-haskell text + th-lift-instances transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq deepseq-generics file-embed persistent + template-haskell text + ]; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template-classy" = callPackage ({ mkDerivation, base, lens, persistent, persistent-sqlite , persistent-template, template-haskell, text @@ -192430,6 +193060,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plzwrk" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , haskell-src-meta, hspec, mtl, neat-interpolation, parsec, split + , template-haskell, text, transformers, unordered-containers + }: + mkDerivation { + pname = "plzwrk"; + version = "0.0.0.7"; + sha256 = "0llag2lgdb5d61961b6sjvl2v0mxbyvnz84ikzs87bf5gjm4v32j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable haskell-src-meta mtl + parsec split template-haskell text transformers + unordered-containers + ]; + executableHaskellDepends = [ + base containers neat-interpolation text unordered-containers + ]; + testHaskellDepends = [ base hspec mtl text unordered-containers ]; + description = "A front-end framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "png-file" = callPackage ({ mkDerivation, array, base, binary-file, bytestring, monads-tf , template-haskell, zlib @@ -193324,6 +193980,8 @@ self: { pname = "pomaps"; version = "0.2.0.0"; sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp"; + revision = "1"; + editedCabalFile = "1srihzg6wm2ydg6kr3q2n7pqk4wp4mhqscansi670pdzblv7ljkn"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -194792,19 +195450,30 @@ self: { }) {}; "postgresql-syntax" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase - , text + ({ mkDerivation, base, bytestring, case-insensitive, containers + , contravariant, fast-builder, foldl, hashable, headed-megaparsec + , hedgehog, megaparsec, parser-combinators, QuickCheck + , quickcheck-instances, rerebase, selective, tasty, tasty-hunit + , tasty-quickcheck, text, text-builder, unordered-containers, uuid + , vector }: mkDerivation { pname = "postgresql-syntax"; - version = "0.1"; - sha256 = "1x658jg0507n3085g8m24qixlixjz9ngxn6c5wqislh9i1rl5d7k"; - libraryHaskellDepends = [ base base-prelude bytestring text ]; - librarySystemDepends = [ pg_query ]; - testHaskellDepends = [ rerebase ]; - description = "PostgreSQL SQL syntax utilities"; + version = "0.2.0.1"; + sha256 = "0qp108cz7ch193hpfl03xffaxpn32zaaxhsv2fj5rbpvvyny3rx1"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers contravariant + fast-builder foldl hashable headed-megaparsec megaparsec + parser-combinators selective text text-builder unordered-containers + uuid vector + ]; + testHaskellDepends = [ + hedgehog QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "PostgreSQL AST parsing and rendering"; license = stdenv.lib.licenses.mit; - }) {pg_query = null;}; + }) {}; "postgresql-transactional" = callPackage ({ mkDerivation, base, monad-control, mtl, postgresql-simple }: @@ -195971,6 +196640,8 @@ self: { testToolDepends = [ alex happy ]; description = "safe PostgreSQL queries using Quasiquoters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "presburger" = callPackage @@ -196507,6 +197178,8 @@ self: { libraryHaskellDepends = [ ghc-prim ]; description = "An ergonomic but conservative interface to ghc-prim"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prim-array" = callPackage @@ -198247,8 +198920,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.10.1"; - sha256 = "1ymjlfp7gri82sa26s6a10lqqmzplvl68siai04wshx3jwr3b5y8"; + version = "5.10.2"; + sha256 = "1yagzlpn6myj46ihcy8v43kxjf8kba42q5vahy22aanpwbp9lij8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198417,8 +199090,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }: mkDerivation { pname = "proteaaudio"; - version = "0.7.1.0"; - sha256 = "1mmfcy7wwyniv5cpakcd73fapzy6z9n1yz66zsnk15ds2jclmqip"; + version = "0.8.0"; + sha256 = "0fwanb1i4cq7352kci3wxkb5nyi5cm6298r559faw1bfyj2lmfbh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -200865,22 +201538,6 @@ self: { }: mkDerivation { pname = "qrcode-core"; - version = "0.9.2"; - sha256 = "17a21a65n3hm739q7kgvpd4wvqz3i5y9bdkl6072ch87j0baqmpy"; - libraryHaskellDepends = [ - base binary bytestring case-insensitive containers dlist primitive - text vector - ]; - description = "QR code library in pure Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "qrcode-core_0_9_3" = callPackage - ({ mkDerivation, base, binary, bytestring, case-insensitive - , containers, dlist, primitive, text, vector - }: - mkDerivation { - pname = "qrcode-core"; version = "0.9.3"; sha256 = "08kp0qp7kvld99kk2iwr6cxpxji2w9vjydivqc3nwxbk5ay2mpjg"; libraryHaskellDepends = [ @@ -200889,7 +201546,6 @@ self: { ]; description = "QR code library in pure Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qrcode-juicypixels" = callPackage @@ -200898,22 +201554,6 @@ self: { }: mkDerivation { pname = "qrcode-juicypixels"; - version = "0.8.0"; - sha256 = "14cjf8gykh22ps5i8sh5im2m4sq81kgz4cdxmqyc9rpidqh763wk"; - libraryHaskellDepends = [ - base base64-bytestring bytestring JuicyPixels qrcode-core text - vector - ]; - description = "Converts a qrcode-core image to JuicyPixels"; - license = stdenv.lib.licenses.mit; - }) {}; - - "qrcode-juicypixels_0_8_1" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels - , qrcode-core, text, vector - }: - mkDerivation { - pname = "qrcode-juicypixels"; version = "0.8.1"; sha256 = "0yd22dygh2z8i0yhgdgr1m25ag9bdkpmd1ciq4iq42k0yhk6iqx9"; libraryHaskellDepends = [ @@ -200922,7 +201562,6 @@ self: { ]; description = "Converts a qrcode-core image to JuicyPixels"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "qsem" = callPackage @@ -205392,6 +206031,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-dot-preprocessor_0_2_5" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, record-hasfield + , uniplate + }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.2.5"; + sha256 = "10f054da8iz38mplgbq4j78r4jl4l07iridd89ivk9d366z1c0ly"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base extra ghc uniplate ]; + executableHaskellDepends = [ base extra ]; + testHaskellDepends = [ base extra filepath record-hasfield ]; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "record-encode" = callPackage ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck , vector @@ -206198,8 +206855,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.7.0.0"; - sha256 = "107xi9mwz20zcn9s941lfdyx79py3yvqn7117yqa2h7lnimda9fm"; + version = "0.7.1.0"; + sha256 = "0qxxhgkh3cv3fzxd9pgy78kxhi9b4q72jcq4n002h9qh8i6wwp7a"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -208178,22 +208835,20 @@ self: { "releaser" = callPackage ({ mkDerivation, base, Cabal, pretty-terminal, process, regex-tdfa - , regex-tdfa-text, text + , text }: mkDerivation { pname = "releaser"; - version = "0.2.1.0"; - sha256 = "1nmbqilik3zdcyi7b5hq7xrk1f62g6lw0i8014zxqz56lcwkaj4z"; + version = "0.3.0.0"; + sha256 = "0fz8zlkdrk8pjyqxyfyhlvvn68yi9d299z50indyhdnwgd4g94lr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal pretty-terminal process regex-tdfa regex-tdfa-text text + base Cabal pretty-terminal process regex-tdfa text ]; executableHaskellDepends = [ base ]; description = "Automation of Haskell package release process"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "relevant-time" = callPackage @@ -208904,6 +209559,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_4_0_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.4.0.0"; + sha256 = "1w0dlwfipli94g3fbqh118pmwgyzgrcwp32s60sk7a78cbr5mic4"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + description = "Find, replace, and split string patterns with Attoparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { @@ -208916,15 +209587,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "replace-megaparsec_1_3_2_0" = callPackage + "replace-megaparsec_1_4_1_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { pname = "replace-megaparsec"; - version = "1.3.2.0"; - sha256 = "0bhxjk2yc0h49i9b8irszhgg5041s63clrrcrd6l58s2nmfr3zw5"; + version = "1.4.1.0"; + sha256 = "0a51fsdmjq3iaamdnwslyrv99psh03qhqk8j0k3ikbjxqj3md3br"; libraryHaskellDepends = [ base bytestring megaparsec text ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and edit text patterns with Megaparsec parsers (instead of regex)"; + description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -210035,8 +210706,8 @@ self: { pname = "rethinkdb-client-driver"; version = "0.0.25"; sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g"; - revision = "4"; - editedCabalFile = "1fjavc5gmz15za1yzj4b23gd50b2jj83l0d5pc2kmz8f6bs5nx9f"; + revision = "5"; + editedCabalFile = "051fgkx8zdlbpnsgvqm4jqk9a21xszz9sdhcmchx6h4ilyn7byjy"; libraryHaskellDepends = [ aeson base binary bytestring containers hashable mtl network old-locale scientific stm template-haskell text time @@ -211001,31 +211672,6 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.1.15.0"; - sha256 = "0171sgxysksyhpcnpqrlawp1zrb279a0lr9bp5j5f4g0ak59h4p6"; - libraryHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable microlens mtl primitive process text time typed-process - unix unliftio unliftio-core unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory exceptions filepath - hashable hspec microlens mtl primitive process QuickCheck text time - typed-process unix unliftio unliftio-core unordered-containers - vector - ]; - description = "A standard library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rio_0_1_15_1" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, hashable, hspec, microlens, mtl, primitive - , process, QuickCheck, text, time, typed-process, unix, unliftio - , unliftio-core, unordered-containers, vector - }: - mkDerivation { - pname = "rio"; version = "0.1.15.1"; sha256 = "05mkxjwy9vp6ldzj5wci1frd2chvbg3l4vw1q8bpjdsj8svr2g5i"; libraryHaskellDepends = [ @@ -211041,7 +211687,6 @@ self: { ]; description = "A standard library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rio-orphans" = callPackage @@ -211609,6 +212254,8 @@ self: { ]; description = "A build system for incremental, parallel, and demand-driven computations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rocksdb-haskell" = callPackage @@ -211649,6 +212296,8 @@ self: { ]; description = "RocksDB database querying library for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "roguestar" = callPackage @@ -212243,10 +212892,8 @@ self: { }: mkDerivation { pname = "roundtrip"; - version = "0.2.0.5"; - sha256 = "10b57yfcnsgrkx4djgiinnyh46hwbysskmlh27bajp82p91v7xfa"; - revision = "1"; - editedCabalFile = "1kxlgbgwlrln9pal7yq4i487yy6jyf04s6fpb63w7z16anxly4bs"; + version = "0.2.0.7"; + sha256 = "130ad9kryygd3gikzrqcvwkparbpn57hp257v5wwr35q9p6ndhbj"; libraryHaskellDepends = [ base containers pretty safe template-haskell text xml-types ]; @@ -212627,33 +213274,33 @@ self: { }) {}; "rss-conduit" = callPackage - ({ mkDerivation, atom-conduit, base, blaze-builder, bytestring - , conduit, conduit-combinators, containers, data-default - , dublincore-xml-conduit, filepath, lens-simple, mono-traversable - , QuickCheck, quickcheck-instances, resourcet, safe - , safe-exceptions, singletons, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring, vinyl - , xml-conduit, xml-types + ({ mkDerivation, atom-conduit, base, base-compat-batteries + , blaze-builder, bytestring, conduit, conduit-combinators + , containers, data-default, dublincore-xml-conduit, filepath + , lens-simple, mono-traversable, QuickCheck, quickcheck-instances + , resourcet, safe, safe-exceptions, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "rss-conduit"; - version = "0.4.3.1"; - sha256 = "09bf66hk1kv5jn01wwqicmjvhzl4cvkn7qlf9bh5jyq3g17vybsq"; + version = "0.5.1.0"; + sha256 = "199l9ky1nb9ispl1gdn5wvn7c7sd89xa8qpk110w2k5nzi8hmsz5"; libraryHaskellDepends = [ - atom-conduit base conduit conduit-combinators containers - dublincore-xml-conduit lens-simple safe safe-exceptions singletons - text time timerep uri-bytestring vinyl xml-conduit xml-types + atom-conduit base base-compat-batteries conduit conduit-combinators + containers dublincore-xml-conduit lens-simple safe safe-exceptions + text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - atom-conduit base blaze-builder bytestring conduit - conduit-combinators data-default dublincore-xml-conduit filepath - lens-simple mono-traversable QuickCheck quickcheck-instances - resourcet safe-exceptions singletons tasty tasty-golden tasty-hunit - tasty-quickcheck text time uri-bytestring vinyl xml-conduit + atom-conduit base base-compat-batteries blaze-builder bytestring + conduit conduit-combinators data-default dublincore-xml-conduit + filepath lens-simple mono-traversable QuickCheck + quickcheck-instances resourcet safe-exceptions tasty tasty-golden + tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; description = "Streaming parser/renderer for the RSS standard"; - license = stdenv.lib.licenses.publicDomain; + license = stdenv.lib.licenses.cc0; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -215089,6 +215736,8 @@ self: { ]; description = "Work stealing scheduler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schedyield" = callPackage @@ -215116,6 +215765,8 @@ self: { ]; description = "Encoding-independent schemas for Haskell data types"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schemas" = callPackage @@ -215140,6 +215791,8 @@ self: { ]; description = "schema guided serialization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "schematic" = callPackage @@ -215425,6 +216078,8 @@ self: { ]; description = "Scientific notation intended for tokenization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scion" = callPackage @@ -218976,20 +219631,23 @@ self: { "servant-docs-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec - , hspec-core, prettyprinter, raw-strings-qq, servant, text + , hspec-core, ordered-containers, prettyprinter, raw-strings-qq + , servant, text, unordered-containers }: mkDerivation { pname = "servant-docs-simple"; - version = "0.1.0.0"; - sha256 = "11591njaavchmlmdzwql7n3klfs6il1c1q4rd5h8n84krsah3y4r"; + version = "0.2.0.1"; + sha256 = "0r9lq4vv88fvh8dfw5z7kxsw57vr7877gixwjfmsy5q1yam91d9d"; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring prettyprinter servant text + aeson aeson-pretty base bytestring ordered-containers prettyprinter + servant text unordered-containers ]; testHaskellDepends = [ - aeson aeson-pretty base bytestring hspec hspec-core prettyprinter - raw-strings-qq servant text + aeson aeson-pretty base bytestring hspec hspec-core + ordered-containers prettyprinter raw-strings-qq servant text + unordered-containers ]; - description = "Generate documentation via TypeRep for Servant API"; + description = "Generate endpoints overview for Servant API"; license = stdenv.lib.licenses.mit; }) {}; @@ -220916,6 +221574,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serverless-haskell_0_11_3" = callPackage + ({ mkDerivation, aeson, aeson-casing, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-client, http-types, iproute, lens + , raw-strings-qq, safe-exceptions, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.11.3"; + sha256 = "14jaykiwi5xzf9cvkkk35gqgk203yah1ln0skr7gi847bh95v7qf"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive http-client http-types iproute lens + safe-exceptions text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive hspec hspec-discover http-client + http-types iproute lens raw-strings-qq safe-exceptions text time + unix unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -221503,6 +222189,8 @@ self: { pname = "sexp-grammar"; version = "2.1.0"; sha256 = "139sqr50bba74h2r6gdivzsgkqjwq1gcah54zw2jkwzhlfk03fm1"; + revision = "1"; + editedCabalFile = "07rjcyk1zz775znhibaaqwxfkb8vfdbr5qsd20g5ywld0302scb1"; libraryHaskellDepends = [ array base bytestring containers deepseq invertible-grammar prettyprinter recursion-schemes scientific semigroups text @@ -222160,32 +222848,43 @@ self: { broken = true; }) {}; + "shake-plus" = callPackage + ({ mkDerivation, base, extra, path, rio, shake, within }: + mkDerivation { + pname = "shake-plus"; + version = "0.0.2.2"; + sha256 = "0yvwp3wzyzm8v2qihs96nsqlglhp7w1ndig04nzd13nqa726m6nd"; + libraryHaskellDepends = [ base extra path rio shake within ]; + description = "Re-export of Shake using well-typed paths and ReaderT"; + license = stdenv.lib.licenses.mit; + }) {}; + "shakebook" = callPackage - ({ mkDerivation, aeson, base, comonad, comonad-extras, doctemplates - , extra, feed, free, lens, lens-aeson, optparse-applicative, pandoc - , pandoc-types, relude, rio, shake, slick, split, tasty - , tasty-golden, text-time + ({ mkDerivation, aeson, base, comonad, doctemplates, extra, feed + , free, lens, lens-aeson, mustache, optparse-applicative, pandoc + , pandoc-types, path, relude, rio, shake, shake-plus, slick, split + , tasty, tasty-golden, text-time, within, zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.2.0.4"; - sha256 = "1h36pm81fwzsyjannsbxc27h03mb5k47byq1xc23gfj5i1gs1vhv"; + version = "0.2.2.0"; + sha256 = "19aa021sl9k2q5im3nfh73rhydald8f7f3z7c1ncnqszbfkhf8xh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base comonad comonad-extras doctemplates extra feed free lens - lens-aeson pandoc pandoc-types relude rio shake slick split - text-time + aeson base comonad doctemplates extra feed free lens lens-aeson + mustache pandoc pandoc-types path relude rio shake shake-plus slick + split text-time within zipper-extra ]; executableHaskellDepends = [ - aeson base comonad comonad-extras doctemplates extra feed free lens - lens-aeson optparse-applicative pandoc pandoc-types relude rio - shake slick split text-time + aeson base comonad doctemplates extra feed free lens lens-aeson + mustache optparse-applicative pandoc pandoc-types path relude rio + shake shake-plus slick split text-time within zipper-extra ]; testHaskellDepends = [ - aeson base comonad comonad-extras doctemplates extra feed free lens - lens-aeson pandoc pandoc-types relude rio shake slick split tasty - tasty-golden text-time + aeson base comonad doctemplates extra feed free lens lens-aeson + mustache pandoc pandoc-types path relude rio shake shake-plus slick + split tasty tasty-golden text-time within zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -222755,6 +223454,24 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "shellmet_0_0_3_1" = callPackage + ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text + }: + mkDerivation { + pname = "shellmet"; + version = "0.0.3.1"; + sha256 = "099v8w3b6s66mz79igjh57v98b90il6zkqh5wnqi3rvagbs89w5r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process text ]; + executableHaskellDepends = [ base text ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Out of the shell solution for scripting in Haskell"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shellout" = callPackage ({ mkDerivation, async, base, stm, text, typed-process }: mkDerivation { @@ -223090,14 +223807,17 @@ self: { }) {}; "shortcut-links" = callPackage - ({ mkDerivation, base, text }: + ({ mkDerivation, base, doctest, text }: mkDerivation { pname = "shortcut-links"; - version = "0.5.0.0"; - sha256 = "0y5q3m5sqwwhahq8fx1alc2531jfgr4nng8yfpib8sg57n0wggwf"; + version = "0.5.1.0"; + sha256 = "0gi3w7hh261nc2bmcwvagbgdazllk50sxn4vpzdhc2wb046mcida"; libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base doctest ]; description = "Link shortcuts for use in text markup"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shorten-strings" = callPackage @@ -223691,22 +224411,6 @@ self: { }: mkDerivation { pname = "simple-affine-space"; - version = "0.1"; - sha256 = "02cy4vnl3fy18dsfxazh60bqgk5c1gw2x460x6i1fb5qysw7q8nh"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base directory filepath hlint process regex-posix - ]; - description = "A simple library for affine and vector spaces"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-affine-space_0_1_1" = callPackage - ({ mkDerivation, base, deepseq, directory, filepath, hlint, process - , regex-posix - }: - mkDerivation { - pname = "simple-affine-space"; version = "0.1.1"; sha256 = "172yn8kispqbn6zrdn610mh3l728ffb6lwa1zk5qgwm0lfpx3849"; libraryHaskellDepends = [ base deepseq ]; @@ -223715,7 +224419,6 @@ self: { ]; description = "A simple library for affine and vector spaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-atom" = callPackage @@ -224758,6 +225461,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simplistic-generics_2_0_0" = callPackage + ({ mkDerivation, base, containers, deepseq, kind-apply, mtl + , template-haskell + }: + mkDerivation { + pname = "simplistic-generics"; + version = "2.0.0"; + sha256 = "178sy401xh8g4a7gs0iiwpcgqb9nif8yaa7rsr0ryjkhi5xpbb6q"; + libraryHaskellDepends = [ + base containers deepseq kind-apply mtl template-haskell + ]; + description = "Generic programming without too many type classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simseq" = callPackage ({ mkDerivation, base, bio, bytestring, random }: mkDerivation { @@ -225712,6 +226431,31 @@ self: { broken = true; }) {}; + "slack-progressbar" = callPackage + ({ mkDerivation, aeson, base, bytestring, interpolate, lens + , lens-aeson, mtl, network-uri, text, transformers, wreq + }: + mkDerivation { + pname = "slack-progressbar"; + version = "0.1.0.0"; + sha256 = "0jdjl8cs29jlk7likvvci4l435rgngj2a4fnj258rq2ws3c5zxgn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring interpolate lens lens-aeson mtl network-uri + text transformers wreq + ]; + executableHaskellDepends = [ + aeson base bytestring interpolate lens lens-aeson mtl network-uri + text transformers wreq + ]; + testHaskellDepends = [ + aeson base bytestring interpolate lens lens-aeson mtl network-uri + text transformers wreq + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "slack-verify" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , hspec @@ -226631,6 +227375,8 @@ self: { ]; description = "A type-safe interface to communicate with an SMT solver"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtlib2-debug" = callPackage @@ -226700,6 +227446,8 @@ self: { libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ]; description = "Get timing informations for SMT queries"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smtp-mail" = callPackage @@ -229815,8 +230563,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.2.1"; - sha256 = "1n6yd2is628wsrfj149cdr8k06anncbk92d39r1w4dmsmdp7hchk"; + version = "0.3.2.2"; + sha256 = "03f4mdrrfdivf0ynk4rfl64mng4nd82k8a64p05b3bymvd8lsdhn"; libraryHaskellDepends = [ base clustering containers hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -230723,11 +231471,11 @@ self: { ({ mkDerivation, base, logging, text, transformers, unixODBC }: mkDerivation { pname = "sqlcli"; - version = "0.2.1.0"; - sha256 = "1wqad2chgkpim467affs9bd6ipmkfv36kv8bdpd5mv8qkszryzwp"; + version = "0.2.2.0"; + sha256 = "1kscw8l14cx7q55vq72vg8ydfz19s41prdlbg9b11fhzv691iwgd"; libraryHaskellDepends = [ base logging text transformers ]; librarySystemDepends = [ unixODBC ]; - description = "High quality SQL/CLI and ODBC C function bindings"; + description = "Bindings for SQL/CLI (ODBC) C API"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unixODBC;}; @@ -235189,6 +235937,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "string-interpolate_0_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, formatting + , haskell-src-exts, haskell-src-meta, hspec, interpolate + , neat-interpolation, QuickCheck, quickcheck-instances + , quickcheck-text, quickcheck-unicode, split, template-haskell + , text, text-conversions, unordered-containers, utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.2.1.0"; + sha256 = "0wply8lqfhc1xnqxq88xwygwqxbq86gjrwphygbn7nz66g2abgda"; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta split + template-haskell text text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck quickcheck-instances + quickcheck-text quickcheck-unicode template-haskell text + unordered-containers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq formatting interpolate + neat-interpolation QuickCheck text + ]; + description = "Haskell string/text/bytestring interpolation that just works"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -236842,6 +237619,8 @@ self: { pname = "supervisors"; version = "0.2.0.0"; sha256 = "0q6r211sbb9dyrplr61xajbwcfvz7z93401mhqxhw3pz55vyrg8i"; + revision = "1"; + editedCabalFile = "1p91gji7qgvash13d4c6av573czk70p89g9i4x8gnklzbrpz2qg7"; libraryHaskellDepends = [ async base containers safe-exceptions stm ]; @@ -240392,28 +241171,6 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.3.3.1"; - sha256 = "1gvi35kjpj7636hi8mx05gp3qip7g94la3063d7nwr0jn9g6zb5s"; - 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 = stdenv.lib.licenses.mit; - }) {}; - - "tasty-golden_2_3_3_2" = 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; @@ -240427,7 +241184,6 @@ self: { ]; description = "Golden tests support for tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-groundhog-converters" = callPackage @@ -241417,6 +242173,8 @@ self: { ]; description = "Servant bindings to the Telegram bot API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "telegram-types" = callPackage @@ -241438,6 +242196,8 @@ self: { ]; description = "Types used in Telegram bot API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "teleport" = callPackage @@ -241537,6 +242297,8 @@ self: { libraryHaskellDepends = [ base time ]; description = "For representing musical tempi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "template" = callPackage @@ -241563,13 +242325,13 @@ self: { broken = true; }) {}; - "template-haskell_2_15_0_0" = callPackage - ({ mkDerivation, base, ghc-boot-th, pretty }: + "template-haskell_2_16_0_0" = callPackage + ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.15.0.0"; - sha256 = "16p8szb5by7gyk5r5cnrdp3b613vp5wasqj8dz63my17l2lsp2wl"; - libraryHaskellDepends = [ base ghc-boot-th pretty ]; + version = "2.16.0.0"; + sha256 = "1nk1cv35szp80qkhbyh5gn6vn194zzl0wz186qrqdrdx3a9r9w4g"; + libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -241967,6 +242729,8 @@ self: { ]; description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {libtensorflow = null;}; "tensorflow-core-ops" = callPackage @@ -241987,6 +242751,8 @@ self: { ]; description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-logging" = callPackage @@ -242015,6 +242781,8 @@ self: { ]; description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-mnist" = callPackage @@ -242096,6 +242864,8 @@ self: { ]; description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tensorflow-proto" = callPackage @@ -247834,13 +248604,17 @@ self: { }) {}; "tokyocabinet-haskell" = callPackage - ({ mkDerivation, base, bytestring, mtl, tokyocabinet }: + ({ mkDerivation, base, bytestring, directory, HUnit, mtl + , tokyocabinet + }: mkDerivation { pname = "tokyocabinet-haskell"; - version = "0.0.5"; - sha256 = "1v6s39q8a6cnc0ggpspz9i0xw6aih4ixn9bhn4hwf9kwgcspardg"; + version = "0.0.6"; + sha256 = "1cav27hnl49ghl6f7mhyaqmvfdqib6s76z251vai4vih9psis8rk"; libraryHaskellDepends = [ base bytestring mtl ]; librarySystemDepends = [ tokyocabinet ]; + testHaskellDepends = [ base bytestring directory HUnit mtl ]; + testSystemDepends = [ tokyocabinet ]; description = "Haskell binding of Tokyo Cabinet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -251064,6 +251838,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_19" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, fail + , foldl, hostname, managed, optional-args, optparse-applicative + , process, semigroups, stm, streaming-commons, system-fileio + , system-filepath, temporary, text, time, transformers, unix + , unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.19"; + sha256 = "06hxmhz1i6f5r8k3bf5h54g4ahjsvxhv44sa4xiy52rz6qp0211g"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm streaming-commons + system-fileio system-filepath temporary text time transformers unix + unix-compat + ]; + testHaskellDepends = [ + base doctest fail system-filepath temporary + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -251166,6 +251968,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "twentefp" = callPackage @@ -252598,8 +253402,8 @@ self: { }: mkDerivation { pname = "typed-encoding"; - version = "0.1.0.0"; - sha256 = "182qw95s60nnicl74hhijj4d9rk5rhpyibxw1awcwhks2a3c89r6"; + version = "0.2.0.0"; + sha256 = "1h1bnvw9j72mw2r4qjxsq4hvq1p8jkax4fhnhglcyskngmaa7ri5"; libraryHaskellDepends = [ base base64-bytestring bytestring text ]; testHaskellDepends = [ base base64-bytestring bytestring doctest doctest-discover @@ -252607,6 +253411,8 @@ self: { ]; description = "Type safe string transformations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "typed-process" = callPackage @@ -253783,6 +254589,8 @@ self: { pname = "unboxed-containers"; version = "0.0.2.4"; sha256 = "0yahavqjjnlf4ps8kd41s9s64nbhx2hf7qzk2xxkmq0i3b91d123"; + revision = "1"; + editedCabalFile = "16j16v36jabr9lpmjm52zbfz82m0ckd4p0f3z8123aawvzcvayji"; libraryHaskellDepends = [ base containers ]; description = "Self-optimizing unboxed sets using view patterns and data families"; license = stdenv.lib.licenses.bsd3; @@ -255037,8 +255845,8 @@ self: { }: mkDerivation { pname = "unjson"; - version = "0.15.2.1"; - sha256 = "1zx66qjx4rikbs8f2j1vazasin5fr6pxks3j5b7fkpriyxk49khs"; + version = "0.15.3"; + sha256 = "1p2bk9j5ww0zbkaw1wvl2122h763zn4ddjzg5rka948q3d6zivvi"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers free hashable invariant pretty primitive scientific semigroups text time @@ -256198,6 +257006,8 @@ self: { ]; description = "Communicate with USB devices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "usb-enumerator" = callPackage @@ -257327,8 +258137,8 @@ self: { }: mkDerivation { pname = "validation-selective"; - version = "0.0.0.0"; - sha256 = "01awbhfday2j0jcfgqq074yqxxasqddwxhlwigsbjgv94b4c55bd"; + version = "0.1.0.0"; + sha256 = "0ia3g2c1137pa0ns97yf8vbfvwmjhqnqhzn9lzgxvxwzchvwpnf7"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -257432,6 +258242,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-aeson_0_2_0_4" = callPackage + ({ mkDerivation, aeson, base, hspec, validity, validity-scientific + , validity-text, validity-unordered-containers, validity-vector + }: + mkDerivation { + pname = "validity-aeson"; + version = "0.2.0.4"; + sha256 = "1k0x6va9mmz0z9hgd1is71ks4fgbziw53rm7r6jsidp4ksszdzm0"; + libraryHaskellDepends = [ + aeson base validity validity-scientific validity-text + validity-unordered-containers validity-vector + ]; + testHaskellDepends = [ aeson base hspec validity ]; + description = "Validity instances for aeson"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-bytestring" = callPackage ({ mkDerivation, base, bytestring, validity }: mkDerivation { @@ -258451,6 +259279,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_4_1_0" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.4.1.0"; + sha256 = "14l6c8l8l29f6kdffknd70kkccfjcf105i1zd0kchgsgjnr9p6l1"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -259084,8 +259930,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.32"; - sha256 = "0kij1cscfjg6bvh0gm6avsrd2n225dwg2pn8wk3xydvxq1wpcg2b"; + version = "0.0.0.33"; + sha256 = "1xj9b2b3wi0sr75fafcjh054aqs4g9sdqryc4w5lwr7wndi0qjgr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -259240,10 +260086,8 @@ self: { }: mkDerivation { pname = "vinyl"; - version = "0.12.1"; - sha256 = "0bwy1814762vy2din5i73h4d6mmf4hw71ix5c1mnnzmbmjnmbqc0"; - revision = "1"; - editedCabalFile = "0v5rhc9xxb1q8z1kj1y2c0zy5ijx044fggvvk1844hz2z93f5x83"; + version = "0.12.2"; + sha256 = "1h5q5y3ni7vx48rmammf66nzjmbclwh5n1c41gln8fm98n6n96yn"; libraryHaskellDepends = [ array base ghc-prim ]; testHaskellDepends = [ aeson base doctest hspec lens lens-aeson microlens mtl @@ -259533,6 +260377,8 @@ self: { libraryHaskellDepends = [ base mtl profunctors ]; description = "Profunctor optics via the profunctor representation theorem"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "vivid" = callPackage @@ -259956,18 +260802,12 @@ self: { }) {}; "vulkan" = callPackage - ({ mkDerivation, base, bytestring, transformers, vector - , vector-sized, vulkan - }: + ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.1.0.0"; - sha256 = "0g2avnjizgn6qb7vp4zy71db2pd9d1s16k0nagcc0fsyx5mnhh49"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring transformers vector vector-sized - ]; + version = "3.3"; + sha256 = "18xch9fs4xnknfvxx867yg3mbp2y9fv4lldrlk7nkqp8hlsgzh1k"; + libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; @@ -262779,8 +263619,8 @@ self: { }: mkDerivation { pname = "web3"; - version = "0.8.3.2"; - sha256 = "1yk24r1pbavvp8si8yxk4p5n4s80h1klz5rav49sgrw8zj69n3x7"; + version = "0.8.4.0"; + sha256 = "1sib2s0zkn8a26y4mfyyy7vjxj3b5x4nmanj27zijnh2aa8rr51c"; libraryHaskellDepends = [ aeson async base basement bytestring cereal cryptonite data-default exceptions generics-sop http-client http-client-tls machines memory @@ -263407,6 +264247,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_12_7_1" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary + , bytestring, bytestring-builder, case-insensitive, clock + , containers, criterion, entropy, HUnit, network, QuickCheck + , random, SHA, streaming-commons, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.12.7.1"; + sha256 = "1jqlvgw1ffw0236y4g7li188m9ac37a2yp07vkvcmbz63rmhfmnk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive clock containers entropy + network random SHA streaming-commons text + ]; + testHaskellDepends = [ + async attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive clock containers entropy HUnit + network QuickCheck random SHA streaming-commons test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + async attoparsec base base64-bytestring binary bytestring + bytestring-builder case-insensitive clock containers criterion + entropy network random SHA text + ]; + doCheck = false; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, mtl, QuickCheck @@ -264357,6 +265232,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "within" = callPackage + ({ mkDerivation, base, exceptions, hashable, path }: + mkDerivation { + pname = "within"; + version = "0.0.2.0"; + sha256 = "08ddmh9zfb435q8ljsisszvd5hgjpsnxcv57kzadwcicy2wkj32b"; + libraryHaskellDepends = [ base exceptions hashable path ]; + description = "A path within another path"; + license = stdenv.lib.licenses.mit; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -265373,6 +266259,8 @@ self: { ]; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wreq-sb" = callPackage @@ -265739,6 +266627,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wstunnel" = callPackage + ({ mkDerivation, async, base, base64-bytestring, binary, bytestring + , classy-prelude, cmdargs, connection, hslogger, hspec, iproute + , mtl, network, network-conduit-tls, streaming-commons, text + , unordered-containers, websockets + }: + mkDerivation { + pname = "wstunnel"; + version = "0.3.0.1"; + sha256 = "17qbf9sy82lrnqz8aa3brggdps7adlizm75x3x5byib769v1k1pa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base base64-bytestring binary bytestring classy-prelude + connection hslogger iproute mtl network network-conduit-tls + streaming-commons text unordered-containers websockets + ]; + executableHaskellDepends = [ + async base bytestring classy-prelude cmdargs hslogger text + ]; + testHaskellDepends = [ + async base binary bytestring classy-prelude hspec network + network-conduit-tls streaming-commons text + ]; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "wtk" = callPackage ({ mkDerivation, base, old-locale, time, transformers }: mkDerivation { @@ -268921,6 +269839,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yaml_0_11_4_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, mtl, raw-strings-qq, resourcet, scientific + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.11.4.0"; + sha256 = "0v69d10ni6ydj4g63ajcmnx6a2j3kbl91vpz678l7k5mkd3chkns"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath libyaml mtl resourcet scientific template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring conduit containers + directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq + resourcet scientific template-haskell temporary text transformers + unordered-containers vector + ]; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -269120,6 +270068,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yamlparse-applicative" = callPackage + ({ mkDerivation, aeson, base, bytestring, genvalidity-aeson + , genvalidity-hspec, genvalidity-scientific, genvalidity-text + , hspec, optparse-applicative, path, path-io, prettyprinter + , QuickCheck, scientific, text, unordered-containers, validity + , validity-text, vector, yaml + }: + mkDerivation { + pname = "yamlparse-applicative"; + version = "0.0.0.0"; + sha256 = "1n2mm542zl4mji8la5xpyjj6cab3rqihlwm1x4d0xgn7xzmng02g"; + libraryHaskellDepends = [ + aeson base bytestring optparse-applicative path path-io + prettyprinter scientific text unordered-containers validity + validity-text vector yaml + ]; + testHaskellDepends = [ + aeson base genvalidity-aeson genvalidity-hspec + genvalidity-scientific genvalidity-text hspec QuickCheck scientific + text + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "yampa-canvas" = callPackage ({ mkDerivation, base, blank-canvas, stm, time, Yampa }: mkDerivation { @@ -273030,8 +274002,8 @@ self: { }: mkDerivation { pname = "zeolite-lang"; - version = "0.1.2.9"; - sha256 = "1jyy54cpvcaarsxhglbcq9yjz24l6qfcfkinwj1lngz824mr0qgq"; + version = "0.4.1.1"; + sha256 = "0vhxlznprjmaf910j99s7yc0mjyk4jw6gdh49106v83xv3b5ak1m"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -273682,6 +274654,17 @@ self: { broken = true; }) {}; + "zipper-extra" = callPackage + ({ mkDerivation, base, comonad, comonad-extras, split }: + mkDerivation { + pname = "zipper-extra"; + version = "0.1.0.1"; + sha256 = "07bhmqjd743x2zjay0q29jfms8xlhk2awc38x75h0cym3agi1m5d"; + libraryHaskellDepends = [ base comonad comonad-extras split ]; + description = "Zipper utils that weren't in Control.Comonad.Store.Zipper"; + license = stdenv.lib.licenses.mit; + }) {}; + "zippers" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest , fail, lens, profunctors, semigroupoids, semigroups @@ -274089,18 +275072,17 @@ self: { }) {}; "zsdd" = callPackage - ({ mkDerivation, base, containers, hashable, mtl, random + ({ mkDerivation, base, containers, hashable, mtl , unordered-containers }: mkDerivation { pname = "zsdd"; - version = "0.1.0.0"; - sha256 = "0r6b1azxbkvnqa1ksw9hrk37cglv1lkhqaq16zkjnigzvgfilw8g"; + version = "0.2.1.0"; + sha256 = "107mw1xyx1imi2w0lz5f768yj8r9plamz7f988yhw89i8l51wx80"; libraryHaskellDepends = [ base containers hashable mtl unordered-containers ]; - testHaskellDepends = [ base mtl random ]; - description = "Zero-suppressed decision diagrams"; + description = "Zero-Suppressed and Reduced Decision Diagrams"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -274178,21 +275160,21 @@ self: { }) {}; "ztar" = callPackage - ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq - , directory, filepath, path, path-io, process, QuickCheck, tasty + ({ mkDerivation, base, bytestring, deepseq, directory, filepath + , path, path-io, process, QuickCheck, quickcheck-instances, tasty , tasty-quickcheck, text, unix-compat, zip, zlib }: mkDerivation { pname = "ztar"; - version = "1.0.1"; - sha256 = "13nqbl1bakyw0nn7nihs49qfqz3lx78h3nvq8d9pxm2jvp9x32j9"; + version = "1.0.2"; + sha256 = "081ip4fmkavrwhlqa8jwv4pdf40dvhfd7d4w3iqk3p9qpdnbjm3j"; libraryHaskellDepends = [ base bytestring deepseq directory filepath path process text unix-compat zip zlib ]; testHaskellDepends = [ - base bytestring bytestring-arbitrary filepath path path-io - QuickCheck tasty tasty-quickcheck + base bytestring filepath path path-io QuickCheck + quickcheck-instances tasty tasty-quickcheck ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; @@ -274267,6 +275249,8 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zxcvbn-hs" = callPackage @@ -274305,6 +275289,8 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; } diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 130eabbee34..86c7938db04 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -3,17 +3,17 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.0.89"; + version = "0.0.94"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "0bc5rbizd2lg7qfh733yiip8m9zqrwgjf5ca09sdibxp7nhhsjby"; + sha256 = "103x5ih48rhhdipar66bp0s0j62fv4r3sszh8fwaivs7dvsvcvsd"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "11jhqbm3svvikr9glz8wwps1267y25g3384ijw6avn267s7d7l8c"; + sha256 = "0fin80x898qzylzq91q6mp8pgwk0sciwwa9l71mdhahqasa90sri"; }; dontUnpack = true; @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/borkdude/babashka"; license = licenses.epl10; platforms = graalvm8.meta.platforms; - maintainers = with maintainers; [ bhougland DerGuteMoritz jlesquembre ]; + maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; }; } diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json index 6ab3f9616c7..acfd5c4ed49 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/package.json +++ b/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -27,7 +27,7 @@ "glob": "^7.1.3", "gunzip-maybe": "^1.4.1", "insert-module-globals": "^7.2.0", - "jszip": "github:anmonteiro/jszip#patch-1", + "jszip": "2.x", "mkdirp": "^1.0.3", "ncp": "^2.0.0", "node-fetch": "^2.2.1", diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix index afab770da35..d63a94d98d6 100644 --- a/pkgs/development/interpreters/elixir/1.10.nix +++ b/pkgs/development/interpreters/elixir/1.10.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.10.2"; - sha256 = "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6"; + version = "1.10.3"; + sha256 = "18bqqqzvhr1zj491wc3d36a310mg1wcs12npp70zfmgqrc60q65a"; minimumOTPVersion = "21"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index b46b71485c8..54b046beaab 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -73,6 +73,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny havvy couchemar ankhers filalex77 ]; + maintainers = with maintainers; [ havvy couchemar ankhers filalex77 ]; }; }) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 883fa87cbd4..f80e1f344f7 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -122,7 +122,7 @@ in stdenv.mkDerivation ({ ''; platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ]; + maintainers = with maintainers; [ sjmackenzie couchemar gleber ]; license = licenses.asl20; } // meta); } diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix new file mode 100644 index 00000000000..a317f35d2a7 --- /dev/null +++ b/pkgs/development/interpreters/jelly/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication { + pname = "jelly"; + version = "0.1.31"; + + src = fetchFromGitHub { + owner = "DennisMitchell"; + repo = "jellylanguage"; + rev = "70c9fd93ab009c05dc396f8cc091f72b212fb188"; + sha256 = "1rpclqagvigp5qhvgnjavvy463f1drshnc1mfxm6z7ygzs0l0yz6"; + }; + + propagatedBuildInputs = [ python3Packages.sympy ]; + + # checks are disabled because jelly has no tests, and the default is to run + # the output binary with no arguments, which exits with status 1 and causes + # the build to fail + doCheck = false; + + meta = with lib; { + description = "A recreational programming language inspired by J"; + homepage = https://github.com/DennisMitchell/jellylanguage; + license = licenses.mit; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index b176c55cbfd..39588a0c363 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.0"; + version = "0.15.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "03lbvxmkn0rr7yv7kj6c4dh4zayiwbhrkqbz2m22dw568rjbp8az"; + sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn"; }; - modSha256 = "1mylgim9nm0v5wybgzi74nqzmvzwzws0027wzl86dbj5id83ab9v"; + modSha256 = "165mjfjk4x95ckw7wg96bg9pzb3297sggnip38nz2jxxbqr0ff8b"; preBuild = '' go generate ./... diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 2abcec68c86..692aed3e4ee 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df"; + sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2"; }; buildInputs = [ readline ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e0aea60e293..8ccb0e54641 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -67,7 +67,7 @@ let getDepsRecursively = extensions: let deps = lib.concatMap - (ext: ext.internalDeps or []) + (ext: (ext.internalDeps or []) ++ (ext.peclDeps or [])) extensions; in if ! (deps == []) then @@ -86,12 +86,12 @@ let (map (ext: let extName = getExtName ext; + phpDeps = (ext.internalDeps or []) ++ (ext.peclDeps or []); type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; in lib.nameValuePair extName { text = "${type}=${ext}/lib/php/extensions/${extName}.so"; - deps = lib.optionals (ext ? internalDeps) - (map getExtName ext.internalDeps); + deps = map getExtName phpDeps; }) (enabledExtensions ++ (getDepsRecursively enabledExtensions))); @@ -112,8 +112,10 @@ let phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; tests = nixosTests.php; - inherit (php-packages) packages extensions; - inherit (php) meta; + inherit (php-packages) packages extensions buildPecl; + meta = php.meta // { + outputsToInstall = [ "out" ]; + }; }; paths = [ php ]; postBuild = '' diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 00e77033575..f7343f6e4d6 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Tests are currently broken on i686 see - # http://hydra.nixos.org/build/24003763/nixlog/1 + # https://hydra.nixos.org/build/24003763/nixlog/1 doCheck = if stdenv.isi686 then false else true; checkTarget = "test"; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5dc3b224720..2def54de12d 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -23,8 +23,6 @@ with pkgs; }; in rec { isPy27 = pythonVersion == "2.7"; - isPy33 = pythonVersion == "3.3"; # TODO: remove - isPy34 = pythonVersion == "3.4"; # TODO: remove isPy35 = pythonVersion == "3.5"; isPy36 = pythonVersion == "3.6"; isPy37 = pythonVersion == "3.7"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 725b1d5106d..1db01c0d775 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.6"; # always change at once with ./minimal.nix + version = "7.7"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8"; + sha256 = "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2"; }; FONTCONFIG_FILE = fontsConf; @@ -82,10 +82,7 @@ stdenv.mkDerivation rec { ''; shared = if stdenv.isDarwin then "dylib" else "shared"; - configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" - # The following flag is a temporary workaround for an upstream bug: - # https://github.com/racket/racket/issues/3046 - "--enable-useprefix" ] + configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 9e817b76000..a4a7a5c12cd 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y"; + sha256 = "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln"; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 37abbd97746..e4501d85238 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.02.1"; + version = "2020.05"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1qfaiqfclqd6zz04xl90yiqkvmm610r905nnbd6gszgyq1k77ckv"; + sha256 = "08d1591k8lhyw3kmxq53lf24wg6d61lg2xc81zzcglask9n9ilc6"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index ade97b56a64..a7b57c9287a 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.02.1"; + version = "2020.05"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "0cnnyjyci24pbws2cic80xdr7a5g3qvrsi221c6bpbnpkar81jw2"; + sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index f12e60b14f0..40133287f9e 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.02.1"; + version = "2020.05"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0zw3g7viyq4n4qwy0laww2mzz6wrzkfcq4fm82scy1mh65r7bdgj"; + sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 9a8c11324a2..5c8fe16408b 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.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "1fscv8fbaa5l8dcwclmq3hvg3c59l4dvyjqb316mgnc5anxpzy2f"; + sha256 = "02a3awnjr1mgb9275xvp3xms80vcxkq55ffi8sbjzxpwyadj5y5k"; }; buildInputs = [ rakudo makeWrapper ]; diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 32dd28bcb20..5a1e3f265b2 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation { meta = { homepage = "http://s48.org/"; description = "Scheme 48"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; unix; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 79222749dc4..67d54af7bb2 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,24 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; rev = "v${version}"; - sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr"; + sha256 = "1df99iak0psydlg9m8f8qq4zyh4wbi5l4qgsdjr2lm74ci3483xy"; fetchSubmodules = true; }; - cargoSha256 = "0vyxp74jlnrisk0kblsbj9d9a54wcgzbyjm7iqav1k4ns3syrnmh"; + cargoSha256 = "170bz48jrc1k2ylfmd3bcry0xpcxx8p3rzzv9mprlfmrfpb0b28r"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - doCheck = false; # https://github.com/bytecodealliance/wasmtime/issues/1197 + # no test on darwin due to + # https://github.com/bytecodealliance/wasmtime/issues/1556 + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 6b7739b322d..45e73410d28 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - date = "20191119"; - rev = "8ba96a8244bbe334d09542e92d566673a65c1f78"; - version = "${date}-${rev}"; + version = "20200225.2"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = rev; - sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb"; + rev = version; + sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +17,7 @@ stdenv.mkDerivation rec { description = "An open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; + platforms = platforms.all; maintainers = [ maintainers.andersk ]; }; } diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 3251b1c9e0d..9b32d46b3b2 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 = "9.860.1"; + version = "9.870.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1ab5y4ll6js2w4p9dabj2dmzzc3f8dja8dqsvy40azrvny58h0qn"; + sha256 = "0mpp1iq4ws9yhcv0bnn0czzyim7whcan34c7a052sh8w9kp5y6sl"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 84fa46eed27..593854bb280 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -9,7 +9,7 @@ let allBass = { bass = { h = "bass.h"; - version = "2.4.14"; + version = "2.4.15"; so = { i686_linux = "libbass.so"; x86_64-linux = "x64/libbass.so"; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index e415aa5e4f2..bb2645beda7 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lv2"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2"; - sha256 = "1ppippbpdpv13ibs06b0bixnazwfhiw0d0ja6hx42jnkgdyp5hyy"; + sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh"; }; nativeBuildInputs = [ pkgconfig wafHook ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch new file mode 100644 index 00000000000..6e4cad9e73c --- /dev/null +++ b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch @@ -0,0 +1,75 @@ +diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake +index e87252123e..5457bd5910 100644 +--- a/cmake/AWSSDKConfig.cmake ++++ b/cmake/AWSSDKConfig.cmake +@@ -82,6 +82,7 @@ if (AWSSDK_ROOT_DIR) + ) + else() + find_file(AWSSDK_CORE_HEADER_FILE Aws.h ++ "/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "/usr/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "/usr/local/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "C:/Progra~1/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" +@@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE) + message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") + endif() + +-# based on core header file path, inspects the actual AWSSDK_ROOT_DIR +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +- +-if (NOT AWSSDK_ROOT_DIR) +- message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") ++if (IS_ABSOLUTE ${AWSSDK_INSTALL_LIBDIR}) ++ set(AWSSDK_ROOT_DIR "") ++else() ++ # based on core header file path, inspects the actual AWSSDK_ROOT_DIR ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ ++ if (NOT AWSSDK_ROOT_DIR) ++ message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") ++ endif() + endif() + + +diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake +index 283a14a138..646aea1da3 100644 +--- a/cmake/utilities.cmake ++++ b/cmake/utilities.cmake +@@ -43,7 +43,8 @@ macro(setup_install) + EXPORT "${PROJECT_NAME}-targets" + ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY} + LIBRARY DESTINATION ${LIBRARY_DIRECTORY} +- RUNTIME DESTINATION ${BINARY_DIRECTORY} ) ++ RUNTIME DESTINATION ${BINARY_DIRECTORY} ++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY} ) + + if (BUILD_SHARED_LIBS) + install( +@@ -57,7 +58,8 @@ macro(setup_install) + install (TARGETS ${PROJECT_NAME} + ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} + LIBRARY DESTINATION ${LIBRARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} +- RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) ++ RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} ++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) + endif() + endif() + endmacro() +diff --git a/toolchains/pkg-config.pc.in b/toolchains/pkg-config.pc.in +index 9b519d2772..a61069225c 100644 +--- a/toolchains/pkg-config.pc.in ++++ b/toolchains/pkg-config.pc.in +@@ -1,5 +1,5 @@ +-includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_DIRECTORY@ +-libdir=@CMAKE_INSTALL_PREFIX@/@LIBRARY_DIRECTORY@ ++includedir=@INCLUDE_DIRECTORY@ ++libdir=@LIBRARY_DIRECTORY@ + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index f6878cd9396..94827743bf3 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; + postFixupHooks = [ + # This bodge is necessary so that the file that the generated -config.cmake file + # points to an existing directory. + ''mkdir -p $out/include'' + ]; + __darwinAllowLocalNetworking = true; patches = [ @@ -57,6 +63,7 @@ stdenv.mkDerivation rec { url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; }) + ./cmake-dirs.patch ]; meta = with lib; { diff --git a/pkgs/development/libraries/boost/cmake-paths.patch b/pkgs/development/libraries/boost/cmake-paths.patch new file mode 100644 index 00000000000..b7f90148f9d --- /dev/null +++ b/pkgs/development/libraries/boost/cmake-paths.patch @@ -0,0 +1,21 @@ +diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam +index ad19f7b55..ec6bf57ff 100644 +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * ) + "# Compute the include and library directories relative to this file." + "" + "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" ++ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" + : true ; + + if [ path.is-rooted $(cmakedir) ] +@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * ) + " unset(_BOOST_CMAKEDIR_ORIGINAL)" + "endif()" + "" ++ "# Assume that the installer actually did know where the libs were to be installed" ++ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)" + : true ; + } + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 7fe3c185c04..6d1c20f323d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -112,7 +112,8 @@ stdenv.mkDerivation { ++ optional stdenv.isDarwin ( if version == "1.55.0" then ./darwin-1.55-no-system-python.patch - else ./darwin-no-system-python.patch); + else ./darwin-no-system-python.patch) + ++ optional (versionAtLeast version "1.70") ./cmake-paths.patch; meta = { homepage = "http://boost.org/"; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 67e2794c8a2..20524cf179c 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -3,24 +3,23 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation { pname = "boringssl"; - version = "2017-02-23"; + version = "2019-12-04"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5"; - sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975"; + rev = "243b5cc9e33979ae2afa79eaa4e4c8d59db161d4"; + sha256 = "1ak27dln0zqy2vj4llqsb99g03sk0sg25wlp09b58cymrh3gccvl"; }; - buildInputs = [ cmake perl go ]; + nativeBuildInputs = [ cmake perl go ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; installPhase = '' - mkdir -p $out/bin $out/include $out/lib + mkdir -p $bin/bin $out/include $out/lib - mv tool/bssl $out/bin + mv tool/bssl $bin/bin mv ssl/libssl.a $out/lib mv crypto/libcrypto.a $out/lib @@ -29,6 +28,8 @@ stdenv.mkDerivation { mv ../include/openssl $out/include ''; + outputs = [ "out" "bin" ]; + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index d3bb3479911..85905778e80 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.17.1"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "1asp3xmbvdnz1mj1pl1ykzz61cybvkxz3cdn43zh1z0x1qlgwm80"; + sha256 = "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70"; }; buildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index a2b65c9bbb4..960c07e29df 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.11.3"; + version = "2.12.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="012j7fnlsdyvg6d7gwdab7yzllkv4wqb164lfg4ixahx9l9schmp"; + sha256="163198lizcr84ify34xjj1955rcgsqhwn87dwifiwyamnggn445f"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 193bdda3445..0a51e7e592b 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx"; }; - # Test can randomly fail: http://hydra.nixos.org/build/7243912 + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 6453ff2a3e9..4b2520d714b 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "1c5rs28pavv8zabprjbd2y1sblgqbbhww07qvairh149rahvxi85"; + sha256 = "18sy1jrz5adzy7c8k42kqlpicc4h0igimjqwaa6m9swwkhwiqqjz"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cudd/cudd.patch b/pkgs/development/libraries/cudd/cudd.patch new file mode 100644 index 00000000000..152fa30997f --- /dev/null +++ b/pkgs/development/libraries/cudd/cudd.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile.am b/Makefile.am +index 45f216a..39c3c82 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,6 +3,9 @@ ACLOCAL_AMFLAGS = -I m4 + include_HEADERS = cudd/cudd.h + if DDDMP + include_HEADERS += dddmp/dddmp.h ++include_HEADERS += util/util.h ++include_HEADERS += config.h ++include_HEADERS += mtr/mtr.h + endif + if OBJ + include_HEADERS += cplusplus/cuddObj.hh diff --git a/pkgs/development/libraries/cudd/default.nix b/pkgs/development/libraries/cudd/default.nix new file mode 100644 index 00000000000..6749d2e94c0 --- /dev/null +++ b/pkgs/development/libraries/cudd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "cudd"; + version = "3.0.0"; + + src = fetchurl { + url = "https://davidkebo.com/source/cudd_versions/cudd-3.0.0.tar.gz"; + sha256 = "0sgbgv7ljfr0lwwwrb9wsnav7mw7jmr3k8mygwza15icass6dsdq"; + }; + + configureFlags = [ + "--enable-dddmp" + "--enable-obj" + ]; + + patches = [ + ./cudd.patch + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + homepage = "https://davidkebo.com/cudd"; + description = "Binary Decision Diagram (BDD) library"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ chessai ]; + }; +} diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 1d24da9f7fe..65373547977 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.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "cutelyst"; repo = "cutelyst"; rev = "v${version}"; - sha256 = "13h2sj131s31qdzdwa3hx7ildmvlk8mv9s0j99kvx1ijaq49z79f"; + sha256 = "1k8pbpwll19l3i3s34l9yhkxj4yqxbrf393nm29jqwlhvi9nz8qm"; }; nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 90c312bb7a6..e1172870ede 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.14"; + name = "enet-1.3.15"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq"; + sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas"; }; meta = { diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index f6a7f6c12fb..8973eda5d82 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.04"; + version = "20.05"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0ykc2y1w0wh6s3g9xzk3zqscvdjnf59923zxh2x0whxlcvndab2d"; + sha256 = "14i0s0m1n57wjwzy54v1czq0w38xplcdsfn4nz5v6fryaxzr5z60"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 89ea40c1c65..31ce6602963 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.26"; + version = "1.1.33"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "1nqxcnf6lax7grsxhajq87h92ngm487nzzz87kkmh1nzk33r7dwd"; + sha256 = "1gq972ngpdmpb63mc6myxsd0rf3qph95qx542021xh9f2791qffi"; }; buildInputs = [ diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index be0edab3155..4e7ce1d5ac8 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.8.0"; + name = "geos-3.8.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr"; + sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 1f25abd2cf3..ee29c6a97a4 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -28,11 +28,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.1"; + version = "1.64.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z4qx4s3174b1w5b0slnn6jwpy2c18s4fvx4xii2kflr7s4q7bsm"; + sha256 = "0ywrsfmkxaw11z83dnmb9yqkn6k3c1mkxw2mv6arbwad6x6q7zqm"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 2ed717a49b8..85a9944fcf7 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -2,12 +2,12 @@ , zlib, libGL, libGLU, libpng, freeglut }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.2"; pname = "gl2ps"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; - sha256 = "0fsx5lh9pz1xswr4yng24j4ngiijnanksbgz05bfzkh07m5h6qkk"; + sha256 = "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d"; }; buildInputs = [ diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 8f237199a65..80a7759c574 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-2.1.0"; + name = "glew-2.2.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4"; + sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 9689bf98b31..882c9f8c3f5 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.64.1"; + version = "2.64.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wmg5n2h0r1rcdmp4w48akqlsbpjrjrj6p59g5ylc5yqyzg4dhx4"; + sha256 = "19wmyv7j355z1wk650fyygadbwwmmhqggr54845rn7smbiqz1pj5"; }; patches = [ diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 6dcb6b3296a..dff122d38d1 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.62.0"; + version = "2.64.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n"; + sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 80753823ff1..f2ba29d461e 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -2,12 +2,12 @@ , vala }: stdenv.mkDerivation rec { - version = "3.2.6"; + version = "3.2.7"; pname = "gmime"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb"; + sha256 = "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 78cfa40d196..a027d58de39 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -25,7 +25,7 @@ let self = stdenv.mkDerivation rec { (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". - # See <http://hydra.nixos.org/build/2760931>, for instance. + # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index cca0f8d68e1..c5fffa09bf0 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -27,7 +27,7 @@ let self = stdenv.mkDerivation rec { (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". - # See <http://hydra.nixos.org/build/2760931>, for instance. + # See <https://hydra.nixos.org/build/2760931>, for instance. # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 90e863760e9..c6d35b68236 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -11,7 +11,7 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + # https://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 4e7e19d9ff0..6d0faa03a88 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -11,7 +11,7 @@ let version = "3.6.13"; # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + # https://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" && stdenv.buildPlatform == stdenv.hostPlatform; @@ -48,6 +48,8 @@ stdenv.mkDerivation { sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh + '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 + sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool ''; preConfigure = "patchShebangs ."; @@ -57,8 +59,12 @@ stdenv.mkDerivation { "--disable-dependency-tracking" "--enable-fast-install" "--with-unbound-root-key-file=${dns-root-data}/root.key" - ] ++ lib.optional guileBindings - [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; + ] ++ lib.optional guileBindings [ + "--enable-guile" + "--with-guile-site-dir=\${out}/share/guile/site" + "--with-guile-site-ccache-dir=\${out}/share/guile/site" + "--with-guile-extension-dir=\${out}/share/guile/site" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index a68d544cfbe..6bee47aeb09 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -18,7 +18,14 @@ giDiscoverSelf() { fi } -preFixupHooks+=(giDiscoverSelf) +# gappsWrapperArgsHook expects GI_TYPELIB_PATH variable to be set by this. +# Until we have dependency mechanism in generic builder, we need to use this ugly hack. +if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then + preFixupPhases+=" " + preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / giDiscoverSelf gappsWrapperArgsHook }" +else + preFixupPhases+=" giDiscoverSelf" +fi _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index c1fa8af1271..6a94944e9f1 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn"; + sha256 = "1nf97vq07gadwdla6kws8z510xlmv0a7wlyqwwnhyagq7kjdnjq0"; }; passthru = { diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d9bf86e0cf3..903ca661486 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -104,6 +104,8 @@ in stdenv.mkDerivation rec { sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; }) ./fix_pkgconfig_includedir.patch + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 + ./opencv-4.3.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch new file mode 100644 index 00000000000..55155d5c5e7 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch @@ -0,0 +1,13 @@ +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55d..05b142e 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -65,7 +65,7 @@ if opencv_found + endif + endforeach + else +- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) ++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) + opencv_found = opencv_dep.found() + if opencv_found + foreach h : libopencv4_headers diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index a3fe432017c..1e618730cd8 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.18"; + version = "3.24.20"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1lia2ybd1661j6mvrc00iyd50gm7sy157bdzlyf4mr028rzzzspm"; + sha256 = "Laxp9xbo0EunqVCRWJ4rquyV3KzpMssVg5Fj20ebHfM="; }; patches = [ @@ -71,12 +71,17 @@ stdenv.mkDerivation rec { sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 - ./patches/01-build-Fix-path-handling-in-pkgconfig.patch + # Fix path handling in pkg-config + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch"; + sha256 = "QHseZWgPlZBDEM2dIVixUJkGZMCaYjahkLmSCqCcoWU="; + }) ] ++ optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536 ./patches/3.0-darwin-x11.patch ]; @@ -92,6 +97,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' + # TODO: Remove in 3.24.21 + # https://gitlab.gnome.org/GNOME/gtk/issues/2669 + echo "${stdenv.shell}" > check-version.py + chmod +x check-version.py + files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py diff --git a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch deleted file mode 100644 index ec69a12514f..00000000000 --- a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Fri, 19 Jul 2019 13:32:57 -0400 -Subject: [PATCH] build: Fix path handling in pkgconfig - ---- - meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 36913b3f04..161b378ba5 100644 ---- a/meson.build -+++ b/meson.build -@@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson', - # pkg-config files - bit of a mess all of this - pkgconf = configuration_data() - --pkgconf.set('prefix', get_option('prefix')) -+pkgconf.set('prefix', gtk_prefix) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', gtk_libdir) -+pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir)) - pkgconf.set('GTK_API_VERSION', gtk_api_version) - pkgconf.set('VERSION', meson.project_version()) - pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version) --- -2.22.0 - diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 0244725177e..9d2479c2e0b 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,9 +1,13 @@ -{ stdenv, lib, buildPackages, automake, autoconf, libtool, which, - fetchpatch, openexr }: +{ stdenv +, buildPackages +, cmake +, libtool +, openexr +}: stdenv.mkDerivation rec { pname = "ilmbase"; - version = lib.getVersion openexr; + version = stdenv.lib.getVersion openexr; # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. @@ -13,22 +17,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - preConfigure = '' - patchShebangs ./bootstrap - ./bootstrap - ''; - - # otherwise, the pkgconfig info for the libraries will not match the filenames - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; - + nativeBuildInputs = [ cmake libtool ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ automake autoconf libtool which ]; - - NIX_CFLAGS_LINK = "-pthread"; - patches = [ - ./cross.patch - ]; + patches = [ ./cross.patch ]; # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index cbfb943d375..411cc227b30 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.1.0"; + version = "20.1.1"; src = fetchurl { url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "1afck8wgxb23jy1jd5sn9aiyd7nj3yi3q08hw180wwnpbvmiaicn"; + sha256 = "1p13b4abslq31pbgqf0bzs2ixns85yfdsm94326h2vcg0q7hqc24"; }; # patchelf is needed for binaries in $out/share/samples diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index d745ff438ce..6c0298c0f71 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper +, pkgconfig, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1"; + sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; }; cmakeFlags = [ @@ -23,12 +24,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + nativeBuildInputs = [ cmake xz makeWrapper ]; + buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + + postInstall = '' + wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" + ''; meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = "http://www.itk.org/"; + homepage = "https://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index a9624ff243c..5307c635834 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.18"; + version = "1.20"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1"; + sha256 = "0zx1sc0rw3vzjan69vxr2qw82y9b0hqdzp4plcahc3c1y0vkz3fg"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 5eb7ef6c076..d0258d5896b 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, jre} : stdenv.mkDerivation rec { - name = "jflex-1.8.1"; + name = "jflex-1.8.2"; src = fetchurl { url = "http://jflex.de/release/${name}.tar.gz"; - sha256 = "0hspw4z1i7wc1dnnyh4xx6ka7891nsw4hc66bf45510gjks6779x"; + sha256 = "1ar7g6zb2xjgnws3j4cqcp86jplhc9av8cpcjdmxw08x6igd5q51"; }; sourceRoot = name; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index eb9dded94b2..c79b4a51262 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lasso"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://dev.entrouvert.org/lasso/lasso-${version}.tar.gz"; - sha256 = "1kqagm63a4mv5sw5qc3y0qlky7r9qg5lccq0c3cnfr0n4mxgysql"; + sha256 = "1pniisy4z9cshf6lvlz28kfa3qnwnhldb2rvkjxzc0l84g7dpa7q"; }; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index a0cb8a7762b..702738fdfc0 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A="; + sha256 = "0x6yr14znp42b92i7br4wxfjri6i689dsifzz9kbyzvn558a16b4"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 1fab7ee28a8..8a34f05f6cf 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { - sha256 = "1kp35gnph9myqxdxzyj1871ay19nfajxglzwai1gvsnh5840xnxy"; + sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8"; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libaec/default.nix b/pkgs/development/libraries/libaec/default.nix new file mode 100644 index 00000000000..bf6fd029de1 --- /dev/null +++ b/pkgs/development/libraries/libaec/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab +, cmake +}: + +stdenv.mkDerivation rec { + pname = "libaec"; + version = "1.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.dkrz.de"; + owner = "k202009"; + repo = "libaec"; + rev = "v${version}"; + sha256 = "1rpma89i35ahbalaqz82y201syxni7jkf9892jlyyrhhrvlnm4l2"; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.dkrz.de/k202009/libaec"; + description = "Adaptive Entropy Coding library"; + license = licenses.bsd2; + maintainers = with maintainers; [ tbenst ]; + }; +} diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index bdf081222b6..885338793f1 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "0cw1apj4qxfxpp0gz4my4656d5ijjj6s2y4rjahhj67h10qj4bd2"; + sha256 = "16xgl0yqzqkqfrz7x9rbbv8rj5rg5jlz4a7apj9igqb58q0w362x"; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 7067caa42c0..9b6a54d92f9 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + NIX_CFLAGS_COMPILE = "-fno-lto"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 1ef749c1740..908c9cb15dd 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -1,17 +1,21 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libcello-0.9.2"; + pname = "libcello"; + version = "2.1.0"; src = fetchurl { - url = "http://libcello.org/static/${name}.tar.gz"; - sha256 = "cd82639cb9b133119fd89a77a5a505a55ea5fcc8decfc53bee0725358ec8bad0"; + url = "http://libcello.org/static/libCello-${version}.tar.gz"; + sha256 = "0a1b2x5ni07vd9ridnl7zv7h2s32070wsphjy94qr066b99gdb29"; }; + makeFlags = [ "PREFIX=$(out)" ]; + meta = { homepage = "http://libcello.org/"; description = "Higher level programming in C"; license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.MostAwesomeDude ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index c28ca339a65..997018a2970 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdread"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh"; + sha256 = "15hpwbw3nm84y432l0j61w0zmqxplsyymfc52dry6nvwl44p6d9y"; }; buildInputs = [libdvdcss]; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 30ecdda3da2..b062b10732e 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libcbor openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; + patches = [ + # make build reproducible + (fetchpatch { + url = "https://github.com/Yubico/libfido2/commit/e79f7d7996e70d6b2ae9826fce81d61659cab4f6.patch"; + sha256 = "0jwg69f95qqf0ym24q1ka50d3d3338cyw4fdfzpw4sab0shiaq9v"; + }) + ]; + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" "-DUSE_HIDAPI=1" diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 0fa5c3a7db0..10f46a67e89 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,16 +9,19 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.19.3"; + version = "0.21.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4"; + sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gnutls nettle ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://lib.filezilla-project.org/"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index 9145d8fd892..94476984de0 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { "sysconfdir=${placeholder "out"}/etc" ]; + # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm + postInstall = optional (!extraOnly) '' + rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 075742e3139..1ff02a8709d 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libgdiplus"; - version = "6.0.4"; + version = "6.0.5"; src = fetchFromGitHub { owner = "mono"; repo = "libgdiplus"; rev = version; - sha256 = "1pf3yhwq9qk0w3yv9bb8qlwwqkffg7xb4sgc8yqdnn6pa56i3vmn"; + sha256 = "1387lgph5r17viv3rkf5hbksdn435njzmra7s17q0nzk2mkkm68c"; }; NIX_LDFLAGS = "-lgif"; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 5772e0d24f6..92cde8aef4c 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -2,34 +2,18 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni"; + sha256 = "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; - # The following 3 patches should be removed once libglvnd >1.2.0 is released - patches = [ - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/6f52473dac08c44b081b792874b4ce73122096da.patch"; - sha256 = "0rd9ihl8n33cm0rya5a7ki0hn31fh52r0gaj5d4w80jrsah2ayij"; - }) - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch"; - sha256 = "1qx3nw8vq5xcrixmi7xw1vpy4gbf7kmx38rx8wg8x046g4mv8ijj"; - }) - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/5dfdc5a6dc60a3bdc63cd4510dabacba388da13a.patch"; - sha256 = "0gmb3619yz3z7n22afjh8p2y13bmsky4r0z0csm14is3wvdi64ya"; - }) - ]; - postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/GLX/Makefile.am \ --replace "-Wl,-Bsymbolic " "" diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 71a4620161e..25917c44bd0 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgnurl"; - version = "7.69.1"; + version = "7.70.0"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0x8m26y3klndis6a28j8i0b7ab04d38q3rmlvgaqa65bjhlfdrp0"; + sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 0b2e7341513..e170e4931b8 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation (rec { # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number - # (See <http://hydra.nixos.org/build/2931046/nixlog/1/raw>.) + # (See <https://hydra.nixos.org/build/2931046/nixlog/1/raw>.) # Thus, re-run it with Bash. "${stdenv.shell} config.status"; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index aa782ec3339..34cb1ef3381 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.46"; + version = "1.14.47"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bddmlzg719sjhlbzqlhb7chwk93qc7g68m2r9r8xz112jdradpa"; + sha256 = "0kbpp9ksl7977xiga37sk1gdw1r039v6zviqznl7alvvg39yp26i"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 3d50df3e56c..ff26c1029ef 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -3,7 +3,8 @@ let inherit (buildPackages.buildPackages) gcc; in stdenv.mkDerivation { - name = "libiberty-${gcc.cc.version}"; + pname = "libiberty"; + version = "${gcc.cc.version}"; inherit (gcc.cc) src; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 8e3558fe1b1..f490dfbd23a 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "1ha5qyak1ka5npy5i6hzqfpii8samkj389mkppj4wdsfv536i2ww"; + sha256 = "15ww4jl3lcxyi8m8idg8canklbqv729gnwpkz7r98c1w8a7zq3m9"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index dc95f919932..54ab31e2702 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , docbook_xml_dtd_43 , docbook-xsl-nons , glib @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.1"; + version = "0.1.2"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -28,18 +27,12 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0="; + sha256 = "zb9zKEvYUOSyo/j6hXTYZlQOSLdMkkT2I+Pe/0wMrWo="; }; patches = [ # Installed tests are installed to different output ./installed-tests-path.patch - - # Fix version file generation - (fetchpatch { - url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch"; - sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index c7290e147c3..72d8b967749 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, nasm, enableStatic ? false }: +{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false }: stdenv.mkDerivation rec { @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { }; patches = + [ + # Fixes race in tests that causes "jpegtran-shared-icc" to fail + # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425 + (fetchpatch { + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; + sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; + }) + ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 25762573a1f..82ac1b3144e 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liblcf"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "EasyRPG"; repo = "liblcf"; rev = version; - sha256 = "18kx9h004bncyi0hbj6vrc7f4k8l1rwp96cwncv3xm0lwspj0vyl"; + sha256 = "0b0bz9ydpc98mxbg78bgf8kil85kxyqgkzxgsjq7awzmyw7f3c1c"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 898c659d0f7..71fbda7b471 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.19"; + version = "8.0.20"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "fDvXTOZKkwDn1IG3aziK2VAXpSSAxpi3VVea7GLUoh4="; + sha256 = "1jrrbfy6sw4pni72c1hgvchx1zzfpnamp34sjnv82mlvsp8ypsjh"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index d4469d79f56..7a8d1877bc7 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 = "67"; + version = "68"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n"; + sha256 = "0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index b1504fc9540..33b4983b015 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.24.6"; + version = "1.24.10"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1jfq8jdjc9z5c0g7m377svdlniwkr4k9hs7s8fsb5rvdq5xja98k"; + sha256 = "1rzxapr6hb18ccvqh5fizx7zk63l47bs0p3gizycz2ysnm1i44n2"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 17f9537e418..7d0eb7f67dd 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "1il8dany6y981ficrwnxjlc13v5lj6gqia5678p5pj6bcbq7l7lb"; + sha256 = "132i1b1m7c7hkbxsnpa7n07cbghxjxmcbb8zhgwziaxg4nzxsa6l"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ba8ef8e6a85..afd1df51e5b 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.48.2"; + version = "2.48.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jmxd03fs8vkwycxpmx69kdfmgq52g64bhv82gmj3kjgw2h5h9i7"; + sha256 = "0vlmgisf87dz4vcl1ypcw7g211wkyvhydv6ksf1p6mgdbkw3mdi8"; }; outputs = [ "out" "dev" "installedTests" ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 99cd2fb1c53..cebfdfe3838 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsass"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - sha256 = "1q6lvd8sj5k5an32qir918pa5khhcb8h08dzrg1bcxmw7a23j514"; + sha256 = "074kvacdan85h4qrvsk97575ys9xgkc044gplz3m6vn4a8pcl2rn"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 2dbff9614a7..010a74eab3c 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hzz34gmsxxf1jm1b7qin390rkwbg8sx198xdkwxqp3q6cw19sc1"; + sha256 = "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg"; }; postPatch = '' diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix index 100dbb3779c..6278f6234f0 100644 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsignal-protocol-c"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal-protocol-c"; rev = "v${version}"; - sha256 = "1qj2w4csy6j9jg1jy66n1qwysx7hgjywk4n35hlqcnh1kpa14k3p"; + sha256 = "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index b4dd8ccbfb5..9443846acf1 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.11"; + version = "0.7.13"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1jq08qgj05cr9zk5paj3qvma7y2ixvkqlvbszcgmfvx0yq4gl1af"; + sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 0922d3c1730..a77e209119b 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20190731"; + version = "20200505"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256:1wc6ikjrvcq05jki0ligmxyplgb4nzx6qb5va277qiin8vad9b1v"; + sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index bf6e0a491f2..c6accad9c3c 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.8.8"; + version = "0.8.9"; src = fetchurl { url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; - sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb"; + sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; }; postPatch = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix index 8b9992ec66d..91e5a54bab1 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.2.5"; + version = "1.2.6"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -18,7 +18,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "libtorrent-${formattedVersion}"; - sha256 = "0y2fzqbvb1bxvf93d7sphwzxih6j40p5p3fay943k26w0nrq802w"; + sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 2e29aafdbdd..afae04cb6b2 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20200313"; + version = "20200413"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8"; + sha256 = "0jbg94z00f5vwqyjfrbill6cjvzp1zrki6m3d235jjxyw0hm3wr5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index d9f90306584..9f6adeb65b0 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.35.0"; + version = "1.37.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz"; + sha256 = "0iy25w4wy9f5y7i7aqidhqz93qi00lv7vhx6s521n0kphvaj8ijz"; }; postPatch = let diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index c867b73c317..28c5536d626 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; - sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; + url = "https://gitlab.xiph.org/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25.patch"; + sha256 = "18k4vp0nmrxxpis641ylnw6dgwxrymh5bf74njr6v8dizmmz1bkj"; name = "CVE-2017-14160+CVE-2018-10393.patch"; }) (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff"; + url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b.diff"; sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7"; name = "CVE-2018-10392.patch"; }) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 321e4e0560d..629c064404b 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }: +{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { version = "4.9.2"; pname = "nco"; nativeBuildInputs = [ flex which ]; - buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl ]; + buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ]; src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn"; }; + prePatch = '' + substituteInPlace src/nco/nco_fl_utl.c \ + --replace "/bin/cp" "${coreutils}/bin/cp" + substituteInPlace src/nco/nco_fl_utl.c \ + --replace "/bin/mv" "${coreutils}/bin/mv" + ''; + 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"; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 36c9f0e6ac7..7c0c6476bd0 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.1"; + version = "3.6"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m"; + sha256 = "1wg3sprl0bzy49cmbwwm91vw67hk1x5i3ksdygsciyxz587hsk6j"; }; }) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8dbef28804a..d48b5a6ba73 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.51"; + version = "3.52"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m"; + sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -27,8 +27,12 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; prePatch = '' - # strip the trailing whitespace from the patch line… - xz -d < ${nssPEM} | sed -e '/^-DIRS = builtins $/ s/ $//' | patch -p1 + # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_ + xz -d < ${nssPEM} | sed \ + -e '/^-DIRS = builtins $/ s/ $//' \ + -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \ + -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \ + | patch -p1 ''; patches = diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 0cda3d6ac9a..57c47c79f84 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "19mwjg5mz645i4ijhx93rqbcim14ca6nczymr20p0z0pn5mx5p18"; + sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 0d29c6eae8b..7d9adca074c 100644 --- a/pkgs/development/libraries/dnnl/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -1,11 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }: +{ stdenv, lib, fetchFromGitHub, cmake }: # This was originally called mkl-dnn, then it was renamed to dnnl, and it has -# just recently been renamed again to oneDNN. In a follow-up, let's move the -# attr and alias dnnl -> oneDNN. See here for details: +# just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { - pname = "dnnl"; + pname = "oneDNN"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index abec6e1ace5..9dcb9956838 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -38,20 +38,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; let - version = "4.1.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0c98ziwvfrzdzwn52a36d37n5rac8zmxq2jn479bzfaii1bib8xx"; + sha256 = "1r9bq9p1x99g2y8jvj9428sgqvljz75dm5vrfsma7hh5wjhz9775"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "10ryyxhggin5dk5glf4ycyrfryqf50f4bs10biv6nxlrrinm2di4"; + sha256 = "068b4f95rlryab3mffxs2w6dnbmbhrnpsdgl007rxk4bwnz29y49"; }; # Contrib must be built in order to enable Tesseract support: @@ -62,8 +62,8 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4"; - sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp"; + rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; + sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; } + "/ippicv"; files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in if stdenv.hostPlatform.system == "x86_64-linux" then @@ -168,7 +168,9 @@ stdenv.mkDerivation { # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with # what appears to be some stray headers in dnn/misc/tensorflow # in contrib when generating the Python bindings: - patches = lib.optional enableCuda ./cuda_opt_flow.patch; + patches = [ + ./cmake-don-t-use-OpenCVFindOpenEXR.patch + ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py diff --git a/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch new file mode 100644 index 00000000000..dc80b09b646 --- /dev/null +++ b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch @@ -0,0 +1,55 @@ +From 6d988c08e852379a163ecd20df8639196d84d014 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer <meurerbernardo@gmail.com> +Date: Sun, 26 Apr 2020 14:50:25 -0700 +Subject: [PATCH] cmake: don't use OpenCVFindOpenEXR + +Use find_package for this. +--- + CMakeLists.txt | 2 ++ + cmake/OpenCVFindLibsGrfmt.cmake | 15 +++------------ + 2 files changed, 5 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c0b3880fc..0360469350 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,8 @@ FATAL: In-source builds are not allowed. + ") + endif() + ++# the future! ++include(FindPkgConfig) + + include(cmake/OpenCVMinDepVersions.cmake) + +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 0beaf19317..4c5e46e615 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -227,20 +227,11 @@ endif() + # --- OpenEXR (optional) --- + if(WITH_OPENEXR) + ocv_clear_vars(HAVE_OPENEXR) +- if(NOT BUILD_OPENEXR) +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") +- endif() +- ++ pkg_check_modules(OPENEXR OpenEXR) + if(OPENEXR_FOUND) + set(HAVE_OPENEXR YES) +- else() +- ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) +- +- set(OPENEXR_LIBRARIES IlmImf) +- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr") +- if(OPENEXR_VERSION) # check via TARGET doesn't work +- set(HAVE_OPENEXR YES) +- endif() ++ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS}) ++ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}) + endif() + endif() + +-- +2.26.1 + diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 81a5ab1db99..425afc70f37 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, - zlib, ilmbase, fetchpatch }: - -let - # Doesn't really do anything when not crosscompiling - emulator = stdenv.hostPlatform.emulator buildPackages; -in - +{ lib +, stdenv +, buildPackages +, fetchFromGitHub +, zlib +, ilmbase +, fetchpatch +, cmake +, libtool +}: stdenv.mkDerivation rec { pname = "openexr"; version = "2.4.1"; @@ -17,39 +19,11 @@ stdenv.mkDerivation rec { sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"; }; - sourceRoot = "source/OpenEXR"; - outputs = [ "bin" "dev" "out" "doc" ]; - - # Needed because there are some generated sources. Solution: just run them under QEMU. - postPatch = '' - for file in b44ExpLogTable dwaLookups - do - # Ecape for both sh and Automake - emu=${lib.escapeShellArg (lib.replaceStrings ["$"] ["$$"] emulator)} - before="./$file > $file.h" - after="$emu $before" - substituteInPlace IlmImf/Makefile.am \ - --replace "$before" "$after" - done - - # Make sure the patch succeeded - [[ $(grep "$emu" IlmImf/Makefile.am | wc -l) = 2 ]] - ''; - - preConfigure = '' - patchShebangs ./bootstrap - ./bootstrap - ''; - - # otherwise, the pkgconfig info for the libraries will not match the filenames - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ cmake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; enableParallelBuilding = true; - doCheck = false; # fails 1 of 1 tests meta = with stdenv.lib; { description = "A high dynamic-range (HDR) image file format"; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 49c3c2629c5..a8e65aebc45 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.4"; + version = "1.7.6"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "0drhq5348vbaccpa0z3jvd5hyv5bm2i9xrak1wb4yvl2mx77dbmh"; + sha256 = "03hs0196qbjfbviqn6nnb7igvv3cnpxyizlwlzmx88a6fhiq97bm"; }; meta = { description = "Library for working with finite-state transducers"; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index fe46d25421a..e038bb7f66d 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "0sa4n4xshmiiv6h767jjq9qxapxxjwwwm3bpcignkxv5xn5sls5r"; + sha256 = "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 5651f552dfa..b0488435ded 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.0"; + version= "2.42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa"; + sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 7f7a115f877..93b49524dc1 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 = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.88.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4="; + sha256 = "1isns9s484irq9ir4hbhpyqf6af2xzswh2pfrvk1k9d5x423hidl"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix new file mode 100644 index 00000000000..2624c718d27 --- /dev/null +++ b/pkgs/development/libraries/pxlib/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool }: + +stdenv.mkDerivation rec { + pname = "pxlib"; + version = "0.6.8"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz"; + }; + + nativeBuildInputs = [ intltool ]; + + meta = with stdenv.lib; { + description = "Library to read and write Paradox files"; + homepage = "http://pxlib.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index cc4a3ae84d9..48c0158531a 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "05l28xf7pf9mxm6crrdx5i7d2ri3hlg5iva0fqc8wxnj8pf2m38r"; + sha256 = "1w2d33g13vkjasabmcgvhsmfqv3jmwbxhqxm1jnyc7d4nlk4jwmb"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index f955f464d32..d8f20d74a0d 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "1arwpvva2b1m3yd618s59v38gwsi0nnm07g6yc9dapcgxrkg5n0h"; + sha256 = "0axrzjmih1njjpxpwfb6pwjwkjy1b6s5s1sjf165m2cmd6x3vbap"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index e5565aae29b..4d98b12928f 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python3 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: stdenv.mkDerivation rec { pname = "elastix"; @@ -11,10 +11,24 @@ stdenv.mkDerivation rec { sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; }; + patches = [ + (fetchpatch { + name = "itk-5.1-compat.patch"; + url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; + sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; + }) + (fetchpatch { + name = "fix-osx-build.patch"; + url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch"; + sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q"; + }) + ]; + + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ itk ]; - doCheck = true; + doCheck = !stdenv.isDarwin; # usual dynamic linker issues preCheck = " export LD_LIBRARY_PATH=$(pwd)/bin @@ -24,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.linux; + platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index ee861c14ab4..2df39b330c4 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -20,6 +20,8 @@ let openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; + shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; + in stdenvNoCC.mkDerivation { pname = "mkl"; inherit version; @@ -114,10 +116,15 @@ in stdenvNoCC.mkDerivation { '') + '' # Setup symlinks for blas / lapack - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt} + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt} + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt} + '' + stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt}".3" + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libcblas${shlibExt}".3" + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapack${shlibExt}".3" + ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/liblapacke${shlibExt}".3" ''; # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f6a40204587..318922d7f25 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -93,15 +93,18 @@ let if !builtins.isBool val then toString val else if val then "1" else "0"; mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); + + shlibExt = stdenv.hostPlatform.extensions.sharedLibrary; + in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p"; + sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal"; }; inherit blas64; @@ -178,10 +181,15 @@ EOF done # Setup symlinks for blas / lapack - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt} + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt} + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt} + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libblas${shlibExt}.3 + ln -s $out/lib/libopenblas${shlibExt} $out/lib/libcblas${shlibExt}.3 + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapack${shlibExt}.3 + ln -s $out/lib/libopenblas${shlibExt} $out/lib/liblapacke${shlibExt}.3 ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index ce6780f0046..a69ae5af15f 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.5"; + version = "7.6"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac"; + sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b"; }; # The original build system uses cmake which does things like pull diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 200dd58a435..6eeeda9e928 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz"; + sha256 = "0pr604b9pnryl9q0q5arlhs0xdx7wslca0sbz0pzs9qylmz775qp"; }; nativeBuildInputs = [ blas gfortran.cc.lib lapack python ]; diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix index e67f61599b5..ae7a7c778de 100644 --- a/pkgs/development/libraries/science/math/sympow/default.nix +++ b/pkgs/development/libraries/science/math/sympow/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - version = "2.023.5"; + version = "2.023.6"; pname = "sympow"; src = fetchFromGitLab { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "forks"; repo = "sympow"; rev = "v${version}"; - sha256 = "1c5a2pizgqsf3pjkf7rfj20022ym4ixhrddp8ivs2nbzxwz6qvv9"; + sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; }; postUnpack = '' diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index d6708b0dfed..445a8bc5f21 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }: +{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }: stdenv.mkDerivation rec { pname = "simpleitk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git swig ]; - buildInputs = [ lua itk ]; + buildInputs = [ lua itk4 ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index 3b6eaf7007c..d5708cb6b1e 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.35"; + version = "3.1.36"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "05prjhlsmjmbjpks3bsx4ifz5izshsabys20c56jgibgnjsflm6k"; + sha256 = "0jljzw1xl2kjwf9cylp1ddnjhz7wbm499s03r479891max1m2mlf"; }; installPhase = '' diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index dc2869f3723..5fa35751e24 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth-mvtools"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; rev = "v${version}"; - sha256 = "0vjxpp4jmmjhcp8z81idsbgq6jyx0l4r4i32b8alnp6c9fahjh6p"; + sha256 = "11al56liaahkr3819iynq83k8n42wvijfv2ja5fsjdl6j4zfzpbr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 897d3433f19..811921df3e7 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.60.1"; + version = "0.60.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i7h1jvsg115l5djn29n06xsqvygpfagczxy0i9f39zq6dr809ay"; + sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"; }; passthru = { diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 6a7e26c753c..1cc706f4eb7 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 84ffd2cd813..4d968cc325e 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -178,7 +178,6 @@ stdenv.mkDerivation rec { homepage = "https://webkitgtk.org/"; license = licenses.bsd2; platforms = platforms.linux; - hydraPlatforms = []; maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 438b40d9140..2815520f517 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1gd613k4qh9yhl0d8yh0flqn2cvm9qb5pp2p0khk31b1fh1p4vin"; + sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9"; }; configureFlags = [ "--enable-all" ]; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 70b650eecb1..9bea7f5e848 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, wxGTK, sqlite -, darwin }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK +, sqlite +, darwin +}: stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "3.3.1"; + version = "4.5.1"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g"; + sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3"; }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - cp build28/Info.plist.in build28/wxmac.icns build/ - ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ wxGTK sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 6a2e33f9a9f..18ecea4cbe1 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "guanlisheng"; repo = "wxsqliteplus"; rev = "v${version}"; - sha1 = "yr9ysviv4hbrxn900z1wz8j32frimvx1"; + sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; buildInputs = [ wxGTK wxsqlite3 sqlite ]; @@ -24,12 +24,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp wxsqliteplus $out/bin/ + install -D wxsqliteplus $out/bin/wxsqliteplus ''; meta = with stdenv.lib; { - homepage = "http://guanlisheng.com/"; + homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 67a688342b2..96ceb76f6f2 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" echo "#! ${stdenv.shell}" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" - echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" + echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" && export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; moveAsdFiles = '' diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 95edbef44e3..3096408963e 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,67 +22,67 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.3" = { + "@angular-devkit/architect-0.901.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.3"; + version = "0.901.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.3.tgz"; - sha512 = "CFjSj48nOJwejmFFtenIqSZWyxRe4fRQsg16l0R4sagW7YwMJSaW6Yl9hRHM8bviPRrTpGHnxeq1x506v1ARLw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.4.tgz"; + sha512 = "w4RMj7eLhUSh70HUy5tW4EXjLQFXk0Lfr9WiSy5gvPGp+zzYxknI+Wn4Xid1wU/WS+4tuMv5nJIaNaH2sABESQ=="; }; }; - "@angular-devkit/core-9.1.3" = { + "@angular-devkit/core-9.1.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.3.tgz"; - sha512 = "VRV96prPy0Kdlm6XmI7DITqSMSc1bINimnOhzQre3euDX5OQty+EUqaexHtMv/SPDZX1agP+buHr6viv9YEhzA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.4.tgz"; + sha512 = "OPFQDmT4XabLMSRDgmnzedlOrc83DzQIgLcfoh/UhZ7aJKf/2Vq4l09p/DkMNI36vN5BRL0zDZt7TjvKNgyYgA=="; }; }; - "@angular-devkit/schematics-9.1.3" = { + "@angular-devkit/schematics-9.1.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.3.tgz"; - sha512 = "nNRoQPqoin5jzLKmTabIPLSqVw2Zjnk78XC4AhAM7rSisWMsZ6pw5+BNDITiKfq0LkSXfOs0DoJV/Vr9mLkn/A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.4.tgz"; + sha512 = "RAbdnUEZ3JTLmWSBiXT5trsVx8Fi72fxN9CiRaluM09Cytg6BUc1wC5XCO0YPvhI400+3Ro1nwjPXezjg7LXzQ=="; }; }; - "@antora/asciidoc-loader-2.3.0" = { + "@antora/asciidoc-loader-2.3.1" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.0.tgz"; - sha512 = "mncSlmkk6rYH5SGplZtHjuieG3ve5bhm4x0f9WIFE+GhqajIogDjxTBNWNr9B2dVA4bMves7Sy+c5h+f9V3iVw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.1.tgz"; + sha512 = "YSf5oEExzrR+O7FizQAeIYyP/BAGvhGw9inACFF3Er3fzCR/sOvPadT6a/slW//tVGLF3eul0ARvw7QAvo6yHQ=="; }; }; - "@antora/content-aggregator-2.3.0" = { + "@antora/content-aggregator-2.3.1" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.0.tgz"; - sha512 = "LbH65Hw5uk3QCX8sCsJGnIVapQbtkxgyaDAfxYJlXnBI4jjd92391k0vitFL7f+9dzEvSdzxUHJU/lPyi9eB6g=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.1.tgz"; + sha512 = "DKrM7FtK5ivWHmQjMkPYkn3S4jQ9Sy6QiNfKYcg/EcIee5k3VPRjYHn40nPY0gS+R4zElRJhru6bHOpnkGJYVA=="; }; }; - "@antora/content-classifier-2.3.0" = { + "@antora/content-classifier-2.3.1" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.0.tgz"; - sha512 = "x/GUrm62+zSA8uQYaPG1y8NDALSDeKKl+um0CrxV5nt8c6vEO80KODN4YEPqoC0tOq8zdT99J6ElYblpkxrW6Q=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.1.tgz"; + sha512 = "d9vfhxcJY8DdU43h93cK96/Te2eKcJeA4pCljQrRUFpguZndMVrmWMxp8wzOYYSMIIukwcZVa3AISz86RNvrYA=="; }; }; - "@antora/document-converter-2.3.0" = { + "@antora/document-converter-2.3.1" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.0.tgz"; - sha512 = "RMvdqBIz+pXf5znuyVeR7GF8qw/zLfaRMmEzMzywYa+8Cappxy+pgs+BuAuH1TdAnsFzpPrIO211c2FE1OxXBg=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.1.tgz"; + sha512 = "5vnr3twkunAkv04NaqgLtXQTTlRNsvTo/jpVrUQ6DNQHE3l3Sr0z/6u4GWkueI95L/PFlFQ79WUNsBPLICfLrA=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -94,67 +94,67 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.3.0" = { + "@antora/navigation-builder-2.3.1" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.0.tgz"; - sha512 = "bpdT50pUW8IbRHAwlwaRdMlqwdTCOGdh0novW2Z6uBi6KKKbl6K3BdbaVs/jwXalESWqkYHcyBpinMivsX4bBA=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.1.tgz"; + sha512 = "kWsi/wn/+IEljBdR6dSE6TFrF+KUfOlDQTnq9YmMzdUCLJRk7Cvz36zsbDFRE8cgqkuunddfsA6oOECgXLQyrw=="; }; }; - "@antora/page-composer-2.3.0" = { + "@antora/page-composer-2.3.1" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.0.tgz"; - sha512 = "ve4h3uColNuqGehSJ2qUw5dar1Ls3i+RBYh2HyVZZ84qjLoOjPGAALFYzRVJnYlEX6nAswNFhh5ll/hIuaxuHQ=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.1.tgz"; + sha512 = "HVZR5GgF+aA41Y0FVOmRHkI5Hn+ab4giJ5FvKwMZlqF10zd0u+rne6+0664kC08wYUIr40/OMayCRgIHPqEwuQ=="; }; }; - "@antora/playbook-builder-2.3.0" = { + "@antora/playbook-builder-2.3.1" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.0.tgz"; - sha512 = "zuuTqY5dDXYhu4LfmFW3qzdFXSrXSo9NCDX9eBJ6MCXsuj64PqdOljzv4rWNy3HvmKOSCupfWCashJS0vuH2Dw=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.1.tgz"; + sha512 = "/gl4H/0ey/Uc80GaomZoz10c/f8TX4bQ70SR+BlKrwjwsHCskfffVa+jvMAjnOlP0SGEPwIGkifWPGQbTHdH7A=="; }; }; - "@antora/redirect-producer-2.3.0" = { + "@antora/redirect-producer-2.3.1" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.0.tgz"; - sha512 = "/632VZlkpFIh5KlV3A9LqE4yGtYyQ+1vOb5A9yajYWsCnhqNfEMslMWuoLoQk4gzs3Ju+hz5MrAXp8sn1vbRvg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.1.tgz"; + sha512 = "2iDYwygpZ5xHrSflnDIn+kzLt+9jXKOTRHXXqCQHYZuHANQVEYLI93yOXivvFZZvX/jaRzZBF7uTI3FGwg2Isw=="; }; }; - "@antora/site-mapper-2.3.0" = { + "@antora/site-mapper-2.3.1" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.0.tgz"; - sha512 = "XzIoYKJQXgOzsDeUlL/edVR9B9aaCYUHADvzYqDc1S5/czFQxpqIIgMfYCiYYc7pHk6nmj5rgx/6HfvDImv87w=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.1.tgz"; + sha512 = "EkHEEPz0CfLJuE8lx6s9b8+jEC8krFN29zAqK6WaOTi34Tqhv5H/W14mk7IJfy8nWjIjZgP/q/a8gJK9LegYaw=="; }; }; - "@antora/site-publisher-2.3.0" = { + "@antora/site-publisher-2.3.1" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.0.tgz"; - sha512 = "2qC0fDE70VKtyttPpRx9glPWL4M5x7HYVCs1K6+GmpuISmljO3c/09L+ExPsJiSVVFarnWmMu0w+76XqSRHlog=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.1.tgz"; + sha512 = "s42S+e3IF5qLgL7N42LpcGc2+UcsJBrY9B10fUP0WQFM51LsNWIwQmU3EheoSEUjo5JvQYi5vlQsHlb7j8TCPA=="; }; }; - "@antora/ui-loader-2.3.0" = { + "@antora/ui-loader-2.3.1" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.0.tgz"; - sha512 = "EcBUwd4ImWI/BH0dZpH6CfDzBnAtQ2qUPChaeqVbmfCNpBvH6t09YYRVA713no21ypAF3AwBs3FGU1+vR6T/IQ=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.1.tgz"; + sha512 = "0uZDixaamnMnGJvl1M5bqW2ac8+6W2KZcfOTwPBEJJCLTGiZe4GASB+zR7tXNyrUr51zLuCjxPNcEbzGEfRxAQ=="; }; }; "@apollo/federation-0.14.1" = { @@ -256,22 +256,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.9.0" = { + "@babel/compat-data-7.9.6" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz"; - sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz"; + sha512 = "5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g=="; }; }; - "@babel/core-7.9.0" = { + "@babel/core-7.9.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; - sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"; + sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -292,6 +292,15 @@ let sha512 = "GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ=="; }; }; + "@babel/generator-7.9.6" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz"; + sha512 = "+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ=="; + }; + }; "@babel/helper-annotate-as-pure-7.8.3" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -328,22 +337,22 @@ let sha512 = "HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg=="; }; }; - "@babel/helper-compilation-targets-7.8.7" = { + "@babel/helper-compilation-targets-7.9.6" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.8.7"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; - sha512 = "4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; + sha512 = "x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw=="; }; }; - "@babel/helper-create-class-features-plugin-7.9.5" = { + "@babel/helper-create-class-features-plugin-7.9.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz"; - sha512 = "IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; + sha512 = "6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow=="; }; }; "@babel/helper-create-regexp-features-plugin-7.8.8" = { @@ -463,13 +472,13 @@ let sha512 = "kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA=="; }; }; - "@babel/helper-replace-supers-7.8.6" = { + "@babel/helper-replace-supers-7.9.6" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.8.6"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; - sha512 = "PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; + sha512 = "qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA=="; }; }; "@babel/helper-simple-access-7.8.3" = { @@ -508,13 +517,13 @@ let sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ=="; }; }; - "@babel/helpers-7.9.2" = { + "@babel/helpers-7.9.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.9.2"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; - sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz"; + sha512 = "tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw=="; }; }; "@babel/highlight-7.9.0" = { @@ -526,13 +535,13 @@ let sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; - "@babel/parser-7.9.4" = { + "@babel/parser-7.9.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.9.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; - sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz"; + sha512 = "AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -598,13 +607,13 @@ let sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.9.5" = { + "@babel/plugin-proposal-object-rest-spread-7.9.6" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz"; - sha512 = "VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; + sha512 = "Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { @@ -904,31 +913,31 @@ let sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA=="; }; }; - "@babel/plugin-transform-modules-amd-7.9.0" = { + "@babel/plugin-transform-modules-amd-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; - sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; + sha512 = "zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.9.0" = { + "@babel/plugin-transform-modules-commonjs-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; - sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; + sha512 = "7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.9.0" = { + "@babel/plugin-transform-modules-systemjs-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; - sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; + sha512 = "NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg=="; }; }; "@babel/plugin-transform-modules-umd-7.9.0" = { @@ -1012,13 +1021,13 @@ let sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A=="; }; }; - "@babel/plugin-transform-runtime-7.9.0" = { + "@babel/plugin-transform-runtime-7.9.6" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; - sha512 = "pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz"; + sha512 = "qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w=="; }; }; "@babel/plugin-transform-shorthand-properties-7.8.3" = { @@ -1066,13 +1075,13 @@ let sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg=="; }; }; - "@babel/plugin-transform-typescript-7.9.4" = { + "@babel/plugin-transform-typescript-7.9.6" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.9.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz"; - sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; + sha512 = "8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ=="; }; }; "@babel/plugin-transform-unicode-regex-7.8.3" = { @@ -1093,13 +1102,13 @@ let sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.9.5" = { + "@babel/preset-env-7.9.6" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.5.tgz"; - sha512 = "eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ=="; }; }; "@babel/preset-flow-7.9.0" = { @@ -1165,13 +1174,22 @@ let sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; }; }; - "@babel/runtime-corejs3-7.9.2" = { + "@babel/runtime-7.9.6" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz"; + sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; + }; + }; + "@babel/runtime-corejs3-7.9.6" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.9.2"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; - sha512 = "HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha512 = "6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA=="; }; }; "@babel/template-7.8.6" = { @@ -1183,13 +1201,13 @@ let sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; }; }; - "@babel/traverse-7.9.5" = { + "@babel/traverse-7.9.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz"; - sha512 = "c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz"; + sha512 = "b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1210,6 +1228,15 @@ let sha512 = "XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg=="; }; }; + "@babel/types-7.9.6" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz"; + sha512 = "qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA=="; + }; + }; "@chemzqm/neovim-5.1.9" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; @@ -1561,22 +1588,22 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/transform-25.4.0" = { + "@jest/transform-25.5.1" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "25.4.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz"; - sha512 = "t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz"; + sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg=="; }; }; - "@jest/types-25.4.0" = { + "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz"; - sha512 = "XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw=="; + url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; + sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -2137,58 +2164,58 @@ let sha512 = "nGwwmkdm3tuLdEkWMIwLBgFBfMFILILxcZIQY0dfqsdboN2iZdKfOYKUOKoa0wXw1FL1PL3yEYGPCXhwodQDTA=="; }; }; - "@node-red/editor-api-1.0.5" = { + "@node-red/editor-api-1.0.6" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.5.tgz"; - sha512 = "YYzc+EQJBSqkzip9Gm+sw8yK0HVLougiLs9xmqOxmMXQCiH56kyB1Tip+CRExsAgSqM1fLITxtBNkzAPgiP0pQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.6.tgz"; + sha512 = "9LieY6LSDtvj43IbpmCs9MmSGdPjOEmtsi+T13dXxxmil4ngedvJ7uMP1d96eKLW/b6Viuk7kx2olSGtUqgqLg=="; }; }; - "@node-red/editor-client-1.0.5" = { + "@node-red/editor-client-1.0.6" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.5.tgz"; - sha512 = "7SDm0JxWnME3gWgTkbZey0zaWE18ehWLxNkI+A/CSp/ubwJJf8YGDAXWzDOW/ZxQumjWI3PrMnck/p/U2F6I/w=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.6.tgz"; + sha512 = "V8zsj+wKY6RzOX92ePdgJtJdmOT9Whfz6CTN34/H2pZlzFA/+KE/sippkInRrx+ujTp4uI2ycAGJ7i1Qkt8ztw=="; }; }; - "@node-red/nodes-1.0.5" = { + "@node-red/nodes-1.0.6" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.5.tgz"; - sha512 = "rS+qVwY/I0sapyhQ695OO3GxdSfrV9FShZ8DywIwkrMq8Xzmhbi0WmOyQASok/2TPROGYRcTPq5QITtWWh7saA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.6.tgz"; + sha512 = "4+wTiwhJlhLL6HV3YBLOGHSIcfygf4YxP/fJDkG+vy09pRyux/NqZ06NiqhYs+d+Ndf13LIc20KTEzN3pLW2Rw=="; }; }; - "@node-red/registry-1.0.5" = { + "@node-red/registry-1.0.6" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.5.tgz"; - sha512 = "UJEJp3oBVfkoy0ajQeU531GS5RRph5Gg2eDrTICYTASAwR/VuuoSBziRVSwxIYBOTqBiNc1Uc3cCzp7JSvt0rw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.6.tgz"; + sha512 = "jDNfcNyphjpywHmXfNuZhM593ox9qHMYmL6ZQQiyERwiJwSkGp2zzNicNBe10ysk5ENr36xdP46BryWu/j9xIA=="; }; }; - "@node-red/runtime-1.0.5" = { + "@node-red/runtime-1.0.6" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.5.tgz"; - sha512 = "NWpRW9j2DGBU85zihjXz7fDj8RfwFmBmoMvzJ3XsbXJNFjK78loKqrLgzPscSECVZh/ouXRCQ7tQThzdGUYE9A=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.6.tgz"; + sha512 = "6eat9FZlIcydm0+VoUjlbxf9TyyLu0zTCWWANqGhu5Ab8o366WSOAxyIzJ5QL56FLQ+V6040YWmurBl+bGRGjg=="; }; }; - "@node-red/util-1.0.5" = { + "@node-red/util-1.0.6" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.5.tgz"; - sha512 = "4exRjV72vzrr62vaVz0tvviq6rimuqIFxsOMq0tdbNFyXNmdwU6VXB9WaMBhEnSgIhljo2OO2vrXIUyeCagVmA=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.6.tgz"; + sha512 = "uncyHShA6strCJr1puqrpxsKcb7We2bmo/8xHk91pAQw4dr3jm4S+v/m9tYqVqtXkkW2cfJ6n3bRHJHbOZNW0Q=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -2236,13 +2263,13 @@ let sha512 = "JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA=="; }; }; - "@npmcli/git-2.0.1" = { + "@npmcli/git-2.0.2" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz"; - sha512 = "hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.2.tgz"; + sha512 = "uv9+EuP5YWluNPgkEOL+iyB/+MVt4U5PMBCfl+I8korKluFdiSp7RxjXYzpWM/wU4wXaROAUFiOiCMmBftonjw=="; }; }; "@npmcli/installed-package-contents-1.0.5" = { @@ -2263,6 +2290,15 @@ let sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; }; }; + "@npmcli/run-script-1.3.1" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.3.1.tgz"; + sha512 = "9Ea57XJjNLtBFRAaiKqqdoqRrL2QkM0vvCbMjPecljhog5IHupStPtZULbl0CoGN00N3lhLWJ4PaIEC0MGjqJw=="; + }; + }; "@oclif/color-0.0.0" = { name = "_at_oclif_slash_color"; packageName = "@oclif/color"; @@ -2461,13 +2497,13 @@ let sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; }; }; - "@octokit/types-2.12.1" = { + "@octokit/types-2.12.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.12.1"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.1.tgz"; - sha512 = "LRLR1tjbcCfAmUElvTmMvLEzstpx6Xt/aQVTg2xvd+kHA2Ekp1eWl5t+gU7bcwjXHYEAzh4hH4WH+kS3vh+wRw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.2.tgz"; + sha512 = "1GHLI/Jll3j6F0GbYyZPFTcHZMGjAiRfkTEoRUyaVVk2IWbDdwEiClAJvXzfXCDayuGSNCqAUH8lpjZtqW9GDw=="; }; }; "@parcel/fs-1.11.0" = { @@ -2632,13 +2668,13 @@ let sha512 = "RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q=="; }; }; - "@rollup/pluginutils-3.0.9" = { + "@rollup/pluginutils-3.0.10" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz"; - sha512 = "TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg=="; + url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.10.tgz"; + sha512 = "d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw=="; }; }; "@sailshq/lodash-3.10.4" = { @@ -2659,22 +2695,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.3" = { + "@schematics/angular-9.1.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.3.tgz"; - sha512 = "3vxrPyvcIWvyWgbx/fpeQvMThXlmcnHTXVn2dpTcE2BzstAYdG17W3qouhvmlqd6m28orxkKKiZaJYMNTtnV/A=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.4.tgz"; + sha512 = "7nbiYBRgXc+f0sa5iXTcF6/VMy/Xq0wyKKnDFiLCb2aFYR7EXRHWF2GuwDIg2bvFugLuCBDoNnXeddLE1TXGWg=="; }; }; - "@schematics/update-0.901.3" = { + "@schematics/update-0.901.4" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.3"; + version = "0.901.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.3.tgz"; - sha512 = "kwfc9LMMi6ryN2oiat9vTqGMK1jKwI1c45Nm1xala35nsbQSQ12qeL3MrVmnSCeI14+cinFUbp8mWI9/3M+/Lg=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.4.tgz"; + sha512 = "jCtZY2Fbj502gKN5gdu1brnRy/ssyzTrWm69Ty73V+t8uL7nLr+/hny/VBJ8CiQnKQvxcgVl1xgvI1cXzpysVA=="; }; }; "@serverless/cli-1.4.0" = { @@ -2695,13 +2731,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.30.1" = { + "@serverless/components-2.30.5" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.30.1"; + version = "2.30.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.1.tgz"; - sha512 = "blqZP6aRg9oj1A30ip2hndcvA1g+J8g8vFbUHtAfs5mp/r4KTD63tNagscSNKTSbc6csM3Z9w6yjW4KSarl8LQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.5.tgz"; + sha512 = "c/d60iqzS2NlmRGgIU0S4i6EryjXVwEWcW0bzJ04CwFDQBlvi5kSk8Q59lv0pQ5MwHk+Fw2zMnmMtBQbJxu2vw=="; }; }; "@serverless/core-1.1.2" = { @@ -2713,13 +2749,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.6.6" = { + "@serverless/enterprise-plugin-3.6.9" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.6.6"; + version = "3.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.6.tgz"; - sha512 = "ZkzHp8WVOQv2opdXSYES39uorZV3m61+QDPK5W2PtV6InddYlYNTVuhH8vIynNYFrK8tZ95ZjpPi0BQkQ8q2EQ=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.9.tgz"; + sha512 = "ZiZlRbqGerqMuR/OmrJTjDzuccfpdS6YV+VbKu+DM/9tEA9z87n7VrtjZ320C0V20wC+vFNnHl2EE26lCePyxg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2740,31 +2776,22 @@ let sha512 = "MpNMmV0uADfmGF8jVQ3Vmw+cdh7vAc8Ga/N9LHDhlbWh+EVHkqlpTi6bb3Xv6WsaPlWrx55Wo389IwpbhA0nPQ=="; }; }; - "@serverless/platform-client-0.24.0" = { - name = "_at_serverless_slash_platform-client"; - packageName = "@serverless/platform-client"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.24.0.tgz"; - sha512 = "ppxR5wONzzxNSmt/9agfSzC0F4yrkHZWAR5IPLm4yj+dMxb+768XrbqBU6vnOfCcmjb89OX5Bk0GvyQh+T5gLw=="; - }; - }; - "@serverless/platform-client-0.25.5" = { + "@serverless/platform-client-0.25.7" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "0.25.5"; + version = "0.25.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.25.5.tgz"; - sha512 = "29JV8XpJPTUSWgDwxhvZZ9fi9/5jCn1x5IeT+xEiEkpuXZU79wXlSfMfc8XtptOsDouZnOhBpKEZrItGp67CFw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.25.7.tgz"; + sha512 = "ZOKgT49qQPGjv0tDN46INO0gkc5syL2y5t0pau5ljQPtQpJzHrUL87xRlDj3BD+4Y9QFZV1UXXNsOQZsyCBsPw=="; }; }; - "@serverless/platform-client-china-1.0.6" = { + "@serverless/platform-client-china-1.0.9" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.6"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.6.tgz"; - sha512 = "565LsU74rDQQJAN6y8dTJpDNktqGGs2EvafXXEX021F+YlN3fIJebXRASN2Mgj4XWmzY7DbqC3v2wXF9j3LsGg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.9.tgz"; + sha512 = "P2OXDa3S9meOOGJm2i4/d/9HlEjg8FwwfWl4Vq7jjJlA12cJaJnXy/mKgx16eA/YSYNtfW7i4NGyeADvIGNzmg=="; }; }; "@serverless/platform-sdk-2.3.0" = { @@ -2785,13 +2812,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.6" = { + "@serverless/utils-china-0.1.7" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.6.tgz"; - sha512 = "BPaKkRJ47yKTIqRkwF62V5Z/SGdNDmNtinu3fK4988CG1gXBVG2yb3Cq34A98B4BAwZdKzxKCV2n9q4dl1zolw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.7.tgz"; + sha512 = "xpsokLjRK7PQtoNuA+1LxZ4whLlmAuJvtv9m9ARYtMaZhJkmlHD8cEh9Y0/uTcvzcA+pWtxRSHQ92TonpXqVow=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2839,49 +2866,58 @@ let sha512 = "+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg=="; }; }; - "@snyk/cli-interface-2.2.0" = { + "@snyk/cli-interface-2.3.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.2.0.tgz"; - sha512 = "sA7V2JhgqJB9z5uYotgQc5iNDv//y+Mdm39rANxmFjtZMSYJZHkP80arzPjw1mB5ni/sWec7ieYUUFeySZBfVg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.0.tgz"; + sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; }; }; - "@snyk/cli-interface-2.3.0" = { + "@snyk/cli-interface-2.3.2" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.0.tgz"; - sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; + sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; }; }; - "@snyk/cli-interface-2.4.0" = { + "@snyk/cli-interface-2.5.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.4.0"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.5.0.tgz"; + sha512 = "XMc2SCFH4RBSncZgoPb+BBlNq0NYpEpCzptKi69qyMpBy0VsRqIQqddedaazMCU1xEpXTytq6KMYpzUafZzp5Q=="; + }; + }; + "@snyk/cli-interface-2.6.0" = { + name = "_at_snyk_slash_cli-interface"; + packageName = "@snyk/cli-interface"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.4.0.tgz"; - sha512 = "FH3RpJV83SFmNWR7FXS4O4sAF7oZZxAWmN6vwhADGJNAdgJYW4Acc6677ZSMnRpIHiFBHrsxso3Au+NQuu73xA=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.6.0.tgz"; + sha512 = "jtk0gf80v4mFyDqaQNokD8GOPMTXpIUL35ewg6jtmuZw41xt56WF9kqCjiiViSRRRYA0RK+RuiVfmJA5pxvMUQ=="; }; }; - "@snyk/cocoapods-lockfile-parser-3.1.0" = { + "@snyk/cocoapods-lockfile-parser-3.2.0" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.1.0.tgz"; - sha512 = "9288PnbsBNW4Q+T8Q7qAYf0LoRXpBPzJ0ZyLKezmTaWynQ4bk4L4l5F3ENqRRPhwPKOv+eFemUggKQiBBtWD4w=="; + url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.2.0.tgz"; + sha512 = "DyFqZudOlGXHBOVneLnQnyQ97xZLq+PTF9PhWOmrEzH/tKcLyXhdW/WmDPVNJVyNvogyRZ4cXIj487xy/EeZEw=="; }; }; - "@snyk/composer-lockfile-parser-1.2.0" = { + "@snyk/composer-lockfile-parser-1.4.0" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.2.0.tgz"; - sha512 = "kZT+HTqgNcQMeoE5NM9M3jj463M8zI7ZxqZXLw9WoyVs5JTt9g0qFWxIG1cNwZdGVI+y7tzZbNWw9BlMD1vCCQ=="; + url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.0.tgz"; + sha512 = "ga4YTRjJUuP0Ufr+t1IucwVjEFAv66JSBB/zVHP2zy/jmfA3l3ZjlGQSjsRC6Me9P2Z0esQ83AYNZvmIf9pq2w=="; }; }; "@snyk/configstore-3.2.0-rc1" = { @@ -2893,13 +2929,13 @@ let sha512 = "CV3QggFY8BY3u8PdSSlUGLibqbqCG1zJRmGM2DhnhcxQDRRPTGTP//l7vJphOVsUP1Oe23+UQsj7KRWpRUZiqg=="; }; }; - "@snyk/dep-graph-1.16.1" = { + "@snyk/dep-graph-1.18.2" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.16.1"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.16.1.tgz"; - sha512 = "2RbstN/z5A3iTmgDQr0vfpWpqsjcJY54PXXP0gVXTf137QLdvgPEsZikjlofF4qoNO1io5t1VGvf69v9E8UrOw=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.2.tgz"; + sha512 = "v7tIiCH4LmYOSc0xGHKSxSZ2PEDv8zDlYU7ZKSH+1Hk8Qvj3YYEFvtV1iFBHUEQFUen4kQA6lWxlwF8chsNw+w=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -2911,31 +2947,67 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; - "@snyk/java-call-graph-builder-1.3.4" = { + "@snyk/graphlib-2.1.9-patch" = { + name = "_at_snyk_slash_graphlib"; + packageName = "@snyk/graphlib"; + version = "2.1.9-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.tgz"; + sha512 = "uFO/pNMm3pN15QB+hVMU7uaQXhsBNwEA8lOET/VDcdOzLptODhXzkJqSHqt0tZlpdAz6/6Uaj8jY00UvPFgFMA=="; + }; + }; + "@snyk/inquirer-6.2.2-patch" = { + name = "_at_snyk_slash_inquirer"; + packageName = "@snyk/inquirer"; + version = "6.2.2-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-6.2.2-patch.tgz"; + sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; + }; + }; + "@snyk/java-call-graph-builder-1.8.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.3.4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.8.0.tgz"; + sha512 = "dD7hVdEKMMU9CP0jQLm6Q1+l6506rjW0dqQflJ3QOVohNzptYJtTv9pHKzgRu5+q/fgEc35oYi02A0WIQwSvpw=="; + }; + }; + "@snyk/lodash-4.17.15-patch" = { + name = "_at_snyk_slash_lodash"; + packageName = "@snyk/lodash"; + version = "4.17.15-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/lodash/-/lodash-4.17.15-patch.tgz"; + sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ=="; + }; + }; + "@snyk/rpm-parser-1.1.0" = { + name = "_at_snyk_slash_rpm-parser"; + packageName = "@snyk/rpm-parser"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.3.4.tgz"; - sha512 = "3KXA5hTqvn6EZBEyMhA5zj0QCzu1WBPVBeUbQ4sNfftbVgfy/OFc9I/NPi39ALA2+tFYl1aKVIy1ECRea4Mc1w=="; + url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-1.1.0.tgz"; + sha512 = "+DyCagvnpyBjwYTxaPMQGLW4rkpKAw1Jrh8YbZCg7Ix172InBxdve/0zud18Lu2H6xWtDDdMvRDdfl82wlTBvA=="; }; }; - "@snyk/ruby-semver-2.1.0" = { + "@snyk/ruby-semver-2.2.0" = { name = "_at_snyk_slash_ruby-semver"; packageName = "@snyk/ruby-semver"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.1.0.tgz"; - sha512 = "u8ez8kWyqge+N+FxRDx/uPBmcHzY7BMfODvzEVeoTOeoD0CHPymEaVlkEKA8ZHtxzXjUzPIl2I8f2siZEzLjYg=="; + url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.2.0.tgz"; + sha512 = "FqUayoVjcyCsQFYPm3DcaCKdFR4xmapUkCGY+bcNBs3jqCUw687PoP9CPQ1Jvtaw5YpfBNl/62jyntsWCeciuA=="; }; }; - "@snyk/snyk-cocoapods-plugin-2.1.1" = { + "@snyk/snyk-cocoapods-plugin-2.2.0" = { name = "_at_snyk_slash_snyk-cocoapods-plugin"; packageName = "@snyk/snyk-cocoapods-plugin"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.1.1.tgz"; - sha512 = "bUo69YaZfBD/vPookJjdskcnUNGNzPbqgBLzjyDqzmG9zCArW1LEU4A8pwfw1mxjp8NzBreex6K74tC8ssIN4g=="; + url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.2.0.tgz"; + sha512 = "Ux7hXKawbk30niGBToGkKqHyKzhT3E7sCl0FNkPkHaaGZwPwhFCDyNFxBd4uGgWiQ+kT+RjtH5ahna+bSP69Yg=="; }; }; "@snyk/update-notifier-2.5.1-rc2" = { @@ -3271,13 +3343,13 @@ let sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.10" = { + "@types/babel__traverse-7.0.11" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.10"; + version = "7.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.10.tgz"; - sha512 = "74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; + sha512 = "ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q=="; }; }; "@types/babylon-6.16.5" = { @@ -3298,15 +3370,6 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/bunyan-1.8.6" = { - name = "_at_types_slash_bunyan"; - packageName = "@types/bunyan"; - version = "1.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz"; - sha512 = "YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ=="; - }; - }; "@types/cacheable-request-6.0.1" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -3415,13 +3478,13 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.3" = { + "@types/express-4.17.4" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz"; + sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w=="; }; }; "@types/express-serve-static-core-4.17.5" = { @@ -3451,6 +3514,15 @@ let sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; }; }; + "@types/graceful-fs-4.1.3" = { + name = "_at_types_slash_graceful-fs"; + packageName = "@types/graceful-fs"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; + sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; + }; + }; "@types/graphql-upload-8.0.3" = { name = "_at_types_slash_graphql-upload"; packageName = "@types/graphql-upload"; @@ -3505,13 +3577,13 @@ let sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; }; }; - "@types/jquery-3.3.35" = { + "@types/jquery-3.3.37" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.3.35"; + version = "3.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.35.tgz"; - sha512 = "pnIELWhHXJ7RgoFylhiTxD+96QlKBJfEx8JCLj963/dh7zBOKFkZ6rlNqbaCcn2JZrsAxCI8WhgRXznBx2iDsA=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.37.tgz"; + sha512 = "4MNntGYm6xdDiz2+B92xEmWcFN9mOeMXqS854lSe7LDpBhzscUjvXjCAl6JwPBtAkqmPZq+L4I5UyXXNDZyq4Q=="; }; }; "@types/js-yaml-3.12.3" = { @@ -3631,13 +3703,13 @@ let sha512 = "4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg=="; }; }; - "@types/node-13.13.2" = { + "@types/node-13.13.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.2"; + version = "13.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz"; - sha512 = "LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz"; + sha512 = "x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA=="; }; }; "@types/node-6.14.10" = { @@ -3658,6 +3730,15 @@ let sha512 = "2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ=="; }; }; + "@types/node-fetch-2.5.7" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz"; + sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw=="; + }; + }; "@types/normalize-package-data-2.4.0" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; @@ -3676,6 +3757,15 @@ let sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="; }; }; + "@types/qs-6.9.1" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz"; + sha512 = "lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw=="; + }; + }; "@types/range-parser-1.2.3" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -3703,15 +3793,6 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; - "@types/restify-4.3.6" = { - name = "_at_types_slash_restify"; - packageName = "@types/restify"; - version = "4.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/restify/-/restify-4.3.6.tgz"; - sha512 = "4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA=="; - }; - }; "@types/semver-5.5.0" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -3784,22 +3865,22 @@ let sha512 = "WJZtZlinE3meRdH+I7wTsIhpz/GLhqEQwmPGeh4s1irWLwMzCeTV8WZ+pgPTwrDXoafVUWwo1LiZ9HJVHFlJSQ=="; }; }; - "@types/ws-6.0.4" = { + "@types/ws-7.2.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "6.0.4"; + version = "7.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; - sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.4.tgz"; + sha512 = "9S6Ask71vujkVyeEXKxjBSUV8ZUB0mjL5la4IncBoheu04bDaYyUKErh1BQcY9+WzOUOiKqz/OnpJHYckbMfNg=="; }; }; - "@types/xml2js-0.4.3" = { + "@types/xml2js-0.4.5" = { name = "_at_types_slash_xml2js"; packageName = "@types/xml2js"; - version = "0.4.3"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.3.tgz"; - sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g=="; + url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz"; + sha512 = "yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w=="; }; }; "@types/yargs-15.0.4" = { @@ -3838,13 +3919,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-2.29.0" = { + "@typescript-eslint/eslint-plugin-2.31.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz"; - sha512 = "X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; + sha512 = "iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -3856,13 +3937,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-2.29.0" = { + "@typescript-eslint/experimental-utils-2.31.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz"; - sha512 = "H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; + sha512 = "MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -3874,13 +3955,13 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-2.29.0" = { + "@typescript-eslint/parser-2.31.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz"; - sha512 = "H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.31.0.tgz"; + sha512 = "uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -3892,13 +3973,13 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; - "@typescript-eslint/typescript-estree-2.29.0" = { + "@typescript-eslint/typescript-estree-2.31.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz"; - sha512 = "3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; + sha512 = "vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA=="; }; }; "@vue/cli-shared-utils-4.3.1" = { @@ -4828,13 +4909,13 @@ let sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ=="; }; }; - "agentkeepalive-4.1.0" = { + "agentkeepalive-4.1.2" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.0.tgz"; - sha512 = "CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.2.tgz"; + sha512 = "waNHE7tQBBn+2qXucI8HY0o2Y0OBPWldWOWsZwY71JcCm4SvrPnWdceFfB5NIXSqE8Ewq6VR/Qt5b1i69P6KCQ=="; }; }; "aggregate-error-3.0.1" = { @@ -5413,13 +5494,13 @@ let sha512 = "7X5aGbqaOWYG+SSkCzJNHTz2ZKDcyRwtmvW4mGVLRqdQs+HxfXS4dUS2CcwrAj449se6tZ6NLUMnjko4KMt3KA=="; }; }; - "apollo-cache-control-0.9.1" = { + "apollo-cache-control-0.10.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.9.1.tgz"; - sha512 = "9t2EcRevUrANuGhF5XUbKJEfnc6Jy2Rn7Y8nOIKlsEEC+AX7Ko4svWYTyyTxj0h0RXfiegY2nbz4sVry/pS3rA=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.10.0.tgz"; + sha512 = "UIcPlrPdRTOKrF7kc5/WD5i6EVkGEEqgOK/fMj92fnnxR1KnQDiN82lqaxu02eZJvWjFJjik0JVJNXKOJXVrpQ=="; }; }; "apollo-cache-inmemory-1.6.5" = { @@ -5566,22 +5647,22 @@ let sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA=="; }; }; - "apollo-engine-reporting-1.7.1" = { + "apollo-engine-reporting-1.8.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.7.1.tgz"; - sha512 = "9ykddPxlC95R9CkkJaPaGriRbOGfzeKqqPXRAunyX1h4sG/8g+MJ/gGzmnNf63k6RvRUdRENCE83wPk2OeU+2A=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.8.0.tgz"; + sha512 = "VPVpIGW6lbYXga6sqq/fG8ZaPR70bFuxvCov6X0npuVQPXwgZrzBp50cHx9uIaBVxDDxD3leeznsQbmF37RAww=="; }; }; - "apollo-engine-reporting-protobuf-0.4.4" = { + "apollo-engine-reporting-protobuf-0.5.0" = { name = "apollo-engine-reporting-protobuf"; packageName = "apollo-engine-reporting-protobuf"; - version = "0.4.4"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz"; - sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w=="; + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.0.tgz"; + sha512 = "OgMwtLcuL+YAaO2xgkPbnRJnISLDSNE5F11p7oq+1ws+ws71CPfHAthDCxSObCPSALdhsLAGD0v3u3soBuNmMg=="; }; }; "apollo-env-0.6.4" = { @@ -5692,13 +5773,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.12.0" = { + "apollo-server-core-2.13.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.12.0.tgz"; - sha512 = "BRVdOyZrRJ1ALlmis0vaOLIHHYu5K3UVKAQKIgHkRh/YY0Av4lpeEXr49ELK04LTeh0DG0pQ5YYYhaX1wFcDEw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.13.0.tgz"; + sha512 = "PqfsexbyObaQYb2jODs8v/XzrJcn+5mh0jA8ZfQCg5GENlua/CjeTZbRm2X0p3qpwc2E5jFAXSshrIWvhQAGZQ=="; }; }; "apollo-server-env-2.4.3" = { @@ -5719,40 +5800,40 @@ let sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="; }; }; - "apollo-server-express-2.12.0" = { + "apollo-server-express-2.13.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.12.0.tgz"; - sha512 = "oTBKM2SsziCoFW+ta+ubJ/ypvsc+EWrbJnyZhJ5FBYzSXPstt/jvgZHgMO+kOQgHEHrbJwugNDUuLMSm608L7A=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.13.0.tgz"; + sha512 = "xDc+kRqWCXs4MeRjls37G45V6PmKYwo7OlpWCXyWDSPGgY9UD4E5A6rUBCyIhoNr7RnVYMkNuySOOqzX1QJ7EA=="; }; }; - "apollo-server-plugin-base-0.7.1" = { + "apollo-server-plugin-base-0.8.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz"; - sha512 = "PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.8.0.tgz"; + sha512 = "H8sJlOVJrF0IhYIFMv7NOgB6BFgqobXSZrj1y9ju6dq13OotsqcZC4fJOYc9oWzb/+/mqg/odtVioE71mj68yg=="; }; }; - "apollo-server-types-0.3.1" = { + "apollo-server-types-0.4.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.1.tgz"; - sha512 = "6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.4.0.tgz"; + sha512 = "U+6qKCdrucVSMEVvLSqSwxIGr3VI6vcfbhpD86sdb8MgHHGH6egjNAcLrPVRk1AyXs8RV0Ysus+vlj8rpouBzA=="; }; }; - "apollo-tracing-0.9.1" = { + "apollo-tracing-0.10.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.9.1.tgz"; - sha512 = "4wVNM6rc70XhwWxuDWrMBLaHA8NjB9pUS2sNpddQvP36ZtQfsa08XLSUxGAZT+bej+TzW26hKNtuO31RgqC9Hg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.10.0.tgz"; + sha512 = "yuqA1KT0FQUfzVK3ZIk0hRIE8eUKx9Oklq83AGQxLtS/oafBj/VOCZAtJNJkyEqMJxXQT9uIBtbfO1789Gczkw=="; }; }; "apollo-upload-client-11.0.0" = { @@ -6961,13 +7042,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.661.0" = { + "aws-sdk-2.669.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.661.0"; + version = "2.669.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.661.0.tgz"; - sha512 = "dfGtbRQQUmcpj6WGVhj7q2PADCvDhLf+/aRGPXcMrm0cnHavkmHPVaSvrw2lJJJ5N9MsBKoUyacrVcIQkfNsgw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.669.0.tgz"; + sha512 = "kuVcSRpDzvkgmeSmMX6Q32eTOb8UeihhUdavMrvUOP6fzSU19cNWS9HAIkYOi/jrEDK85cCZxXjxqE3JGZIGcw=="; }; }; "aws-sign2-0.6.0" = { @@ -6997,6 +7078,15 @@ let sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; + "axios-0.18.1" = { + name = "axios"; + packageName = "axios"; + version = "0.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"; + sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g=="; + }; + }; "axios-0.19.2" = { name = "axios"; packageName = "axios"; @@ -7105,13 +7195,13 @@ let sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA=="; }; }; - "babel-jest-25.4.0" = { + "babel-jest-25.5.1" = { name = "babel-jest"; packageName = "babel-jest"; - version = "25.4.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz"; - sha512 = "p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz"; + sha512 = "9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ=="; }; }; "babel-loader-8.1.0" = { @@ -7141,13 +7231,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-25.4.0" = { + "babel-plugin-jest-hoist-25.5.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz"; - sha512 = "M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz"; + sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g=="; }; }; "babel-plugin-minify-builtins-0.5.0" = { @@ -7375,13 +7465,13 @@ let sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw=="; }; }; - "babel-preset-jest-25.4.0" = { + "babel-preset-jest-25.5.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz"; - sha512 = "PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz"; + sha512 = "8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw=="; }; }; "babel-preset-minify-0.5.1" = { @@ -8059,13 +8149,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.8.19" = { + "blessed-contrib-4.8.20" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.8.19"; + version = "4.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.19.tgz"; - sha512 = "g2EVkuCd8r46XVI+pgGuTYK0MGKOn30slJTUlV4m/1d/THIb4lUbY2S+yAtqiJ1q3IFu5TfwURb9/eAKZtJLNQ=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz"; + sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ=="; }; }; "blob-0.0.2" = { @@ -9112,13 +9202,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-15.0.0" = { + "cacache-15.0.3" = { name = "cacache"; packageName = "cacache"; - version = "15.0.0"; + version = "15.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz"; - sha512 = "L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g=="; + url = "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz"; + sha512 = "bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ=="; }; }; "cache-base-1.0.1" = { @@ -9391,13 +9481,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001046" = { + "caniuse-lite-1.0.30001050" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001046"; + version = "1.0.30001050"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz"; - sha512 = "CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001050.tgz"; + sha512 = "OvGZqalCwmapci76ISq5q4kuAskb1ebqF3FEQBv1LE1kWht0pojlDDqzFlmk5jgYkuZN7MNZ1n+ULwe/7MaDNQ=="; }; }; "capture-exit-2.0.0" = { @@ -9859,13 +9949,13 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.3.1" = { + "chokidar-3.4.0" = { name = "chokidar"; packageName = "chokidar"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; - sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; + sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; }; }; "chownr-0.0.2" = { @@ -9886,6 +9976,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; "chroma-js-2.1.0" = { name = "chroma-js"; packageName = "chroma-js"; @@ -10210,13 +10309,13 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-progress-3.8.0" = { + "cli-progress-3.8.2" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.8.0"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.0.tgz"; - sha512 = "3e+m7ecKbVTF2yo186vrrt/5217ZwE64z61kMwhSFmgrF3qZiTUuV9Fdh2RyzSkhLRfsqFf721KiUDEAJlP5pA=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.2.tgz"; + sha512 = "qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ=="; }; }; "cli-spinner-0.2.10" = { @@ -10696,13 +10795,13 @@ let sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; }; }; - "codecs-2.0.0" = { + "codecs-2.1.0" = { name = "codecs"; packageName = "codecs"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-2.0.0.tgz"; - sha512 = "WXvpJRAgc693oqYvZte9uYEiL5YHtfrxyEq12uVny9oBJ1k37zSva5vVz7trsnt6R9Y15hEgOSC7VFZT2pfYnA=="; + url = "https://registry.npmjs.org/codecs/-/codecs-2.1.0.tgz"; + sha512 = "nSWYToViFEpZXOxhtMQ6IDs76TN9xKIkHOu1KCr/iFiBcgzKuY1AFPZktuXN8r82FbZ/TXP9fwITszLgcp3eQg=="; }; }; "codepage-1.4.0" = { @@ -11128,13 +11227,13 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commander-5.0.0" = { + "commander-5.1.0" = { name = "commander"; packageName = "commander"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz"; - sha512 = "JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ=="; + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; "commandpost-1.4.0" = { @@ -11993,6 +12092,15 @@ let sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w=="; }; }; + "core-js-2.3.0" = { + name = "core-js"; + packageName = "core-js"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz"; + sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"; + }; + }; "core-js-2.6.11" = { name = "core-js"; packageName = "core-js"; @@ -12236,22 +12344,22 @@ let sha512 = "LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg=="; }; }; - "creato-1.1.1" = { + "creato-1.1.2" = { name = "creato"; packageName = "creato"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/creato/-/creato-1.1.1.tgz"; - sha512 = "FIliDIw0V3V0lWR+pVmGh45rJSemv4EBr46SNvafpxu8UJKUovEaeP5c19jSe/4m2DOEVnBeA5zcEjo1koMolg=="; + url = "https://registry.npmjs.org/creato/-/creato-1.1.2.tgz"; + sha512 = "BSna+qXnoIhNugGcUz9wnC6UtyRRKRm3QMQ/42BDw97/8eW0Y6b5Z5ecyaDbZdWMW6ipvvCbuj7H9NEkd1C0jA=="; }; }; - "cron-1.8.2" = { + "cron-1.7.2" = { name = "cron"; packageName = "cron"; - version = "1.8.2"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"; - sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; + url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; + sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; }; }; "cross-env-6.0.3" = { @@ -12659,13 +12767,13 @@ let sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; }; }; - "cssstyle-2.2.0" = { + "cssstyle-2.3.0" = { name = "cssstyle"; packageName = "cssstyle"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz"; - sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA=="; + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"; + sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; "csstype-2.6.10" = { @@ -13082,13 +13190,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.25" = { + "dayjs-1.8.26" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.25"; + version = "1.8.26"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.25.tgz"; - sha512 = "Pk36juDfQQGDCgr0Lqd1kw15w3OS6xt21JaLPE3lCfsEf8KrERGwDNwvK1tRjrjqFC0uZBJncT4smZQ4F+uV5g=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.26.tgz"; + sha512 = "KqtAuIfdNfZR5sJY1Dixr2Is4ZvcCqhb0dZpCOt5dGEFiMzoIbjkTSzUb4QKTCsP+WNpGwUjAFIZrnZvUxxkhw=="; }; }; "de-indent-1.0.2" = { @@ -13100,13 +13208,13 @@ let sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; }; }; - "deasync-0.1.19" = { + "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; - version = "0.1.19"; + version = "0.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.19.tgz"; - sha512 = "oh3MRktfnPlLysCPpBpKZZzb4cUC/p0aA3SyRGp15lN30juJBTo/CiD0d4fR+f1kBtUQoJj1NE9RPNWQ7BQ9Mg=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz"; + sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; "death-1.1.0" = { @@ -13433,13 +13541,13 @@ let sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; - "deep-equal-2.0.2" = { + "deep-equal-2.0.3" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.2.tgz"; - sha512 = "kX0bjV7tdMuhrhzKPEnVwqfQCuf+IEfN+4Xqv4eKd75xGRyn8yzdQ9ujPY6a221rgJKyQC4KBu1PibDTpa6m9w=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz"; + sha512 = "Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA=="; }; }; "deep-extend-0.2.11" = { @@ -13469,15 +13577,6 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "deep-freeze-node-1.1.3" = { - name = "deep-freeze-node"; - packageName = "deep-freeze-node"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-freeze-node/-/deep-freeze-node-1.1.3.tgz"; - sha512 = "CrA+1BVGfs9ZrGFMYtHfFHncWivh9XPb+6g8bLOzYPJmW8FmUs1dXLjALzU1SMqOMdoD5pQJARXtzxfeLqE9HQ=="; - }; - }; "deep-is-0.1.2" = { name = "deep-is"; packageName = "deep-is"; @@ -13829,13 +13928,13 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; - "dependency-graph-0.8.1" = { + "dependency-graph-0.9.0" = { name = "dependency-graph"; packageName = "dependency-graph"; - version = "0.8.1"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.8.1.tgz"; - sha512 = "g213uqF8fyk40W8SBjm079n3CZB4qSpCrA2ye1fLGzH/4HEgB6tzuW2CbLE7leb4t45/6h44Ud59Su1/ROTfqw=="; + url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz"; + sha512 = "9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w=="; }; }; "dependency-tree-7.2.1" = { @@ -14477,13 +14576,13 @@ let sha512 = "Yiolk/ktLUjThacBuIEqyoRYzDdGrp8rjKjcdZA/hhtIUHrU5iVrS1MIm3p3PWKpnD7va4Jlp/FV0ywP3AdKrg=="; }; }; - "dockerfile-language-service-0.0.11" = { + "dockerfile-language-service-0.0.12" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.11.tgz"; - sha512 = "fTCa36gGPpveIsdNTa5GkvJzL/j78ga8kZ7pnF/OaJiuXKzphDetVVfeamgtXLsviAwIXyUDmofxaVKCT/XWSw=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.12.tgz"; + sha512 = "73ZEQW8LCL/SIWzWekqqLdH41pZ8+N2BYD5K16cBQCQfsZPjFoJC04tv7jlTnEPypJZs3zV0hpBLVTi7zhRFfw=="; }; }; "dockerfile-utils-0.0.11" = { @@ -14666,13 +14765,13 @@ let sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; }; }; - "domino-2.1.4" = { + "domino-2.1.5" = { name = "domino"; packageName = "domino"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz"; - sha512 = "l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ=="; + url = "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz"; + sha512 = "vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="; }; }; "domutils-1.4.3" = { @@ -14810,13 +14909,13 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-4.9.0" = { + "dotnet-deps-parser-4.10.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.9.0.tgz"; - sha512 = "V0O+7pI7Ei+iL5Kgy6nYq1UTwzrpqci5K/zf8cXyP5RWBSQBUl/JOE9I67zLUkKiwOdfPhbMQgcRj/yGA+NL1A=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.10.0.tgz"; + sha512 = "dEO1oTvreaDCtcvhRdOmmAMubyC+MWqVr1c/1Wvasi+NW4NZeB67qGh1taqowUFh+aCXtPw3SP2eExn6aNkhwA=="; }; }; "downgrade-root-1.2.2" = { @@ -14891,6 +14990,15 @@ let sha512 = "RyOSTL7B3qzrhCOfhgzxNrcZD1klFOAJcw2YG345AIB4su1KC4WSk6fzRz3xpg1tp/plr5v8aDlvZy+LDtf6uA=="; }; }; + "download-stats-0.3.4" = { + name = "download-stats"; + packageName = "download-stats"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/download-stats/-/download-stats-0.3.4.tgz"; + sha512 = "ic2BigbyUWx7/CBbsfGjf71zUNZB4edBGC3oRliSzsoNmvyVx3Ycfp1w3vp2Y78Ee0eIIkjIEO5KzW0zThDGaA=="; + }; + }; "draftlog-1.0.12" = { name = "draftlog"; packageName = "draftlog"; @@ -15170,13 +15278,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.415" = { + "electron-to-chromium-1.3.427" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.415"; + version = "1.3.427"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz"; - sha512 = "GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz"; + sha512 = "/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A=="; }; }; "elegant-spinner-1.0.1" = { @@ -15224,13 +15332,13 @@ let sha512 = "gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ=="; }; }; - "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = { + "emitter-https://github.com/component/emitter/archive/1.0.1.tar.gz" = { name = "emitter"; packageName = "emitter"; version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; + url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -15639,6 +15747,15 @@ let sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ=="; }; }; + "envinfo-7.5.1" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz"; + sha512 = "hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ=="; + }; + }; "epidemic-broadcast-trees-7.0.0" = { name = "epidemic-broadcast-trees"; packageName = "epidemic-broadcast-trees"; @@ -15657,13 +15774,13 @@ let sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; - "errlop-2.1.0" = { + "errlop-2.2.0" = { name = "errlop"; packageName = "errlop"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/errlop/-/errlop-2.1.0.tgz"; - sha512 = "sEmQX03aJkWsqTPDYaymq3ROJmKxMHhFS4UN8fWwr5ZiRtw3p61QHRk2QQj68DiaTIXWujJP+uEUS1Zx3spxlw=="; + url = "https://registry.npmjs.org/errlop/-/errlop-2.2.0.tgz"; + sha512 = "e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw=="; }; }; "errno-0.1.7" = { @@ -15801,6 +15918,15 @@ let sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; + "es6-promise-3.0.2" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; + sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; + }; + }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -15855,6 +15981,15 @@ let sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; }; }; + "es6-promisify-6.1.1" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz"; + sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -17547,13 +17682,13 @@ let sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; - "filelist-0.0.6" = { + "filelist-1.0.1" = { name = "filelist"; packageName = "filelist"; - version = "0.0.6"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/filelist/-/filelist-0.0.6.tgz"; - sha1 = "58a641ad1f57574a27fe87a440ef318834b55719"; + url = "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz"; + sha512 = "8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ=="; }; }; "filename-regex-2.0.1" = { @@ -17889,13 +18024,13 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-7.0.0" = { + "fkill-7.0.1" = { name = "fkill"; packageName = "fkill"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.0.0.tgz"; - sha512 = "i61SqvPdfCxl1/VQulh9SXrC+4dudCtINzTHbKaEx3Jr0kD9SvxKDeXzej7Saurnj3al/jMJwQnsUc62VrBMHQ=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.0.1.tgz"; + sha512 = "rziuWzpWErC2aGQUuvGo9dcVBDeHowK9g75u4fnkTCAqPgvUVRMtlDW6KWsWonxY1tjF+p1mIys33yNvLRlAtw=="; }; }; "flagged-respawn-1.0.1" = { @@ -18384,13 +18519,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.5.3" = { + "fp-ts-2.5.4" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.3.tgz"; - sha512 = "lQd+hahLd8cygNoXbEHDjH/cbF6XVWlEPb8h5GXXlozjCSDxWgclvkpOoTRfBA0P+r69l9VvW1nEsSGIJRQpWw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.4.tgz"; + sha512 = "cZlLeEneRYypc2dOzB9h8+bd9mQhJVyt2g0Dny2gKR7uWNgA4EmLSJyguLYsTU44nJSSG9EjurUalEc0wQqeKw=="; }; }; "fraction.js-4.0.12" = { @@ -18690,13 +18825,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fs2-0.3.7" = { + "fs2-0.3.8" = { name = "fs2"; packageName = "fs2"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/fs2/-/fs2-0.3.7.tgz"; - sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw=="; + url = "https://registry.npmjs.org/fs2/-/fs2-0.3.8.tgz"; + sha512 = "HxOTRiFS3PqwAOmlp1mTwLA+xhQBdaP82b5aBamc/rHKFVyn4qL8YpngaAleD52PNMzBm6TsGOoU/Hq+bAfBhA=="; }; }; "fsevents-1.2.12" = { @@ -19578,7 +19713,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = https://codeload.github.com/component/global/tar.gz/v2.0.1; + url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -19708,6 +19843,15 @@ let sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; }; }; + "globby-11.0.0" = { + name = "globby"; + packageName = "globby"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz"; + sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -19942,13 +20086,13 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "graceful-readlink-1.0.1" = { @@ -20068,13 +20212,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.11.1" = { + "graphql-extensions-0.12.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.1.tgz"; - sha512 = "1bstq6YKaC579PTw9gchw2VlXqjPo3vn8NjRMaUqF2SxyYTjVSgXaCAbaeNa0B7xlLVigxi3DV1zh4A+ss+Lwg=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.0.tgz"; + sha512 = "kBRLtNeknrFl0W/UQQYebj6qnvb1E1RpQ2+C7Y8pwMc6yV8+9pWFx5RP0HzfeEuScCmK93i3H5sdPedoQWwENw=="; }; }; "graphql-import-0.4.5" = { @@ -20653,13 +20797,13 @@ let sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; }; - "hash-base-3.0.4" = { + "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; "hash-sum-2.0.0" = { @@ -23345,13 +23489,13 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "is-promise-2.1.0" = { + "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; "is-property-1.0.2" = { @@ -23732,13 +23876,13 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; - "is-wsl-2.1.1" = { + "is-wsl-2.2.0" = { name = "is-wsl"; packageName = "is-wsl"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz"; - sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog=="; + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; }; "is-yarn-global-0.3.0" = { @@ -24047,13 +24191,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "jest-haste-map-25.4.0" = { + "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "25.4.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz"; - sha512 = "5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz"; + sha512 = "dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ=="; }; }; "jest-regex-util-25.2.6" = { @@ -24065,31 +24209,31 @@ let sha512 = "KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw=="; }; }; - "jest-serializer-25.2.6" = { + "jest-serializer-25.5.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "25.2.6"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz"; - sha512 = "RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz"; + sha512 = "LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA=="; }; }; - "jest-util-25.4.0" = { + "jest-util-25.5.0" = { name = "jest-util"; packageName = "jest-util"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz"; - sha512 = "WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz"; + sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; - "jest-worker-25.4.0" = { + "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz"; - sha512 = "ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz"; + sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw=="; }; }; "jetpack-id-1.0.0" = { @@ -24326,13 +24470,13 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jscodeshift-0.7.0" = { + "jscodeshift-0.7.1" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.0.tgz"; - sha512 = "Kt6rpTa1HVhAWagD6J0y6qxxqRmDgkFvczerLgOsDNSGoUZSmq2CO1vFRcda9OV1BaZKSHCIh+VREPts5tB/Ig=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.1.tgz"; + sha512 = "YMkZSyoc8zg5woZL23cmWlnFLPH/mHilonGA7Qbzs7H6M4v4PH0Qsn4jeDyw+CHhVoAnm9UxQyB0Yw1OT+mktA=="; }; }; "jsdom-11.12.0" = { @@ -24659,15 +24803,6 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "jsonata-1.8.2" = { - name = "jsonata"; - packageName = "jsonata"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.2.tgz"; - sha512 = "ma5F/Bs47dZfJfDZ0Dt37eIbzVBVKZIDqsZSqdCCAPNHxKn+s3+CfMA6ahVVlf8Y1hyIjXkVLFU7yv4XxRfihA=="; - }; - }; "jsonata-1.8.3" = { name = "jsonata"; packageName = "jsonata"; @@ -24875,23 +25010,22 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.4.0" = { + "jszip-3.1.5" = { name = "jszip"; packageName = "jszip"; - version = "3.4.0"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; - sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz"; + sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ=="; }; }; - "jszip-git://github.com/anmonteiro/jszip#patch-1" = { + "jszip-3.4.0" = { name = "jszip"; packageName = "jszip"; - version = "2.6.1"; - src = fetchgit { - url = "git://github.com/anmonteiro/jszip"; - rev = "5a92e8c9153a3557daa8d3540b00c50bd8554c49"; - sha256 = "00016993634d04b6f7eea8fae529b804d5a0b7ed2636361c7546a48b866e9c5c"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; + sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; "junk-3.1.0" = { @@ -25390,6 +25524,15 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; + "lazy-cache-2.0.2" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; + sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; + }; + }; "lazyness-1.1.1" = { name = "lazyness"; packageName = "lazyness"; @@ -25741,6 +25884,15 @@ let sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439"; }; }; + "lie-3.1.1" = { + name = "lie"; + packageName = "lie"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; + sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + }; + }; "lie-3.3.0" = { name = "lie"; packageName = "lie"; @@ -27685,13 +27837,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.4" = { + "make-fetch-happen-8.0.6" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.4"; + version = "8.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz"; - sha512 = "hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.6.tgz"; + sha512 = "QJ4pB5VBY9H9e+3t/o+fPjsVUlPULpAllxuKertRo/7ii47TfxeEEnneM6NCmhyn4MQPTYL+M+RkiU9bR+hAfg=="; }; }; "make-iterator-1.0.1" = { @@ -28045,13 +28197,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-terminal-4.0.0" = { + "marked-terminal-4.1.0" = { name = "marked-terminal"; packageName = "marked-terminal"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.0.0.tgz"; - sha512 = "mzU3VD7aVz12FfGoKFAceijehA6Ocjfg3rVimvJbFAB/NOYCsuzRVtq3PSFdPmWI5mhdGeEh3/aMJ5DSxAz94Q=="; + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.0.tgz"; + sha512 = "5KllfAOW02WS6hLRQ7cNvGOxvKW1BKuXELH4EtbWfyWgxQhROoMxEvuQ/3fTgkNjledR0J48F4HbapvYp1zWkQ=="; }; }; "marky-1.2.1" = { @@ -28495,13 +28647,13 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.1.0" = { + "meow-6.1.1" = { name = "meow"; packageName = "meow"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz"; - sha512 = "iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg=="; + url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"; + sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; }; }; "merge-1.2.1" = { @@ -28756,6 +28908,15 @@ let sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; }; }; + "mime-2.4.5" = { + name = "mime"; + packageName = "mime"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz"; + sha512 = "3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w=="; + }; + }; "mime-db-1.12.0" = { name = "mime-db"; packageName = "mime-db"; @@ -28819,6 +28980,15 @@ let sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; }; }; + "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-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -29125,13 +29295,13 @@ let sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880"; }; }; - "mirror-folder-3.0.1" = { + "mirror-folder-3.1.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.1.tgz"; - sha512 = "AWYvbeZbHljMuu+49wgCdLGVOekNh/vpIsIMkFZYcRAJCY9vH7+vHM/aEIY3mrbbrBkHyBDnbmoOWUTbHN4A8g=="; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.1.0.tgz"; + sha512 = "OI7i/f1OjPWyloZi8kEZFSe50V9gMdMsCOzeS6DZ8OgpJP9bCDXDJRiDWYEfYNF2sCY7TBZBbLfKuEo3vohJhw=="; }; }; "mississippi-3.0.0" = { @@ -29188,15 +29358,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkdirp-0.5.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; - }; - }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -29224,13 +29385,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mkdirp-classic-0.5.2" = { + "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz"; - sha512 = "ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="; + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; "mkdirp-promise-5.0.1" = { @@ -29341,6 +29502,15 @@ let sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; + "moment-2.25.3" = { + name = "moment"; + packageName = "moment"; + version = "2.25.3"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; + sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; + }; + }; "moment-2.7.0" = { name = "moment"; packageName = "moment"; @@ -29413,6 +29583,15 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; + "move-file-2.0.0" = { + name = "move-file"; + packageName = "move-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz"; + sha512 = "cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ=="; + }; + }; "mp4-box-encoding-1.4.1" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; @@ -29800,13 +29979,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mutexify-1.2.0" = { + "mutexify-1.3.0" = { name = "mutexify"; packageName = "mutexify"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; - sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.0.tgz"; + sha512 = "WNPlgZ3AHETGSa4jeRP4aW6BPQ/a++MwoMFFIgrDg80+m70mbxuNOrevANfBDmur82zxTFAY3OwvMAvqrkV2sA=="; }; }; "muxrpc-6.5.0" = { @@ -30200,13 +30379,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.2" = { + "nearley-2.19.3" = { name = "nearley"; packageName = "nearley"; - version = "2.19.2"; + version = "2.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.2.tgz"; - sha512 = "h6lygT0BWAGErDvoE2LfI+tDeY2+UUrqG5dcBPdCmjnjud9z1wE0P7ljb85iNbE93YA+xJLpoSYGMuUqhnSSSA=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.3.tgz"; + sha512 = "FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ=="; }; }; "neat-csv-2.1.0" = { @@ -30706,6 +30885,15 @@ let sha512 = "OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw=="; }; }; + "node-gyp-6.1.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz"; + sha512 = "h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw=="; + }; + }; "node-gyp-build-3.7.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -30733,13 +30921,13 @@ let sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; - "node-gyp-build-4.2.1" = { + "node-gyp-build-4.2.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz"; - sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; + sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; }; }; "node-int64-0.4.0" = { @@ -31183,6 +31371,15 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; + "npm-api-1.0.0" = { + name = "npm-api"; + packageName = "npm-api"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz"; + sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ=="; + }; + }; "npm-bundled-1.1.1" = { name = "npm-bundled"; packageName = "npm-bundled"; @@ -31390,22 +31587,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.3" = { + "npm-registry-fetch-4.0.4" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz"; - sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz"; + sha512 = "6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA=="; }; }; - "npm-registry-fetch-8.0.0" = { + "npm-registry-fetch-8.0.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.0.0"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz"; - sha512 = "975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.2.tgz"; + sha512 = "/UteT/LQ+0eegPh96w2sVjpAJk2kuphWASp1SPBFBWtSyuPoUW5gf4utzQm5A5FLrZF3eZJGH59j4X6KBUa40g=="; }; }; "npm-run-4.1.2" = { @@ -31612,7 +31809,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -32714,13 +32911,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.4.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-reduce-1.0.0" = { @@ -32876,13 +33073,13 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-11.1.4" = { + "pacote-11.1.8" = { name = "pacote"; packageName = "pacote"; - version = "11.1.4"; + version = "11.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz"; - sha512 = "eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.8.tgz"; + sha512 = "oBXbdsqA0pnk4lNmWDHMm20uSbZiYCjE0MHeSFG3esxw1mubhSJizVc1rKVI0KMkYTMz4M7OTEqY1h2lx+wbPw=="; }; }; "pacote-9.5.12" = { @@ -32912,6 +33109,15 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; + "paged-request-2.0.1" = { + name = "paged-request"; + packageName = "paged-request"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz"; + sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -34226,13 +34432,13 @@ let sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f"; }; }; - "portfinder-1.0.25" = { + "portfinder-1.0.26" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.25"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz"; - sha512 = "6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; + sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; }; }; "posix-character-classes-0.1.1" = { @@ -34290,6 +34496,15 @@ let sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; }; }; + "postcss-7.0.29" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz"; + sha512 = "ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw=="; + }; + }; "postcss-calc-7.0.2" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -34758,13 +34973,13 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-value-parser-4.0.3" = { + "postcss-value-parser-4.1.0" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; - sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; "postcss-values-parser-1.5.0" = { @@ -35343,13 +35558,13 @@ let sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; - "property-information-5.4.0" = { + "property-information-5.5.0" = { name = "property-information"; packageName = "property-information"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz"; - sha512 = "nmMWAm/3vKFGmmOWOcdLjgq/Hlxa+hsuR/px1Lp/UGEyc5A22A6l78Shc2C0E71sPmAqglni+HrS7L7VJ7AUCA=="; + url = "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz"; + sha512 = "RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA=="; }; }; "proto-list-1.2.4" = { @@ -36432,13 +36647,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.3" = { + "qs-6.9.4" = { name = "qs"; packageName = "qs"; - version = "6.9.3"; + version = "6.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz"; - sha512 = "EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz"; + sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="; }; }; "query-string-1.0.1" = { @@ -37152,13 +37367,13 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; - "readdirp-3.3.0" = { + "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; - sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; "readline2-0.1.1" = { @@ -37206,13 +37421,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.19.0" = { + "recast-0.19.1" = { name = "recast"; packageName = "recast"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.19.0.tgz"; - sha512 = "HymYANYaUFpKoAkOZ2od16SB7A/BwCZbvYIs9Rc8K+wNThQctiCJ0AjLkPbo9eWdy3w5Eemk6I4MeEYbH12PBg=="; + url = "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz"; + sha512 = "8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw=="; }; }; "rechoir-0.6.2" = { @@ -37791,6 +38006,15 @@ let sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; }; + "replace-ext-1.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"; + sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="; + }; + }; "replace-homedir-1.0.0" = { name = "replace-homedir"; packageName = "replace-homedir"; @@ -38520,13 +38744,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.7.2" = { + "rollup-2.7.6" = { name = "rollup"; packageName = "rollup"; - version = "2.7.2"; + version = "2.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.7.2.tgz"; - sha512 = "SdtTZVMMVSPe7SNv4exUyPXARe5v/p3TeeG3LRA5WabLPJt4Usi3wVrvVlyAUTG40JJmqS6zbIHt2vWTss2prw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.7.6.tgz"; + sha512 = "AdHosxHBKyBsdtbT1/AqbWNQ87O4SSxS4N9iMwEpoCDAT6e4Du3uJSy83mp3ckgmCxly5VeXGx0WHsm21Djytg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -38664,13 +38888,13 @@ let sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; }; }; - "run-async-2.4.0" = { + "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; - sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; "run-in-dir-0.3.0" = { @@ -39555,6 +39779,15 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; + "set-getter-0.1.0" = { + name = "set-getter"; + packageName = "set-getter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; + sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; + }; + }; "set-immediate-shim-1.0.1" = { name = "set-immediate-shim"; packageName = "set-immediate-shim"; @@ -39753,13 +39986,13 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.3" = { + "shelljs-0.8.4" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; + sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; }; }; "shellsubstitute-1.2.0" = { @@ -40248,31 +40481,22 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-config-2.2.3" = { + "snyk-config-3.1.0" = { name = "snyk-config"; packageName = "snyk-config"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz"; - sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; - }; - }; - "snyk-config-3.0.0" = { - name = "snyk-config"; - packageName = "snyk-config"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.0.0.tgz"; - sha512 = "sXjd7gUqPTmgkhtLowFkFU5J4xyS7tDIRUbHmpW/dvTjgmiH0ujobJzSdaim4W6pbiIf4snkGJsvHM3/wmdR5w=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.0.tgz"; + sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-2.6.1" = { + "snyk-docker-plugin-3.1.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "2.6.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.6.1.tgz"; - sha512 = "v3LIPILRL5faZ+qiIhF9on0rAxuFaQku3UwaiGumoTrfXywLkv7x8PJgdMnrsWUxDwB8EZFc1k2qvI6V6rTF5g=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.1.0.tgz"; + sha512 = "ggGTiiCuwLYGdlGW/UBuUXJ7omliH0EnbpLfdlTBoRKvmvgoUo1l4Menk18R1ZVXgcXTwwGK9jmuUpPH+X0VNw=="; }; }; "snyk-go-parser-1.4.0" = { @@ -40284,13 +40508,13 @@ let sha512 = "zcLA8u/WreycCjFKBblYfxszg7Fmnemuu9Ug/CE/jqF0yBXsI5DCWMteUvFkoa8DRntfGTlgf98TRl2aTSc2MQ=="; }; }; - "snyk-go-plugin-1.13.0" = { + "snyk-go-plugin-1.14.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.13.0.tgz"; - sha512 = "6lN9S8uO6LE1Y6ZJMZm3EZ8kvvI/vZh8r+JJGAPfVO2C265xymEpFBJ4Nn2or0Q0LlqZ8W8lWi1HUMXXid6k+w=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.14.0.tgz"; + sha512 = "9L+76De8F6yXWb+O3DA8QUi7+eDF2mOzCOveEPUJGkqWIDmurIiFcVxHJoj0EStjcxb3dX367KKlDlfFx+HiyA=="; }; }; "snyk-gradle-plugin-3.2.5" = { @@ -40311,49 +40535,49 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.10.0" = { + "snyk-mvn-plugin-2.15.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.10.0"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.10.0.tgz"; - sha512 = "npslocHJXUbdFxehMPQ8w4oX6bB6J6vHTWNRDF7u2+pIhVumQe1QOvZGjwh3up+vOCoKiEprO7gdt7vC8im1Vg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.15.0.tgz"; + sha512 = "24HWz27Hc5sw+iHtxtQFy0kltjyFZXJ3vfsPA0TTZAL0tOJXInIuZpWD6njC0Y3/sn9CH5kS2KM8GAM7FyKVig=="; }; }; - "snyk-nodejs-lockfile-parser-1.18.0" = { + "snyk-nodejs-lockfile-parser-1.22.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.18.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.18.0.tgz"; - sha512 = "QGb6HBtnqefbVtrDyUqA3vXGo2DZJAlDxrsgIpKxFalhxmxmWQE3Fxx44V3aRq9H8iZ1eXb7s/drTsa/s9qGJQ=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.22.0.tgz"; + sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q=="; }; }; - "snyk-nuget-plugin-1.16.0" = { + "snyk-nuget-plugin-1.17.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.16.0.tgz"; - sha512 = "OEusK3JKKpR4Yto5KwuqjQGgb9wAhmDqBWSQomWdtKQVFrzn5B6BMzOFikUzmeMTnUGGON7gurQBLXeZZLhRqg=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.17.0.tgz"; + sha512 = "t7iZ87LBhCK6P2/mJsQh7Dmk3J9zd+IHL4yoSK95Iyk/gP8r++DZijoRHEXy8BlS+eOtSAj1vgCYvv2eAmG28w=="; }; }; - "snyk-paket-parser-1.5.0" = { + "snyk-paket-parser-1.6.0" = { name = "snyk-paket-parser"; packageName = "snyk-paket-parser"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.5.0.tgz"; - sha512 = "1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA=="; + url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz"; + sha512 = "6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q=="; }; }; - "snyk-php-plugin-1.7.0" = { + "snyk-php-plugin-1.9.0" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.7.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.7.0.tgz"; - sha512 = "mDe90xkqSEVrpx1ZC7ItqCOc6fZCySbE+pHVI+dAPUmf1C1LSWZrZVmAVeo/Dw9sJzJfzmcdAFQl+jZP8/uV0A=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.0.tgz"; + sha512 = "uORrEoC47dw0ITZYu5vKqQtmXnbbQs+ZkWeo5bRHGdf10W8e4rNr1S1R4bReiLrSbSisYhVHeFMkdOAiLIPJVQ=="; }; }; "snyk-policy-1.13.5" = { @@ -40851,13 +41075,13 @@ let sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; }; }; - "source-map-support-0.5.18" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.18"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz"; - sha512 = "9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; "source-map-url-0.4.0" = { @@ -41211,6 +41435,15 @@ let sha512 = "CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg=="; }; }; + "sqlite3-4.2.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; + sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -43155,13 +43388,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.23.5" = { + "systeminformation-4.24.1" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.23.5"; + version = "4.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.5.tgz"; - sha512 = "Zxd1wxN8KigQsDhZupVNAyHnkl+ombejuLpNhJ+LNezMxTLn7nBx9HNAIWUJnhAnSS0ZElQLQ1muqgnwbhgOHg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.24.1.tgz"; + sha512 = "LRksOe2mBvtbD0Y1hZMsaICHpIglhjz758K5XKUiHKcTBc6BV4O7ozbExZc+5BcCYrniMI9ka7piXFeCaymRRQ=="; }; }; "syswide-cas-5.3.0" = { @@ -43354,13 +43587,13 @@ let sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ=="; }; }; - "tar-6.0.1" = { + "tar-6.0.2" = { name = "tar"; packageName = "tar"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz"; - sha512 = "bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q=="; + url = "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz"; + sha512 = "Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg=="; }; }; "tar-fs-2.0.1" = { @@ -43426,13 +43659,13 @@ let sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; }; }; - "telegraf-3.37.0" = { + "telegraf-3.38.0" = { name = "telegraf"; packageName = "telegraf"; - version = "3.37.0"; + version = "3.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-3.37.0.tgz"; - sha512 = "V3448qwfOolBqkIc87yxjW4zMvR2P6AIF24pPTlX9WhZPwA1TF/x3nQhnWPRLtGh2SJuvDcr83iTkXPXT7Opnw=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-3.38.0.tgz"; + sha512 = "va4VlrKWp64JrowFoZX/NPzzA6q38kvaIukVXOWFO1V+jR1G8+hCfgJy4TX8Z3rwLJzwaBEet1QhikHDRZWl3A=="; }; }; "telegram-typings-3.6.1" = { @@ -43579,13 +43812,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.6.11" = { + "terser-4.6.13" = { name = "terser"; packageName = "terser"; - version = "4.6.11"; + version = "4.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz"; - sha512 = "76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA=="; + url = "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz"; + sha512 = "wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw=="; }; }; "terser-webpack-plugin-1.4.3" = { @@ -44056,6 +44289,15 @@ let sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; + "tmp-0.2.1" = { + name = "tmp"; + packageName = "tmp"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; + }; + }; "tmp-graphql-config-extension-openapi-1.0.7" = { name = "tmp-graphql-config-extension-openapi"; packageName = "tmp-graphql-config-extension-openapi"; @@ -44704,13 +44946,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.9.0" = { + "ts-node-8.10.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.9.0"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.9.0.tgz"; - sha512 = "rwkXfOs9zmoHrV8xE++dmNd6ZIS+nmHHCxcV53ekGJrxFLMbp+pizpPS07ARvhwneCIECPppOwbZHvw9sQtU4w=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; + sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw=="; }; }; "ts-process-promises-1.0.2" = { @@ -44722,15 +44964,6 @@ let sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; }; }; - "tslib-1.11.0" = { - name = "tslib"; - packageName = "tslib"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz"; - sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg=="; - }; - }; "tslib-1.11.1" = { name = "tslib"; packageName = "tslib"; @@ -45001,6 +45234,15 @@ let sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; }; }; + "type-fest-0.13.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -45226,13 +45468,13 @@ let sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; }; }; - "uglify-js-3.9.1" = { + "uglify-js-3.9.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; - sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -46477,24 +46719,6 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; - "utilities-0.0.37" = { - name = "utilities"; - packageName = "utilities"; - version = "0.0.37"; - src = fetchurl { - url = "https://registry.npmjs.org/utilities/-/utilities-0.0.37.tgz"; - sha1 = "a3470d0a7f688142d9e8a57cee1128f12e19e196"; - }; - }; - "utilities-1.0.5" = { - name = "utilities"; - packageName = "utilities"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/utilities/-/utilities-1.0.5.tgz"; - sha1 = "f2b77a88f3510733fc7215b5c486a504a75ab245"; - }; - }; "utils-merge-1.0.0" = { name = "utils-merge"; packageName = "utils-merge"; @@ -46531,13 +46755,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.1.7" = { + "utp-native-2.1.10" = { name = "utp-native"; packageName = "utp-native"; - version = "2.1.7"; + version = "2.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.7.tgz"; - sha512 = "PQmXCdZOkmADtIqmhoiFEIdNlvkPouO8ktXqThFDBAt850B752bjQMF5KAJeMBJ5gzuI70ZiP9Qsr9mwCwzSyg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.10.tgz"; + sha512 = "VTjBvb/uE9gYqx2NGVPtAWhqv9itieW+wJceJg5G6Cl/2kBCnHDaFafw3fNgCvii7meTpC4AoZfy6OG0pnuQ/Q=="; }; }; "uuid-2.0.3" = { @@ -47224,13 +47448,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.1.1" = { + "vscode-css-languageservice-4.1.2" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.1.tgz"; - sha512 = "2r2bYbhscivRu1zqh5kNe8aYpFnfksMYC7wTpKX2HqFsSzSJYXk0sCqPaWsP5ptqz0OFBTXnzx2JlE+Nb5Edgw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.2.tgz"; + sha512 = "clIjSS940NPBvtfubZokKT/YDNfE5ST9VDwsuwdCbQSkJAVZPAbmIgfmgrz/f/o8PawYQU/ooUBEuRIvIYq3ag=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -47251,13 +47475,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.5.2" = { + "vscode-json-languageservice-3.6.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.5.2.tgz"; - sha512 = "9cUvBq00O08lpWVVOx6tQ1yLxCHss79nsUdEAVYGomRyMbnPBmc0AkYPcXI9WK1EM6HBo0R9Zo3NjFhcICpy4A=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.6.0.tgz"; + sha512 = "dXzFywypUZ9T0tjr4fREZiknXDz6vAGx1zsxbQY1+9DOpjMfbz0VLP873KmcbuvL4K3nseKTxc4TKHu8kLXRMw=="; }; }; "vscode-jsonrpc-3.6.0" = { @@ -48538,6 +48762,15 @@ let sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="; }; }; + "ws-7.2.5" = { + name = "ws"; + packageName = "ws"; + version = "7.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz"; + sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -48832,7 +49065,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; + url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -49385,22 +49618,22 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.9.5" = { + "yeoman-environment-2.10.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.9.5"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.5.tgz"; - sha512 = "ntxV8VTZbP8QFuJZGT7vG8AsKeyGz8lXlfq2V2T5sl6SrU6UAEVgRreEGz9t+JbFGx1CSM/Ly2atG/avGuheyQ=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.10.0.tgz"; + sha512 = "dn754zZm1kTWS94V5riNLNjs9Wn6Zjl+9jgbQ37EmHEhcRR30fY1sgBnhYZyTpa+zK7ipFI6dMH9Sg0SAMW3hw=="; }; }; - "yeoman-generator-4.8.3" = { + "yeoman-generator-4.10.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.8.3"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.3.tgz"; - sha512 = "yDPHBhfglqiyYlqBnaAmcE/wPznwSx11HCGVCpnnsqpnp45HmdsuBtiFSNDcygiFmz1HmkFWRLWHTai/b+9eiQ=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.10.0.tgz"; + sha512 = "NuY9bt7r6kvjvWjAVcujZwHux5xXy4Vdmz3uabyjioh679ry97+dl+MgtlAkgdSQ7kGI0Iz1GC92tZ33XdxaDw=="; }; }; "yn-3.1.1" = { @@ -49526,17 +49759,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.3.tgz"; - sha512 = "/7yHOuiyMgpcoBuADPrF4Eo9VDysA57fsyrMlOH2WZmKdsjW032StS9EIOue5RNQ7y0DwrtgtnkjbpZ6nYo3Pw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.4.tgz"; + sha512 = "H9MqoT4zyIv+Yo3cvRVkzafWGHsqt7jUvtvGwMHIDMTfEX+Q8yiYlDLL6WM3Eb6/hDmLcRGC/GI495sKS1z5qA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.3" - sources."@angular-devkit/core-9.1.3" - sources."@angular-devkit/schematics-9.1.3" - sources."@schematics/angular-9.1.3" - sources."@schematics/update-0.901.3" + sources."@angular-devkit/architect-0.901.4" + sources."@angular-devkit/core-9.1.4" + sources."@angular-devkit/schematics-9.1.4" + sources."@schematics/angular-9.1.4" + sources."@schematics/update-0.901.4" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -49622,7 +49855,7 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" @@ -49658,11 +49891,10 @@ in sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -49687,8 +49919,8 @@ in sources."lru-cache-5.1.1" sources."magic-string-0.25.7" sources."make-fetch-happen-5.0.2" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -49716,7 +49948,7 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-1.4.8" sources."npm-pick-manifest-6.0.0" - (sources."npm-registry-fetch-4.0.3" // { + (sources."npm-registry-fetch-4.0.4" // { dependencies = [ sources."hosted-git-info-2.8.8" sources."npm-package-arg-6.1.1" @@ -49778,7 +50010,7 @@ in sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.2" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-queue-1.0.3" sources."rxjs-6.5.4" sources."safe-buffer-5.2.0" @@ -49855,7 +50087,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = https://github.com/angular/angular-cli; + homepage = "https://github.com/angular/angular-cli"; license = "MIT"; }; production = true; @@ -49865,25 +50097,24 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.0.tgz"; - sha512 = "YiAP7Ib4zhAE+owOKg1/cJ+1AQX4BGfvaMnGkHaSf6srutoLLCRIbD0InpSNobf+ouSMqqk6fiLmBVt/cu03og=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.1.tgz"; + sha512 = "AtqlCYdlvwfRUtqaSzjR3Ji4WpCHq/AyD+rcagD3lg/WGiZdwgppiy4Oj36s7rUfR0SDl5GIIWmA5zdDSBRNvw=="; }; dependencies = [ - sources."@antora/playbook-builder-2.3.0" + sources."@antora/playbook-builder-2.3.1" sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."commander-5.0.0" + sources."commander-5.1.0" (sources."convict-5.2.0" // { dependencies = [ sources."json5-2.1.0" ]; }) sources."decamelize-1.2.0" - sources."deep-freeze-node-1.1.3" sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."json5-2.1.3" @@ -49899,7 +50130,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -49909,24 +50140,24 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.0.tgz"; - sha512 = "swDQeAEnC/ClmhHJ50UNJppUSAneOp2cHwZiRr3zUQ9+5+mvOrDEdHbyxH7mIwkoeiIcQ/UVw00bg4MwmQ0M0g=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.1.tgz"; + sha512 = "uAt6pCfMfTs2m+IUZjcivN4fDmt2D3C2lI9dfWAkAe2P9vIY7oZuVqCuBQfAwnkJg8mOTk0J2gLEyspbRDsK7w=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.3.0" - sources."@antora/content-aggregator-2.3.0" - sources."@antora/content-classifier-2.3.0" - sources."@antora/document-converter-2.3.0" + sources."@antora/asciidoc-loader-2.3.1" + sources."@antora/content-aggregator-2.3.1" + sources."@antora/content-classifier-2.3.1" + sources."@antora/document-converter-2.3.1" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.3.0" - sources."@antora/page-composer-2.3.0" - sources."@antora/playbook-builder-2.3.0" - sources."@antora/redirect-producer-2.3.0" - sources."@antora/site-mapper-2.3.0" - sources."@antora/site-publisher-2.3.0" - sources."@antora/ui-loader-2.3.0" + sources."@antora/navigation-builder-2.3.1" + sources."@antora/page-composer-2.3.1" + sources."@antora/playbook-builder-2.3.1" + sources."@antora/redirect-producer-2.3.1" + sources."@antora/site-mapper-2.3.1" + sources."@antora/site-publisher-2.3.1" + sources."@antora/ui-loader-2.3.1" sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -49989,7 +50220,6 @@ in sources."crc-32-1.2.0" sources."decamelize-1.2.0" sources."decompress-response-4.2.1" - sources."deep-freeze-node-1.1.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."diff3-0.0.3" @@ -50050,7 +50280,7 @@ in sources."mimic-response-1.0.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."gulp-vinyl-zip-2.2.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50098,8 +50328,8 @@ in sources."map-obj-4.1.0" sources."marky-1.2.1" sources."matcher-2.1.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -50155,7 +50385,7 @@ in ]; }) sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."require-from-string-2.0.2" sources."resolve-options-1.1.0" sources."responselike-1.0.2" @@ -50189,7 +50419,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -50220,7 +50450,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -50289,7 +50519,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -50299,7 +50529,7 @@ in sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -50313,8 +50543,8 @@ in sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -50338,7 +50568,7 @@ in sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."restore-cursor-2.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -50383,7 +50613,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = https://bitwarden.com/; + homepage = "https://bitwarden.com/"; license = "GPL-3.0"; }; production = true; @@ -50413,25 +50643,27 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.8.3" - (sources."@babel/compat-data-7.9.0" // { + (sources."@babel/compat-data-7.9.6" // { dependencies = [ sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.9.0" // { + (sources."@babel/core-7.9.6" // { dependencies = [ + sources."@babel/generator-7.9.6" + sources."@babel/types-7.9.6" sources."semver-5.7.1" ]; }) sources."@babel/generator-7.9.5" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - (sources."@babel/helper-compilation-targets-7.8.7" // { + (sources."@babel/helper-compilation-targets-7.9.6" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.9.5" + sources."@babel/helper-create-class-features-plugin-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" @@ -50445,21 +50677,29 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + (sources."@babel/helper-replace-supers-7.9.6" // { + dependencies = [ + sources."@babel/types-7.9.6" + ]; + }) sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + (sources."@babel/helpers-7.9.6" // { + dependencies = [ + sources."@babel/types-7.9.6" + ]; + }) sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -50489,9 +50729,9 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" @@ -50505,10 +50745,11 @@ in sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-typescript-7.9.4" + sources."@babel/plugin-transform-typescript-7.9.6" sources."@babel/plugin-transform-unicode-regex-7.8.3" - (sources."@babel/preset-env-7.9.5" // { + (sources."@babel/preset-env-7.9.6" // { dependencies = [ + sources."@babel/types-7.9.6" sources."semver-5.7.1" ]; }) @@ -50522,9 +50763,14 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" + (sources."@babel/traverse-7.9.6" // { + dependencies = [ + sources."@babel/generator-7.9.6" + sources."@babel/types-7.9.6" + ]; + }) sources."@babel/types-7.9.5" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" @@ -50612,7 +50858,7 @@ in sources."@types/cookies-0.7.4" sources."@types/cors-2.8.6" sources."@types/events-3.0.0" - sources."@types/express-4.17.3" + sources."@types/express-4.17.4" sources."@types/express-serve-static-core-4.17.5" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.1" @@ -50624,16 +50870,17 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" (sources."@types/node-fetch-2.5.6" // { dependencies = [ sources."form-data-3.0.0" ]; }) sources."@types/normalize-package-data-2.4.0" + sources."@types/qs-6.9.1" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.3" - sources."@types/ws-6.0.4" + sources."@types/ws-7.2.4" sources."@types/zen-observable-0.8.0" sources."@vue/cli-shared-utils-4.3.1" (sources."@vue/cli-ui-4.3.1" // { @@ -50666,12 +50913,12 @@ in ]; }) sources."apollo-cache-1.3.4" - sources."apollo-cache-control-0.9.1" + sources."apollo-cache-control-0.10.0" sources."apollo-cache-inmemory-1.6.5" sources."apollo-client-2.6.8" (sources."apollo-codegen-core-0.36.8" // { dependencies = [ - sources."recast-0.19.0" + sources."recast-0.19.1" sources."source-map-0.6.1" ]; }) @@ -50680,8 +50927,8 @@ in sources."apollo-codegen-swift-0.36.8" sources."apollo-codegen-typescript-0.36.8" sources."apollo-datasource-0.7.0" - sources."apollo-engine-reporting-1.7.1" - sources."apollo-engine-reporting-protobuf-0.4.4" + sources."apollo-engine-reporting-1.8.0" + sources."apollo-engine-reporting-protobuf-0.5.0" sources."apollo-env-0.6.4" sources."apollo-graphql-0.4.3" sources."apollo-language-server-1.21.3" @@ -50694,13 +50941,13 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.12.0" + sources."apollo-server-core-2.13.0" sources."apollo-server-env-2.4.3" sources."apollo-server-errors-2.4.1" - sources."apollo-server-express-2.12.0" - sources."apollo-server-plugin-base-0.7.1" - sources."apollo-server-types-0.3.1" - sources."apollo-tracing-0.9.1" + sources."apollo-server-express-2.13.0" + sources."apollo-server-plugin-base-0.8.0" + sources."apollo-server-types-0.4.0" + sources."apollo-tracing-0.10.0" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.3" (sources."archive-type-4.0.0" // { @@ -50810,7 +51057,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -50841,7 +51088,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - (sources."cli-progress-3.8.0" // { + (sources."cli-progress-3.8.2" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -50993,14 +51240,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."env-ci-3.2.2" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."error-ex-1.3.2" sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" @@ -51133,7 +51380,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."graphql-14.6.0" (sources."graphql-anywhere-4.2.6" // { @@ -51141,7 +51388,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.11.1" + sources."graphql-extensions-0.12.0" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" sources."graphql-tools-4.0.8" @@ -51234,6 +51481,7 @@ in sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" + sources."is-docker-2.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -51253,7 +51501,7 @@ in 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.1.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-redirect-1.0.0" sources."is-regex-1.0.5" @@ -51278,7 +51526,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" - sources."jscodeshift-0.7.0" + sources."jscodeshift-0.7.1" sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" @@ -51370,8 +51618,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -51411,7 +51659,7 @@ in sources."node-modules-regexp-1.0.0" (sources."node-notifier-6.0.0" // { dependencies = [ - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" ]; }) sources."node-releases-1.1.53" @@ -51528,7 +51776,7 @@ in ]; }) sources."pkg-up-2.0.0" - (sources."portfinder-1.0.25" // { + (sources."portfinder-1.0.26" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -51606,7 +51854,7 @@ in sources."retry-0.12.0" sources."rimraf-3.0.2" sources."rss-parser-3.7.6" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" @@ -51682,7 +51930,7 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -51830,7 +52078,7 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.9.0" + sources."ts-node-8.10.1" sources."tslib-1.11.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" @@ -51946,7 +52194,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = https://cli.vuejs.org/; + homepage = "https://cli.vuejs.org/"; license = "MIT"; }; production = true; @@ -52078,12 +52326,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/generator-7.9.5" + sources."@babel/generator-7.9.6" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/types-7.9.5" + sources."@babel/types-7.9.6" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -52163,12 +52411,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.9.0" // { + (sources."@babel/core-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.9.5" // { + (sources."@babel/generator-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -52179,16 +52427,16 @@ in sources."@babel/helper-module-imports-7.8.3" sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -52222,7 +52470,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -52290,11 +52538,11 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -52308,7 +52556,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = https://github.com/electron/asar; + homepage = "https://github.com/electron/asar"; license = "MIT"; }; production = true; @@ -52394,8 +52642,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.15" sources."lodash.sortby-4.7.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -52466,7 +52714,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = http://bower.io/; + homepage = "https://bower.io/"; license = "MIT"; }; production = true; @@ -52504,7 +52752,7 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."fs.realpath-1.0.0" @@ -52522,17 +52770,17 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."lodash-4.2.1" @@ -52555,7 +52803,7 @@ in sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."pify-2.3.0" @@ -52596,7 +52844,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = https://github.com/rvl/bower2nix; + homepage = "https://github.com/rvl/bower2nix"; license = "GPL-3.0"; }; production = true; @@ -52674,7 +52922,11 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" sources."has-1.0.3" - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" @@ -52697,7 +52949,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -52797,7 +53049,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.2" + sources."@types/node-13.13.4" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.2" @@ -52858,7 +53110,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -52918,7 +53170,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-1.2.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-1.0.3" @@ -52974,13 +53226,13 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."multicast-dns-4.0.1" sources."mutate.js-0.2.0" @@ -53205,7 +53457,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A well-tested CSS minifier"; - homepage = https://github.com/jakubpawlowicz/clean-css; + homepage = "https://github.com/jakubpawlowicz/clean-css"; license = "MIT"; }; production = true; @@ -53272,10 +53524,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.9"; + version = "1.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.9.tgz"; - sha512 = "xPHy9q9jsw3Wj9pa+SVjIPMqu9ye33CCmNWYOfGpNfiImQzecPUN619SDViQ0xxSpRgnvtqDYk9ABCWfl3hMDQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.11.tgz"; + sha512 = "4fifGZfy4vLhoKV1riYb3FhOuOUyd98KNCeUg2vG6f9qjbL+VXE8rJgigHMuGWBIJMbJf6NTLbPFRjuUewu0LQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -53367,10 +53619,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.4.9"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.9.tgz"; - sha512 = "Vj2K520HZRWl01Mbw3+zFBfLins+bn5s53dNgRNr+9F8f6gZvzdww4dtleU1vqqCfuwb3ly6PSU4DZBWFpU92w=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.10.tgz"; + sha512 = "WgJuqBpxWM0c1DHDl+UZyDzdD1vdcGInWOMs4bB+dVfCbXktTUEweFty2HViue6G9Clql5hu2+6VB2K3Jx+0Yg=="; }; buildInputs = globalBuildInputs; meta = { @@ -53444,7 +53696,7 @@ in sha512 = "69jOo9oD2JJUo5bMeoV5lcgaAJzMWO7KzWllckc+ZOGB46dE2Qev4MogRnwE/94GI6qc8Cx4RiMoRRLXYIWhyg=="; }; dependencies = [ - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@chemzqm/neovim-5.1.9" sources."async-2.6.3" sources."await-semaphore-0.1.3" @@ -53463,12 +53715,12 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.11.0" - sources."fp-ts-2.5.3" + sources."fp-ts-2.5.4" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -53635,7 +53887,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53721,7 +53973,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -53854,7 +54106,7 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -53940,7 +54192,6 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" @@ -54205,7 +54456,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" @@ -54441,10 +54692,10 @@ in coc-python = nodeEnv.buildNodePackage { name = "coc-python"; packageName = "coc-python"; - version = "1.2.9"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.9.tgz"; - sha512 = "ouwZI3MZnCsO/sa5O1rQYzBgPjZ8h3OkJbBYm3DzaX+x49Gp3ARHpvSF4BMphOE16HUD/bHt+RnE+HSSweGFlg=="; + url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.12.tgz"; + sha512 = "cwZ/uIJT5id6zwBE6RWC/HcGy7uw2hLjC0OyvcjFzidazH73e3fQBBoEMJNtLKgPuAJfNjo4BPu+cDsCSAkCAw=="; }; buildInputs = globalBuildInputs; meta = { @@ -54476,10 +54727,10 @@ in coc-rls = nodeEnv.buildNodePackage { name = "coc-rls"; packageName = "coc-rls"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.4.tgz"; - sha512 = "UcQCBSp/Mzt5SR2mS4Qukvn7mBoh86cB1Fb1/oD88+sn1RHRl67eTrdlbswzdrXyd6WotQi62okCuIhyVoqAig=="; + url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.5.tgz"; + sha512 = "JXM7iLC1rlu7IsnGp7Rwt4sCtnaAQdQQ+brC/HhAWApOZjazPclSs+/IwPqot9fwcitjE0me7BiEyErx07qyFw=="; }; buildInputs = globalBuildInputs; meta = { @@ -54494,10 +54745,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.5.5"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.5.5.tgz"; - sha512 = "l44UBTzSWkEL/uHb5GCR5m6HnheJmuJFbYqqJ+5n6Q+PJIpKSyzyNgMiC3nmsOWCT6W3Js83s1i6zTAu8Zy8LA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.6.1.tgz"; + sha512 = "zyD0N3RBjBCx3KiBMaT3wwo3p+9VpANIXxhnSy/iByxN8UkgHlH6vawaL3hQu3sEGnhNrlql+A7qZx1qM3fjsg=="; }; buildInputs = globalBuildInputs; meta = { @@ -54530,10 +54781,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.25"; + version = "2.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.25.tgz"; - sha512 = "td3vAVOoFgswef3iCO3rDQrmoizKiKw/+5cLIYYiahnxx7SwmKcNZ1AV6OSdks/l/hOJEhtLZw3BqhxaI3+Z4w=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.26.tgz"; + sha512 = "4/XHrxJV5kN0aCrW/Kkw6s19ORs/V26zzZzQ/jFP8BT+HWZegbqPZIP9c+xB9nwknCwa9Tovx3mzcUMq0w0KMw=="; }; buildInputs = globalBuildInputs; meta = { @@ -54571,30 +54822,30 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.5" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -54621,7 +54872,7 @@ in sources."atob-2.1.2" (sources."autoprefixer-9.7.6" // { dependencies = [ - sources."postcss-value-parser-4.0.3" + sources."postcss-value-parser-4.1.0" ]; }) sources."bail-1.0.5" @@ -54645,7 +54896,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54704,7 +54955,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -54783,7 +55034,7 @@ in }) sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -54925,7 +55176,7 @@ in sources."pify-4.0.1" sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -55307,7 +55558,7 @@ in sources."@types/glob-7.1.1" sources."@types/json-schema-7.0.4" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -55663,7 +55914,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -55755,7 +56006,6 @@ in sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -55969,7 +56219,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.4.0" + sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -56035,7 +56285,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.5.5" sources."s.color-0.0.13" @@ -56276,7 +56526,7 @@ in sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" sources."vls-0.2.0" - (sources."vscode-css-languageservice-4.1.1" // { + (sources."vscode-css-languageservice-4.1.2" // { dependencies = [ sources."vscode-uri-2.1.1" ]; @@ -56389,7 +56639,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.5.2" + sources."vscode-json-languageservice-3.6.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -56446,7 +56696,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "https://coffeescript.org/"; license = "MIT"; }; production = true; @@ -56584,7 +56834,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.2" @@ -56805,7 +57055,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -56859,7 +57109,6 @@ in sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -56897,8 +57146,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -57007,7 +57256,7 @@ in sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -57183,23 +57432,28 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.0.tgz"; - sha512 = "LJhHvFragWvIsJH1kjhzZwGSagukewJZ5nV5yjMc5TILs+Z/CbZSvX0W9t9XC26Mw32j56UHjR3co5kAXaeTwg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz"; + sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ + sources."@babel/code-frame-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/minimist-1.2.0" + sources."@types/node-13.13.4" + sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" + sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-find-index-1.0.2" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" @@ -57220,8 +57474,9 @@ in }) sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-2.4.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -57241,12 +57496,13 @@ in }) sources."clean-stack-2.2.0" sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."cp-file-7.0.0" sources."cpy-8.1.0" - sources."currently-unhandled-0.4.1" sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -57258,6 +57514,7 @@ in sources."define-property-2.0.2" sources."dir-glob-2.2.2" sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -57293,7 +57550,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-4.1.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" @@ -57306,7 +57563,9 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" + sources."hard-rejection-2.1.0" + sources."has-flag-3.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -57341,25 +57600,22 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" + sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" sources."junk-3.1.0" sources."kind-of-6.0.3" - (sources."load-json-file-4.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."locate-path-2.0.0" - sources."loud-rejection-1.6.0" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" sources."make-dir-3.1.0" sources."map-cache-0.2.2" - sources."map-obj-2.0.0" + sources."map-obj-4.1.0" sources."map-visit-1.0.0" - sources."meow-5.0.0" + sources."meow-6.1.1" sources."merge2-1.3.0" sources."micromatch-3.1.10" + sources."min-indent-1.0.0" sources."minimatch-3.0.4" - (sources."minimist-options-3.0.2" // { + (sources."minimist-options-4.0.2" // { dependencies = [ sources."arrify-1.0.1" ]; @@ -57405,15 +57661,15 @@ in ]; }) sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-timeout-2.0.1" - sources."p-try-1.0.0" - sources."parse-json-4.0.0" + sources."p-try-2.2.0" + sources."parse-json-5.0.0" sources."pascalcase-0.1.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-parse-1.0.6" (sources."path-type-3.0.0" // { @@ -57423,14 +57679,18 @@ in }) sources."pify-4.0.1" sources."posix-character-classes-0.1.1" - sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - (sources."redent-2.0.0" // { + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { dependencies = [ - sources."indent-string-3.2.0" + sources."type-fest-0.6.0" ]; }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."redent-3.0.0" sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -57444,7 +57704,6 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."signal-exit-3.0.3" sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -57499,8 +57758,8 @@ in sources."kind-of-5.1.0" ]; }) - sources."strip-bom-3.0.0" - sources."strip-indent-2.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -57508,7 +57767,8 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."trim-newlines-2.0.0" + sources."trim-newlines-3.0.0" + sources."type-fest-0.13.1" sources."union-value-1.0.1" (sources."unset-value-1.0.0" // { dependencies = [ @@ -57524,7 +57784,7 @@ in sources."use-3.1.1" sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" - sources."yargs-parser-10.1.0" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -57555,7 +57815,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -57616,7 +57876,6 @@ in ]; }) sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."lodash-4.17.15" @@ -57630,8 +57889,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.2" @@ -57643,12 +57902,12 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" sources."restore-cursor-2.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" @@ -57738,7 +57997,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" sources."iconv-lite-0.4.24" @@ -57755,7 +58014,6 @@ in ]; }) sources."is-fullwidth-code-point-3.0.0" - sources."is-promise-2.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -57775,7 +58033,7 @@ in sources."readable-stream-1.1.14" sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -57841,7 +58099,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = https://github.com/expo/create-react-native-app; + homepage = "https://github.com/expo/create-react-native-app"; license = "BSD-3-Clause"; }; production = true; @@ -57863,7 +58121,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = http://csslint.net/; + homepage = "http://csslint.net/"; # https is broken license = "MIT"; }; production = true; @@ -58113,7 +58371,7 @@ in sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -58127,7 +58385,7 @@ in sources."http-signature-1.2.0" (sources."hypercore-7.7.1" // { dependencies = [ - sources."codecs-2.0.0" + sources."codecs-2.1.0" sources."unordered-set-2.0.1" ]; }) @@ -58214,27 +58472,27 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mirror-folder-3.0.1" + sources."mirror-folder-3.1.0" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."multi-random-access-2.1.1" sources."multicast-dns-7.2.2" sources."multistream-2.1.1" sources."mute-stream-0.0.8" - sources."mutexify-1.2.0" + sources."mutexify-1.3.0" sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" @@ -58382,7 +58640,7 @@ in sources."sodium-javascript-0.5.6" (sources."sodium-native-2.4.9" // { dependencies = [ - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" ]; }) sources."sodium-universal-2.0.0" @@ -58488,9 +58746,9 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.1.7" // { + (sources."utp-native-2.1.10" // { dependencies = [ - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" sources."readable-stream-3.6.0" sources."unordered-set-2.0.1" ]; @@ -58518,7 +58776,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = https://datproject.org/; + homepage = "https://datproject.org/"; license = "BSD-3-Clause"; }; production = true; @@ -58539,7 +58797,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = https://github.com/infusion/node-dhcp; + homepage = "https://github.com/infusion/node-dhcp"; license = "MIT OR GPL-2.0"; }; production = true; @@ -58617,8 +58875,8 @@ in sources."merge-descriptors-0.0.2" sources."methods-1.1.2" sources."mime-1.2.11" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-0.0.10" sources."ms-0.7.0" sources."nan-2.14.1" @@ -58684,7 +58942,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = https://github.com/okTurtles/dnschain; + homepage = "https://github.com/okTurtles/dnschain"; license = "MPL-2.0"; }; production = true; @@ -58694,14 +58952,14 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.0.23"; + version = "0.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.23.tgz"; - sha512 = "cOMMCsZ2hAt68NjLaBMTWHgCZvM5UfnQI25yIAAVJ6o6srqlUcDzl39CmO7OZsDVOtyG7n+T72PelVmQH2ymlw=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.24.tgz"; + sha512 = "tG0cE6yIyj80eKHMbDBMNPHc1l40GW8v7b8jeDRs0Jv42boG0s6DEsM/eDFQw92mwAtBry07mB1tM+jSwqGzJw=="; }; dependencies = [ sources."dockerfile-ast-0.0.25" - (sources."dockerfile-language-service-0.0.11" // { + (sources."dockerfile-language-service-0.0.12" // { dependencies = [ (sources."dockerfile-utils-0.0.16" // { dependencies = [ @@ -58734,10 +58992,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.27.3"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.27.3.tgz"; - sha512 = "nzkJS9Z/bEXk+AOouAU2SGuhU1OSXjuhvn+48/l97YbREWk2nY1bmguTe/dHW7w8vBxg1cQW/yqTZ8o+rxTAmw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.28.0.tgz"; + sha512 = "JVT1VyJqRdSqg9xFy7FQtdcHlWfBLiW08DUtJZaRRsU/4mEvLtUXU1y+h6n3nRtoe5HplVMsP/Dlwj0jUMSPug=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -58746,7 +59004,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.661.0" + sources."aws-sdk-2.669.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -58795,13 +59053,13 @@ in sources."jsprim-1.4.1" sources."lodash-4.17.15" sources."lossless-json-1.0.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."p-finally-1.0.0" - sources."p-queue-6.3.0" + sources."p-queue-6.4.0" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -58893,8 +59151,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.5" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-react-jsx-7.9.0" sources."@babel/helper-builder-react-jsx-experimental-7.9.5" @@ -58905,22 +59163,22 @@ in sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/parser-7.9.6" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-syntax-jsx-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.9.5" sources."@babel/plugin-transform-parameters-7.9.5" sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -58928,7 +59186,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.1" @@ -59033,12 +59291,13 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" + sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -59082,9 +59341,9 @@ in sources."mimic-fn-3.0.0" ]; }) - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."mimic-fn-2.1.0" @@ -59217,7 +59476,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = https://www.emojione.com/; + homepage = "https://www.emojione.com/"; }; production = true; bypassCache = true; @@ -59315,7 +59574,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" @@ -59345,7 +59603,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -59393,7 +59651,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = https://eslint.org/; + homepage = "https://eslint.org/"; license = "MIT"; }; production = true; @@ -59494,7 +59752,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" @@ -59527,7 +59784,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -59575,7 +59832,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = https://github.com/mantoni/eslint_d.js; + homepage = "https://github.com/mantoni/eslint_d.js"; license = "MIT"; }; production = true; @@ -59638,7 +59895,7 @@ in sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" @@ -59676,8 +59933,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -59820,7 +60077,7 @@ in sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" - (sources."fkill-7.0.0" // { + (sources."fkill-7.0.1" // { dependencies = [ sources."ps-list-7.0.0" ]; @@ -59848,7 +60105,6 @@ in sources."is-arrayish-0.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" - sources."is-promise-2.1.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -59858,9 +60114,9 @@ in sources."lodash-4.17.15" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" @@ -59918,7 +60174,7 @@ in sources."redent-3.0.0" sources."resolve-1.17.0" sources."restore-cursor-3.1.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-5.7.1" @@ -60055,7 +60311,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."deep-equal-2.0.2" + sources."deep-equal-2.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."defined-0.0.0" @@ -60127,7 +60383,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" @@ -60467,11 +60723,11 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -60480,8 +60736,8 @@ in sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" sources."nan-2.14.1" - sources."nearley-2.19.2" - sources."node-gyp-build-4.2.1" + sources."nearley-2.19.3" + sources."node-gyp-build-4.2.2" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -60600,7 +60856,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; + homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; license = "Fair"; }; production = true; @@ -60628,10 +60884,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.3.tgz"; - sha512 = "xUNP+b2CUzMIURcnEVXNgQo51ShKjjjfAO1U4a0A9KzathisjtGrsrrDUnXJlqojGOBYm/z2sAq/h0GfO6DX8A=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.4.tgz"; + sha512 = "rf0NbwZobW2Kwwomf41Ooas7rm7yg1z68fyKgrKaUs/VaaNtwIYMp/J11iQxcFu5p6i73huCytzmmo/8v4usDA=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -60725,7 +60981,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" @@ -60759,7 +61015,6 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-obj-1.1.0" - sources."is-promise-2.1.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" @@ -60787,9 +61042,9 @@ in sources."lowercase-keys-1.0.1" sources."make-dir-3.1.0" sources."map-obj-4.1.0" - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" @@ -60847,7 +61102,7 @@ in sources."resolve-1.17.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -60998,7 +61253,7 @@ in sources."chalk-2.4.2" sources."change-case-3.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" @@ -61036,7 +61291,7 @@ in sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" sources."create-error-class-3.0.2" - (sources."creato-1.1.1" // { + (sources."creato-1.1.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -61165,7 +61420,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ @@ -61258,7 +61513,6 @@ in sources."is-npm-3.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -61336,8 +61590,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -61475,7 +61729,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -61502,7 +61756,7 @@ in sources."simple-errors-1.0.1" sources."snake-case-2.1.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61532,7 +61786,7 @@ in sources."supports-color-5.5.0" sources."swap-case-1.1.2" sources."sync-exec-0.6.2" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" @@ -61543,7 +61797,11 @@ in sources."through2-2.0.5" sources."timed-out-4.0.1" sources."title-case-2.1.1" - sources."tmp-0.1.0" + (sources."tmp-0.2.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."tmp-graphql-config-extension-openapi-1.0.7" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" @@ -61925,7 +62183,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.8.19" + sources."blessed-contrib-4.8.20" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -61955,10 +62213,10 @@ in sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-0.7.0" - (sources."marked-terminal-4.0.0" // { + (sources."marked-terminal-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.0.0" sources."supports-color-7.1.0" ]; }) @@ -61981,7 +62239,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."systeminformation-4.23.5" + sources."systeminformation-4.24.1" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -62189,7 +62447,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gulp-cli-2.2.0" sources."gulplog-1.0.0" sources."has-symbols-1.0.1" @@ -62320,7 +62578,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" @@ -62452,7 +62710,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = https://gulpjs.com/; + homepage = "https://gulpjs.com/"; license = "MIT"; }; production = true; @@ -62571,7 +62829,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gulplog-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -62797,7 +63055,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = http://gulpjs.com/; + homepage = "https://gulpjs.com/"; license = "MIT"; }; production = true; @@ -62822,13 +63080,13 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = https://kangax.github.io/html-minifier/; + homepage = "https://kangax.github.io/html-minifier/"; license = "MIT"; }; production = true; @@ -62913,8 +63171,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -62960,10 +63218,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "0.12.1"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-0.12.1.tgz"; - sha512 = "T0jB+7J7GJ2Vo+a4/T7P7SbQ3x2GPDnqRqQXdfEuPuUOmES/9NBxPnDm7dh1HGEeUWqUmLUNtGV63ZC5Uy3tGA=="; + url = "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz"; + sha512 = "be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA=="; }; dependencies = [ sources."async-2.6.3" @@ -62982,18 +63240,12 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."opener-1.5.1" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) - sources."portfinder-1.0.25" - sources."qs-6.9.3" + sources."portfinder-1.0.26" + sources."qs-6.9.4" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."union-0.5.0" sources."url-join-2.0.5" - sources."wordwrap-0.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -63093,7 +63345,7 @@ in sources."minimist-1.2.5" ]; }) - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mv-2.1.1" sources."nan-2.14.1" sources."ncp-2.0.0" @@ -63160,7 +63412,7 @@ in sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; }; dependencies = [ - sources."@types/jquery-3.3.35" + sources."@types/jquery-3.3.37" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -63174,7 +63426,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."good-listener-1.2.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."historic-readline-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -63198,7 +63450,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = https://github.com/sharkdp/insect; + homepage = "https://github.com/sharkdp/insect"; license = "MIT"; }; production = true; @@ -63322,7 +63574,7 @@ in ]; }) sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -63352,10 +63604,9 @@ in sources."ip-1.1.5" sources."is-docker-2.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -63388,9 +63639,9 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.3.0" sources."methods-1.1.2" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -63422,13 +63673,13 @@ in sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" sources."rsvp-3.6.2" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -63512,14 +63763,14 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = https://ionicframework.com/; + homepage = "https://ionicframework.com/"; license = "MIT"; }; production = true; @@ -63667,7 +63918,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -63703,8 +63954,8 @@ in sources."megaminx-0.9.0" sources."mem-1.1.0" sources."microbuffer-1.0.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -63942,10 +64193,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.5.2"; + version = "10.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.5.2.tgz"; - sha512 = "2twpudoNYV7izUgKoLoVCwLFV+x8W5PQHri4ZPSm3L2viTq+DxVPQi9WJoeDSTCKE/G3lB5e78KAbeFhYQpgKA=="; + url = "https://registry.npmjs.org/jake/-/jake-10.6.1.tgz"; + sha512 = "pHUK3+V0BjOb1XSi95rbBksrMdIqLVC9bJqDnshVyleYsET3H0XAq+3VB2E3notcYvv4wRdRHn13p7vobG+wfQ=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -63957,15 +64208,10 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."escape-string-regexp-1.0.5" - (sources."filelist-0.0.6" // { - dependencies = [ - sources."utilities-0.0.37" - ]; - }) + sources."filelist-1.0.1" sources."has-flag-3.0.0" sources."minimatch-3.0.4" sources."supports-color-5.5.0" - sources."utilities-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -64056,7 +64302,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = https://github.com/sourcegraph/javascript-typescript-langserver; + homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; license = "Apache-2.0"; }; production = true; @@ -64200,7 +64446,7 @@ in sources."crypt-0.0.2" sources."css-2.2.4" sources."cssom-0.4.4" - (sources."cssstyle-2.2.0" // { + (sources."cssstyle-2.3.0" // { dependencies = [ sources."cssom-0.3.8" ]; @@ -64326,7 +64572,7 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" @@ -64490,9 +64736,9 @@ in sources."mdurl-1.0.1" sources."memory-cache-0.2.0" sources."micromatch-3.1.10" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -64504,8 +64750,8 @@ in ]; }) sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" - sources."moment-2.24.0" + sources."mkdirp-classic-0.5.3" + sources."moment-2.25.3" sources."ms-2.1.2" (sources."multiparty-4.2.1" // { dependencies = [ @@ -64704,7 +64950,7 @@ in sources."split-skip-0.0.2" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" - sources."sqlite3-4.1.1" + sources."sqlite3-4.2.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -64848,7 +65094,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -64906,7 +65152,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = https://beautifier.io/; + homepage = "https://beautifier.io/"; license = "MIT"; }; production = true; @@ -64929,7 +65175,7 @@ in buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = https://github.com/nodeca/js-yaml; + homepage = "https://github.com/nodeca/js-yaml"; license = "MIT"; }; production = true; @@ -64945,13 +65191,13 @@ in sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA=="; }; dependencies = [ - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" sources."entities-2.0.0" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -65025,7 +65271,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = "https://jshint.com/"; license = "(MIT AND JSON)"; }; production = true; @@ -65068,7 +65314,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = https://github.com/andreyvit/json-diff; + homepage = "https://github.com/andreyvit/json-diff"; }; production = true; bypassCache = true; @@ -65103,14 +65349,14 @@ in sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -65122,8 +65368,8 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = https://github.com/whitlockjc/json-refs; + description = "Various utilities for JSON References (https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; + homepage = "https://github.com/whitlockjc/json-refs"; license = "MIT"; }; production = true; @@ -65239,7 +65485,7 @@ in sources."getpass-0.1.7" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -65259,7 +65505,7 @@ in sources."is-npm-4.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" @@ -65289,8 +65535,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -65404,7 +65650,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = https://github.com/typicode/json-server; + homepage = "https://github.com/typicode/json-server"; license = "MIT"; }; production = true; @@ -65431,7 +65677,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = http://zaach.github.com/jsonlint/; + homepage = "https://zaa.ch/jsonlint/"; }; production = true; bypassCache = true; @@ -65440,10 +65686,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.0.2"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.0.2.tgz"; - sha512 = "RpUuCuGJfN3WnjYPGIH+VBF8023Lfm3TQH6D1kcNL+FxtEPc2UUz/nVjbVAGXH4Pm+Q7FVOAQjdAeFUpXpQ3IA=="; + url = "https://registry.npmjs.org/karma/-/karma-5.0.4.tgz"; + sha512 = "UGqTe2LBiGQBXRN+Fygeiq63tbfOX45639SKSbPkLpARwnxROWJZg+froGkpHxr84FXCe8UGCf+1PITM6frT5w=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -65468,7 +65714,7 @@ in sources."bytes-3.1.0" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."chokidar-3.3.1" + sources."chokidar-3.4.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -65521,7 +65767,7 @@ in sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."http-errors-1.7.2" @@ -65547,9 +65793,9 @@ in ]; }) sources."media-typer-0.3.0" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -65571,7 +65817,7 @@ in sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" @@ -65631,7 +65877,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = http://karma-runner.github.io/; + homepage = "https://karma-runner.github.io/"; license = "MIT"; }; production = true; @@ -65669,7 +65915,7 @@ in sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-symbols-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -65703,7 +65949,7 @@ in sources."remove-bom-buffer-3.0.0" sources."remove-bom-stream-1.2.0" sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" sources."stream-shift-1.0.1" @@ -65725,7 +65971,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; + homepage = "https://github.com/mweibel/lcov-result-merger"; license = "MIT"; }; production = true; @@ -65849,13 +66095,13 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -66114,11 +66360,11 @@ in }) sources."@octokit/request-error-1.2.1" sources."@octokit/rest-16.43.1" - sources."@octokit/types-2.12.1" + sources."@octokit/types-2.12.2" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -66303,7 +66549,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.5" @@ -66438,7 +66684,7 @@ in sources."pify-4.0.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."handlebars-4.7.6" // { dependencies = [ sources."source-map-0.6.1" @@ -66512,7 +66758,6 @@ in sources."is-obj-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" @@ -66567,8 +66812,8 @@ in }) sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -66741,7 +66986,7 @@ in sources."ret-0.1.15" sources."retry-0.10.1" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-queue-1.0.3" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -66876,7 +67121,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -66987,7 +67232,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -67000,8 +67245,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."oauth-sign-0.9.0" @@ -67027,7 +67272,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; # https is broken license = "Apache-2.0"; }; production = true; @@ -67052,7 +67297,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; # https is broken }; production = true; bypassCache = true; @@ -67182,7 +67427,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -67221,8 +67466,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -67536,7 +67781,7 @@ in sources."github-slugger-1.3.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -67624,8 +67869,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -67886,14 +68131,14 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = https://github.com/shime/livedown; + homepage = "https://github.com/shime/livedown"; license = "MIT"; }; production = true; @@ -67907,13 +68152,13 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.9.0" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.5" + sources."@babel/compat-data-7.9.6" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-compilation-targets-7.8.7" - sources."@babel/helper-create-class-features-plugin-7.9.5" + sources."@babel/helper-compilation-targets-7.9.6" + sources."@babel/helper-create-class-features-plugin-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" @@ -67927,18 +68172,18 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" @@ -67946,7 +68191,7 @@ in sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -67976,9 +68221,9 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" @@ -67987,20 +68232,20 @@ in sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" - sources."@babel/plugin-transform-runtime-7.9.0" + sources."@babel/plugin-transform-runtime-7.9.6" sources."@babel/plugin-transform-shorthand-properties-7.8.3" sources."@babel/plugin-transform-spread-7.8.3" sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.9.5" + sources."@babel/preset-env-7.9.6" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" (sources."@istanbuljs/load-nyc-config-1.0.0" // { @@ -68014,22 +68259,23 @@ in ]; }) sources."@istanbuljs/schema-0.1.2" - (sources."@jest/transform-25.4.0" // { + (sources."@jest/transform-25.5.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/types-25.4.0" + sources."@jest/types-25.5.0" sources."@types/babel__core-7.1.7" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.10" + sources."@types/babel__traverse-7.0.11" sources."@types/color-name-1.1.1" sources."@types/estree-0.0.44" + sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.4" @@ -68098,7 +68344,7 @@ in sources."babel-helper-mark-eval-scopes-0.4.3" sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" - sources."babel-jest-25.4.0" + sources."babel-jest-25.5.1" (sources."babel-loader-8.1.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -68106,7 +68352,7 @@ in }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-25.4.0" + sources."babel-plugin-jest-hoist-25.5.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" sources."babel-plugin-minify-dead-code-elimination-0.5.1" @@ -68132,7 +68378,7 @@ in sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" sources."babel-preset-current-node-syntax-0.1.2" - sources."babel-preset-jest-25.4.0" + sources."babel-preset-jest-25.5.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -68197,7 +68443,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68314,7 +68560,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -68431,7 +68677,7 @@ in }) sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" @@ -68449,7 +68695,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" @@ -68509,11 +68760,11 @@ in sources."semver-6.3.0" ]; }) - sources."jest-haste-map-25.4.0" + sources."jest-haste-map-25.5.1" sources."jest-regex-util-25.2.6" - sources."jest-serializer-25.2.6" - sources."jest-util-25.4.0" - (sources."jest-worker-25.4.0" // { + sources."jest-serializer-25.5.0" + sources."jest-util-25.5.0" + (sources."jest-worker-25.5.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -68532,7 +68783,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."jszip-git://github.com/anmonteiro/jszip#patch-1" + sources."jszip-2.6.1" sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" sources."lcid-2.0.0" @@ -68573,8 +68824,8 @@ in ]; }) sources."miller-rabin-4.0.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -68587,7 +68838,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.2" (sources."move-concurrently-1.0.1" // { dependencies = [ @@ -68731,7 +68982,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -68823,7 +69074,7 @@ in sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68882,7 +69133,7 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.6.11" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -69051,7 +69302,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = http://madoko.codeplex.com/; + homepage = "https://madoko.codeplex.com/"; }; production = true; bypassCache = true; @@ -69081,7 +69332,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -69111,8 +69362,8 @@ in sources."lodash-4.17.15" sources."markdown-link-extractor-1.2.3" sources."marked-0.8.2" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -69191,7 +69442,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = https://bitbucket.org/aahmed/meat; + homepage = "https://bitbucket.org/aahmed/meat"; }; production = true; bypassCache = true; @@ -69442,7 +69693,7 @@ in sources."fragment-cache-0.2.1" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -69497,7 +69748,7 @@ in }) (sources."gulp-sourcemaps-2.6.5" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."readable-stream-2.3.7" sources."source-map-0.6.1" sources."string_decoder-1.1.1" @@ -69514,7 +69765,7 @@ in sources."extend-shallow-1.1.4" sources."glob-7.1.6" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."kind-of-1.1.0" sources."minimatch-3.0.4" sources."ordered-read-streams-1.0.1" @@ -69582,7 +69833,7 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-relative-1.0.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" @@ -69615,7 +69866,7 @@ in sources."lead-1.0.0" (sources."less-2.7.3" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."liftoff-2.5.0" @@ -69654,8 +69905,8 @@ in sources."memoizee-0.4.14" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-2.0.10" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -69742,7 +69993,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."request-2.81.0" sources."resolve-1.17.0" sources."resolve-dir-1.0.1" @@ -69856,7 +70107,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.8.3" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."uglify-to-browserify-1.0.2" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -69893,7 +70144,7 @@ in dependencies = [ sources."clone-2.1.2" sources."clone-stats-1.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."vinyl-2.2.0" ]; }) @@ -69919,10 +70170,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz"; - sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; + sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -69994,7 +70245,7 @@ in sources."log-symbols-3.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.3" + sources."mkdirp-0.5.5" sources."ms-2.1.1" sources."node-environment-flags-1.0.6" sources."normalize-path-3.0.0" @@ -70049,7 +70300,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; + homepage = "https://mochajs.org/"; license = "MIT"; }; production = true; @@ -70090,14 +70341,14 @@ in sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -70173,7 +70424,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = https://github.com/neovim/node-client; + homepage = "https://github.com/neovim/node-client"; license = "MIT"; }; production = true; @@ -70247,7 +70498,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -70264,8 +70515,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" @@ -70324,15 +70575,15 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz"; - sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; + sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; }; buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -70431,7 +70682,7 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" @@ -70476,8 +70727,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -70628,7 +70879,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; + homepage = "https://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -70722,16 +70973,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.0.5.tgz"; - sha512 = "va9ovLft0HDG0//KGwLU+4r4ZtUpQ8qPmH/FasnJUURROqeTcQpAd49T/3FtJuapJQML5ulSKL6jeD57DDMiyA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.0.6.tgz"; + sha512 = "5K7LKdy232xLSHMo3ZprAEHbLilszSD/qQkt+9PxByJnEMACeHJ7SH4Gpt/1FX+K75gHHNtlnHsWwpQ53lggEA=="; }; dependencies = [ - sources."@babel/runtime-7.9.2" - sources."@node-red/editor-api-1.0.5" - sources."@node-red/editor-client-1.0.5" - (sources."@node-red/nodes-1.0.5" // { + sources."@babel/runtime-7.9.6" + sources."@node-red/editor-api-1.0.6" + sources."@node-red/editor-client-1.0.6" + (sources."@node-red/nodes-1.0.6" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.5.1" @@ -70744,9 +70995,9 @@ in }) ]; }) - sources."@node-red/registry-1.0.5" - sources."@node-red/runtime-1.0.5" - sources."@node-red/util-1.0.5" + sources."@node-red/registry-1.0.6" + sources."@node-red/runtime-1.0.6" + sources."@node-red/util-1.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.0" // { @@ -70845,7 +71096,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cron-1.8.2" + sources."cron-1.7.2" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."d-1.0.1" @@ -70933,7 +71184,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -70973,7 +71224,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.2" + sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" @@ -70999,8 +71250,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -71010,7 +71261,7 @@ in }) sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."moment-timezone-0.5.28" (sources."mqtt-2.18.8" // { dependencies = [ @@ -71195,7 +71446,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = http://nodered.org/; + homepage = "https://nodered.org/"; license = "Apache-2.0"; }; production = true; @@ -71228,7 +71479,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -71264,7 +71515,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -71283,8 +71534,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.1" @@ -71360,7 +71611,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -71385,7 +71636,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -71431,7 +71682,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."chokidar-3.3.1" + sources."chokidar-3.4.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."clone-response-1.0.2" @@ -71455,7 +71706,7 @@ in sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -71504,7 +71755,7 @@ in sources."pump-3.0.0" sources."pupa-2.0.1" sources."rc-1.2.8" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" sources."responselike-1.0.2" @@ -71549,7 +71800,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = http://nodemon.io/; + homepage = "https://nodemon.io/"; license = "MIT"; }; production = true; @@ -71559,15 +71810,15 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.4"; + version = "6.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz"; - sha512 = "B8UDDbWvdkW6RgXFn8/h2cHJP/u/FPa4HWeGzW23aNEBARN3QPrRaHqPIZW2NSN3fW649gtgUDNZpaRs0zTMPw=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz"; + sha512 = "CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA=="; }; buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; + homepage = "https://docs.npmjs.com/"; license = "Artistic-2.0"; }; production = true; @@ -71584,19 +71835,23 @@ in }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" - sources."@npmcli/git-2.0.1" + sources."@npmcli/git-2.0.2" sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/promise-spawn-1.2.0" + sources."@npmcli/run-script-1.3.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."@types/color-name-1.1.1" + sources."abbrev-1.1.1" sources."agent-base-6.0.0" - sources."agentkeepalive-4.1.0" + sources."agentkeepalive-4.1.2" sources."aggregate-error-3.0.1" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -71604,17 +71859,28 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" sources."balanced-match-1.0.0" - sources."boxen-4.2.0" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - (sources."cacache-15.0.0" // { + sources."bcrypt-pbkdf-1.0.2" + (sources."boxen-4.2.0" // { dependencies = [ - sources."p-map-3.0.0" + 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."strip-ansi-6.0.0" ]; }) + sources."brace-expansion-1.1.11" + sources."builtins-1.0.3" + sources."cacache-15.0.3" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.1.0" @@ -71622,65 +71888,79 @@ in ]; }) sources."camelcase-5.3.1" + sources."caseless-0.12.0" sources."chalk-3.0.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" sources."cli-boxes-2.2.0" sources."cli-table-0.3.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."colors-1.0.3" - sources."commander-5.0.0" + sources."combined-stream-1.0.8" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) + sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" + sources."dashdash-1.14.1" sources."debug-4.1.1" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."dezalgo-1.0.3" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" + sources."env-paths-2.2.0" sources."err-code-1.1.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.1" sources."fast-diff-1.2.0" + sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.2" sources."find-up-4.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."fs-minipass-2.1.0" - sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" sources."get-stdin-7.0.0" sources."get-stream-4.1.0" + sources."getpass-0.1.7" sources."glob-7.1.6" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."has-ansi-2.0.0" sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.4" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" + sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" - sources."iferr-0.1.5" sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -71691,7 +71971,7 @@ in sources."ini-1.3.5" sources."ip-1.1.5" sources."is-ci-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-installed-globally-0.3.2" sources."is-lambda-1.0.1" sources."is-npm-4.0.0" @@ -71701,13 +71981,19 @@ in sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isstream-0.1.2" sources."jju-1.4.0" sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.2.0" sources."json-parse-helpfulerror-1.0.3" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" sources."keyv-3.1.0" sources."kleur-3.0.3" sources."latest-version-5.1.0" @@ -71728,7 +72014,9 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.4" + sources."make-fetch-happen-8.0.6" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -71738,22 +72026,23 @@ in ]; }) sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.2.1" + (sources."minipass-fetch-1.2.1" // { + dependencies = [ + sources."minizlib-2.1.0" + sources."yallist-4.0.0" + ]; + }) sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.2" sources."minipass-sized-1.0.3" - (sources."minizlib-2.1.0" // { + (sources."minizlib-1.3.3" // { dependencies = [ - sources."yallist-4.0.0" + sources."minipass-2.9.0" ]; }) sources."mkdirp-1.0.4" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) + sources."move-file-2.0.0" sources."ms-2.1.2" sources."nested-error-stacks-2.0.1" (sources."node-alias-1.0.4" // { @@ -71763,6 +72052,19 @@ in sources."supports-color-2.0.0" ]; }) + (sources."node-gyp-6.1.0" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + sources."semver-5.7.1" + sources."tar-4.4.13" + sources."which-1.3.1" + ]; + }) + sources."nopt-4.0.3" sources."normalize-url-4.5.0" sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" @@ -71770,8 +72072,20 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.1" sources."npm-pick-manifest-6.1.0" - sources."npm-registry-fetch-8.0.0" + (sources."npm-registry-fetch-8.0.2" // { + dependencies = [ + sources."minizlib-2.1.0" + sources."yallist-4.0.0" + ]; + }) + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -71782,18 +72096,22 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.4" + sources."pacote-11.1.8" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" + sources."performance-now-2.1.0" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."prompts-2.3.2" + sources."psl-1.8.0" sources."pump-3.0.0" + sources."punycode-2.1.1" sources."pupa-2.0.1" + sources."qs-6.5.2" sources."rc-1.2.8" sources."rc-config-loader-3.0.0" sources."read-package-json-fast-1.1.3" @@ -71801,13 +72119,13 @@ in sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" + sources."request-2.88.2" sources."require-from-string-2.0.2" sources."requireg-0.2.2" sources."resolve-1.7.1" sources."responselike-1.0.2" sources."retry-0.10.1" - sources."rimraf-2.7.1" - sources."run-queue-1.0.3" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.2" @@ -71817,6 +72135,7 @@ in ]; }) sources."semver-utils-1.1.4" + sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" @@ -71824,37 +72143,47 @@ in sources."socks-proxy-agent-5.0.0" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" sources."ssri-8.0.0" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.1.0" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ + sources."minizlib-2.1.0" sources."yallist-4.0.0" ]; }) sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" sources."update-notifier-4.1.0" + sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" sources."which-2.0.2" - sources."widest-line-3.1.0" + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { + dependencies = [ + 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."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -71863,7 +72192,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = https://github.com/tjunnone/npm-check-updates; + homepage = "https://github.com/tjunnone/npm-check-updates"; license = "Apache-2.0"; }; production = true; @@ -71955,8 +72284,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -72037,7 +72366,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = https://github.com/NixOS/npm2nix; + homepage = "https://github.com/NixOS/npm2nix"; }; production = true; bypassCache = true; @@ -72078,7 +72407,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = https://github.com/freebroccolo/ocaml-language-server; + homepage = "https://github.com/freebroccolo/ocaml-language-server"; license = "Apache-2.0"; }; production = true; @@ -72095,14 +72424,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.9.0" - (sources."@babel/core-7.9.0" // { + sources."@babel/compat-data-7.9.6" + (sources."@babel/core-7.9.6" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.9.5" // { + (sources."@babel/generator-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -72111,7 +72440,7 @@ in sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" sources."@babel/helper-builder-react-jsx-7.9.0" sources."@babel/helper-builder-react-jsx-experimental-7.9.5" - sources."@babel/helper-compilation-targets-7.8.7" + sources."@babel/helper-compilation-targets-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" @@ -72125,20 +72454,20 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -72168,9 +72497,9 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" @@ -72186,12 +72515,12 @@ in sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.9.5" + sources."@babel/preset-env-7.9.6" sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -72297,7 +72626,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72381,7 +72710,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.19" + sources."deasync-0.1.20" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -72430,12 +72759,12 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."error-ex-1.3.2" (sources."es-abstract-1.17.5" // { dependencies = [ @@ -72498,7 +72827,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -72516,7 +72845,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -72528,7 +72862,7 @@ in (sources."htmlnano-0.2.5" // { dependencies = [ sources."posthtml-0.12.3" - sources."terser-4.6.11" + sources."terser-4.6.13" ]; }) (sources."htmlparser2-3.10.1" // { @@ -72645,8 +72979,8 @@ in }) sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -72720,14 +73054,14 @@ in sources."pkg-up-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."supports-color-6.1.0" ]; }) (sources."postcss-calc-7.0.2" // { dependencies = [ - sources."postcss-value-parser-4.0.3" + sources."postcss-value-parser-4.1.0" ]; }) sources."postcss-colormin-4.0.3" @@ -72892,7 +73226,7 @@ in sources."snapdragon-util-3.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.18" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" (sources."split-string-3.1.0" // { dependencies = [ @@ -73121,7 +73455,7 @@ in sources."dicer-0.3.0" sources."dnscache-1.0.2" sources."dom-storage-2.1.0" - sources."domino-2.1.4" + sources."domino-2.1.5" sources."dtrace-provider-0.8.8" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -73157,7 +73491,7 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -73200,12 +73534,12 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -73293,7 +73627,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -73428,7 +73762,7 @@ in sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -73464,7 +73798,6 @@ in sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" @@ -73484,13 +73817,13 @@ in sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" @@ -73562,7 +73895,7 @@ in sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."run-series-1.1.8" sources."rusha-0.8.13" @@ -73639,7 +73972,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = https://github.com/mafintosh/peerflix; + homepage = "https://github.com/mafintosh/peerflix"; license = "MIT"; }; production = true; @@ -73783,7 +74116,7 @@ in sources."get-browser-rtc-1.0.2" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -73845,13 +74178,13 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" @@ -74001,7 +74334,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -74020,15 +74353,15 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.14.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.0.tgz"; - sha512 = "O6B5OD+wiO4srzegQTs0LiOrdExLvoKgG7UFL5+Lu1DhgqhW9NFP/pPg8+zKSrOQTontH3GGSWAkinxM3tCqnw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.2.tgz"; + sha512 = "srFTvu4mm2tzo+bt1QkahH3JJnBDXPbjboYOPSZRwocoyGcTxYgGr0aUHg6non0i8eFzbhUFqQiqG+iCJ5spbA=="; }; buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = https://pnpm.js.org/; + homepage = "https://pnpm.js.org/"; license = "MIT"; }; production = true; @@ -74038,42 +74371,36 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.0.tgz"; - sha512 = "tCGK0GO2reu644dUHxks8U2SAtKnzftQTAXN1dwzFPoKXZr0b7VX4vTkQ2Pl2Lunas6+o8uHR56hlcYBm1srZg=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz"; + sha512 = "bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@types/color-name-1.1.1" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" sources."array-union-2.1.0" - sources."balanced-match-1.0.0" + sources."at-least-node-1.0.0" sources."binary-extensions-2.0.0" - sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" - sources."chalk-3.0.0" - sources."chokidar-3.3.1" + sources."chalk-4.0.0" + sources."chokidar-3.4.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."concat-map-0.0.1" sources."cosmiconfig-5.2.1" sources."decamelize-1.2.0" - sources."dependency-graph-0.8.1" + sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -74083,22 +74410,18 @@ in sources."fastq-1.7.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" + sources."fs-extra-9.0.0" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."get-stdin-7.0.0" - sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."globby-10.0.2" - sources."graceful-fs-4.2.3" + sources."globby-11.0.0" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."ignore-5.1.4" sources."import-cwd-2.1.0" sources."import-fresh-2.0.0" sources."import-from-2.1.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-directory-0.3.1" @@ -74108,7 +74431,7 @@ in sources."is-number-7.0.0" sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" - sources."jsonfile-4.0.0" + sources."jsonfile-6.0.1" sources."locate-path-5.0.0" sources."lodash-4.17.15" (sources."log-symbols-2.2.0" // { @@ -74123,19 +74446,16 @@ in }) sources."merge2-1.3.0" sources."micromatch-4.0.2" - sources."minimatch-3.0.4" sources."normalize-path-3.0.0" - sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parse-json-4.0.0" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -74162,7 +74482,7 @@ in }) sources."pretty-hrtime-1.0.3" sources."read-cache-1.0.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-from-3.0.0" @@ -74176,10 +74496,9 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" - sources."universalify-0.1.2" + sources."universalify-1.0.0" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" - sources."wrappy-1.0.2" sources."y18n-4.0.0" sources."yargs-15.3.1" sources."yargs-parser-18.1.3" @@ -74205,7 +74524,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = https://prettier.io/; + homepage = "https://prettier.io/"; license = "MIT"; }; production = true; @@ -74374,10 +74693,14 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globule-1.3.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" @@ -74423,7 +74746,7 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" (sources."module-deps-6.2.2" // { dependencies = [ sources."concat-stream-1.6.2" @@ -74512,7 +74835,7 @@ in sources."slice-ansi-2.1.0" sources."sorcery-0.10.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74540,7 +74863,7 @@ in sources."rimraf-2.6.3" ]; }) - (sources."terser-4.6.11" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74592,7 +74915,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = https://github.com/purescript-contrib/pulp; + homepage = "https://github.com/purescript-contrib/pulp"; license = "LGPL-3.0+"; }; production = true; @@ -74637,7 +74960,7 @@ in sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."deep-equal-2.0.2" + sources."deep-equal-2.0.3" sources."define-properties-1.1.3" sources."es-abstract-1.17.5" sources."es-get-iterator-1.1.0" @@ -74740,7 +75063,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -74764,7 +75087,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = https://facebook.github.io/react; + homepage = "https://facebook.github.io/react"; license = "BSD-3-Clause"; }; production = true; @@ -74782,7 +75105,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = http://revealjs.com/; + homepage = "https://revealjs.com/"; license = "MIT"; }; production = true; @@ -74800,19 +75123,19 @@ in sources."@babel/highlight-7.9.0" sources."@rollup/plugin-commonjs-11.1.0" sources."@rollup/plugin-node-resolve-7.1.3" - sources."@rollup/pluginutils-3.0.9" + sources."@rollup/pluginutils-3.0.10" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.4" sources."@types/node-12.12.37" - sources."@types/node-fetch-2.5.6" + sources."@types/node-fetch-2.5.7" sources."@types/resolve-0.0.8" sources."@types/vscode-1.44.0" - sources."@typescript-eslint/eslint-plugin-2.29.0" - sources."@typescript-eslint/experimental-utils-2.29.0" - sources."@typescript-eslint/parser-2.29.0" - sources."@typescript-eslint/typescript-estree-2.29.0" + sources."@typescript-eslint/eslint-plugin-2.31.0" + sources."@typescript-eslint/experimental-utils-2.31.0" + sources."@typescript-eslint/parser-2.31.0" + sources."@typescript-eslint/typescript-estree-2.31.0" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" @@ -74830,7 +75153,6 @@ in sources."balanced-match-1.0.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" sources."buffer-crc32-0.2.13" sources."builtin-modules-3.1.0" sources."callsites-3.1.0" @@ -74897,7 +75219,6 @@ in sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-entry-cache-5.0.1" - sources."fill-range-7.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."form-data-3.0.0" @@ -74930,8 +75251,6 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-module-1.0.0" - sources."is-number-7.0.0" - sources."is-promise-2.1.0" sources."is-reference-1.1.4" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -74951,10 +75270,9 @@ in ]; }) sources."mdurl-1.0.1" - sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -74995,8 +75313,8 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.7.2" - sources."run-async-2.4.0" + sources."rollup-2.7.6" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -75035,7 +75353,6 @@ in sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" sources."tslib-1.11.1" sources."tsutils-3.17.1" sources."tunnel-0.0.4" @@ -75155,8 +75472,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -75280,8 +75597,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -75334,14 +75651,14 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.68.0"; + version = "1.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.68.0.tgz"; - sha512 = "CLA8K4B/oZm1LwgUDAfCHiVYGszveDSlAUr2mIdzdcVc3CLjzlRZn7IVipy3myXOc7/+kocxOqs3VXogm9A4Wg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.69.0.tgz"; + sha512 = "af4gBZeto9JCkObSErzSXI+UcxoGNxUP4oQq7b/+QoCFa0NYjO4lCtW66MD6ONYg0YxDEukTQwzgkbD9VmunWg=="; }; dependencies = [ sources."2-thenable-1.0.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -75351,7 +75668,7 @@ in sources."node-fetch-2.6.0" ]; }) - (sources."@serverless/components-2.30.1" // { + (sources."@serverless/components-2.30.5" // { dependencies = [ sources."fs-extra-8.1.0" sources."globby-10.0.2" @@ -75364,11 +75681,9 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.6.6" // { + (sources."@serverless/enterprise-plugin-3.6.9" // { dependencies = [ - sources."@serverless/platform-client-0.24.0" sources."fs-extra-8.1.0" - sources."https-proxy-agent-5.0.0" sources."node-fetch-2.6.0" sources."semver-6.3.0" sources."uuid-3.4.0" @@ -75383,12 +75698,12 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."@serverless/platform-client-0.25.5" // { + (sources."@serverless/platform-client-0.25.7" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; }) - (sources."@serverless/platform-client-china-1.0.6" // { + (sources."@serverless/platform-client-china-1.0.9" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75401,7 +75716,7 @@ in ]; }) sources."@serverless/template-1.1.3" - (sources."@serverless/utils-china-0.1.6" // { + (sources."@serverless/utils-china-0.1.7" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75414,8 +75729,8 @@ in sources."@types/glob-7.1.1" sources."@types/lodash-4.14.150" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" - (sources."@typescript-eslint/typescript-estree-2.29.0" // { + sources."@types/node-13.13.4" + (sources."@typescript-eslint/typescript-estree-2.31.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -75459,7 +75774,11 @@ in sources."string_decoder-1.1.1" ]; }) - sources."argparse-1.0.10" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."arr-diff-4.0.0" sources."arr-union-3.1.0" sources."array-union-2.1.0" @@ -75474,7 +75793,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.661.0" // { + (sources."aws-sdk-2.669.0" // { dependencies = [ sources."buffer-4.9.1" sources."isarray-1.0.0" @@ -75513,6 +75832,7 @@ in }) sources."blob-0.0.5" sources."bluebird-3.7.2" + sources."boolean-3.0.1" (sources."boxen-3.2.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -75558,7 +75878,7 @@ in sources."cross-spawn-6.0.5" ]; }) - sources."chokidar-3.3.1" + sources."chokidar-3.4.0" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -75630,6 +75950,7 @@ in sources."cookie-0.3.1" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -75649,7 +75970,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.25" + sources."dayjs-1.8.26" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -75683,9 +76004,11 @@ in sources."deep-is-0.1.3" sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" + sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dependency-tree-7.2.1" + sources."detect-node-2.0.4" sources."detective-amd-3.0.0" sources."detective-cjs-3.1.1" sources."detective-es6-2.1.0" @@ -75736,8 +76059,9 @@ in sources."env-variable-0.0.6" sources."errno-0.1.7" sources."es5-ext-0.10.53" + sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" - sources."es6-promisify-6.1.0" + sources."es6-promisify-6.1.1" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -75819,11 +76143,7 @@ in ]; }) sources."fs.realpath-1.0.0" - (sources."fs2-0.3.7" // { - dependencies = [ - sources."type-1.2.0" - ]; - }) + sources."fs2-0.3.8" sources."fsevents-2.1.3" sources."get-amd-module-type-3.0.0" sources."get-own-enumerable-property-symbols-3.0.2" @@ -75834,7 +76154,13 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" + (sources."global-agent-2.1.8" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) sources."global-dirs-0.1.1" + sources."globalthis-1.0.1" (sources."globby-6.1.0" // { dependencies = [ sources."array-union-1.0.2" @@ -75843,7 +76169,7 @@ in }) sources."gonzales-pe-4.3.0" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.8" sources."har-schema-2.0.0" @@ -75923,7 +76249,7 @@ in 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.1.0" + sources."is-promise-2.2.2" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-relative-path-1.0.2" @@ -75932,7 +76258,11 @@ in sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - sources."is-wsl-2.1.1" + (sources."is-wsl-2.2.0" // { + dependencies = [ + sources."is-docker-2.0.0" + ]; + }) sources."isarray-2.0.1" sources."isexe-2.0.0" sources."iso8601-duration-1.2.0" @@ -76006,6 +76336,11 @@ in sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" + (sources."matcher-2.1.0" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) sources."memoizee-0.4.14" (sources."memory-fs-0.5.0" // { dependencies = [ @@ -76019,8 +76354,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -76029,7 +76364,7 @@ in sources."mkdirp-0.5.5" sources."module-definition-3.3.0" sources."module-lookup-amd-6.2.0" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nanoid-2.1.11" @@ -76067,6 +76402,7 @@ in ]; }) sources."object-hash-2.0.3" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -76112,7 +76448,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."has-flag-3.0.0" sources."supports-color-6.1.0" @@ -76143,7 +76479,7 @@ in }) sources."rc-1.2.8" sources."readable-stream-3.6.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.5" sources."regex-not-1.0.2" sources."registry-auth-token-4.1.1" @@ -76167,7 +76503,8 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."roarr-2.15.3" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -76181,8 +76518,14 @@ in ]; }) sources."semver-5.7.1" + sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" + (sources."serialize-error-5.0.0" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -76237,11 +76580,11 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.18" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."split-string-3.1.0" sources."split2-3.1.1" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.2" sources."sprintf-kit-2.0.0" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -76406,7 +76749,7 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -76430,7 +76773,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = https://serverless.com/framework/docs/; + homepage = "https://serverless.com/framework/docs/"; license = "MIT"; }; production = true; @@ -76495,7 +76838,7 @@ in sources."duplexer-0.1.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + sources."emitter-https://github.com/component/emitter/archive/1.0.1.tar.gz" sources."encodeurl-1.0.2" (sources."engine.io-1.3.1" // { dependencies = [ @@ -76562,8 +76905,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -76618,7 +76961,7 @@ in (sources."socket.io-adapter-0.2.0" // { dependencies = [ sources."debug-0.7.4" - sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" + sources."emitter-https://github.com/component/emitter/archive/1.0.1.tar.gz" sources."socket.io-parser-2.1.2" ]; }) @@ -76760,7 +77103,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -77064,41 +77407,42 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.309.0"; + version = "1.317.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.309.0.tgz"; - sha512 = "NVizsLhGNhgjI+wCy1TajQoko+GVjop3r10BxX12KKxj3bUE9cDhqzkXmngHzuyFhTfdhED6yOzdg+jDvm1VpA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.317.0.tgz"; + sha512 = "zNUvvT50Ii5TpHEo9YmDo+j5tqO1b8jXQK9XygfgiuXPRUwxf6PMSqDM5hKkfzuBhaBYZ4IbZWQFQPbMkprj0w=="; }; dependencies = [ - sources."@snyk/cli-interface-2.4.0" - sources."@snyk/cocoapods-lockfile-parser-3.1.0" - sources."@snyk/composer-lockfile-parser-1.2.0" + sources."@snyk/cli-interface-2.6.0" + sources."@snyk/cocoapods-lockfile-parser-3.2.0" + sources."@snyk/composer-lockfile-parser-1.4.0" sources."@snyk/configstore-3.2.0-rc1" - sources."@snyk/dep-graph-1.16.1" + sources."@snyk/dep-graph-1.18.2" sources."@snyk/gemfile-1.2.0" - (sources."@snyk/java-call-graph-builder-1.3.4" // { + sources."@snyk/graphlib-2.1.9-patch" + sources."@snyk/inquirer-6.2.2-patch" + (sources."@snyk/java-call-graph-builder-1.8.0" // { dependencies = [ sources."ci-info-2.0.0" sources."debug-4.1.1" - sources."snyk-config-3.0.0" ]; }) - sources."@snyk/ruby-semver-2.1.0" - (sources."@snyk/snyk-cocoapods-plugin-2.1.1" // { + sources."@snyk/lodash-4.17.15-patch" + sources."@snyk/rpm-parser-1.1.0" + sources."@snyk/ruby-semver-2.2.0" + (sources."@snyk/snyk-cocoapods-plugin-2.2.0" // { dependencies = [ sources."@snyk/cli-interface-1.5.0" ]; }) sources."@snyk/update-notifier-2.5.1-rc2" sources."@types/agent-base-4.2.0" - sources."@types/bunyan-1.8.6" sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.3" - sources."@types/node-13.13.2" - sources."@types/restify-4.3.6" + sources."@types/node-13.13.4" sources."@types/semver-5.5.0" - sources."@types/xml2js-0.4.3" + sources."@types/xml2js-0.4.5" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -77167,11 +77511,7 @@ in sources."diff-4.0.2" sources."dockerfile-ast-0.0.19" sources."dot-prop-5.2.0" - (sources."dotnet-deps-parser-4.9.0" // { - dependencies = [ - sources."xml2js-0.4.19" - ]; - }) + sources."dotnet-deps-parser-4.10.0" sources."duplexer3-0.1.4" sources."email-validator-2.0.4" sources."emoji-regex-7.0.3" @@ -77209,8 +77549,7 @@ in sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" - sources."graphlib-2.1.8" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-errors-1.7.3" @@ -77229,21 +77568,20 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.5.2" sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-ci-1.2.1" + sources."is-docker-2.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-obj-2.0.0" sources."is-path-inside-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.13.1" @@ -77252,7 +77590,6 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" - sources."lodash-4.17.15" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -77279,7 +77616,7 @@ in sources."object-hash-1.3.1" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.5.0" + sources."open-7.0.3" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -77306,6 +77643,7 @@ in sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" + sources."prettier-1.19.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" @@ -77333,7 +77671,7 @@ in sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -77351,14 +77689,18 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - sources."snyk-config-2.2.3" - (sources."snyk-docker-plugin-2.6.1" // { + (sources."snyk-config-3.1.0" // { + dependencies = [ + sources."debug-4.1.1" + ]; + }) + (sources."snyk-docker-plugin-3.1.0" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."snyk-go-parser-1.4.0" - (sources."snyk-go-plugin-1.13.0" // { + (sources."snyk-go-plugin-1.14.0" // { dependencies = [ sources."debug-4.1.1" sources."tmp-0.1.0" @@ -77371,20 +77713,29 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.10.0" // { + (sources."snyk-mvn-plugin-2.15.0" // { dependencies = [ + sources."@snyk/cli-interface-2.5.0" sources."debug-4.1.1" sources."tmp-0.1.0" - sources."tslib-1.11.0" ]; }) - sources."snyk-nodejs-lockfile-parser-1.18.0" - sources."snyk-nuget-plugin-1.16.0" - sources."snyk-paket-parser-1.5.0" - (sources."snyk-php-plugin-1.7.0" // { + sources."snyk-nodejs-lockfile-parser-1.22.0" + (sources."snyk-nuget-plugin-1.17.0" // { + dependencies = [ + sources."core-js-2.3.0" + sources."es6-promise-3.0.2" + sources."isarray-1.0.0" + sources."jszip-3.1.5" + sources."lie-3.1.1" + sources."process-nextick-args-1.0.7" + sources."readable-stream-2.0.6" + ]; + }) + sources."snyk-paket-parser-1.6.0" + (sources."snyk-php-plugin-1.9.0" // { dependencies = [ - sources."@snyk/cli-interface-2.2.0" - sources."tslib-1.9.3" + sources."@snyk/cli-interface-2.3.2" ]; }) sources."snyk-policy-1.13.5" @@ -77411,7 +77762,7 @@ in ]; }) sources."source-map-0.6.1" - sources."source-map-support-0.5.18" + sources."source-map-support-0.5.19" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -77451,6 +77802,7 @@ in sources."tree-kill-1.2.2" sources."tslib-1.11.1" sources."type-check-0.3.2" + sources."typescript-3.8.3" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" @@ -77478,12 +77830,8 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - (sources."xml2js-0.4.23" // { - dependencies = [ - sources."xmlbuilder-11.0.1" - ]; - }) - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."xregexp-2.0.0" sources."y18n-3.2.1" sources."yallist-2.1.2" @@ -77542,8 +77890,8 @@ in sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-component-0.0.3" @@ -77562,7 +77910,7 @@ in }) sources."socket.io-parser-3.4.0" sources."to-array-0.1.4" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -77630,7 +77978,7 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-proxy-agent-2.1.0" @@ -77954,7 +78302,7 @@ in sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-network-0.0.1" @@ -78134,9 +78482,9 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.2" + sources."nearley-2.19.3" sources."nice-try-1.0.5" - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" @@ -78543,7 +78891,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = https://github.com/ssbc/ssb-server; + homepage = "https://github.com/ssbc/ssb-server"; license = "MIT"; }; production = true; @@ -78561,7 +78909,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = https://www.stackdriver.com/; + homepage = "https://www.stackdriver.com/"; license = "MIT"; }; production = true; @@ -78636,7 +78984,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.661.0" // { + (sources."aws-sdk-2.669.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78776,7 +79124,7 @@ in dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" - sources."ws-7.2.3" + sources."ws-7.2.5" ]; }) (sources."engine.io-client-3.4.1" // { @@ -78847,7 +79195,7 @@ in sources."debug-3.2.6" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -78898,7 +79246,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-stream-1.1.0" @@ -78993,15 +79341,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" sources."multer-1.4.2" sources."mustache-2.3.2" @@ -79231,7 +79579,7 @@ in dependencies = [ sources."debug-3.2.6" sources."form-data-2.5.1" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -79244,7 +79592,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.9.3" + sources."qs-6.9.4" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -79480,7 +79828,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = https://github.com/svg/svgo; + homepage = "https://github.com/svg/svgo"; license = "MIT"; }; production = true; @@ -79692,7 +80040,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.15" @@ -79815,8 +80163,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -79882,7 +80230,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."superagent-3.8.3" ]; }) @@ -80059,7 +80407,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -80179,12 +80527,12 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."long-4.0.0" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."module-alias-2.2.2" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" sources."node-fetch-2.6.0" sources."oauth-sign-0.9.0" @@ -80215,7 +80563,7 @@ in }) sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."telegraf-3.37.0" + sources."telegraf-3.38.0" sources."telegram-typings-3.6.1" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -80259,7 +80607,7 @@ in sources."errno-0.1.7" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -80361,7 +80709,7 @@ in sources."function-bind-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.1" @@ -80515,7 +80863,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = https://github.com/textlint/textlint/; + homepage = "https://github.com/textlint/textlint/"; license = "MIT"; }; production = true; @@ -80537,7 +80885,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = https://github.com/elzup/textlint-plugin-latex; + homepage = "https://github.com/elzup/textlint-plugin-latex"; license = "MIT"; }; production = true; @@ -80576,7 +80924,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; + homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; license = "MIT"; }; production = true; @@ -80667,7 +81015,7 @@ in sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."ignore-3.3.10" @@ -80890,7 +81238,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = https://github.com/textlint-rule/textlint-rule-alex; + homepage = "https://github.com/textlint-rule/textlint-rule-alex"; license = "MIT"; }; production = true; @@ -80915,7 +81263,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = https://github.com/io-monad/textlint-rule-common-misspellings; + homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; license = "GPL-3.0"; }; production = true; @@ -80937,7 +81285,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = https://github.com/sapegin/textlint-rule-diacritics; + homepage = "https://github.com/sapegin/textlint-rule-diacritics"; license = "MIT"; }; production = true; @@ -80974,7 +81322,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = https://github.com/azu/textlint-rule-en-max-word-count; + homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; license = "MIT"; }; production = true; @@ -81067,7 +81415,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; + homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; license = "MIT"; }; production = true; @@ -81108,7 +81456,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; + homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; license = "MIT"; }; production = true; @@ -81138,7 +81486,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = https://github.com/sapegin/textlint-rule-stop-words; + homepage = "https://github.com/sapegin/textlint-rule-stop-words"; license = "MIT"; }; production = true; @@ -81168,7 +81516,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = https://github.com/sapegin/textlint-rule-terminology; + homepage = "https://github.com/sapegin/textlint-rule-terminology"; license = "MIT"; }; production = true; @@ -81178,10 +81526,10 @@ in textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage { name = "textlint-rule-unexpanded-acronym"; packageName = "textlint-rule-unexpanded-acronym"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.3.tgz"; - sha512 = "kkbsbUlI3Gw4VTr79E825+2wuxPG8dM8T4VjEH25zlNhh3j8vpsVDjpbXRkVFl+EvDBCtDZEDaFPwhXy85toVQ=="; + url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.4.tgz"; + sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ sources."array-includes-3.1.1" @@ -81208,7 +81556,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; + homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; license = "MIT"; }; production = true; @@ -81248,7 +81596,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = https://github.com/textlint-rule/textlint-rule-write-good; + homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; license = "MIT"; }; production = true; @@ -81272,7 +81620,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-13.13.2" + sources."@types/node-13.13.4" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -81419,7 +81767,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-10.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -81674,7 +82022,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.0" @@ -81683,7 +82031,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = https://thelounge.chat/; + homepage = "https://thelounge.chat/"; license = "MIT"; }; production = true; @@ -81693,15 +82041,15 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.115.0"; + version = "0.116.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.115.0.tgz"; - sha512 = "mAV2Ky3RdcbdSbR9capI+tKLvRldWYxd4151PZTT/o7+U2jh9Is3a4KmnYwzyUAhB2ZA3pXSgCd2DOY4Tj5kow=="; + url = "https://registry.npmjs.org/three/-/three-0.116.1.tgz"; + sha512 = "l2JCMiA/lVZAuSrLWRYMalvpR+0j8hbIhCpfs4V6JFnw2+JQEQJ5HltNpfFr+9TDpQts1BhtcISehWf/xBGPvQ=="; }; buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = https://threejs.org/; + homepage = "https://threejs.org/"; license = "MIT"; }; production = true; @@ -81773,7 +82121,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -81790,11 +82138,11 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-0.0.10" - sources."moment-2.24.0" + sources."moment-2.25.3" (sources."node-appc-0.2.49" // { dependencies = [ sources."temp-0.8.4" @@ -81854,10 +82202,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.8.0.tgz"; - sha512 = "/f9E08NvOvOyudT1ar0ENjtJqcFuEnVMBhEpgQda8dQibxgOEbK7dOkc6T0OZ3ve1E3wXn8JVnY+l1EBZ/8/5w=="; + url = "https://registry.npmjs.org/triton/-/triton-7.9.0.tgz"; + sha512 = "PCZVVbdI90e07avgNyBJiw32Q0YIFwqgIW/HFbU5g3Hh/+P5VBJP8TBlkXM27VCM7L3hyCC3z9K8uq9mI8aIVQ=="; }; dependencies = [ sources."asn1-0.2.4" @@ -81926,7 +82274,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -82042,7 +82390,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = https://github.com/joyent/node-triton; + homepage = "https://github.com/joyent/node-triton"; license = "MPL-2.0"; }; production = true; @@ -82091,7 +82439,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = https://github.com/HerringtonDarkholme/typescript-repl; + homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; license = "MIT"; }; production = true; @@ -82132,7 +82480,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = https://www.typescriptlang.org/; + homepage = "https://www.typescriptlang.org/"; license = "Apache-2.0"; }; production = true; @@ -82152,7 +82500,7 @@ in sources."commander-2.20.3" sources."crypto-random-string-1.0.0" sources."fs-extra-7.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."jsonfile-4.0.0" sources."p-debounce-1.0.0" sources."temp-dir-1.0.0" @@ -82178,10 +82526,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; - sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q=="; }; dependencies = [ sources."commander-2.20.3" @@ -82209,7 +82557,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -82351,7 +82699,7 @@ in sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-1.1.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-2.0.1" sources."jquery-3.4.1" sources."jquery-ui-bundle-1.12.1" @@ -82380,8 +82728,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -82490,9 +82838,9 @@ in dependencies = [ sources."component-emitter-1.3.0" sources."debug-4.1.1" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."ms-2.1.2" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."semver-6.3.0" ]; }) @@ -82524,7 +82872,7 @@ in }) sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" @@ -82716,7 +83064,7 @@ in sources."git-clone-0.1.0" sources."glob-7.1.6" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" sources."handlebars-4.7.6" @@ -82743,7 +83091,6 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-natural-number-4.0.1" sources."is-object-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -82777,8 +83124,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -82820,7 +83167,7 @@ in sources."request-2.88.2" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -82867,7 +83214,7 @@ in sources."tslib-1.11.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."uid-0.0.2" sources."unbzip2-stream-1.4.2" sources."unyield-0.0.1" @@ -82926,7 +83273,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-13.13.2" + sources."@types/node-13.13.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -83250,7 +83597,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -83332,7 +83679,6 @@ in sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" @@ -83541,7 +83887,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.4.0" + sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -83604,7 +83950,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."rxjs-6.5.5" @@ -83843,7 +84189,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.1.1" // { + (sources."vscode-css-languageservice-4.1.2" // { dependencies = [ sources."vscode-uri-2.1.1" ]; @@ -83896,7 +84242,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = https://github.com/vuejs/vetur/tree/master/server; + homepage = "https://github.com/vuejs/vetur/tree/master/server"; license = "MIT"; }; production = true; @@ -83926,14 +84272,14 @@ in }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.9.2" + sources."@babel/runtime-corejs3-7.9.6" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" @@ -84414,7 +84760,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -84482,6 +84828,7 @@ in sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" + sources."is-docker-2.0.0" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -84499,7 +84846,6 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-relative-0.1.3" @@ -84509,7 +84855,7 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -84584,15 +84930,15 @@ in }) sources."merge-stream-2.0.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" sources."mkdirp-1.0.3" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.0.0" sources."multimatch-4.0.0" sources."mute-stream-0.0.7" @@ -84762,7 +85108,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-3.1.2" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -85019,7 +85365,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = https://github.com/mozilla/web-ext; + homepage = "https://github.com/mozilla/web-ext"; license = "MPL-2.0"; }; production = true; @@ -85222,14 +85568,19 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" @@ -85397,7 +85748,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -85428,7 +85779,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.6.11" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -85495,7 +85846,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = https://github.com/webpack/webpack; + homepage = "https://github.com/webpack/webpack"; license = "MIT"; }; production = true; @@ -85622,7 +85973,7 @@ in ]; }) sources."global-prefix-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -85843,7 +86194,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."accepts-1.3.7" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" @@ -86053,7 +86404,7 @@ in sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -86132,8 +86483,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" @@ -86198,7 +86549,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.25" // { + (sources."portfinder-1.0.26" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -86404,7 +86755,7 @@ in sources."wbuf-1.7.3" (sources."webpack-dev-middleware-3.7.2" // { dependencies = [ - sources."mime-2.4.4" + sources."mime-2.4.5" ]; }) sources."webpack-log-2.0.0" @@ -86486,7 +86837,7 @@ in sources."pify-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" @@ -86560,7 +86911,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = https://github.com/webpack-contrib/copy-webpack-plugin; + homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; license = "MIT"; }; production = true; @@ -86587,7 +86938,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.2" + sources."@types/node-13.13.4" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -86696,7 +87047,7 @@ in sources."is-docker-2.0.0" sources."is-file-1.0.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."junk-3.1.0" sources."k-bucket-5.0.0" @@ -86717,12 +87068,12 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.3.0" sources."memory-chunk-store-1.3.0" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-classic-0.5.2" - sources."moment-2.24.0" + sources."mkdirp-classic-0.5.3" + sources."moment-2.25.3" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" sources."ms-2.0.0" @@ -86849,7 +87200,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -86857,7 +87208,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = https://webtorrent.io/; + homepage = "https://webtorrent.io/"; license = "MIT"; }; production = true; @@ -86932,7 +87283,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.5.2" + sources."vscode-json-languageservice-3.6.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -86990,7 +87341,7 @@ in sources."@babel/code-frame-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" @@ -86998,8 +87349,9 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" + sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" sources."ajv-6.12.2" sources."ansi-0.3.1" @@ -87026,6 +87378,11 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" + (sources."axios-0.18.1" // { + dependencies = [ + sources."is-buffer-2.0.4" + ]; + }) sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -87093,6 +87450,7 @@ in sources."cli-width-2.2.1" sources."clone-1.0.4" sources."clone-buffer-1.0.0" + sources."clone-deep-4.0.1" sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" sources."clone-stats-0.0.1" @@ -87140,6 +87498,7 @@ in }) sources."dot-prop-4.2.0" sources."downgrade-root-1.2.2" + sources."download-stats-0.3.4" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" (sources."editions-2.3.0" // { @@ -87152,7 +87511,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."env-paths-1.0.0" - sources."errlop-2.1.0" + sources."errlop-2.2.0" sources."error-7.2.1" sources."error-ex-1.3.2" sources."es6-error-4.1.1" @@ -87206,6 +87565,11 @@ in sources."find-up-2.1.0" sources."find-versions-2.0.0" sources."first-chunk-stream-2.0.0" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -87250,7 +87614,7 @@ in sources."p-cancelable-0.4.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -87315,7 +87679,6 @@ in 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.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" @@ -87341,6 +87704,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."keyv-3.0.0" sources."kind-of-6.0.3" @@ -87353,6 +87717,7 @@ in sources."url-parse-lax-1.0.0" ]; }) + sources."lazy-cache-2.0.2" sources."lines-and-columns-1.1.6" (sources."load-json-file-1.1.0" // { dependencies = [ @@ -87396,7 +87761,7 @@ in ]; }) sources."pify-4.0.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."slash-2.0.0" sources."through2-3.0.1" sources."vinyl-2.2.0" @@ -87412,8 +87777,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -87424,6 +87789,7 @@ in ]; }) sources."mkdirp-0.5.5" + sources."moment-2.25.3" sources."ms-2.0.0" (sources."multimatch-4.0.0" // { dependencies = [ @@ -87436,6 +87802,7 @@ in sources."nice-try-1.0.5" sources."normalize-package-data-2.5.0" sources."normalize-url-2.0.1" + sources."npm-api-1.0.0" sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ @@ -87491,6 +87858,7 @@ in sources."p-try-1.0.0" sources."package-json-5.0.0" sources."pad-component-0.0.1" + sources."paged-request-2.0.1" sources."parse-help-1.0.0" sources."parse-json-2.2.0" sources."pascalcase-0.1.1" @@ -87576,7 +87944,7 @@ in sources."rimraf-2.7.1" sources."roarr-2.15.3" sources."root-check-1.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-4.1.0" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -87593,14 +87961,16 @@ in sources."type-fest-0.8.1" ]; }) + sources."set-getter-0.1.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) + sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shelljs-0.8.3" + sources."shelljs-0.8.4" sources."signal-exit-3.0.3" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { @@ -87811,7 +88181,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.9.5" // { + (sources."yeoman-environment-2.10.0" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -87857,7 +88227,7 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.8.3" // { + (sources."yeoman-generator-4.10.0" // { dependencies = [ sources."debug-4.1.1" sources."diff-4.0.2" @@ -87896,7 +88266,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = http://yeoman.io/; + homepage = "https://yeoman.io/"; license = "BSD-2-Clause"; }; production = true; diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix deleted file mode 100644 index 230db8189de..00000000000 --- a/pkgs/development/ocaml-modules/async/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, - async_unix_p4, async_extra_p4, pa_ounit}: - -buildOcaml rec { - name = "async"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async/archive/${version}.tar.gz"; - sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; - }; - - propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra_p4 pa_ounit ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async"; - description = "Jane Street Capital's asynchronous execution library"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix deleted file mode 100644 index aa797cdace3..00000000000 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, core_p4, sexplib_p4}: - -buildOcaml rec { - name = "async_find"; - version = "111.28.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz"; - sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; - }; - - propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_find"; - description = "Directory traversal with Async"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix index c74676e4a1e..98687262c33 100644 --- a/pkgs/development/ocaml-modules/bigstring/default.nix +++ b/pkgs/development/ocaml-modules/bigstring/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/c-cube/ocaml-bigstring; + homepage = "https://github.com/c-cube/ocaml-bigstring"; description = "Bigstring built on top of bigarrays, and convenient functions"; license = licenses.bsd2; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/fiat-p256/default.nix b/pkgs/development/ocaml-modules/fiat-p256/default.nix new file mode 100644 index 00000000000..ac7e6640eea --- /dev/null +++ b/pkgs/development/ocaml-modules/fiat-p256/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchurl, alcotest, asn1-combinators, benchmark +, bigarray-compat, cstruct, eqaf, hex, ppx_deriving_yojson, rresult +, stdlib-shims, yojson, dune-configurator }: + +buildDunePackage rec { + pname = "fiat-p256"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/mirage/fiat/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0086h9qkvnqfm8acrxqbki54z619nj73x7f0d01v5vg2naznx7w9"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ bigarray-compat cstruct eqaf hex ]; + checkInputs = [ alcotest asn1-combinators benchmark + ppx_deriving_yojson rresult stdlib-shims yojson ]; + doCheck = true; + + meta = with lib; { + description = "Primitives for Elliptic Curve Cryptography taken from Fiat"; + homepage = "https://github.com/mirage/fiat"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 20ade26f909..b01d4b4a04c 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchFromGitHub, buildDunePackage +, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm +}: buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.3.6"; + version = "0.3.19"; minimumOCamlVersion = "4.02"; @@ -10,10 +12,11 @@ buildDunePackage rec { owner = "astrada"; repo = pname; rev = "v${version}"; - sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4"; + sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9"; }; - propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; + propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ]; + buildInputs = [ xmlm ]; meta = { description = "OCaml client for google services"; diff --git a/pkgs/development/ocaml-modules/hacl_x25519/default.nix b/pkgs/development/ocaml-modules/hacl_x25519/default.nix new file mode 100644 index 00000000000..a741f5b6681 --- /dev/null +++ b/pkgs/development/ocaml-modules/hacl_x25519/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchurl, benchmark, cstruct +, eqaf, hex, ppx_blob, ppx_deriving_yojson, stdlib-shims, yojson }: + +buildDunePackage rec { + pname = "hacl_x25519"; + version = "0.1.1"; + + src = fetchurl { + url = "https://github.com/mirage/hacl/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "187khbx1myh942c2v5f7wbms2hmhmgn57ik25djhnryln32c0874"; + }; + + propagatedBuildInputs = [ eqaf cstruct ]; + checkInputs = [ benchmark hex ppx_blob ppx_deriving_yojson stdlib-shims yojson ]; + doCheck = true; + + meta = with lib; { + description = "Primitives for Elliptic Curve Cryptography taken from Project Everest"; + homepage = "https://github.com/mirage/hacl"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix new file mode 100644 index 00000000000..9832a5f4c41 --- /dev/null +++ b/pkgs/development/ocaml-modules/hkdf/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchurl, cstruct, mirage-crypto, alcotest }: + +buildDunePackage rec { + pname = "hkdf"; + version = "1.0.4"; + + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "0nzx6vzbc1hh6vx1ly8df4b16lgps6zjpp9mjycsnnn49bddc9mr"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ cstruct mirage-crypto ]; + checkInputs = [ alcotest ]; + doCheck = true; + + meta = with lib; { + description = "HMAC-based Extract-and-Expand Key Derivation Function (RFC 5869)"; + homepage = "https://github.com/hannesm/ocaml-hkdf"; + license = licenses.mit; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix deleted file mode 100644 index 8f15531403a..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, - async_unix, async_extra}: - -buildOcamlJane { - name = "async"; - version = "113.33.03"; - hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr"; - propagatedBuildInputs = [ async_kernel async_unix async_extra ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async"; - description = "Jane Street Capital's asynchronous execution library"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix deleted file mode 100644 index 1157c398080..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/re2.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, buildOcamlJane, - bin_prot, core_kernel, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - rsync}: - -buildOcamlJane { - name = "re2"; - hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; - buildInputs = [ rsync ]; - propagatedBuildInputs = - [ bin_prot core_kernel fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/re2"; - description = "OCaml bindings for RE2"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index d49208ede60..641f16f69b0 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }: buildDunePackage rec { - version = "3.0.beta6"; + version = "3.1.0"; pname = "lablgtk3"; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz"; - sha256 = "1jni5cbp54qs7y0dc5zkm28v2brpfwy5miighv7cy0nmmxrsq520"; + sha256 = "1fn04qwgkwc86jndlrnv4vxcmasjsp1mmcgfznahj1ccc7bv47sv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 261374115ff..1331c10d426 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,19 +1,20 @@ { lib, fetchurl, buildDunePackage, opaline, ocaml +, alcotest , astring, cmdliner, cppo, fmt, logs, ocaml-migrate-parsetree, ocaml-version, ocaml_lwt, pandoc, re }: buildDunePackage rec { pname = "mdx"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://github.com/realworldocaml/mdx/releases/download/1.5.0/mdx-1.5.0.tbz"; - sha256 = "0g45plf4z7d178gp0bx7842fwbd3m19679yfph3s95da6mrfm3xn"; + url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; + sha256 = "18m4ay226dwbgnwp3ia6bfcm033dvp9yby0lbddqn8ak374m2k3b"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; propagatedBuildInputs = [ astring fmt logs ocaml-migrate-parsetree ocaml-version re ]; - checkInputs = lib.optionals doCheck [ ocaml_lwt pandoc ]; + checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 90c449e383f..dabe7ae52a3 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,22 +1,17 @@ -{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: +{ stdenv, buildDunePackage, fetchFromGitHub, camlidl, fuse }: -stdenv.mkDerivation rec { +buildDunePackage { pname = "ocamlfuse"; - version = "2.7.1_cvs5"; + version = "2.7.1_cvs6_e35e76b"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "v${version}"; - sha256 = "01ayw2hzpxan95kncbxh9isj9g149cs8scq3xim1vy8bz085wb0m"; + rev = "e35e76bee3b06806256b5bfca108b7697267cd5c"; + sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; }; - buildInputs = [ocaml findlib]; - propagatedBuildInputs = [camlidl fuse]; - configurePhase = '' ocaml setup.ml -configure --prefix $out ''; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; - createFindlibDestdir = true; + propagatedBuildInputs = [ camlidl fuse ]; meta = { homepage = "https://sourceforge.net/projects/ocamlfuse"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index b306ee9ce6d..7dd1d525a46 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -6,13 +6,11 @@ , eigen , stdio , stdlib-shims -, openblas, blas, lapack +, openblasCompat , owl-base , npy }: -assert (!blas.isILP64) && (!lapack.isILP64); -assert blas.implementation == "openblas" && lapack.implementation == "openblas"; buildDunePackage rec { pname = "owl"; @@ -22,7 +20,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - eigen stdio stdlib-shims openblas owl-base npy + eigen stdio stdlib-shims openblasCompat owl-base npy ]; doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 diff --git a/pkgs/development/ocaml-modules/re2/Makefile.patch b/pkgs/development/ocaml-modules/re2/Makefile.patch deleted file mode 100644 index fcb6eefe62b..00000000000 --- a/pkgs/development/ocaml-modules/re2/Makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./lib/Makefile 2014-11-18 08:16:19.000000000 -0800 -+++ ./lib/Makefile 2015-05-23 14:48:31.000000000 -0700 -@@ -6,12 +6,12 @@ - all: libre2_stubs.a dllre2_stubs.so - - dllre2_stubs.so libre2_stubs.a: stubs.o $(LIBRE2) -- ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lstdc++ -+ ocamlmklib -oc re2_stubs stubs.o $(LIBRE2) -lc++ - rm libre2_stubs.a # ocamlmklib just includes $(LIBRE2) inside the stubs archive - cp $(LIBRE2) libre2_stubs.a && ar r libre2_stubs.a stubs.o - - stubs.o: stubs.cpp stubs.h util.h enum_x_macro.h -- g++ -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ -+ $(CXX) -O2 -DPIC -fPIC -g -pipe -DCAML_NAME_SPACE -Wall -I. -I../../../include \ - -I$(RE2_HOME) -I$(ocaml-version-selected-include-path) -c stubs.cpp - - #stubs.o: %.o: %.cpp %.h diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix deleted file mode 100644 index 1132d97f74a..00000000000 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, - bin_prot_p4, comparelib, sexplib_p4, rsync}: - -buildOcaml rec { - name = "re2"; - version = "112.06.00"; - - minimumSupportedOcamlVersion = "4.00"; - - src = fetchurl { - url = "https://github.com/janestreet/re2/archive/${version}.tar.gz"; - sha256 = "a538765872363fcb67f12b95c07455a0afd68f5ae9008b59bb85a996d97cc752"; - }; - patches = if stdenv.isDarwin - then [./Makefile.patch ./myocamlbuild.patch] - else null; - - buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core_p4 bin_prot_p4 comparelib sexplib_p4 ]; - - hasSharedObjects = true; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/re2"; - description = "OCaml bindings for RE2"; - license = stdenv.lib.licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch b/pkgs/development/ocaml-modules/re2/myocamlbuild.patch deleted file mode 100644 index 46ad6fa801b..00000000000 --- a/pkgs/development/ocaml-modules/re2/myocamlbuild.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ./myocamlbuild.ml 2015-05-23 14:35:18.000000000 -0700 -+++ ./myocamlbuild.ml 2015-05-23 15:05:24.000000000 -0700 -@@ -626,16 +626,18 @@ - rule "Generate lib/options.ml" - ~prod:"lib/options.ml" - ~deps:["lib/options.mlp"; "lib/enum_x_macro.h"] -- (fun _ _ -> Cmd (S[A"gcc"; A"-E"; A"-P"; A"-x"; A"c"; -+ (fun _ _ -> Cmd (S[A"cc"; A"-E"; A"-P"; A"-x"; A"c"; - P"lib/options.mlp"; A"-o"; P"lib/options.ml"])); - - flag ["ocaml"; "link"; "library"; "native"] (S[A"-cclib"; A"-Llib"; - A"-cclib"; A"-lre2_stubs"; -- A"-cclib"; A"-lstdc++"]); -+ A"-ccopt"; A"--stdlib=libc++"; -+ A"-cclib"; A"-lc++"]); - flag ["ocaml"; "link"; "library"; "byte"] (S[A"-dllib"; A"dllre2_stubs.so"; - A"-cclib"; A"-Llib"; - A"-cclib"; A"-lre2_stubs"; -- A"-cclib"; A"-lstdc++"]); -+ A"-ccopt"; A"--stdlib=libc++"; -+ A"-cclib"; A"-lc++"]); - | _ -> - () - diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index e425e2a3b7e..dea03f2b38a 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct +{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct , cstruct-sexp, sexplib, mirage-crypto, mirage-crypto-pk, mirage-crypto-rng -, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime }: +, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime +, hacl_x25519, fiat-p256, hkdf, logs, alcotest }: buildDunePackage rec { minimumOCamlVersion = "4.07"; - version = "0.11.1"; + version = "0.12.0"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "0ms13fbaxgmpbviazlfa4hb7nmi7s22nklc7ns926b0rr1aq1069"; + sha256 = "0fy38qmy7rcld1b4qzz4ycl1fr0v1wa7qd24125lpd6hly86fn57"; }; useDune2 = true; doCheck = true; - buildInputs = [ cstruct-unix ounit2 ]; + checkInputs = [ cstruct-unix ounit2 alcotest ]; propagatedBuildInputs = [ ppx_sexp_conv ppx_cstruct cstruct cstruct-sexp sexplib mirage-crypto mirage-crypto-pk mirage-crypto-rng - x509 domain-name fmt ocaml_lwt ptime ]; + x509 domain-name fmt ocaml_lwt ptime hacl_x25519 fiat-p256 + hkdf logs ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mirleft/ocaml-tls"; description = "TLS in pure OCaml"; license = licenses.bsd2; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 99f2cf582cb..06c84531482 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" - || stdenv.lib.versionAtLeast ocaml.version "4.08" then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-wasm-${version}"; - version = "1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "spec"; - rev = "v${version}"; - sha256 = "0r0wj31s2yg4vn4hyw2afc8wp8b0k3q130yiypwq3dlvfxrr70m6"; + rev = "opam-${version}"; + sha256 = "1kp72yv4k176i94np0m09g10cviqp2pnpm7jmiq6ik7fmmbknk7c"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index dc3ff1dbf4d..c3c67194ebb 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.2"; + version = "6.3"; src = fetchPypi { inherit pname version; - sha256 = "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh"; + sha256 = "0v34w88if3p4vn46aby24msfnxj6znmkf4848n4d24jnykxcsqk9"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 392c77036ca..7b0bfe80684 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.7"; + version = "0.3.9"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023"; + sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy"; }; propagatedBuildInputs = [ aiohttp attrs ]; diff --git a/pkgs/development/python-modules/ajpy/default.nix b/pkgs/development/python-modules/ajpy/default.nix index 373c3544062..5f42646dd99 100644 --- a/pkgs/development/python-modules/ajpy/default.nix +++ b/pkgs/development/python-modules/ajpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ajpy"; - version = "0.0.4"; + version = "0.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0a5f62b765f59ffc37e759d3f343de16cd782cc4e9e8be09c73b71dfbe383d9b"; + sha256 = "173wm207zyi86m2ms7vscakdi4mmjqfxqsdx1gn0j9nn0gsf241h"; }; # ajpy doesn't have tests diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index bd3e5662e18..b9c710e6888 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.2"; + version = "2.9.7"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8"; + sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s"; }; prePatch = '' diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 4943a2e53f7..706648f56a3 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -167,6 +167,9 @@ buildPythonPackage rec { --replace "/bin/bash" "${stdenv.shell}" ''; + # allow for gunicorn processes to have access to python packages + makeWrapperArgs = [ "--prefix PYTHONPATH : $PYTHONPATH" ]; + checkPhase = '' export HOME=$(mktemp -d) export AIRFLOW_HOME=$HOME diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index dd845b1d349..f3c3615d926 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.5.2"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0ai5l62ldaq1cqfmq3hvnzp8gp0hjjmjnck9d3cnx5r8la5ig18y"; + sha256 = "1ym9mmxjpnnlinly1rxfqj9rlyl2fv7dxc81f30n1b8n9pwc6jb5"; }; postPatch = '' diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 57a7c35215e..147a4d65de5 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "astropy"; - version = "4.0"; + version = "4.0.1.post1"; disabled = !isPy3k; # according to setup.py src = fetchPypi { inherit pname version; - sha256 = "404200e0baa84de09ac563ad9ccab3817e9b9669d0025cee74a8752f4bc2771b"; + sha256 = "1da4xj793ldck29aajyb514wpz330cml26f3gdp45jj531n4lc2w"; }; nativeBuildInputs = [ astropy-helpers ]; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index ccefe60ea08..715e4da8f44 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "1swr8ccm3mafcm3zpbwyn22kjs39lbqmg8w41sh7yb3gskgy2syc"; + sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm"; }; propagatedBuildInputs = [ pycodestyle ]; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index de3aab936c6..dc31669f718 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0vfcfpb01qsrqh9xg4xyfm153bczwjglkv59zpdvrn7x0rrdc1cc"; + sha256 = "181iyigm11y56lf1kwv7pcdyppavpwjb1b6k3qp3jnbqaypad9mg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 84ff0e88b14..e29263a6b4f 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.18.3"; + version = "0.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1742a25a9ef1b1ac4000683406879a3e1a6577faa02f31e482e6c84e2e3bf628"; + sha256 = "11wiis62kcw6g3n4gdj39fx1yrlq5vz3zx3kmb6g79mliyhn2x7g"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 7c58aab85c4..aff3f70cb88 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.8.1"; + version = "8.10.0"; src = fetchPypi { inherit pname version; - sha256 = "84893f90eb78f8179af24a87622ef964ede5c7e785562022917033987d6ce198"; + sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 04ae5a78bdb..94619956cff 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,13 +5,17 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.11.28"; + version = "2020.4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; + sha256 = "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i"; }; + pythonImportsCheck = [ "certifi" ]; + + dontUseSetuptoolsCheck = true; + meta = { homepage = "https://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 5046017a94d..60946d23a1e 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.0.4.2"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1ac64f8f9066ea756ea27d67cedaf064e7c866275218fa7c84684066a5890f70"; + sha256 = "17w9myl8mg4isv4lb1nv64zim53ishi32f6m5m0s00q9a6v5qfb0"; }; checkInputs = [ pytest coveralls pytestcov ]; diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 32e9b4fcb4a..98533f95f92 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy27, isPy34 +, isPy27 , pylev, pastel, typing, enum34 }: buildPythonPackage rec { @@ -13,8 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylev pastel - ] ++ lib.optional (isPy27 || isPy34) typing - ++ lib.optional isPy27 enum34; + ] ++ lib.optionals isPy27 [ typing enum34 ]; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 13f68d6a392..9d58c130582 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk"; + sha256 = "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 75255badf98..d1dcce9699b 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ConfigArgParse"; - version = "1.0"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0cvinm7bb03qfjpq2zhfacm0qs4ip4378nvya8x41p4wpi2q4dxz"; + sha256 = "1p1pzpf5qpf80bfxsx1mbw9blyhhypjvhl3i60pbmhfmhvlpplgd"; }; # no tests in tarball diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 2b6d1b4d248..bafa75072f7 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -18,13 +18,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.4"; + version = "1.2.5"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "1h9g79gxpgpy6xciqyypihw5q4ngp322lpkka1nkwk0ysybfsp7s"; + sha256 = "0widrfxr0x0cyg72ibkv7fdzkvmf5mllchq1x4fs2a36plv8rv4l"; }; buildInputs = [ blas lapack ]; diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 1a1e3db46ff..b4af53cb296 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1wr6989hq7q9vyh1qqdpbp8igk9rfca4phfpaim3nnk4swvm5m75"; + sha256 = "0mi608d4q4clx5ikblqni5v67k051k894q0w5asa3jj1v0agawpa"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b8dfd8deb4a..1b3a08aa997 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fsspec -, pytest +, pytestCheckHook , pythonOlder , cloudpickle , numpy @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2.10.1"; + version = "2.14.0"; disabled = pythonOlder "3.5"; @@ -23,13 +23,15 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "035mr7385yf5ng5wf60qxr80529h8dsla5hymkyg68dxhkd0jvbr"; + sha256 = "0kj46pwzvdw8ii1h45y48wxvjid89yp4cfak2h4b8z8xic73fqgj"; }; checkInputs = [ - pytest + pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + propagatedBuildInputs = [ bokeh cloudpickle @@ -50,9 +52,10 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - checkPhase = '' - pytest - ''; + disabledTests = [ + "test_argwhere_str" + "test_count_nonzero_str" + ]; meta = { description = "Minimal task scheduling abstraction"; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 6c338ce6dc2..3411247599e 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.8"; + version = "1.2.9"; src = fetchPypi { inherit pname version; - sha256 = "029mr75wgah0z1ilsf3vf3dmjn65y4fy1jgq5qny2qsb9hvwbblw"; + sha256 = "1k7c5kkh8jxxqdm0cbcvmhn3mwj0rcjwapwbzmm5r04n78lpvwqc"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 7478c18b2c0..fb5698062f7 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.7"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1vcjy6flqbzgjh4zhcs0sl83b946wxrlsx5miliz0ik1d9kjyff0"; + sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix new file mode 100644 index 00000000000..abc07346efd --- /dev/null +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, gdcm +, nose +, nibabel +, numpy +, pydicom +, scipy +}: + +buildPythonPackage rec { + pname = "dicom2nifti"; + version = "2.2.8"; + disabled = isPy27; + + # no tests in PyPI dist + src = fetchFromGitHub { + owner = "icometrix"; + repo = pname; + rev = version; + sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34"; + }; + + propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ]; + + checkInputs = [ nose gdcm ]; + checkPhase = "nosetests tests"; + + meta = with lib; { + homepage = "https://github.com/icometrix/dicom2nifti"; + description = "Library for converting dicom files to nifti"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 88cbee2649d..457e9d3e530 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "17wsybqq0916i1yh7bpf2cmicldn7d0y2b9mzlgs503fkcpxda5w"; + sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 08dbafe019e..4205d32d495 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "0wb2gh9ji8bgq4s9ci9x017dybxqzjhncpw33b1wjksm2yhbkvlz"; + sha256 = "0jlgmwcanfkhkwvh4vxibpi0zyyl6xkjzcz2xqn7raympqscq81a"; }; bazelFlags = [ diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix index eeb962a845f..7cc069707aa 100644 --- a/pkgs/development/python-modules/dotnetcore2/default.nix +++ b/pkgs/development/python-modules/dotnetcore2/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dotnetcore2"; - version = "2.1.13"; + version = "2.1.14"; format = "wheel"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { inherit pname version format; python = "py3"; platform = "manylinux1_x86_64"; - sha256 = "1fbg3pn7g0a6pg0gb5vaapcc3cdp6wfnliim57fn3cnzmx5d8p6i"; + sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q"; }; nativeBuildInputs = [ unzip ]; @@ -35,14 +35,18 @@ buildPythonPackage rec { ) ]; - # prevent exposing a broken dotnet executable - postInstall = '' - rm -r $out/${python.sitePackages}/${pname}/bin + # remove bin, which has a broken dotnetcore installation + installPhase = '' + rm -rf dotnetcore2/bin + mkdir -p $out/${python.sitePackages}/ + cp -r dotnetcore2 $out/${python.sitePackages}/ ''; # no tests, ensure it's one useful function works checkPhase = '' - ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path())' + rm -r dotnetcore2 # avoid importing local directory + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path()); runtime.ensure_dependencies()' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix new file mode 100644 index 00000000000..6433e0d17a7 --- /dev/null +++ b/pkgs/development/python-modules/dparse/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, toml, pyyaml }: + +buildPythonPackage rec { + pname = "dparse"; + version = "0.5.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"; + }; + + propagatedBuildInputs = [ toml pyyaml ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "A parser for Python dependency files"; + homepage = "https://github.com/pyupio/safety"; + license = licenses.mit; + maintainers = with maintainers; [ thomasdesr ]; + }; +} diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 41a4c1a7a2a..878b882810f 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.8"; + version = "0.2.10"; src = fetchPypi { inherit pname version; - sha256 = "da7f67a006e2eb63d86a8f3f4baa9d6752dab9676009a67193a4e433f2f41c2a"; + sha256 = "06zaxydyqvb5mk5kxs6y3pjbq5nm6lmi3h5g3y41xpic48q5wsv3"; }; # No tests diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index d10c1a0be65..8c7d7679005 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface zope_testing ]; - # tests fail, see http://hydra.nixos.org/build/4316603/log/raw + # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index ce8c0dc77a0..8c6d0bb543a 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.1.0"; + version = "7.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0140787216646e1eb7eb001f8146aff7071d7ca438854249787b6cc221ddd266"; + sha256 = "1j499w9hbpyx0v83xnn1vrm45amx5lbnhlik65v5z1n0gb9v4a6j"; }; # 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 c8b1a376f26..09d4cc6024e 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 = "1.4.3"; + version = "1.4.4"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "18gqqdsrdlgwn93xnxy6ifxrk7ppaimijinflphxia2qcm8czkgf"; + sha256 = "1z7403ykfdb2zy6g4qcbjm87ibpi0k59dgmz1px7z7wy5p2vknxw"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index cef6c27e59c..ab169fe679d 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }: +{ lib, buildPythonPackage, fetchPypi, linuxHeaders }: buildPythonPackage rec { pname = "evdev"; @@ -17,8 +17,6 @@ buildPythonPackage rec { doCheck = false; - disabled = isPy34; # see http://bugs.python.org/issue21121 - meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; homepage = "https://pythonhosted.org/evdev"; diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index a8ac610855d..7a74de03d52 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -1,13 +1,21 @@ -{ stdenv, buildPythonPackage, fetchPypi, flask, events -, pymongo, simplejson, cerberus, werkzeug }: +{ stdenv +, buildPythonPackage +, fetchPypi +, flask +, events +, pymongo +, simplejson +, cerberus +, setuptools +}: buildPythonPackage rec { pname = "Eve"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "ebde455e631b8eb9d38783eedfbd7e416b4477cce3d9988880eb3e477256a11e"; + sha256 = "1a7i7x77p5wjqfzmgn30m9sz2mcz06k4qf5af6a45109lafcq0bv"; }; propagatedBuildInputs = [ @@ -16,13 +24,10 @@ buildPythonPackage rec { flask pymongo simplejson - werkzeug + setuptools ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "werkzeug==0.15.4" "werkzeug" - ''; + pythonImportsCheck = [ "eve" ]; # tests call a running mongodb instance doCheck = false; diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 0184ae9ffd7..a745566a645 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { - version = "0.11"; + version = "0.12"; pname = "ezdxf"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "mozman"; repo = "ezdxf"; rev = "v${version}"; - sha256 = "167iw1j1c6195bwv6i8z1m7s0i27r0y0acxd2w76hvnq3a72jbsd"; + sha256 = "1flcq96ljk5wqrmgsb4acflqzkg7rhlaxz0j5jxky9za0mj1x6dq"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 0ed9d42c3b0..3513f57cdbe 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.54.0"; + version = "0.54.1"; format = "flit"; disabled = !isPy3k; @@ -24,9 +24,14 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "17bicrpr801z71wrn9iimvh7qk6iwyxvr89ialf0s2rxxa2s0yb5"; + sha256 = "0k0lss8x6lzf0szcli48v28r269fsx1jdkr9q78liz47dz5x03d8"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "starlette ==0.13.2" "starlette" + ''; + propagatedBuildInputs = [ uvicorn starlette diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index ead11aa38be..c0ccb7d345a 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s"; + sha256 = "0m6fjnrx3sd0bm6pnbhxxx5ywlwqh8bx0lka386kj28mg3fmm2m2"; }; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index 40bbc688e20..4bbb6c41f54 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr"; + sha256 = "19vav4w8vvcnrps1mirjkrv4pr1khwn5ma6m5pgpxd4qip73wffs"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 962555d492d..060f592b2cf 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-WTF"; - version = "0.14.2"; + version = "0.14.3"; src = fetchPypi { inherit pname version; - sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x"; + sha256 = "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl"; }; propagatedBuildInputs = [ flask wtforms nose ]; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index d1374ca71bf..0c5a0fff79d 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "foolscap"; - version = "0.13.2"; + version = "20.4.0"; src = fetchPypi { inherit pname version; - sha256 = "8498c7e9eaecb5b19be74b18d55c2086440be08de29f2bb507f9b505757467ff"; + sha256 = "0rbw9makjmawkcxnkkngybj3n14s0dnzn9gkqqq2krcm514kmlb9"; }; propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index d335020a1a8..be6321f86ca 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "3.8.2"; + version = "3.8.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1x9gvz954h10wgq02wybi21llwwjj9r1gal2qr82q7g1h9g0dqs6"; + sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq"; }; propagatedBuildInputs = [ smart_open numpy six scipy ]; diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index e9b33f33081..441fdc85bac 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -14,13 +14,13 @@ with stdenv.lib; buildPythonPackage rec { pname = "GooCalendar"; - version = "0.7.0"; + version = "0.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "14m05pi1vwl7i8iv1wvc0r3450dlivsh85f4cyny08l869cr9lf1"; + sha256 = "1ccvw1w7xinl574h16hqs6dh3fkpm5n1jrqwjqz3ignxvli5sr38"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 9534e416550..34e8c7ff16f 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "grequests"; - version = "0.4.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8aeccc15e60ec65c7e67ee32e9c596ab2196979815497f85cf863465a1626490"; + sha256 = "0rpnim3ppxjdsaa869h1jdimcyc66mamcs593rd7brk8cq68kv3x"; }; # No tests in archive diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 0a6a6c50e07..d0c1e74ee29 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2dcd3f2acaf6c1a864f903f084ddd6a6b753f3107ae864355d7c8c1e9cb205b2"; + sha256 = "1c530pb0h34z0ziym256qps21b8mh533ia1lcnx9wqwx9rnqriki"; }; # Tests require more packages. diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index c267b6d4726..6d432fed0e4 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "h2"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1d1svhixk3hr78ph3nx8wi7sagx1xrvm712mmk028i2rhb92p8xq"; + sha256 = "051gg30aca26rdxsmr9svwqm06pdz9bv21ch4n0lgi7jsvml2pw7"; }; propagatedBuildInputs = [ enum34 hpack hyperframe ]; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 9f261417884..6ee76e5271a 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.25"; + version = "0.8.26"; src = fetchPypi { inherit pname version; - sha256 = "17mi4nlifaygfw3n5ark5mfzx71pjxz3h6l455sh0i5mzh6czk4j"; + sha256 = "0zlj2y42f0hrklviv21j9m895259ad8273dxgh7b44702781r9l1"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix new file mode 100644 index 00000000000..29a29a3b652 --- /dev/null +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, mock +, dcm2niix +, nibabel +, pydicom +, nipype +, dcmstack +, etelemetry +, filelock +}: + +buildPythonPackage rec { + version = "0.8.0"; + pname = "heudiconv"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + #sha256 = "0gzqqa4pzhywdbvks2qjniwhr89sgipl5k7h9hcjs7cagmy9gb05"; + sha256 = "1r6y93125mc84c09970ifps5xysp8ffp62rwlzili3q2k1m3fh4v"; + }; + + postPatch = '' + # doesn't exist as a separate package with Python 3: + substituteInPlace heudiconv/info.py --replace "'pathlib'," "" + ''; + + propagatedBuildInputs = [ + dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock + ]; + + checkInputs = [ dcm2niix pytest mock ]; + + # test_monitor and test_dlad require 'inotify' and 'datalad' respectively, + # and these aren't in Nixpkgs + checkPhase = "pytest -k 'not test_dlad and not test_monitor' heudiconv/tests"; + + meta = with stdenv.lib; { + homepage = "https://heudiconv.readthedocs.io"; + description = "Flexible DICOM converter for organizing imaging data"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 5aabc20ebd9..6ec62f25a59 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 = "9.3.0"; + version = "9.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1jqlckibf7wwrg7syx6mzqz6zsipmsl474rfpmin6j6axh4cdpn7"; + sha256 = "0d3gd8k0p6n2flcf7kny1zjvrbbrwbbq4lq82ah6gvnbvllxm4hj"; }; doCheck = false; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 6f2bf5d511d..e75894611a1 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.3.31"; + version = "2020.5.5"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "12hncxzawvdsrssl350xxn1byfm1firgd3ziqfll4xhhw403jaa9"; + sha256 = "0n3wp2ihjaxlq002rv141766cx4wgk0amg1cb6v30zp0m4054w7d"; }; # tests require network connection diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 08867aa6708..a783246ee5c 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0s0705lk3i1srsjxqhqv9sc2m54fj8lbflxz9gyxf4igxaa6vj1f"; + sha256 = "1fcd2psvkfsqy45iygm59rzhb7qkbgv3c1dk3x3jvhy6a1ls4kkq"; }; propagatedBuildInputs = [ requests six ]; diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 1418c925ebf..81c97a0ee48 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.5"; + version = "4.0.6"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q"; + sha256 = "17wpvngxv9q333ng3hm4k1qhiafmzipr7l2liwny7ar24qiyfvvy"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index c0858605bd7..e66509fbae5 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.13"; + version = "1.4.15"; src = fetchPypi { inherit pname version; - sha256 = "12adarxndb9f5kgbfch9644h86jhbf6vc1d5c5iiqnjqws9n495b"; + sha256 = "1w6vy3nk28xhnamnmh7ddawprmb1ri2yw5s9lphmpq2hpfbqvh93"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index cd682072707..785ec581491 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest +, matplotlib , mock , pytorch , pynvml @@ -11,23 +12,23 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "15k6dd11yxn4923llcpmw4srl1by5ljhh7aw5pnkn4n4qpywh6cm"; + sha256 = "0i863kxi1r1hspj19lhn6r8256vdazjcyvis0s33fgzrf7kxi08x"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ pytest matplotlib mock ]; + propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; + # Some packages are not in NixPkgs; other tests try to build distributed + # models, which doesn't work in the sandbox. checkPhase = '' - pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon' tests/ + pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon and not conftest and not engines and not distrib_' tests/ ''; - # these packages are not currently in nixpkgs - - propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ]; meta = with lib; { description = "High-level training library for PyTorch"; diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index c3b6b9c9e7e..7de40cdfe5b 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.11"; + version = "0.12"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d6850578a0dc6530ac19113cfe4ddc13903df635212d498f176fe601a8a5a4a3"; + sha256 = "12i8r5z0y6ya850fwl2r4hig5hyli8skvjmgylapxa4zbr13fqmc"; }; meta = { diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 6cbf694955c..ca22dc4a9f9 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -11,6 +11,7 @@ , numpy , pandas , panel +, pyarrow , python-snappy , requests , ruamel_yaml @@ -22,16 +23,16 @@ buildPythonPackage rec { pname = "intake"; - version = "0.5.4"; + version = "0.5.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "81c3bdadbb81ec10c923b89e118c229d977a584ccbe27466f8fde41c0c274c3f"; + sha256 = "0ypgf0046hln27gjcy7gjh4diblgmivkf7kxbcy1mjvwka55bdmw"; }; - checkInputs = [ pytest ]; + checkInputs = [ pyarrow pytest ]; propagatedBuildInputs = [ appdirs dask diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index f9caaa058cb..d862e3d2abb 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,22 +1,37 @@ -{ buildPythonPackage, fetchFromGitHub, pytest, six, clint, pyyaml, docopt -, requests, jsonpatch, args, schema, responses, backports_csv, isPy3k -, lib, glibcLocales, setuptools }: +{ buildPythonPackage +, fetchFromGitHub +, pytest +, six +, tqdm +, pyyaml +, docopt +, requests +, jsonpatch +, args +, schema +, responses +, backports_csv +, isPy3k +, lib +, glibcLocales +, setuptools +}: buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.0"; + version = "1.9.3"; # Can't use pypi, data files for tests missing src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - sha256 = "1h344c04ipzld4s7xk8d84f80samjjlgzvv3y8zsv0n1c895gymb"; + sha256 = "19av6cpps2qldfl3wb9mcirs1a48a4466m1v9k9yhdznqi4zb0ji"; }; propagatedBuildInputs = [ six - clint + tqdm pyyaml docopt requests @@ -24,8 +39,7 @@ buildPythonPackage rec { args schema setuptools - backports_csv - ]; + ] ++ lib.optionals (!isPy3k) [ backports_csv ]; checkInputs = [ pytest responses glibcLocales ]; @@ -37,8 +51,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "A python wrapper for the various Internet Archive APIs"; + description = "A Python and Command-Line Interface to Archive.org"; homepage = "https://github.com/jjjake/internetarchive"; license = licenses.agpl3; + maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix new file mode 100644 index 00000000000..5134ffb2d6d --- /dev/null +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, pytest +, pytestcov +, nbval +, ipywidgets +, numpy +, six +, traittypes +}: + +buildPythonPackage rec { + pname = "ipydatawidgets"; + version = "4.0.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1h7cppy959q6x5rvkdjhzxhqh57s37i2xsish5rfavcqbp2xgk4g"; + }; + + propagatedBuildInputs = [ + ipywidgets + numpy + six + traittypes + ]; + + checkInputs = [ pytest pytestcov nbval ]; + + checkPhase = "pytest ipydatawidgets/tests"; + + meta = { + description = "Widgets to help facilitate reuse of large datasets across different widgets"; + homepage = "https://github.com/vidartf/ipydatawidgets"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 1e71e35de16..edf9d0863a1 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "5.1.4"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7f1f01df22f1229c8879501057877ccaf92a3b01c1d00db708aad5003e5f9238"; + sha256 = "1a3hr7wx3ywwskr99hgp120dw9ab1vmcaxdixlsbd9bg6ly3fdr9"; }; propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; @@ -42,6 +42,9 @@ buildPythonPackage rec { "test_subprocess_print" "test_subprocess_error" "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" ] ++ lib.optionals (pythonOlder "3.8") [ # flaky test https://github.com/ipython/ipykernel/issues/485 "test_shutdown" diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index fe89691431c..9d6624a7df4 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.12.0"; + version = "7.13.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6"; + sha256 = "ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index efbec0fb8fa..17ba3a2183a 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "itypes"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { repo = pname; owner = "tomchristie"; rev = version; - sha256 = "0zkhn16wpslkxkq77dqw5rxa28nrchcb6nd3vgnxv91p4skyfm62"; + sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index a03aa9ec18b..a9acf380da1 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "0.5.2"; + version = "0.7.0"; pname = "javaproperties"; src = fetchFromGitHub { owner = "jwodder"; repo = pname; rev = "v${version}"; - sha256 = "14hrp94cjj44yldf3k71wbq88cmlf01dfadi53gcirnsa56ddz5d"; + sha256 = "14dlzwr4gxlbgjy012i4pqs2rn2rmp21w8n1k1wwjkf26mcvrq5s"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 9ade29bece1..7ab5d230782 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,23 +1,25 @@ { stdenv , buildPythonPackage -, fetchPypi, - ruamel_yaml -, ifconfig-parser +, fetchFromGitHub +, ruamel_yaml , xmltodict +, pygments , isPy27 }: buildPythonPackage rec { pname = "jc"; - version = "1.9.3"; + version = "1.10.10"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "1hg6h3ag4pbilpmqylnj7dflz7avk3w8ngmk6psfqrizizwx0hnj"; + src = fetchFromGitHub { + owner = "kellyjonbrazil"; + repo = "jc"; + rev = "v${version}"; + sha256 = "1rkgk1d1gijic6l6rsvz5mpfhdj8l7qc60aqafj27s4yi5bbqrc7"; }; - propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; + propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; meta = with stdenv.lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output."; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 27de988b3bd..a53c7abee72 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1pimyq95w99ik5av96j0n9i6n12mr9kk0y28jnrq0555d7hmii8r"; + sha256 = "006yvxw6xv6qzcqpxm8jcf21gmdn0z4vp8njdbvk023mmq05k3h4"; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix new file mode 100644 index 00000000000..4855663ebc7 --- /dev/null +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, traitlets +, jupyter_core +, pyzmq +, dateutil +, isPyPy +, py +, tornado +}: + +buildPythonPackage rec { + pname = "jupyter_client"; + version = "5.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + }; + + propagatedBuildInputs = [ + traitlets + jupyter_core + pyzmq + dateutil + tornado + ] ++ lib.optional isPyPy py; + + # Circular dependency with ipykernel + doCheck = false; + + meta = { + description = "Jupyter protocol implementation and client libraries"; + homepage = "https://jupyter.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 4855663ebc7..008a74dfb3e 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.3.4"; + version = "6.1.3"; src = fetchPypi { inherit pname version; - sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index c10f3026876..fe40a3f09c4 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.6.1"; + version = "4.6.3"; src = fetchPypi { inherit pname version; - sha256 = "a183e0ec2e8f6adddf62b0a3fc6a2237e3e0056d381e536d3e7c7ecc3067e244"; + sha256 = "394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e"; }; checkInputs = [ pytest mock glibcLocales nose ]; diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index d9694633704..eb2d09d8d26 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.6.1"; + version = "2.7"; src = fetchPypi { inherit pname version; - sha256 = "0ag5xqlki6pjk3f50b8ar8vynx2fmkna7rfampv3kdgwg8z6gjr7"; + sha256 = "1h1q8g1c2nkhx8p5n91bzkvjx5js5didi9xqbnmfrxqbnyc45w0p"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index a3f795f254e..cd5f0aef648 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.5.0"; + version = "4.6.1"; format = "other"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index c7b12e3daf5..32717e127fb 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.5.0"; + version = "4.6.1"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1l3l8cgaxzqdk93880p2ijrabshdj5sq05cwj1i6jpmhlqc5b9rx"; + sha256 = "0nk8zl5b0b36wrrkj271ck4phzxsigkjsazndscjslc9nkldmnpq"; }; postPatch = '' diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index a60b023acd7..027e6b0d134 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "2.1.2"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; + sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141"; }; patches = [ ./python37.patch ]; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index da789c0f6a6..83bd4bcfb72 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -7,7 +7,6 @@ , singledispatch , futures , isPy27 -, isPy33 }: buildPythonPackage rec { @@ -23,8 +22,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] - ++ stdenv.lib.optionals isPy27 [ singledispatch futures ] - ++ stdenv.lib.optionals isPy33 [ singledispatch ]; + ++ stdenv.lib.optionals isPy27 [ singledispatch futures ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 5763f3beb65..01ff1458c0f 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "m3u8"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "globocom"; repo = pname; rev = version; - sha256 = "1a2c7vqcysxkaffk40zg8d60l9hpjk0dw221fy9cg72i8jxq1gmm"; + sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p"; }; checkInputs = [ bottle pytest pytestcov ]; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index fe68b507ecf..94b575f3f46 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,20 +2,24 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.9.3"; + version = "3.12.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0v6hgsz6yvp6csgx4y440ksqj24rdsd06vyfqcihiy3dfvp9229y"; + sha256 = "0p851jlly6bzcs70kd1lcjwmg4scwh1icymfc0f2y6rkh4kfsdhk"; }; LC_ALL = "en_US.utf-8"; + # remove version bounds + prePatch = '' + sed -i -e 's/==.*//g' requirements.txt + '' # ipaddress is part of the standard library of Python 3.3+ - prePatch = lib.optionalString (!pythonOlder "3.3") '' + + lib.optionalString (!pythonOlder "3.3") '' substituteInPlace requirements.txt \ --replace "ipaddress" "" ''; diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix new file mode 100644 index 00000000000..8861a19811f --- /dev/null +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mortgage"; + version = "1.0.5"; + + src = fetchPypi { + inherit version pname; + hash = "sha256:18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + doCheck = false; # No tests in sdist + + disabled = pythonOlder "3.5"; + + meta = { + description = "Mortgage calculator"; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index 10e62f5cc58..705ae9b61cc 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.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "16l2bmmm5pdlb61av5748mhy0lg9r965lmyn69is6mhsyr9zi38s"; + sha256 = "0pqprfgcsns89gmlm284zcvqnlsn3a5c46n1p33kdk53gyyym66y"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index 354498836a9..d646c1ed15f 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.4.3"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "a02c0069fb580c6a2dda9b98d40d34fda3840863112a5465ba9b54fa2ee005a5"; + sha256 = "0z3ls52iamqv6fbn1ljnd5nnnzaiakczciry5c3vym5r77wgc9mg"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 35ee52b11ec..2f8c57e0033 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.4"; + version = "5.0.6"; src = fetchPypi { inherit pname version; - sha256 = "562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a"; + sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757"; }; LC_ALL="en_US.utf8"; diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix new file mode 100644 index 00000000000..631beabea8a --- /dev/null +++ b/pkgs/development/python-modules/neo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, numpy +, quantities +}: + +buildPythonPackage rec { + pname = "neo"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik"; + }; + + propagatedBuildInputs = [ numpy quantities ]; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests --exclude=iotest + ''; + + meta = with lib; { + homepage = "https://neuralensemble.org/neo/"; + description = "Package for representing electrophysiology data in Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 436c9fe6379..06c6f9cb0c1 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -31,6 +31,7 @@ , xvfbwrapper , pytestcov , codecov +, sphinx # other dependencies , which , bash @@ -49,11 +50,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.3.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71"; + sha256 = "1nr0z0k4xx1vswkp03g1lf8141mr4j2fbwd7wmpay4vz46qcp786"; }; postPatch = '' @@ -61,6 +62,10 @@ buildPythonPackage rec { --replace "/usr/bin/env bash" "${bash}/bin/bash" ''; + nativeBuildInputs = [ + sphinx + ]; + propagatedBuildInputs = [ click dateutil @@ -102,15 +107,14 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' + LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display' ''; + pythonImportsCheck = [ "nipype" ]; meta = with stdenv.lib; { homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; - # tests hang, blocking reviews of other packages - broken = isPy38; }; } diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 8fbbdb677fd..71e8eec3941 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -4,7 +4,6 @@ , python , buildPythonPackage , isPy27 -, isPy33 , isPy3k , numpy , llvmlite @@ -26,7 +25,8 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + propagatedBuildInputs = [numpy llvmlite] + ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch]; # Copy test script into $out and run the test suite. checkPhase = '' diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 5acdfd6f8c6..b862319d947 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.11.0"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "1z6b740fpkr8fbbhw79l29hmwf76xcda6ni804sqz0jghm7883yy"; + sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 4a062ca7b97..29f01387dd2 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -23,17 +23,25 @@ let library_dirs = "${blas}/lib:${lapack}/lib"; libraries = "lapack,lapacke,blas,cblas"; }; + lapack = { + include_dirs = "${lib.getDev lapack}/include"; + library_dirs = "${lapack}/lib"; + }; + blas = { + include_dirs = "${lib.getDev blas}/include"; + library_dirs = "${blas}/lib"; + }; }); }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.1"; + version = "1.18.3"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b6ff59cee96b454516e47e7721098e6ceebef435e3e21ac2d6c3b8b02628eb77"; + sha256 = "e46e2384209c91996d5ec16744234d1c906ab79a701ce1a26155c9ec890b8dc8"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 3e2c8bd499d..6c0560bbaff 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -18,29 +18,18 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.6.0"; + version = "1.7.0"; # Due to Protobuf packaging issues this build of Onnx with Python 2 gives - # errors on import + # errors on import. + # Also support for Python 2 will be deprecated from Onnx v1.8. disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0ig33jl3591041lyylxp52yi20rfrcqx3i030hd6al8iabzc721v"; + sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy"; }; - # Remove the unqualified requirement for the typing package for running the - # tests. typing is already required for the installation, where it is - # correctly qualified so as to only be required for sufficiently old Python - # versions. - # This patch should be in the next release (>1.6). - patches = [ - (fetchpatch { - url = "https://github.com/onnx/onnx/commit/c963586d0f8dd5740777b2fd06f04ec60816de9f.patch"; - sha256 = "1hl26cw5zckc91gmh0bdah87jyprccxiw0f4i5h1gwkq28hm6wbj"; - }) - ]; - nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ @@ -61,13 +50,17 @@ buildPythonPackage rec { patchShebangs tools/protoc-gen-mypy.py ''; + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES + ''; + # The executables are just utility scripts that aren't too important postInstall = '' rm -r $out/bin ''; - # The setup.py does all the configuration (running CMake) - dontConfigure = true; + # The setup.py does all the configuration + dontUseCmakeConfigure = true; meta = { homepage = "http://onnx.ai"; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 08af6dc2720..bb09646b6b4 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.12.1"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "a5fca7000c6588d77bc65c28f3f21bfce03b5e44daa8f9f07c17fe364990d717"; + sha256 = "1h4m5df5grjpaf087g8ciishz5ajl28s3140s8bngppvy71f5m56"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index c71e39ca111..a51f1c00327 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "parver"; - version = "0.2.1"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0jzyylcmjxb0agc4fpdnzdnv2ajvp99rs9pz7qcklnhlmy8scdqv"; + sha256 = "0a6jp17c1ag6b9yp5xgy9wvznk3g0v2f8gpwkcwxpyc9ygk98zdm"; }; propagatedBuildInputs = [ six attrs arpeggio ]; diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 03db8916d44..61ab5532ca9 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.11.9"; + version = "1.11.10"; src = fetchPypi { inherit pname version; - sha256 = "77f8651450ccbde7d3036cfe93486a4eeeb5ade28d1ebc4b2ba186fea0023c56"; + sha256 = "1jrq6bhzwvz6db8ays8zff15hbk1iazs2qxrzvrnlkgxxjkp8p7n"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index f16bf3f014c..42621493d24 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.0"; + version = "8.12.2"; src = fetchPypi { inherit pname version; - sha256 = "0mnicas0c5av322d7k6m14j3c10axh9mcvn3vx99vhngdnb9j6hn"; + sha256 = "000vhxjlgvs0w3vywlgx1kq8wj0wk07ybnsdn1qwbamd06msvbb1"; }; meta = { diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 2fb95cde9e9..f28ea5b24a6 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.11.0"; + version = "1.11.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0v9sraihad0vz8dv3zc5xm5f2ixwbpr2kfpya5s0mgnrn6l19nds"; + sha256 = "03y6xkkqz6rsk23304gg0mn4vgdb0mh1wi9xzrk5vz2ma2wyp8i6"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index ecb5f7cc3ad..2d14488c4ee 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.4.1"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "acc94f17452471ca3446c2ce491c4d1affb99b9ddd9eac4e05614ac4318f8780"; + sha256 = "0br996lqbyq1prq9hhrzkgpicz5fgvxamzjrrpms20a2y1alkwv1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index 127cf47251b..48504c8a3ee 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -22,6 +22,5 @@ buildPythonPackage rec { description = "Application that generates RSS feeds for podcast episodes from local audio files"; homepage = "https://github.com/jakubroztocil/podcats"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 481fd2c5feb..46be9bc92a2 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, callPackage -, isPy27, isPy34, pythonOlder +, isPy27 +, pythonOlder , cleo , requests , cachy @@ -66,8 +67,7 @@ in buildPythonPackage rec { pexpect keyring lockfile - ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ] - ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ] + ] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; postInstall = '' diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 098ad530084..3c4c6ae4ec7 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { install -dm755 "$out/share/tmux" install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" + + install -dm755 "$out/share/fish/vendor_functions.d" + install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish" + ''; meta = { diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 2102554face..cf0784024f1 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.47"; + version = "1.51"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "0zvp1gib2lryw698vxkbdv40n3lsmdlhwp7vdcg41dqqa5nfryhn"; + hash = "sha256-8uQCFiw1ByPOX8ZRUlSLYPIibjmd19r/JtTnmQdz5cM="; }; checkInputs = [ httpretty parameterized pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index fbefd7efefa..d61279e38d5 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy33, isPy3k }: +{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: buildPythonPackage rec { pname = "pycairo"; @@ -6,8 +6,6 @@ buildPythonPackage rec { format = "other"; - disabled = isPy33; - src = fetchFromGitHub { owner = "pygobject"; repo = "pycairo"; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 55354a17c72..330acab3e1d 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "PyContracts"; - version = "1.8.12"; + version = "1.8.14"; src = fetchPypi { inherit pname version; - sha256 = "e76adbd832deec28b2045a6094c5bb779a0b2cb1105a23b3efafe723e2c9937a"; + sha256 = "03q5m595ysjrc9h57m7prrca6b9l4yrzvdijnzxnhd61p7jzbh49"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 4e0623e5cc1..ef33b6fb2bd 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.4"; + version = "1.5.1"; disabled = !isPy3k; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "1zmnwyvvrj6nb2r1wh63yb6dzqaxw8m4njzqycjdq9911c5gwg6z"; + sha256 = "0fwrx7p6d5vskg9ibganahiz9y9299idvdmzhjw62jy84gn1vrb4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 339775c2f54..6f4e4c97fd1 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "pydicom"; src = fetchPypi { inherit pname version; - sha256 = "0ki4736h6mp77733rsrwicl8pyig39idywzcmwvw3nzi2r1yc7w8"; + sha256 = "1483hv74fhfk4q18r4rda7yixqqdxrd1djzp3492s81ykxd4k24l"; }; propagatedBuildInputs = [ numpy pillow ]; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index eb85c690d81..1825c690f30 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pydocstyle"; - version = "4.0.1"; + version = "5.0.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "1sr8d2fsfpam4f14v4als6g2v6s3n9h138vxlwhd6slb3ll14y4l"; + sha256 = "03z8miyppm2xncrc9yjilwl7z5c5cpv51zha580v64p8sb2l0j7j"; }; propagatedBuildInputs = [ snowballstemmer ]; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index 472cdc7118d..91626bd5e55 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -1,16 +1,18 @@ { stdenv , buildPythonPackage +, isPy27 , fetchPypi , enchant2 }: buildPythonPackage rec { pname = "pyenchant"; - version = "2.0.0"; + version = "3.0.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; + sha256 = "0nfmckqm45fbfz795qw5hgvygdxgxchdiwp3kmm1k05z99j6mlhv"; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index ff14c78a7b7..4e0c294de01 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw="; + sha256 = "11q3a0p4mvzdskla0c6ffcrddldfbh7dc4p5l6xrriwri88j356y"; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index d3e0da07868..62d40e368ef 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyhcl"; - version = "0.4.2"; + version = "0.4.4"; disabled = !isPy3k; src = fetchFromGitHub { owner = "virtuald"; repo = pname; rev = version; - sha256 = "01y5fn3pis43i0w0858wmrc8azfinp07a16ixglmg28gg07c0zkd"; + sha256 = "0rcpx4vvj2c6wxp31vay7a2xa5p62kabi91vps9plj6710yz29nc"; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index d4f14f3be01..02a0f875836 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pylatexenc"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0icwd7iipz3sv4jdh9iam7h4xslvdqg16rwsmczrna3mmjbwccdk"; + sha256 = "0i4frypbv90mjir8bkp03cwkvwhgvc9p3fw6q2jz1dn7fw94v2rv"; }; pythonImportsCheck = [ "pylatexenc" ]; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 8530e6f8543..af4b0177eb2 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.0.14"; + version = "2.0.15"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "07fkwb4phfr71dpajnq6l64phjxvljx2nf8ibs12n9gwjdvm9i52"; + sha256 = "0wpzd3j01njxfclbhxz31s5clc7il67nhm4lz89q2aaj19c0xzsa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index a7bdfeea90a..a0575bbfede 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pymediainfo"; - version = "4.1"; + version = "4.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0mhpxs7vlqx8w75z93dy7nnvx89kwfdjkla03l19an15rlyqyspd"; + sha256 = "0vg2icmsc44k1ra898rjfp912xijsn96s0zplax6w13lpzb9jb9r"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix deleted file mode 100644 index 5c013efc2d1..00000000000 --- a/pkgs/development/python-modules/pymssql/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, freetds, cython, setuptools-git }: - -buildPythonPackage rec { - pname = "pymssql"; - version = "3.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "4d0ed31c76983d723c0c979b18e2273623621e630ca4901f17a86128aca13f84"; - }; - - buildInputs = [cython setuptools-git]; - propagatedBuildInputs = [freetds]; - - # The tests require a running instance of SQLServer, so we skip them - doCheck = false; - - meta = with lib; { - homepage = "http://pymssql.org/en/stable/"; - description = "A simple database interface for Python that builds on top - of FreeTDS to provide a Python DB-API (PEP-249) interface to Microsoft - SQL Server"; - license = licenses.lgpl21; - maintainers = with maintainers; [ mredaelli ]; - }; -} diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 2ab33fb1838..1625b15f2ee 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.16"; + version = "1.16.18"; src = fetchPypi { inherit pname version; - sha256 = "1rw4wjbsp8pnkkqcn097psjd6qinv70pjzvrbns04maybhn4ni6v"; + sha256 = "0gpcmmcjgwc6x4rn6nm3akiijdkpa9nahsw2x8a0i7z7kzj4firk"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4305487b656..33fd3c6e10d 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { }) ]; - # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 + # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 5a49fa10fbf..0a28ef6369b 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.11"; + version = "0.5.12"; src = fetchPypi { inherit pname version; - sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85"; + sha256 = "1lry042qsamdzyw6zpmdld0v14g6cl05jsr9qdb7h5wnahf80mq1"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 99a9f01d4b0..e242dbe5e96 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.19"; + version = "1.0.21"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "0dwffbfp3ay8y35hhc37ip61xdh522f5rfs097f3ia121h9x1mvj"; + sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/pysolr/default.nix b/pkgs/development/python-modules/pysolr/default.nix index 0544b84e532..bf56d7ca56e 100644 --- a/pkgs/development/python-modules/pysolr/default.nix +++ b/pkgs/development/python-modules/pysolr/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pysolr"; - version = "3.8.1"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "88ecb176627db6bcf9aeb94a3570bfa0363cb68be4b2a6d89a957d4a87c0a81b"; + sha256 = "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix index 369ddf2c476..9b25e2045e9 100644 --- a/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/pkgs/development/python-modules/pytest-metadata/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-metadata"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1fk6icip2x1nh4kzhbc8cnqrs77avpqvj7ny3xadfh6yhn9aaw90"; + sha256 = "1711gippwsl7c1wi8pc2y75xqq5sn1sscpqvrxjvpjm8pcx2138n"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 0657c627770..419b4906487 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,29 +1,40 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }: +{ stdenv +, fetchurl +, buildPythonPackage +, pkgconfig +, python +, dbus-python +, enlightenment +}: # Should be bumped along with EFL! buildPythonPackage rec { pname = "python-efl"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib"; + sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ python.pkgs.dbus-python ]; + propagatedBuildInputs = [ dbus-python ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" ''; - preBuild = "${python.interpreter} setup.py build_ext"; + preBuild = '' + ${python.interpreter} setup.py build_ext + ''; - installPhase= "${python.interpreter} setup.py install --prefix=$out"; + installPhase = '' + ${python.interpreter} setup.py install --prefix=$out + ''; doCheck = false; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index d2b1a6570b1..0c1f7c67e3d 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,22 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }: +{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }: buildPythonPackage rec { - pname = "python-gitlab"; - version = "1.15.0"; + pname = "python-gitlab"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e"; + sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2"; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ mock httmock ]; + disabled = pythonOlder "3.6"; + meta = with stdenv.lib; { description = "Interact with GitLab API"; - homepage = "https://github.com/python-gitlab/python-gitlab"; - license = licenses.lgpl3; + homepage = "https://github.com/python-gitlab/python-gitlab"; + license = licenses.lgpl3; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 20393d40cce..5b8c140df67 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.4.8"; + version = "0.5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "19423b3386b23d2e0fc94a8f6a358bcfbb44eed05376e33fd434d26d168bd18c"; + sha256 = "fa9c318256945ad4a8623fdf921ce81c466a7aea18b04a6711efb662f520b195"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 28541372c5e..f36f8239568 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -7,11 +7,13 @@ , urllib3 , tornado , pytest +, isPy3k }: buildPythonPackage rec { pname = "python-telegram-bot"; version = "12.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; @@ -21,7 +23,11 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ certifi future urllib3 tornado decorator ]; - pipInstallFlags = "--install-option '--with-upstream-urllib3'"; + # --with-upstream-urllib3 is not working properly + postPatch = '' + rm -rf telegram/vendor + ''; + setupPyGlobalFlags = "--with-upstream-urllib3"; # tests not included with release doCheck = false; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index a0a4aadfe58..2318738411f 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, fetchgit, buildPythonPackage, python, pythonOlder, +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, - mklSupport ? false, mkl ? null, + mklDnnSupport ? true, useSystemNccl ? true, openMPISupport ? false, openmpi ? null, - buildNamedTensor ? false, - buildBinaries ? false, + buildDocs ? false, cudaArchList ? null, - fetchFromGitHub, lib, numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, + numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil, linkFarm, symlinkJoin, + # virtual pkg that consistently instantiates blas across nixpkgs + # See https://github.com/NixOS/nixpkgs/pull/83888 + blas, + # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, # dependencies for torch.utils.tensorboard - tensorboardSupport ? true, pillow, six, future, tensorflow-tensorboard, + pillow, six, future, tensorflow-tensorboard, protobuf, utillinux, which, isPy3k }: assert !openMPISupport || openmpi != null; -assert !tensorboardSupport || tensorflow-tensorboard != null; # assert that everything needed for cuda is present and that the correct cuda versions are used assert !cudaSupport || cudatoolkit != null; @@ -28,17 +30,11 @@ assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; let hasDependency = dep: pkg: lib.lists.any (inp: inp == dep) pkg.buildInputs; matchesCudatoolkit = hasDependency cudatoolkit; - matchesMkl = hasDependency mkl; in # confirm that cudatoolkits are sync'd across dependencies assert !(openMPISupport && cudaSupport) || matchesCudatoolkit openmpi; assert !cudaSupport || matchesCudatoolkit magma; -# confirm that mkl is sync'd across dependencies -assert !mklSupport || mkl != null; -assert !(mklSupport && cudaSupport) || matchesMkl magma; -assert !mklSupport || (numpy.blasImplementation == "mkl" && numpy.blas == mkl); - let cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -108,7 +104,7 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.2.0"; + version = "1.4.1"; pname = "pytorch"; disabled = !isPy3k; @@ -122,11 +118,9 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1biyq2p48chakf2xw7hazzqmr5ps1nx475ql8vkmxjg5zaa071cz"; + sha256 = "1aa1il4f98pswfj20cv27yfb91l1jcq4515i7mvq7sh5647yzwms"; }; - dontUseCmakeConfigure = true; - preConfigure = lib.optionalString cudaSupport '' export TORCH_CUDA_ARCH_LIST="${lib.strings.concatStringsSep ";" final_cudaArchList}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ @@ -134,6 +128,44 @@ in buildPythonPackage rec { export CUDNN_INCLUDE_DIR=${cudnn}/include ''; + patches = [ + # Prevents a race condition which would be introduced by pull 30333. + # See https://github.com/pytorch/pytorch/issues/32277 + # Can be removed >1.5.0. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30332.patch"; + sha256 = "1v9dwbhz3rdxcx6sz8y8j9n3bj6nqs78b1r8yg89yc15n6l4cqx2"; + }) + + # Fixes errors with gcc-9 compilation. Cherry-picked on advice from ezyang. + # See https://github.com/pytorch/pytorch/issues/32277 + # Can be removed >1.5.0. + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/30333.patch"; + sha256 = "139413fl37h2fnil0cv99a67mqqnsh02k74b92by1qyr6pcfyg3q"; + }) + ]; + + # Use pytorch's custom configurations + dontUseCmakeConfigure = true; + + BUILD_NAMEDTENSOR = true; + BUILD_DOCS = buildDocs; + + USE_MKL = blas.implementation == "mkl"; + + # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note + # that this was renamed to dnnl and then renamed again to oneDNN upstream, but + # pytorch still calls it by the old name mkldnn. + USE_MKLDNN = mklDnnSupport; + USE_MKLDNN_CBLAS = mklDnnSupport; + + preBuild = '' + export MAX_JOBS=$NIX_BUILD_CORES + ${python.interpreter} setup.py build --cmake-only + ${cmake}/bin/cmake build + ''; + preFixup = '' function join_by { local IFS="$1"; shift; echo "$*"; } function strip2 { @@ -155,8 +187,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - BUILD_NAMEDTENSOR = buildNamedTensor; # experimental feature - USE_SYSTEM_NCCL=true; # don't build pytorch's third_party NCCL + USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) @@ -165,7 +196,7 @@ in buildPythonPackage rec { # # Also of interest: pytorch ignores CXXFLAGS uses CFLAGS for both C and C++: # https://github.com/pytorch/pytorch/blob/v1.2.0/setup.py#L17 - NIX_CFLAGS_COMPILE = lib.optionals (numpy.blas == mkl) [ "-Wno-error=array-bounds" ]; + NIX_CFLAGS_COMPILE = lib.optionals (blas.implementation == "mkl") [ "-Wno-error=array-bounds" ]; nativeBuildInputs = [ cmake @@ -174,9 +205,8 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ - numpy.blas - ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] + buildInputs = [ blas blas.provider oneDNN ] + ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; propagatedBuildInputs = [ @@ -184,23 +214,37 @@ in buildPythonPackage rec { click numpy pyyaml - ] ++ lib.optionals openMPISupport [ openmpi ] - ++ lib.optional (pythonOlder "3.5") typing - ++ lib.optionals tensorboardSupport [pillow six future tensorflow-tensorboard]; + # the following are required for tensorboard support + pillow six future tensorflow-tensorboard protobuf + ] ++ lib.optionals openMPISupport [ openmpi ]; - checkInputs = [ hypothesis ninja ]; + checkInputs = [ hypothesis ninja psutil ]; - doCheck = false; # tests take a long time for channel release, so doCheck should be overridden only when developing - checkPhase = "${cudaStubEnv}python test/run_test.py" - + " --exclude utils" # utils requires git, which is not allowed in the check phase + # Tests take a long time and may be flaky, so just sanity-check imports + doCheck = false; + pythonImportsCheck = [ + "torch" + ]; + + checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ + cudaStubEnv + "${python.interpreter} test/run_test.py" + "--exclude" + (concatStringsSep " " [ + "utils" # utils requires git, which is not allowed in the check phase - # Other tests which have been disabled in previous nix derivations of pytorch. - # --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions - ; + # "dataloader" # psutils correctly finds and triggers multiprocessing, but is too sandboxed to run -- resulting in numerous errors + # ^^^^^^^^^^^^ NOTE: while test_dataloader does return errors, these are acceptable errors and do not interfere with the build + + # tensorboard has acceptable failures for pytorch 1.3.x due to dependencies on tensorboard-plugins + (optionalString (majorMinor version == "1.3" ) "tensorboard") + ]) + ]; postInstall = '' mkdir $dev cp -r $out/${python.sitePackages}/torch/lib $dev/lib cp -r $out/${python.sitePackages}/torch/include $dev/include + cp -r $out/${python.sitePackages}/torch/share $dev/share ''; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' @@ -233,6 +277,6 @@ in buildPythonPackage rec { homepage = "https://pytorch.org/"; license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; - maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds + maintainers = with lib.maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds }; } diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index dedec796e65..c26f9bcabe6 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyudev"; - version = "0.21.0"; + version = "0.22.0"; src = fetchPypi { inherit pname version; - sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9"; + sha256 = "0xmj6l08iih2js9skjqpv4w7y0dhxyg91zmrs6v5aa65gbmipfv9"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index a7fbf301295..25845c9847a 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "6.7.1.2018.12"; + version = "7.0"; src = fetchFromGitHub { owner = "vmware"; repo = pname; rev = "v${version}"; - sha256 = "1pgl95rbghidbyr8hndjzfzgb1yjchfcknlqgg3qbqvljnz9hfja"; + sha256 = "1qqljrlc9h7kddx3xxc6479gk75fvaxspfikzjn6zj5mznsvfwj5"; }; # requires old version of vcrpy diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 70c5ba38fea..7c74ddab2b1 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch , cmake , cvxpy , cython @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.5.0"; + version = "0.5.1"; disabled = pythonOlder "3.5"; @@ -27,7 +28,7 @@ buildPythonPackage rec { repo = "qiskit-aer"; rev = version; fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "05lsirrdnnr5yqhwkgv08d9aib8xq4xpd6aq2pfqsi9qkii2fff1"; + sha256 = "0pbi8ldz8f1zm7pf2n5229g6kccriq21f24q9cb7bd4j5gdky5sk"; }; nativeBuildInputs = [ @@ -47,7 +48,15 @@ buildPythonPackage rec { pybind11 ]; - prePatch = '' + patches = [ + (fetchpatch{ + name = "qiskit-aer-pr-727-fix-random-unitary-test.patch"; + url = "https://github.com/Qiskit/qiskit-aer/commit/09afb3b6b0710042ab65d88e863363f2c843dcb0.patch"; + sha256 = "0521b7i4fpc5brqs08w381g3c655f9cbn6my1740jnk7dv5lhsv9"; + }) + ]; + + postPatch = '' # remove dependency on PyPi cmake package, which isn't in Nixpkgs substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" ''; @@ -81,7 +90,7 @@ buildPythonPackage rec { # Tests include a compiled "circuit" which is auto-built in $HOME export HOME=$(mktemp -d) # move tests b/c by default try to find (missing) cython-ized code in /build/source dir - cp -r test $HOME + cp -r $TMP/$sourceRoot/test $HOME # Add qiskit-aer compiled files to cython include search pushd $HOME diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index 9ff6404f2fc..8037d28f82c 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +# , cplex , cvxopt , dlx , docplex @@ -10,19 +11,20 @@ , networkx , numpy , psutil +, python , qiskit-ignis , qiskit-terra , quandl , scikitlearn # Check Inputs -, parameterized +, ddt , pytestCheckHook , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.6.6"; + version = "0.7.0"; disabled = pythonOlder "3.5"; @@ -31,11 +33,12 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "080m5nsy3ia6bcdypq5d3ijb7762yl1l9llygmxsi6si449zl2cp"; + sha256 = "0yykw6k1rb3f2ihcp0y9pb0695mcmy29nyqlj89qs4da0503vxvh"; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ + # cplex cvxopt docplex dlx # Python Dancing Links package @@ -57,19 +60,33 @@ buildPythonPackage rec { # It can also be installed at runtime from the pip wheel. # We disable appropriate tests below to allow building without pyscf installed + # NOTE: we remove cplex b/c we can't build pythonPackages.cplex. + # cplex is only distributed in manylinux1 wheel (no source), and Nix python is not manylinux1 compatible + postPatch = '' substituteInPlace setup.py \ - --replace "pyscf; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')" "" + --replace "pyscf; sys_platform != 'win32'" "" \ + --replace "cplex; python_version >= '3.6' and python_version < '3.8'" "" # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included - echo -e "\nimport warnings\ntry: import pyscf;\nexcept:\n " \ + echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \ "warnings.warn('pyscf is not supported on Nixpkgs so some qiskit features will fail." \ "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ "See https://github.com/NixOS/nixpkgs/pull/83447 for details', ImportWarning)\n" \ >> qiskit/chemistry/__init__.py + + # Add ImportWarning when running qiskit.optimization that cplex (optimization package) is not included + echo -e "\nimport warnings\ntry: import cplex;\nexcept ImportError:\n " \ + "warnings.warn('cplex is not supported on Nixpkgs so some qiskit features will fail." \ + "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ + "', ImportWarning)\n" \ + >> qiskit/optimization/__init__.py + ''; - checkInputs = [ parameterized qiskit-aer pytestCheckHook ]; + postInstall = "rm -rf $out/${python.sitePackages}/docs"; # Remove docs dir b/c it can cause conflicts. + + checkInputs = [ ddt qiskit-aer pytestCheckHook ]; dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "qiskit.aqua" @@ -84,42 +101,35 @@ buildPythonPackage rec { "--ignore=test/chemistry/test_qeom_ee.py" "--ignore=test/chemistry/test_qeom_vqe.py" "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" - - # Following tend to be slow tests, all pass - "--ignore=test/aqua/test_vqc.py" - "--ignore=test/aqua/test_hhl.py" - "--ignore=test/aqua/test_qgan.py" - "--ignore=test/aqua/test_mcr.py" - "--ignore=test/aqua/test_mcu1.py" - "--ignore=test/aqua/test_vqe.py" ]; disabledTests = [ # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py # Disabling slow tests > 10 seconds - "test_clique_vqe" - "test_delta_3_qasm" - "test_evaluate_qasm_mode" - "test_evolve_1_suzuki" - "test_exact_cover_vqe" - "test_exchangedata" - "test_expected_value_0_statevector" - "test_expected_value_1_qasm" - "test_expected_value_2_statevector" + "TestVQE" + "TestVQC" + "TestQSVM" "test_graph_partition_vqe" - "test_lookup_rotation" - "test_mct_with_dirty_ancillae_15" - "test_mcrz_11" + "TestLookupRotation" + "_vqe" + "TestHHL" + "TestQGAN" + "test_evaluate_qasm_mode" "test_measurement_error_mitigation_auto_refresh" - "test_qgan_training" - "test_qsvm_multiclass" - "test_shor_factoring_0" - "test_vertex_cover_vqe" - "test_vqc_with_raw_feature_vector_on_wine" - "test_vqe_2_iqpe" - "test_vqe_qasm" + "test_exchangedata" "test_wikipedia" + "test_shor_factoring_1__15___qasm_simulator____3__5__" + "test_readme_sample" + "test_ecev" + "test_expected_value" + "test_qubo_gas_int_paper_example" + "test_shor_no_factors_1_5" + "test_shor_no_factors_2_7" + "test_evolve_2___suzuki___1__3_" + "test_delta_4" + "test_swaprz" + "test_deprecated_algo_result" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index ea14bef2b9e..5f8f0d94e4f 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.6.1"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "16c73m9gp1wcrygr6mnc0a9ps0i872bgc7v1zbqyh50kxbcrnpnz"; + sha256 = "1n13jjx1cx5gswwk8rpxfjqyk97cwx1n2hwsabkcbi7fksw3c5jk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index a421b5f84ad..79998a84325 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, python , numpy , qiskit-terra , scikitlearn @@ -38,11 +39,12 @@ buildPythonPackage rec { scikitlearn scipy ]; + postInstall = "rm -rf $out/${python.sitePackages}/docs"; # this dir can create conflicts # Tests pythonImportsCheck = [ "qiskit.ignis" ]; dontUseSetuptoolsCheck = true; - preCheck = ''export HOME=$TMPDIR''; + preCheck = "export HOME=$TMPDIR"; checkInputs = [ ddt pytestCheckHook diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 14497b20b0d..78c28a282cb 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.13.0"; + version = "0.14.1"; disabled = pythonOlder "3.5"; @@ -44,7 +44,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "03fgqmyahgmkf5dbw19n9c1v8p4kmpk50wxhhc8435cclvs26x9j"; + sha256 = "0pd7x2jrqy7q1s38ychqw9bayjn2rvi6rq7c2c0kd160rwj1l2sc"; }; nativeBuildInputs = [ cython ]; @@ -94,10 +94,6 @@ buildPythonPackage rec { "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; - disabledTests = [ - "test_jupyter_jobs_pbars" # needs IBMQ provider package (qiskit-ibmq-provider), circular dependency - ]; - pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index ca0988955d5..ded9c68e6fe 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.18.2"; + version = "0.19.1"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "05pwpcps1ksqx6m6hwq90l8sbak64fsz76yv4q3jplfjf6597k6p"; + sha256 = "0p1sahgf6qgbkvxb067mnyj6ya8nv7y57yyiiaadhjw242sjkjy5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index abf5509056d..0a932729ff3 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -10,19 +10,20 @@ , pygments , ipykernel , pyqt5 +, qtpy }: buildPythonPackage rec { pname = "qtconsole"; - version = "4.6.0"; + version = "4.7.3"; src = fetchPypi { inherit pname version; - sha256 = "654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1"; + sha256 = "8f5ae5571f0e921db9f2d12613ed667c350ee22c7db598d9bbbe143e8533f932"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; - propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; + propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5 qtpy]; # : cannot connect to X server doCheck = false; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 87d99623057..261ba794e70 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rdflib"; - version = "4.2.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0398c714znnhaa2x7v51b269hk20iz073knq2mvmqp2ma92z27fs"; + sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; }; propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 611bdd66901..ebe3dc772d7 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "52bbce24fa1fd7bb950d38ce9b60f497dd00ac6b26688d80ab9bce709f063e71"; + sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; checkInputs = [ sphinx pytestcov pytest ]; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 7769adf2219..3240c524d3b 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, isPy33 , fetchgit , cython }: @@ -8,7 +7,6 @@ buildPythonPackage { pname = "rencode"; version = "git20150810"; - disabled = isPy33; src = fetchgit { url = "https://github.com/aresch/rencode"; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 7d8a44365c4..3af6d2f022b 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "rfc3986"; - version = "1.3.2"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0344d0bd428126ce554e7ca2b61787b6a28d2bbd19fc70ed2dd85efe31176405"; + sha256 = "17dvx15m3r49bmif5zlli8kzjd6bys6psixzbp14sd5367d9h8qi"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/rig/default.nix b/pkgs/development/python-modules/rig/default.nix index d83afd7885f..bc43aac3551 100644 --- a/pkgs/development/python-modules/rig/default.nix +++ b/pkgs/development/python-modules/rig/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy34, isPy35, isPy27 +, isPy35, isPy27 , numpy, pytz, six, enum-compat, sentinel }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # This is the list of officially supported versions. Other versions may work # as well. - disabled = !(isPy35 || isPy34 || isPy27); + disabled = !(isPy27 || isPy35); # Test Phase is only supported in development sources. doCheck = false; diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index bee588457ff..e9efb0c02b4 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0c4f3a334ff55d534d2fc7f83d5e791f64b780391039e367f6cd9b4381838744"; + sha256 = "0i47hf0l76ydyrky6f8h760bfr0zg5g3vy675x6m6pgm9wrklkqc"; }; propagatedBuildInputs = [ @@ -94,5 +94,7 @@ buildPythonPackage rec { homepage = "https://nervanasystems.github.io/coach/"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; + # pythonPackages.gym is too new + broken = true; # since 2020-04-20 }; } diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix new file mode 100644 index 00000000000..c268f269959 --- /dev/null +++ b/pkgs/development/python-modules/safety/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, requests, dparse, click, setuptools, pytestCheckHook }: + +buildPythonPackage rec { + pname = "safety"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "23bf20690d4400edc795836b0c983c2b4cbbb922233108ff925b7dd7750f00c9"; + }; + + propagatedBuildInputs = [ requests dparse click setuptools ]; + + # Disable tests depending on online services + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + disabledTests = [ + "test_check_live" + "test_check_live_cached" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = + "Safety checks your installed dependencies for known security vulnerabilities"; + homepage = "https://github.com/pyupio/safety"; + license = licenses.mit; + maintainers = with maintainers; [ thomasdesr ]; + }; +} diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index c7519ee3962..454e631634b 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.21.3"; + version = "0.22.2.post1"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003"; + sha256 = "0z81n13dxvd6qwq5lsnzw2machmxbirhdhr73v90fi55ic9qslsp"; }; buildInputs = [ @@ -41,15 +41,6 @@ buildPythonPackage rec { ]; checkInputs = [ pytest ]; - patches = [ - # Fixes tests by changing threshold of a test-case that broke - # with numpy versions >= 1.17. This should be removed for versions > 0.21.2. - ( fetchpatch { - url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch"; - sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv"; - }) - ]; - LC_ALL="en_US.UTF-8"; doCheck = !stdenv.isAarch64; @@ -61,6 +52,12 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; + changelog = let + major = versions.major version; + minor = versions.minor version; + dashVer = replaceChars ["."] ["-"] version; + in + "https://scikit-learn.org/stable/whats_new/v${major}.${minor}.html#version-${dashVer}"; homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 353ea1cbe26..701de520046 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -4,7 +4,6 @@ , lib , python , isPy27 -, isPy33 , enum34 , attrs , pytz @@ -19,7 +18,7 @@ buildPythonPackage rec { sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk"; }; - propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ]; + propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; checkInputs = [ attrs pytz ]; checkPhase = '' diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index efb0a23a7c6..a34996b8734 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snakeviz"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "11a8cd4g98vq2x61i99ncl5w83clnndwg909ya4y1cdf0k1ckb40"; + sha256 = "0s6byw23hr2khqx2az36hpi52fk4v6bfm1bb7biaf0d2nrpqgbcj"; }; # Upstream doesn't run tests from setup.py diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 93b0e309b7c..3c2a5e2a356 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy27 , ptable , click , requests @@ -17,6 +18,7 @@ buildPythonPackage rec { pname = "softlayer-python"; version = "5.8.4"; + disabled = isPy27; propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 614f0881ff8..9a6baf80f04 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.14"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "c7b0f7ad86550668da55404eabcb63d4212ec622fcce86510092306b77d2e80a"; + sha256 = "028f6e5df83027f4bfba5d6d61e6d46eb8689f9e647825e09f539920dee17d2c"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 483fc12915f..355453ed26e 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.8.0"; + version = "0.9.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a3dc14ee5314caa2e64331b0b50c8f92e8999d7d275179a804a114e6cb1f8b81"; + sha256 = "04gfwm1y9knryx992biniqa3978n3chr38iy3y4i2b8wy52fzy3d"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index 7987775cee1..e5c5683f5dc 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -1,62 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, - psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, +{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, + psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels_0_5, qtpy, pyzmq, chardet -, pyqtwebengine + spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine }: buildPythonPackage rec { pname = "spyder"; version = "3.3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = "spyder"; + rev = "v3.3.6"; + sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6"; }; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - propagatedBuildInputs = [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 + jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc + qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine ]; - # There is no test for spyder + # tests fail with a segfault doCheck = false; - desktopItem = makeDesktopItem { - name = "Spyder"; - exec = "spyder"; - icon = "spyder"; - comment = "Scientific Python Development Environment"; - desktopName = "Spyder"; - genericName = "Python IDE"; - categories = "Application;Development;Editor;IDE;"; - }; - postPatch = '' # remove dependency on pyqtwebengine - # this is still part of the pyqt 5.11 version we have in nixpkgs + # this is still part of the pyqt 5.13 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; - # Create desktop item - postInstall = '' - mkdir -p $out/share/icons - cp spyder/images/spyder.svg $out/share/icons - cp -r $desktopItem/share/applications/ $out/share - ''; - - dontWrapQtApps = true; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - meta = with stdenv.lib; { - description = "Scientific python development environment"; + description = "Library providing a scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive @@ -65,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/spyder-ide/spyder/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner marcus7070 ]; }; } diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index cad0aa79705..842622e56f8 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { # https://github.com/tiangolo/fastapi/issues/683. Please update when # possible. FastAPI is currently Starlette's only dependent. - version = "0.13.2"; + version = "0.13.4"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "1ls8d121zyyhry5ji7gf7vjvhyqdpr4za3qx1llq48943fmaxxpq"; + sha256 = "1rk20rj62iigkkikb80bmalriyg1j3g28s25l8z2gijagv1v5c7l"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index e2c7142c979..c65fb0990f0 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.11.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0wcc7xbwlf8r2diw9fnzf4bg9h5cg406w7phd3dz37hx17yfi3ha"; + sha256 = "5bde3fa0a35a91b45dba7cbc28270b5b649ff1d721c89290883f6e831672d5f0"; }; checkInputs = with self; [ nose ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index ff520c5ffe3..109a5f6c769 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.44.0"; + version = "2.47.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0aaaf8dp989im2n0cdmslq0ys4ia970yl1irhxiwwqarmh6fap5i"; + sha256 = "14skddrf2nl25bvcyys0bgibjqkcivvfdywzldqjzyqvbwr4mkal"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 4c8bf7f6ba6..25e20a44118 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "subliminal"; - version = "2.0.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dzv5csjcwgz69aimarx2c6606ckm2gbn4x2mzydcqnyai7sayhl"; + sha256 = "12v2clnbic8320fjsvkg3xfxfa7x8inhjk61z00pzwx46g3rqhy6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index c482c517989..4686d02486f 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.6"; + version = "0.8.7"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8"; + sha256 = "db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 3a5ee229b43..9ae3464f3f8 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -61,7 +61,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx"; + sha256 = "0nmk7sbgl1ag20333v9r7l5cka6wapbskikfhi3y5a8l9f6hxkl3"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index aae812e8ebe..7c628a0789b 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -300,9 +300,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1qygfcvvn9vysap9nk6xccxi9mgmzyxiywz6k456f811l1v70p2c" + "09j57w6kc0vkfcdwr0qggy3qgrgq82kfa2jrwvvcnij4bl3wj40j" else - "0kfjanw0mfbh30vi1ms2xlg8yp429cbyfriik6yxd5cla2pncg2j"; + "14g8z49qz7d8n1c2mcsfhr7yqpcy7mhmpm6hgmqvpgb8vm7yvwrc"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index d32305ff513..acb5f473ec9 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -19,7 +19,7 @@ , opt-einsum , backports_weakref , tensorflow-estimator_2 -, tensorflow-tensorboard +, tensorflow-tensorboard_2 , cudaSupport ? false , cudatoolkit ? null , cudnn ? null @@ -77,7 +77,7 @@ in buildPythonPackage { google-pasta wrapt tensorflow-estimator_2 - tensorflow-tensorboard + tensorflow-tensorboard_2 keras-applications keras-preprocessing ] ++ lib.optional (!isPy3k) mock @@ -159,6 +159,14 @@ in buildPythonPackage { done ''; + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # Another possibility would be to have tensorboard only in the buildInputs + # See https://github.com/NixOS/nixpkgs/pull/44381 for more information. + postInstall = '' + rm $out/bin/tensorboard + ''; + pythonImportsCheck = [ "tensorflow" "tensorflow.keras" diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index 089d377ec24..3b4f45f3176 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -294,9 +294,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "0hg3ysy644950a34j28hrb317cz8gcbb9n84d36wdailvnlshghb" + "1kqk1gx5g63kb2zdj392x6mnpbrmgqghrdv597aipn7s23xzj8pd" else - "1gy4pz9kn30wb9c4a9584fibb88c3h38y3dqa99yw1lbsbyyi28c"; + "1plpcm2ydpajsrxdvmmpfy7l0gfdir78hap72w4k7ddm6d3rm2fv"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 0c0db60f2c0..b3db882c82b 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.10.3"; + version = "6.14.1"; src = fetchPypi { inherit pname version; - sha256 = "8f22100d4fb841b958f64e71c8820a32dc46f57d4d7e077777b932acd87b7327"; + sha256 = "0rh38zj8wywgqlsi5j75c7drpqhkrg50qknj1kdmvg4kdlab7ljq"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index ecf9aa91b41..f420cbaee97 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -16,6 +16,5 @@ buildPythonPackage rec { description = "The official Todoist Python API library"; homepage = "https://todoist-python.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 6834876d8f8..62d3f2dde24 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "pendulum==2.0.4" "pendulum>=2.0.4" \ --replace "click-completion==0.5.0" "click-completion>=0.5.0" \ + --replace "click==7.0" "click>=7.0" \ --replace "pbr==5.1.2" "pbr>=5.1.2" \ --replace "inquirer==2.5.1" "inquirer>=2.5.1" ''; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index de48b3736cf..deff7769dfb 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, isPy34 +{ lib, buildPythonPackage, fetchPypi, isPy27 , enum34, functools32, typing }: @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals isPy27 [ enum34 functools32 ] - ++ lib.optional (isPy27 || isPy34) typing; + ++ lib.optional isPy27 typing; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index a6549ee07c9..c00eac75ee0 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.42.1"; + version = "4.45.0"; src = fetchPypi { inherit pname version; - sha256 = "251ee8440dbda126b8dfa8a7c028eb3f13704898caaef7caa699b35e119301e2"; + sha256 = "00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 47bbbee04e7..5bd84990835 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -4,7 +4,6 @@ , python , pytest , numpy -, isPy33 }: buildPythonPackage rec { @@ -28,7 +27,7 @@ buildPythonPackage rec { # https://github.com/enthought/traits/issues/187 # https://github.com/enthought/traits/pull/188 # Furthermore, some tests fail due to being in a chroot - doCheck = isPy33; + doCheck = false; meta = with stdenv.lib; { description = "Explicitly typed attributes for Python"; diff --git a/pkgs/development/python-modules/traittypes/default.nix b/pkgs/development/python-modules/traittypes/default.nix new file mode 100644 index 00000000000..2c8f6dd8031 --- /dev/null +++ b/pkgs/development/python-modules/traittypes/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, isPy27 +, pytest +, nose +, numpy +, scipy +, pandas +, xarray +, traitlets +}: + +buildPythonPackage rec { + pname = "traittypes"; + version = "unstable-2019-06-23"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jupyter-widgets"; + repo = pname; + rev = "0a030b928991dec732c17a7a1cb13acbcd7650a2"; + sha256 = "0rlm5krmq6n8yi47dgdsjyrkz3m079pndpbzkz2gx98pb3jd9pjs"; + }; + + patches = [ + (fetchpatch { + name = "fix-intarray-test.patch"; + url = "https://github.com/minrk/traittypes/commit/a02441e5b259e5858453a853207260c9bd4efbb5.patch"; + sha256 = "120dsvr5nksizw75z1ah3h38mi399fxbvz5anakica557jahi0aw"; + }) + ]; + + propagatedBuildInputs = [ traitlets ]; + + checkInputs = [ numpy pandas xarray nose pytest ]; + + meta = with lib; { + description = "Trait types for NumPy, SciPy, XArray, and Pandas"; + homepage = "https://github.com/jupyter-widgets/traittypes"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; + +} diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 31b2a3ef209..1ec88ff1b77 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "18.6.0"; + version = "20.4.1"; src = fetchPypi { inherit pname version; - sha256 = "91e09ff6b524cc90aa5e934b909c8d0d1a9d36ebd618b6c38e37b17013e69f48"; + sha256 = "115wwb3sripl3xvwpygwyrxrapyis0i7w1yq591z3dwl9k9fgzk8"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix new file mode 100644 index 00000000000..a65ea1e98ba --- /dev/null +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, numpy }: + +buildPythonPackage rec { + pname = "trimesh"; + version = "3.6.36"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m8dqqyzazrjk4d32cqn4d8gvbfcwgs2qbmgvpi2f2mi5vnp6d85"; + }; + + propagatedBuildInputs = [ numpy ]; + + # tests are not included in pypi distributions and would require lots of + # optional dependencies + doCheck = false; + + meta = with lib; { + description = "Python library for loading and using triangular meshes."; + homepage = "https://trimsh.org/"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 75c9a19491c..18e28c358b4 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.35.1"; + version = "6.39.0"; # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "10a1hqvxn0w6z696ay1bbxra6qn8bxg87d6g9iryd2hjnn8sfh4b"; + sha256 = "1l2j54kjd1lrf072a3i5037qxpm8n378dddzd3m711ylz6vp638f"; }; buildInputs = [ nose mock ]; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 1ab67be5bdc..af13fa8d17a 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.5.0"; + version = "4.6.1"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1l8fwj521irla42bdbw298d3c5rjpn1nm9xhjnx7hidbqixr5d27"; + sha256 = "07pksjbgxs1ks2i6pgxkwfg9c56pcql7f9p89dnwaf2rcn7yhx6r"; }; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 1e5ab9a9f2f..5347c696cc2 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "0.9.0"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"; + sha256 = "0ss58k33l5vah894lykid6ar6kw7z1f29cl4hzr5xvgs8fvfyq65"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 440db343025..de779fc2c00 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "xapp"; - version = "1.8.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - sha256 = "0vw3cn09nx75lv4d9idp5fdhd81xs279zhbyyilynq29cxxs2zil"; + sha256 = "1pp3z4q6ryxcc26kaq222j53ji110n2v7rx29c7vy1fbb8mq64im"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a950076a261..abce8ac12fe 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "c72d160c970725201f769e80fb91cbad68d6ebf21d68fcc371385a6c950459c3"; + sha256 = "64e3138d87b641e22fe7a003c94abc685896b247b63e434505c1e6b38c91a8fb"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b883a3d2bc8..c01c862e2f4 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.21.0"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "14yijcnmanyd3s2ir38sxl07rzpxgpgw9s6b8sy68jrl7n5nj7ky"; + sha256 = "1agl80csxhiqglm0idwhw98iqfpp61c9inzcdaz4czsfyivzzwsr"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a1246485cd8..0985da20802 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.24.5"; + version = "0.26.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; + sha256 = "029wxa50dwf4hsi7w0d8wmywh125aaaa7l4g024z1cyi511iy5h1"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 68faec99dbc..9ebd0e2b1d7 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -444,6 +444,7 @@ let sundialr = [ pkgs.libiconv ]; ucminf = [ pkgs.libiconv ]; glmnet = [ pkgs.libiconv ]; + mvtnorm = [ pkgs.libiconv ]; }; packagesRequireingX = [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index f722a155086..c6b97f21bde 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.1.0"; + version = "2.1.1"; 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 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk"; + sha256 = "0yaxv89p5pdj1qymc5bnz0mphrypil9dnijvp3ml9hk1vxw6lfvb"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 29ea3993b1c..c9c5dd873de 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.123.0"; + version = "0.124.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0dsp8q3v9smjli2bkldkhzh2z032zjmqbzzchb5j18r4vz4hif16"; + sha256 = "1isy67fx0lrszvkf3bw3pp8mzvcyab4qnssmv4kvvz32vls8gh25"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 4fbf986e41a..d854065d601 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.22"; + version = "4.5.25"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1321i9ls5k677diwfccrjinzzb5586ygdgax7ryyha3ccdj1ikda"; + sha256 = "1xv4q41kz7a4cqkkdfgwaw2kgi81z62r9l7hmm8qmsnnlbk4xd5j"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index e64f39a4960..3f90e5f7343 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1icv56gxpzdjqn37pk3g99vgpljdc77i6k0x601iw2885s7s01n6"; + sha256 = "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 32d23597e52..f77ea1602f4 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -120,12 +120,12 @@ in { cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "24545"; - gittap = "4.3.1"; - gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; - rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; - version = "2020-03-05"; - sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; + version_commit = "24605"; + gittap = "4.4.0"; + gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; + rev = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; + version = "2020-04-14"; + sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 9cdd72eeaaf..2d9b99a35f8 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -60,7 +60,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0wj573dcirssr2cmq90b4yl57mv3gsxaj1s26afvkz1dvyxmq7sz"; + sha256 = "0ili0123xcl0mjcrn4r1r1q9d7a8a3bbh9r3zhlshl39awfm4r2d"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index f6d112800b6..6b8269584bd 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -64,7 +64,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "141kw2zpr612xdcrg6x9kslg4d5b3fbpzx0vgp3lqwdihfj3sc1l"; + sha256 = "1hzb84zxav68ysdwkimaaz0b9rq95k3bgifw01m644v7idabrz50"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 944bbd9d4bb..7550068274c 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200318"; + version = "20200402"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "10rcgv0hd5axm2b41a5xaig6iqbpyqfp2q7llr7zc3mnbacwaz35"; + sha256 = "0a49pfmbqb3g1h2r2vwbcb4hdyygq1g9n5y7qab37slfml2g45fg"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index ac41394e6a8..756e0cf7100 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.17.0"; + version = "3.17.2"; 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 = "0iq8y1rb5dqnzrwy4lssr76hbnnvh54q2ympl97wrshma6shak5p"; + sha256 = "199srp8yfai51pcbpmfyc4s8vzrmh2dm91bp582hj2l29x634xzw"; }; patches = [ diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index cc44ac1a220..d7aec3527b3 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,7 +1,7 @@ { lib, python3, git, pkgconfig }: # Note: -# Conan has specific dependency demanands; check +# Conan has specific dependency demands; check # https://github.com/conan-io/conan/blob/master/conans/requirements.txt # https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt # on the release branch/commit we're packaging. @@ -39,12 +39,12 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.24.0"; + version = "1.25.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0nkh4f6plamijwcfw536ydm0i04y74qmkh5l1nanyb8p0c3z3x0y"; + sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -90,7 +90,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "PyYAML>=3.11, <3.14.0" "PyYAML" + --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ + --replace "deprecation>=2.0, <2.1" "deprecation" ''; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 07a95539f8d..713f499ce2b 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -48,6 +48,5 @@ stdenv.mkDerivation rec { description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 0dbe9ec7842..a2dc1424d65 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,27 +3,16 @@ , stdenv , writeTextDir , substituteAll -, targetPackages +, pkgsHostHost }: -let - # See https://mesonbuild.com/Reference-tables.html#cpu-families - cpuFamilies = { - aarch64 = "aarch64"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - i686 = "x86"; - x86_64 = "x86_64"; - }; -in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.54.0"; + version = "0.54.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "3eVybXeBEqy9Sme7NjOrLuddM9HoeaYoOntKRMM2PCc="; + sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw="; }; postFixup = '' @@ -45,6 +34,11 @@ python3Packages.buildPythonApplication rec { # We remove the check so multiple outputs can work sanely. ./allow-dirs-outside-of-prefix.patch + # Meson is currently inspecting fewer variables than autoconf does, which + # makes it harder for us to use setup hooks, etc. Taken from + # https://github.com/mesonbuild/meson/pull/6827 + ./more-env-vars.patch + # Unlike libtool, vanilla Meson does not pass any information # about the path library will be installed to to g-ir-scanner, # breaking the GIR when path other than ${!outputLib}/lib is used. @@ -65,35 +59,15 @@ python3Packages.buildPythonApplication rec { setupHook = ./setup-hook.sh; - crossFile = writeTextDir "cross-file.conf" '' - [binaries] - c = '${targetPackages.stdenv.cc.targetPrefix}cc' - cpp = '${targetPackages.stdenv.cc.targetPrefix}c++' - ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar' - strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip' - pkgconfig = 'pkg-config' - ld = '${targetPackages.stdenv.cc.targetPrefix}ld' - objcopy = '${targetPackages.stdenv.cc.targetPrefix}objcopy' - - [properties] - needs_exe_wrapper = true - - [host_machine] - system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}' - cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - ''; + # Ensure there will always be a native C compiler when meson is used, as a + # workaround until https://github.com/mesonbuild/meson/pull/6512 lands. + depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; # checkPhase = "python ./run_project_tests.py"; - inherit (stdenv) cc; - - isCross = stdenv.targetPlatform != stdenv.hostPlatform; - meta = with lib; { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch new file mode 100644 index 00000000000..a8f860f03cc --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -0,0 +1,16 @@ +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index ac13a710..e0d07c51 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -119,9 +119,9 @@ def get_env_var_pair(for_machine: MachineChoice, + # compiling we fall back on the unprefixed host version. This + # allows native builds to never need to worry about the 'BUILD_*' + # ones. +- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), ++ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]), + # Always just the unprefixed host verions +- ([] if is_cross else [var_name]), ++ [var_name], + )[for_machine] + for var in candidates: + value = os.environ.get(var) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 8d76ecdaf32..3d946fcffd5 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -5,11 +5,6 @@ mesonConfigurePhase() { mesonFlags="--prefix=$prefix $mesonFlags" fi - # Build release by default. - if [ -n "@isCross@" ]; then - crossMesonFlags="--cross-file=@crossFile@/cross-file.conf" - fi - # See multiple-outputs.sh and meson’s coredata.py mesonFlags="\ --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ @@ -25,7 +20,7 @@ mesonConfigurePhase() { echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}" + meson build $mesonFlags "${mesonFlagsArray[@]}" cd build if ! [[ -v enableParallelBuilding ]]; then diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 84444261132..0e7a4f3d979 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.6.1"; + version = "0.6.2"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "1blar5dxhmxlwxhmq8wv0xvhy200qks6xj12n54qx9d5qp300ncw"; + sha256 = "1s2ndry0mpjs8hy8rrxnyarkzqjz7zzh5h541v3fkzgc9rsd6ifb"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 0649cd7c595..d4f94c1aed9 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.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "0hq2lx5w5lsiy9c69bcps4wyn2sa9s88hj0bq95p93sfiwq6mxlr"; + sha256 = "1kg11s3figpkvgd85p0zk416s57gnvlzrz1isbc2lv13adidf041"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 39366c7a9ca..1c5996c6b1c 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 2336900bf85..64a2cedd1c9 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "06k4dyb5gjnqx70akjfb65hiafh683800bncbq33kmq77arfkm7c"; + sha256 = "1023qcbdbwl40l7mgyd3j0ggr6paz1zs2q787ym52dhrcibhcq1h"; }; patchPhase = '' diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 84b28631308..3aab8f24da1 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -13,19 +13,18 @@ buildGoPackage rec { pname = "buildah"; - version = "1.14.8"; + version = "1.14.9"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; + sha256 = "1vp59xp374wr7sbx89aikz4rv8fdg0a40v06saryxww9iqyvk8wp"; }; - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; goPackagePath = "github.com/containers/buildah"; - excludedPackages = [ "tests" ]; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; @@ -35,11 +34,12 @@ buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" - install -Dm755 buildah $bin/bin/buildah - installShellCompletion --bash contrib/completions/bash/buildah + make -C docs ''; - postBuild = '' + installPhase = '' + install -Dm755 buildah $out/bin/buildah + installShellCompletion --bash contrib/completions/bash/buildah make -C docs install PREFIX="$man" ''; @@ -49,5 +49,6 @@ buildGoPackage rec { changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 042929e750a..2626ae71942 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.6.3"; + version = "0.7.1"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "032jq74n9mkw22s4ba9blfmi0hqvk587m5v23xz3sxx2rkg0wlbn"; + sha256 = "048h69ffgmpir2ix9ldi6zrzlwxa5yz3idg5ajspz2dihmzmnwws"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 55d9854d792..1fa45a32c05 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -34,7 +34,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm555 out/cf "$bin/bin/cf" + install -Dm555 out/cf "$out/bin/cf" installShellCompletion --bash "$src/ci/installers/completion/cf" ''; diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 0e6c58aa7ba..005c5d55b79 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -20,8 +20,8 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/{internal,ct} - rm $bin/bin/tools + mv $out/bin/{internal,ct} + rm $out/bin/tools ''; meta = { diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 9182c889598..ceaa704b565 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -24,10 +24,10 @@ buildGoPackage rec { postInstall = '' # Fix binary name - mv $bin/bin/{agent,buildkite-agent} + mv $out/bin/{agent,buildkite-agent} # These are runtime dependencies - wrapProgram $bin/bin/buildkite-agent \ + wrapProgram $out/bin/buildkite-agent \ --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 1d50e4ff6d5..39178201456 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -15,17 +15,17 @@ buildGoPackage { postInstall = '' ${stdenv.lib.optionalString hasBootstrapScript '' # Install bootstrap.sh - mkdir -p $bin/libexec/buildkite-agent - cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent - sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh + mkdir -p $out/libexec/buildkite-agent + cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent + sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh ''} # Fix binary name - mv $bin/bin/{agent,buildkite-agent} + mv $out/bin/{agent,buildkite-agent} # These are runtime dependencies - wrapProgram $bin/bin/buildkite-agent \ - ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \ + wrapProgram $out/bin/buildkite-agent \ + ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 7c7862dbe3b..4aadb981081 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 = "12.10.1"; + version = "12.10.2"; # 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 = "0xs0cnkqzmkbj8488s9kyc0m00g3n8vq9wplb99wrax86zs8dyw9"; + sha256 = "1lw0f3svzsvcw1rkc8z60nrl2jqjj8ciqlw5icazf6ikqbqmf660"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1mcz9a44pa8wx8hk2x7rgp5brbw7a71dqilfrfchnjkg2c9q7x1q"; + sha256 = "1hawdihnwk9p06fa3ym5q6b4sv6pp9095nimdy5myi6y88yj1rv2"; }; in buildGoPackage rec { @@ -29,16 +29,16 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1xvkr3zhn085mz7k3xbz7y5q9yjbmgp1h1sp3a2w27jmpmhl32zm"; + sha256 = "1r82xj4krdd51540bhr2wjhp6sdr5c2favnnw8nl26vnmwiqpd3k"; }; patches = [ ./fix-shell-path.patch ]; postInstall = '' - touch $bin/bin/hello - install -d $bin/bin/helper-images - ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz - ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz + touch $out/bin/hello + install -d $out/bin/helper-images + ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz ''; meta = with lib; { diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 14673cb40c8..c710aeaa516 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "0jvizj616rsh3aw9z3bijk7ixpbnqmm3xqmdxznjzqd46avr54c3"; + sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky"; }; - modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i"; + modSha256 = "1ky6cxpmw93nrk26vyrxz8kqa7247axzaxilm6ciypxf30ad0vdq"; meta = with stdenv.lib; { description = "Database migration tool"; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index d66d54ef45b..f246a0a806d 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.8.8"; + version = "3.8.9"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl"; + sha256 = "13qpva81y98gp84zbcx6b4wsfgpsbv18aj5ihkw6l9ndbxfcrxdl"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 4625c79767f..9e45d5988cc 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -9,8 +9,8 @@ buildGoPackage rec { subPackages = [ "client" ]; postInstall = '' - if [ -f "$bin/bin/client" ]; then - mv "$bin/bin/client" "$bin/bin/deis" + if [ -f "$out/bin/client" ]; then + mv "$out/bin/client" "$out/bin/deis" fi ''; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index 86a1ac6d6b1..9d14f7c1c1e 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ]; postFixup = '' - wrapProgram $bin/bin/dep2nix \ + wrapProgram $out/bin/dep2nix \ --prefix PATH : ${nix-prefetch-scripts}/bin ''; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f84167afca8..f9c55555536 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { postInstall = '' export HOME=$(mktemp -d) # attempts to write to /homeless-shelter for shell in bash fish zsh; do - $bin/bin/doctl completion $shell > doctl.$shell + $out/bin/doctl completion $shell > doctl.$shell installShellCompletion doctl.$shell done ''; diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 7e21019ea3f..e5d9143f61c 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "0y0k6rsspvpia4lssals4c3rdz9fgvlrhwd8gw38say02hn5b7ip"; + sha256 = "sha256-VF6GZxWZbrJNixE3wItF4CtVpj9NuKjdotNXrYujugs="; }; - cargoSha256 = "07f2ajg9jpp666915cwsjn5clmi9ghkw25qfqj0lj3kfj79n5ash"; + cargoSha256 = "sha256-b8xXaWACDJ143i8UV3DJDjqu8HiXdO4fe6YDR/GcHoU="; meta = with stdenv.lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 331c86ad88c..6a23f84f236 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $bin/bin/fac \ + wrapProgram $out/bin/fac \ --prefix PATH : ${git}/bin # Install man page, not installed by default diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 746d66c2dbe..2d639467910 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.3.2"; + version = "6.4.1"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1av1q7znphpsi1iz4dbh0fgh3jsx9prz980b25yk5r89h518s76q"; + sha256 = "00vm2p4xn8jnldjxcj0djpjjx2hppq0ii8367abhbswq7xfhy2d2"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 2681b2705ef..1532f64c246 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1m8b0bskhpwjbs0qjp0rdzrjj613639pn92isv1cg0srj8grjcai"; + sha256 = "03v06r6gbn8bhya1ig9wdc92hh2ip7072syxkam3sjv150ld80cn"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 96f82cc827f..300f82ee548 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -17,14 +17,14 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ go-bindata gotools makeWrapper ]; preBuild = ''go generate ./...''; postInstall = '' - wrapProgram $bin/bin/go2nix \ + wrapProgram $out/bin/go2nix \ --prefix PATH : ${nix-prefetch-git}/bin \ --prefix PATH : ${git}/bin diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 3ed719cbfce..603568236e6 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - mv $bin/bin/gocode $bin/bin/gocode-gomod + mv $out/bin/gocode $out/bin/gocode-gomod ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index c33a4cf69f5..be582047157 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "04r26nn72myacs6v2jq8mi4kjik82iwsh6w59h4k9yk0my3fjwia"; + sha256 = "1xw6m4ps6yw8gnkwy8v7rrz2b8c8n72cd7vkpx481dkd36vccpkc"; }; - modSha256 = "1pz5f2hv2lssiwsp60hsycg2ijyafb7r5fl2yrvflqg547k3n8x2"; + modSha256 = "0xgnimr1jydrgwhbyjaz710kx3m3505nhy5cs10p501qxbnzkjf9"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 79054c7f667..ad127b94960 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.4"; + version = "2.6.5"; pname = "jbake"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip"; - sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw"; + sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5ae2ee1c14d..8ba536e3b5f 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; @@ -13,14 +14,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; - postInstall = '' - # generate completion scripts for just + nativeBuildInputs = [ installShellFiles ]; - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + postInstall = '' + installManPage man/just.1 - $out/bin/just --completions bash > "$out/share/bash-completion/completions/just" - $out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish" - $out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just" + installShellCompletion --bash --name just.bash completions/just.bash + installShellCompletion --fish --name just.fish completions/just.fish + installShellCompletion --zsh --name _just completions/just.zsh ''; checkInputs = [ coreutils bash dash ]; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 6436c83ee21..77df7bee063 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -1,26 +1,26 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: with stdenv.lib; -buildGoPackage rec { +buildGoModule rec { pname = "kind"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "0hvb0rbi1m0d1flk15l3wws96kmmjhsy6islkhy5h7jalc4k0nx4"; + sha256 = "0r301nqvycik8fwlghq0cymmq4rm7xp8haj39i2nynxyw8zk6zym"; }; - goDeps = ./deps.nix; + modSha256 = "1vfdyd4yj79f2n0w98k9h4sklxwg49ajlp1blvpslbzmpfkmcjsz"; goPackagePath = "sigs.k8s.io/kind"; subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash zsh; do - $bin/bin/kind completion $shell > kind.$shell + $out/bin/kind completion $shell > kind.$shell installShellCompletion kind.$shell done ''; diff --git a/pkgs/development/tools/kind/deps.nix b/pkgs/development/tools/kind/deps.nix deleted file mode 100644 index 1706406c456..00000000000 --- a/pkgs/development/tools/kind/deps.nix +++ /dev/null @@ -1,741 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "56545f4a5d46"; - sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "v1.0.0"; - sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "5bd2802263f2"; - sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; - }; - } - { - goPackagePath = "github.com/alessio/shellescape"; - fetch = { - type = "git"; - url = "https://github.com/alessio/shellescape"; - rev = "b115ca0f9053"; - sha256 = "0z4jq94yn0jjj56bzrpdazb3pv1jg0r7z0ikq3gjaa51h423wk4z"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "v2.0.0"; - sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.10"; - sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "449fdfce4d96"; - sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; - }; - } - { - goPackagePath = "github.com/elazarl/goproxy"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/goproxy"; - rev = "c4fc26588b6e"; - sha256 = "1s3v02px61a3hmvb47rqk598z5visayxq46k3c8dcrayhhngv2fw"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "ff4f55a20633"; - sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "v4.5.0"; - sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; - }; - } - { - goPackagePath = "github.com/go-logr/logr"; - fetch = { - type = "git"; - url = "https://github.com/go-logr/logr"; - rev = "v0.1.0"; - sha256 = "0fhijjhxz4n2j5i24ckzv8r9kri3v44jdyklgbqjfq0xm7izqg14"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "46af16f9f7b1"; - sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "13c6e3589ad9"; - sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "6aced65f8501"; - sha256 = "0yf0nw7167yjpiqrikns5djarjpf2r07q6xnq9xb1cfsc4m7ynm4"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "1d0bd113de87"; - sha256 = "0fmk42chj20679n87n6sig3czs25lavyj6w208000n6kccv1ns3c"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "65acae22fc9d"; - sha256 = "0700alky9z0g9akhrzn20wf4jr1600d0clhs32sm8chnlbvidy46"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "02826c3e7903"; - sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "v1.0.0"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.1"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2d"; - sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.8"; - sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.2.0"; - sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "d5b7844b561a"; - sha256 = "1g84l4wns28xjpn6nl1g33dcj3sfgxlkqqsa6w8fbq2kwyd50xka"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/munnerz/goautoneg"; - fetch = { - type = "git"; - url = "https://github.com/munnerz/goautoneg"; - rev = "a547fc61f48d"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/mxk/go-flowrate"; - fetch = { - type = "git"; - url = "https://github.com/mxk/go-flowrate"; - rev = "cca7078d478f"; - sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.1"; - sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.7.0"; - sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.6.0"; - sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.0"; - sha256 = "1hlivqlcnm9wrj0v7h43gamw7mvg6svz9sm31fx28zn4ll25ablh"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.5"; - sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.5"; - sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.2"; - sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "d75b2dcb6bc8"; - sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "13f9640d40b9"; - sha256 = "1ba2767lvklnmfvb9jkwvd4m7z6326gaiz3rgylh795g88hy34g1"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "86b910548bc1"; - sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "6c7e314b6563"; - sha256 = "1m1n6r8v6mrlh0yvlz3qxz4s7jc7nis0zf3dfl1i6hqh5xblkwnw"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "v0.9.1"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.7"; - sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v3"; - rev = "4206685974f2"; - sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "v0.17.0"; - sha256 = "1418y3p2fx7zsf1anpwcma1fqnaymal12d6x33j600jf1y0j9g8i"; - }; - } - { - goPackagePath = "k8s.io/gengo"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/gengo"; - rev = "0689ccc1d7d6"; - sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; - }; - } - { - goPackagePath = "k8s.io/klog"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/klog"; - rev = "v1.0.0"; - sha256 = "1cgannfmldcrcksb2wqdn2b5qabqyxl9r25w9y4qbljw24hhnlvn"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "30be4d16710a"; - sha256 = "13pksn2xzyhrz569zihqy78y9ckn4sf4f4x31w1czfwbs87n00gf"; - }; - } - { - goPackagePath = "sigs.k8s.io/structured-merge-diff"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/structured-merge-diff"; - rev = "15d366b2352e"; - sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11"; - }; - } - { - goPackagePath = "sigs.k8s.io/yaml"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/yaml"; - rev = "v1.1.0"; - sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; - }; - } -] diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index fd5bdc64dd6..8b980dc7e31 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubectx"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6"; + sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 4cd87480070..cf9ce2bd265 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.4"; + version = "0.9.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1r8aff082m3kh6wy5diyvq8bzg5x4dp1da9sfz223ii0kc1yp6w5"; + outputHash = "116q2jzqlmdhkqvjg31b9ib8w1k7rlr8gmjcr7z32idpn16hqg59"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index a474ccc7e59..1aaf113d0b9 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = "http://dfu-programmer.sourceforge.net/"; - maintainers = [ maintainers.the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 47af57dfb3d..e23ccf27323 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.13"; + name = "help2man-1.47.15"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p"; + sha256 = "076dvc0z0qp73rpmg0c8bkpfh969h4gzzc442hv1bcyf1srkann2"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index d3afbbc1bc7..2d7431f9e8b 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { postInstall = with stdenv; let binPath = lib.makeBinPath [ mercurial git ]; in '' - wrapProgram $bin/bin/houndd --prefix PATH : ${binPath} + wrapProgram $out/bin/houndd --prefix PATH : ${binPath} ''; meta = { diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix new file mode 100644 index 00000000000..93014af3f62 --- /dev/null +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -0,0 +1,32 @@ +{ fetchFromGitHub +, cargo +, lib +, rustPlatform +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "ptags"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "dalance"; + repo = "ptags"; + rev = "v${version}"; + sha256 = "1xr1szh4dfrcmi6s6dj791k1ix2zbv75rqkqbyb1lmh5548kywkg"; + }; + + cargoSha256 = "1rsnb4kzfb577xw7jk0939n42sv94vvspvbz783bmpy9vl53i38k"; + + # Sanity check. + checkPhase = '' + $releaseDir/ptags --help > /dev/null + ''; + + meta = with stdenv.lib; { + description = "A parallel universal-ctags wrapper for git repository"; + homepage = "https://github.com/dalance/ptags"; + maintainers = with maintainers; [ pamplemousse ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 9af294716ff..1a6fb6746a1 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.9.17"; + version = "0.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0fm7avkc8izs0a9lqshibzpl08g4l3w38ayw7g521p23aq90q3c9"; + sha256 = "1ag55n3gfwcp6v8v3hha8bdqxw9r4bmz97p00vyqla9gjzn5ka9w"; }; - modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw"; + modSha256 = "0x9bcszk9hd7vwg9lnlg4vqv4r9vx8x91j3ghijbr1jmqxhgjb9a"; subPackages = [ "cmd/reviewdog" ]; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index a67430d52a1..0c2cb96a9d6 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/stm32flash/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms - maintainers = with maintainers; [ the-kenny elitak ]; + maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index e547fef46c4..75a960c80c5 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + postPatch = "patchShebangs strace-graph"; + configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; # fails 1 out of 523 tests with diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 10748d75159..616a1cbc3fb 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; - version = "1.0.19"; + version = "1.0.20"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libmysqlclient libaio ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "akopytov"; repo = pname; rev = version; - sha256 = "1zgqb9cr7ld3vw4a3jhq1mlszhcyjlpr0c8q1jcp1d27l9dcvd1w"; + sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index 62c480707cd..40f3921ec70 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { description = "Firmware uploader for the Teensy microcontroller boards"; homepage = "https://www.pjrc.com/teensy/"; license = licenses.gpl3; - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 5cc67cb5e17..0076884e2ed 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "0y8cv8y92a4nqwrvqk2cxgs6nspqjk8jm4spr8rgkwlpfbrg74xn"; + sha256 = "0cmciadiknw6w573v71spzf5ydaz2xxm2snv3n1hks732nahlr56"; }; - cargoSha256 = "1qi1c4v5d5a4xcf1bjbdicrv35w6chl5swlm96c1h3pr9s09lqy7"; + cargoSha256 = "0dhbbni8ia0dkwjacx5jlr5rj7173nsbivm9gjsx9j8ais0f0hff"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 9b84a713af5..ca625a28c94 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.1.0"; + version = "11.1.1"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "11nmh2b7pal67nhcygp5gpzf3n158671fjjxw0vwjgrb87hkdry9"; + sha256 = "1sribqcyalgl66im92pmla0hnp07zvg3pbxxakm7jk5l6p13wiw3"; }; - cargoSha256 = "1axfkyghf6gzv24is4n6kgc28nx0d6laqpdv7j1xzkf6hdixkch7"; + cargoSha256 = "0jcy3p896ykc6s3m21pnh4jv4lhpvhzlrrl1y67ink2lqkamdhvv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index aee7af17730..02298d93b8a 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -2,6 +2,7 @@ , gocode ? null , godef ? null , gotools ? null +, nodePackages ? null , rustracerd ? null , fixDarwinDylibNames, Cocoa ? null }: @@ -69,6 +70,9 @@ stdenv.mkDerivation { TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls mkdir -p $TARGET ln -sf ${gotools}/bin/gopls $TARGET + '' + lib.optionalString (nodePackages != null) '' + TARGET=$out/lib/ycmd/third_party/tsserver + ln -sf ${nodePackages.typescript} $TARGET '' + lib.optionalString (rustracerd != null) '' TARGET=$out/lib/ycmd/third_party/racerd/target/release mkdir -p $TARGET diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 3261c8af202..5237d131af0 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "1kcsdi9qls9kgklj96ycyrq5fsz5m2qj3ij63d2rwqjggqk0cab6"; + sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl"; }; - modSha256 = "0famjypv5qg9lgzw4pz2kz70l50cn6n6nbjyk7jrzmd6bjzd0ypl"; + modSha256 = "1nl7d00prw1663xrl1nvj1xbs7wzkbqn75i92al821pz12dybdif"; subPackages = [ "cmd/mod" ]; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 9a034a2b047..c79f65b47a8 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,7 +2,7 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.14.1"; + version = "0.14.2"; minimumOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ with ocamlPackages; buildDunePackage rec { src = fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; + sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; }; buildInputs = [ diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 5daeb384cc5..a81b7133e92 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.34.15"; + version = "1.35.0"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "16wjp89lzg33cap99jv1vgqvdx0y0xvb892fpihwg62iafh10b8m"; + sha256 = "191jiyw6kx1rw241bg9nv5splfpz6ny90g9yf28cd0xwpx978p83"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix new file mode 100644 index 00000000000..ca9c648adfb --- /dev/null +++ b/pkgs/development/tools/oq/default.nix @@ -0,0 +1,37 @@ +{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper }: + +crystal.buildCrystalPackage rec { + pname = "oq"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "Blacksmoke16"; + repo = pname; + rev = "v${version}"; + sha256 = "1zg4kxpfi3sap4cwp42zg46j5dv0nf926qdqm7k22ncm6jdrgpgw"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jq libxml2 ]; + + format = "crystal"; + crystalBinaries.oq.src = "src/oq_cli.cr"; + + preCheck = '' + mkdir bin + cp oq bin/oq + ''; + + postInstall = '' + wrapProgram "$out/bin/oq" \ + --prefix PATH : "${lib.makeBinPath [ jq ]}" + ''; + + meta = with lib; { + description = "A performant, and portable jq wrapper"; + homepage = "https://blacksmoke16.github.io/oq/"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 5faeec2387d..434f0186d89 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postFixup = '' - wrapProgram $bin/bin/out-of-tree \ + wrapProgram $out/bin/out-of-tree \ --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" ''; diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix new file mode 100644 index 00000000000..ce7132b0007 --- /dev/null +++ b/pkgs/development/tools/pandoc/default.nix @@ -0,0 +1,29 @@ +{ haskellPackages, haskell, removeReferencesTo }: + +let + static = haskell.lib.justStaticExecutables haskellPackages.pandoc; + +in + (haskell.lib.overrideCabal static (drv: { + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; + buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; + buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; + })).overrideAttrs (drv: { + + # These libraries are still referenced, because pandoc references + # their `Paths_*` module for figuring out their version. + # The `Paths_*` module is generated by Cabal, and contains the + # version, but also paths to e.g. the data directories, which + # lead to a transitive runtime dependency on the whole GHC distribution. + # This should ideally be fixed in haskellPackages (or even Cabal), + # but a minimal pandoc is important enough to patch it manually. + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.HTTP ]; + postInstall = '' + remove-references-to \ + -t ${haskellPackages.pandoc-types} \ + $out/bin/pandoc + remove-references-to \ + -t ${haskellPackages.HTTP} \ + $out/bin/pandoc + ''; + }) diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index cff36d2cb52..04a1a637207 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -1,29 +1,27 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: stdenv.mkDerivation rec { - name = "jshon-20160111.2"; - - rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7"; - sha256 = "1053w7jbl90q3p5y34pi4i8an1ddsjzwaib5cfji75ivamc5wdmh"; + pname = "jshon"; + version = "20170302"; src = fetchFromGitHub { - inherit rev sha256; owner = "keenerd"; repo = "jshon"; + rev = "d919aeaece37962251dbe6c1ee50f0028a5c90e4"; + sha256 = "1x4zfmsjq0l2y994bxkhx3mn5vzjxxr39iib213zjchi9h6yxvnc"; }; + buildInputs = [ jansson ]; + patches = [ - # Fix null termination in read_stream. - # https://github.com/keenerd/jshon/issues/53 (fetchpatch { - url = "https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch"; - sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl"; + # https://github.com/keenerd/jshon/pull/62 + url = "https://github.com/keenerd/jshon/commit/96b4e9dbf578be7b31f29740b608aa7b34df3318.patch"; + sha256 = "0kwbn3xb37iqb5y1n8vhzjiwlbg5jmki3f38pzakc24kzc5ksmaa"; }) ]; - buildInputs = [ jansson ]; - - patchPhase = + postPatch = '' substituteInPlace Makefile --replace "/usr/" "/" ''; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index dddd407d0da..482beeff122 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "re2c"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "1qj0ck9msb9h8g9qb1lr57jmlj8x68ini3y3ccdifjjahhhr0hd4"; + sha256 = "0aqlf2h6i2m3dq11dkq89p4w4c9kp4x66s5rhp84gmpz5xqv1x5h"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-11958.patch"; + url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch"; + sha256 = "1d95ahxk92g7k87sda9gxgmr3blyfzwd2y7h9jxj8zkd74knd9zh"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; doCheck = true; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix index fbcee749b7c..b96316e59d8 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix @@ -1,4 +1,4 @@ -{ pkgs ? import <nixpkgs> {} +{ pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , version }: @@ -33,8 +33,8 @@ pkgs.stdenv.mkDerivation { mv poetry2nix $out/bin wrapProgram $out/bin/poetry2nix --prefix PATH ":" ${lib.makeBinPath [ - pkgs.nix-prefetch-git - ]} + pkgs.nix-prefetch-git + ]} runHook postInstall ''; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index e7f718519a5..a7fb382c755 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -1,22 +1,20 @@ -{ pkgs ? import <nixpkgs> {} +{ pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , poetry ? null , poetryLib ? import ./lib.nix { inherit lib pkgs; } }: let - inherit (poetryLib) isCompatible readTOML; + inherit (poetryLib) isCompatible readTOML moduleName; # Poetry2nix version - version = "1.7.1"; + version = "1.8.0"; /* The default list of poetry2nix override overlays */ defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); - mkEvalPep508 = import ./pep508.nix { inherit lib poetryLib; stdenv = pkgs.stdenv; }; - getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; # Map SPDX identifiers to license names @@ -34,95 +32,99 @@ let , overrides ? [ defaultPoetryOverrides ] , python ? pkgs.python3 , pwd ? projectDir + , preferWheels ? false }@attrs: - let - poetryPkg = poetry.override { inherit python; }; - - pyProject = readTOML pyproject; - poetryLock = readTOML poetrylock; - lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; - - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - evalPep508 = mkEvalPep508 python; - - # Filter packages by their PEP508 markers & pyproject interpreter version - partitions = let + let + poetryPkg = poetry.override { inherit python; }; + pyProject = readTOML pyproject; + poetryLock = readTOML poetrylock; + lockFiles = + let + lockfiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; + in + lib.listToAttrs (lib.mapAttrsToList (n: v: { name = moduleName n; value = v; }) lockfiles); + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "preferWheels" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + evalPep508 = mkEvalPep508 python; + + # Filter packages by their PEP508 markers & pyproject interpreter version + partitions = + let supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; in - lib.partition supportsPythonVersion poetryLock.package; - - compatible = partitions.right; - incompatible = partitions.wrong; - - # Create an overriden version of pythonPackages - # - # We need to avoid mixing multiple versions of pythonPackages in the same - # closure as python can only ever have one version of a dependency - baseOverlay = self: super: - let - getDep = depName: self.${depName}; - - lockPkgs = builtins.listToAttrs ( - builtins.map ( - pkgMeta: rec { - name = pkgMeta.name; - value = self.mkPoetryDep ( - pkgMeta // { - inherit pwd; - source = pkgMeta.source or null; - files = lockFiles.${name}; - pythonPackages = self; - sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; - } - ); - } - ) compatible + lib.partition supportsPythonVersion poetryLock.package; + compatible = partitions.right; + incompatible = partitions.wrong; + + # Create an overriden version of pythonPackages + # + # We need to avoid mixing multiple versions of pythonPackages in the same + # closure as python can only ever have one version of a dependency + baseOverlay = self: super: + let + getDep = depName: self.${depName}; + lockPkgs = builtins.listToAttrs + ( + builtins.map + ( + pkgMeta: rec { + name = moduleName pkgMeta.name; + value = self.mkPoetryDep + ( + pkgMeta // { + inherit pwd preferWheels; + source = pkgMeta.source or null; + files = lockFiles.${name}; + pythonPackages = self; + sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; + } + ); + } + ) compatible ); - in - lockPkgs; - overlays = builtins.map getFunctorFn ( + in + lockPkgs; + overlays = builtins.map getFunctorFn + ( [ ( self: super: let - hooks = self.callPackage ./hooks {}; + hooks = self.callPackage ./hooks { }; in - { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit pkgs lib python poetryLib; - }; - poetry = poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - - inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; - } + { + mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { + inherit pkgs lib python poetryLib; + }; + poetry = poetryPkg; + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; + + inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook; + } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs - (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) + (self: super: builtins.listToAttrs (builtins.map (x: { name = moduleName x.name; value = null; }) incompatible)) # Create poetry2nix layer baseOverlay ] ++ # User provided overrides overrides ); - - packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; - - py = python.override { inherit packageOverrides; self = py; }; - in - { - python = py; - poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; - poetryLock = poetryLock; - inherit pyProject; - }; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays; + py = python.override { inherit packageOverrides; self = py; }; + in + { + python = py; + poetryPackages = map (pkg: py.pkgs.${moduleName pkg.name}) compatible; + poetryLock = poetryLock; + inherit pyProject; + }; /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. @@ -136,15 +138,17 @@ let , overrides ? [ defaultPoetryOverrides ] , pwd ? projectDir , python ? pkgs.python3 + , preferWheels ? false }: - let - py = mkPoetryPackages ( + let + py = mkPoetryPackages + ( { - inherit pyproject poetrylock overrides python pwd; + inherit pyproject poetrylock overrides python pwd preferWheels; } ); - in - py.python.withPackages (_: py.poetryPackages); + in + py.python.withPackages (_: py.poetryPackages); /* Creates a Python application from pyproject.toml and poetry.lock */ mkPoetryApplication = @@ -153,79 +157,79 @@ let , pyproject ? projectDir + "/pyproject.toml" , poetrylock ? projectDir + "/poetry.lock" , overrides ? [ defaultPoetryOverrides ] - , meta ? {} + , meta ? { } , python ? pkgs.python3 , pwd ? projectDir + , preferWheels ? false , ... }@attrs: - let - poetryPython = mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd; - }; - py = poetryPython.python; - - inherit (poetryPython) pyProject; - - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - "pyproject" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - # Get dependencies and filter out depending on interpreter version - getDeps = depAttr: - let - compat = isCompatible py.pythonVersion; - deps = pyProject.tool.poetry.${depAttr} or {}; - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); - in - builtins.map ( - dep: - let - pkg = py.pkgs."${dep}"; - constraints = deps.${dep}.python or ""; - isCompat = compat constraints; - in - if isCompat then pkg else null - ) depAttrs; - - getInputs = attr: attrs.${attr} or []; - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; - in - py.pkgs.buildPythonApplication ( - passedAttrs // { - pname = pyProject.tool.poetry.name; - version = pyProject.tool.poetry.version; - - inherit src; - - format = "pyproject"; - - buildInputs = mkInput "buildInputs" buildSystemPkgs; - propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); - nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; - checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); - - passthru = { - python = py; - }; - - meta = meta // { - inherit (pyProject.tool.poetry) description homepage; - inherit (py.meta) platforms; - license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - }; - - } - ); + let + poetryPython = mkPoetryPackages { + inherit pyproject poetrylock overrides python pwd preferWheels; + }; + py = poetryPython.python; + + inherit (poetryPython) pyProject; + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "pyproject" + "preferWheels" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + + # Get dependencies and filter out depending on interpreter version + getDeps = depAttr: + let + compat = isCompatible (poetryLib.getPythonVersion py); + deps = pyProject.tool.poetry.${depAttr} or { }; + depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); + in + builtins.map + ( + dep: + let + pkg = py.pkgs."${dep}"; + constraints = deps.${dep}.python or ""; + isCompat = compat constraints; + in if isCompat then pkg else null + ) depAttrs; + getInputs = attr: attrs.${attr} or [ ]; + mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pyProject; + pythonPackages = py.pkgs; + }; + in + py.pkgs.buildPythonApplication + ( + passedAttrs // { + pname = moduleName pyProject.tool.poetry.name; + version = pyProject.tool.poetry.version; + + inherit src; + + format = "pyproject"; + + buildInputs = mkInput "buildInputs" buildSystemPkgs; + propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; + checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); + + passthru = { + python = py; + }; + + meta = meta // { + inherit (pyProject.tool.poetry) description homepage; + inherit (py.meta) platforms; + license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); + }; + + } + ); /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ cli = import ./cli.nix { inherit pkgs lib version; }; @@ -247,7 +251,7 @@ in defaultSet = defaultPoetryOverrides self super; customSet = fn self super; in - defaultSet // customSet; + defaultSet // customSet; }; /* diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh new file mode 100644 index 00000000000..97f54b23416 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh @@ -0,0 +1,24 @@ +source $stdenv/setup +set -euo pipefail + +curl="curl \ + --location \ + --max-redirs 20 \ + --retry 2 \ + --disable-epsv \ + --cookie-jar cookies \ + --insecure \ + --speed-time 5 \ + -# \ + --fail \ + $curlOpts \ + $NIX_CURL_FLAGS" + +echo "Trying to fetch wheel with predicted URL: $predictedURL" + +$curl $predictedURL --output $out && exit 0 + +echo "Predicted URL '$predictedURL' failed, querying pypi.org" +$curl "https://pypi.org/pypi/$pname/json" | jq -r ".releases.\"$version\"[] | select(.filename == \"$file\") | .url" > url +url=$(cat url) +$curl -k $url --output $out diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 12d2bc96206..ae5867b8337 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -2,31 +2,48 @@ , callPackage , makeSetupHook , yj +, wheel +, pip }: let pythonInterpreter = python.pythonForBuild.interpreter; + pythonSitePackages = python.sitePackages; in { - removePathDependenciesHook = callPackage ( - {}: + removePathDependenciesHook = callPackage + ( + {}: makeSetupHook { name = "remove-path-dependencies.sh"; - deps = []; + deps = [ ]; substitutions = { inherit pythonInterpreter; yj = "${yj}/bin/yj"; pyprojectPatchScript = "${./pyproject-without-path.py}"; }; } ./remove-path-dependencies.sh - ) {}; + ) { }; - poetry2nixFixupHook = callPackage ( - {}: + pipBuildHook = callPackage + ( + { pip, wheel }: + makeSetupHook { + name = "pip-build-hook.sh"; + deps = [ pip wheel ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + }; + } ./pip-build-hook.sh + ) { }; + + poetry2nixFixupHook = callPackage + ( + {}: makeSetupHook { name = "fixup-hook.sh"; - deps = []; + deps = [ ]; } ./fixup-hook.sh - ) {}; + ) { }; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh new file mode 100644 index 00000000000..fa7b698fb51 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh @@ -0,0 +1,50 @@ +# Setup hook to use for pip projects +echo "Sourcing pip-build-hook" + +pipBuildPhase() { + echo "Executing pipBuildPhase" + runHook preBuild + + # Prefer using setup.py to avoid build-system dependencies if we have a setup.py + if [ -z "${dontPreferSetupPy-}" ]; then + if test -e setup.py && test -e pyproject.toml; then + echo "Removing pyproject.toml..." + rm -f pyproject.toml + fi + fi + + mkdir -p dist + echo "Creating a wheel..." + @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + echo "Finished creating a wheel..." + + runHook postBuild + echo "Finished executing pipBuildPhase" +} + +pipShellHook() { + echo "Executing pipShellHook" + runHook preShellHook + + # Long-term setup.py should be dropped. + if [ -e pyproject.toml ]; then + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" + mkdir -p "$tmp_path/@pythonSitePackages@" + @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2 + fi + + runHook postShellHook + echo "Finished executing pipShellHook" +} + +if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then + echo "Using pipBuildPhase" + buildPhase=pipBuildPhase +fi + +if [ -z "${shellHook-}" ]; then + echo "Using pipShellHook" + shellHook=pipShellHook +fi diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py index bb61e4a5cb4..5d8fbcfe6b4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py @@ -6,7 +6,14 @@ import sys data = json.load(sys.stdin) -for dep in data['tool']['poetry']['dependencies'].values(): + +def get_deep(o, path): + for p in path.split('.'): + o = o.get(p, {}) + return o + + +for dep in get_deep(data, 'tool.poetry.dependencies').values(): if isinstance(dep, dict): try: del dep['path']; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index f4497afb8bc..ed47837ee43 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -8,6 +8,20 @@ let genList (i: if i == idx then value else (builtins.elemAt list i)) (length list) ); + # Do some canonicalisation of module names + moduleName = name: lib.toLower (lib.replaceStrings [ "_" "." ] [ "-" "-" ] name); + + # Get a full semver pythonVersion from a python derivation + getPythonVersion = python: + let + pyVer = lib.splitVersion python.pythonVersion ++ [ "0" ]; + ver = lib.splitVersion python.version; + major = l: lib.elemAt l 0; + minor = l: lib.elemAt l 1; + joinVersion = v: lib.concatStringsSep "." v; + in + joinVersion ( if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer); + # Compare a semver expression with a version isCompatible = version: let @@ -18,41 +32,41 @@ let }; splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; in - expr: + expr: + let + tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); + combine = acc: v: let - tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver version v); - }; - initial = { operator = "&&"; state = true; }; + isOperator = builtins.typeOf v == "list"; + operator = if isOperator then (builtins.elemAt v 0) else acc.operator; in - if expr == "" then true else (builtins.foldl' combine initial tokens).state; - + if isOperator then (acc // { inherit operator; }) else { + inherit operator; + state = operators."${operator}" acc.state (satisfiesSemver version v); + }; + initial = { operator = "&&"; state = true; }; + in if expr == "" then true else (builtins.foldl' combine initial tokens).state; fromTOML = builtins.fromTOML or ( - toml: builtins.fromJSON ( - builtins.readFile ( - pkgs.runCommand "from-toml" - { - inherit toml; - allowSubstitutes = false; - preferLocalBuild = true; - } - '' - ${pkgs.remarshal}/bin/remarshal \ - -if toml \ - -i <(echo "$toml") \ - -of json \ - -o $out - '' + toml: builtins.fromJSON + ( + builtins.readFile + ( + pkgs.runCommand "from-toml" + { + inherit toml; + allowSubstitutes = false; + preferLocalBuild = true; + } + '' + ${pkgs.remarshal}/bin/remarshal \ + -if toml \ + -i <(echo "$toml") \ + -of json \ + -o $out + '' + ) ) - ) ); readTOML = path: fromTOML (builtins.readFile path); @@ -63,10 +77,61 @@ let let ml = pkgs.pythonManylinuxPackages; in - if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } - else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } - else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } - else { pkg = []; str = null; }; + if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } + else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } + else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } + else { pkg = [ ]; str = null; }; + + # Predict URL from the PyPI index. + # Args: + # pname: package name + # file: filename including extension + # hash: SRI hash + # kind: Language implementation and version tag + predictURLFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind }: + "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}" + ); + + + # Fetch the wheels from the PyPI index. + # We need to first get the proper URL to the wheel. + # Args: + # pname: package name + # file: filename including extension + # hash: SRI hash + # kind: Language implementation and version tag + fetchWheelFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind, curlOpts ? "" }: + let + version = builtins.elemAt (builtins.split "-" file) 2; + in + (pkgs.stdenvNoCC.mkDerivation { + name = file; + nativeBuildInputs = [ + pkgs.curl + pkgs.jq + ]; + isWheel = true; + system = "builtin"; + + preferLocalBuild = true; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "NIX_CURL_FLAGS" + ]; + + predictedURL = predictURLFromPypi { inherit pname file hash kind; }; + inherit pname file version curlOpts; + + builder = ./fetch-wheel.sh; + + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = hash; + }) + ); # Fetch the artifacts from the PyPI index. Since we get all # info we need from the lock file we don't use nixpkgs' fetchPyPi @@ -78,25 +143,27 @@ let # file: filename including extension # hash: SRI hash # kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention - fetchFromPypi = lib.makeOverridable ( - { pname, file, hash, kind }: - pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}"; - inherit hash; - } - ); - + fetchFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind }: + if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; } + else + pkgs.fetchurl { + url = predictURLFromPypi { inherit pname file hash kind; }; + inherit hash; + } + ); getBuildSystemPkgs = { pythonPackages , pyProject }: - let - buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; - drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; - in - if buildSystem == "" then [] else ( - [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] - ); + let + buildSystem = lib.attrByPath [ "build-system" "build-backend" ] "" pyProject; + drvAttr = moduleName (builtins.elemAt (builtins.split "\\.|:" buildSystem) 0); + in + if buildSystem == "" then [ ] else ( + [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] + ); # Find gitignore files recursively in parent directory stopping with .git findGitIgnores = path: @@ -105,9 +172,9 @@ let gitIgnore = path + "/.gitignore"; isGitRoot = builtins.pathExists (path + "/.git"); hasGitIgnore = builtins.pathExists gitIgnore; - gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; + gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ]; in - lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; + lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; /* Provides a source filtering mechanism that: @@ -124,22 +191,25 @@ let || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) ; in - lib.cleanSourceWith { - filter = lib.cleanSourceFilter; - src = lib.cleanSourceWith { - filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; - inherit src; - }; + lib.cleanSourceWith { + filter = lib.cleanSourceFilter; + src = lib.cleanSourceWith { + filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; + inherit src; }; + }; in { inherit fetchFromPypi + fetchWheelFromPypi getManyLinuxDeps isCompatible readTOML getBuildSystemPkgs satisfiesSemver cleanPythonSources + moduleName + getPythonVersion ; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 5e71190d28f..2467dad31e1 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -10,74 +10,68 @@ , version , files , source -, dependencies ? {} +, dependencies ? { } , pythonPackages , python-versions , pwd , sourceSpec , supportedExtensions ? lib.importJSON ./extensions.json +, preferWheels ? false , ... }: -pythonPackages.callPackage ( - { preferWheel ? false - , ... - }@args: +pythonPackages.callPackage + ( + { preferWheel ? preferWheels + , ... + }@args: let - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi; + inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { inherit lib python; inherit (pkgs) stdenv; }) selectWheel ; - - fileCandidates = let - supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); - matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; - hasSupportedExtension = fname: builtins.match supportedRegex fname != null; - isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; - in + fileCandidates = + let + supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); + matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; + hasSupportedExtension = fname: builtins.match supportedRegex fname != null; + isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; + in builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files; - toPath = s: pwd + "/${s}"; - isSource = source != null; isGit = isSource && source.type == "git"; isLocal = isSource && source.type == "directory"; - localDepPath = toPath source.url; pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml"); - buildSystemPkgs = poetryLib.getBuildSystemPkgs { inherit pythonPackages pyProject; }; - - fileInfo = let - isBdist = f: lib.strings.hasSuffix "whl" f.file; - isSdist = f: ! isBdist f && ! isEgg f; - isEgg = f: lib.strings.hasSuffix ".egg" f.file; - - binaryDist = selectWheel fileCandidates; - sourceDist = builtins.filter isSdist fileCandidates; - eggs = builtins.filter isEgg fileCandidates; - - entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; - - lockFileEntry = builtins.head entries; - - _isEgg = isEgg lockFileEntry; - in + fileInfo = + let + isBdist = f: lib.strings.hasSuffix "whl" f.file; + isSdist = f: ! isBdist f && ! isEgg f; + isEgg = f: lib.strings.hasSuffix ".egg" f.file; + binaryDist = selectWheel fileCandidates; + sourceDist = builtins.filter isSdist fileCandidates; + eggs = builtins.filter isEgg fileCandidates; + entries = ( if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; + lockFileEntry = builtins.head entries; + _isEgg = isEgg lockFileEntry; + in rec { inherit (lockFileEntry) file hash; name = file; format = if _isEgg then "egg" else if lib.strings.hasSuffix ".whl" name then "wheel" - else "setuptools"; + else "pyproject"; kind = if _isEgg then python.pythonVersion - else if format == "setuptools" then "source" + else if format == "pyproject" then "source" else (builtins.elemAt (lib.strings.splitString "-" name) 2); }; @@ -88,63 +82,65 @@ pythonPackages.callPackage ( "toml" # Toml is an extra for setuptools-scm ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; - - format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format; + format = if isLocal then "pyproject" else if isGit then "pyproject" else fileInfo.format; in - - buildPythonPackage { - pname = name; - version = version; - - inherit format; - - doCheck = false; # We never get development deps - - # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` - dontStrip = format == "wheel"; - - nativeBuildInputs = [ - pythonPackages.poetry2nixFixupHook - ] - ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook - ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook - ; - - buildInputs = ( - baseBuildInputs - ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg - ++ lib.optional isLocal buildSystemPkgs - ); - - propagatedBuildInputs = let - compat = isCompatible python.pythonVersion; - deps = lib.filterAttrs (n: v: v) ( - lib.mapAttrs ( - n: v: - let - constraints = v.python or ""; - in - compat constraints - ) dependencies - ); + buildPythonPackage { + pname = moduleName name; + version = version; + + inherit format; + + doCheck = false; # We never get development deps + + # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` + dontStrip = format == "wheel"; + + nativeBuildInputs = [ + pythonPackages.poetry2nixFixupHook + ] + ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook + ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook + ; + + buildInputs = ( + baseBuildInputs + ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg + ++ lib.optional isLocal buildSystemPkgs + ); + + propagatedBuildInputs = + let + compat = isCompatible (poetryLib.getPythonVersion python); + deps = lib.filterAttrs (n: v: v) + ( + lib.mapAttrs + ( + n: v: + let + constraints = v.python or ""; + in + compat constraints + ) dependencies + ); depAttrs = lib.attrNames deps; in - builtins.map (n: pythonPackages.${lib.toLower n}) depAttrs; + builtins.map (n: pythonPackages.${moduleName n}) depAttrs; - meta = { - broken = ! isCompatible python.pythonVersion python-versions; - license = []; - inherit (python.meta) platforms; - }; + meta = { + broken = ! isCompatible (poetryLib.getPythonVersion python) python-versions; + license = [ ]; + inherit (python.meta) platforms; + }; - passthru = { - inherit args; - }; + passthru = { + inherit args; + }; - # We need to retrieve kind from the interpreter and the filename of the package - # Interpreters should declare what wheel types they're compatible with (python type + ABI) - # Here we can then choose a file based on that info. - src = if isGit then ( + # We need to retrieve kind from the interpreter and the filename of the package + # Interpreters should declare what wheel types they're compatible with (python type + ABI) + # Here we can then choose a file based on that info. + src = + if isGit then ( builtins.fetchGit { inherit (source) url; rev = source.reference; @@ -154,6 +150,5 @@ pythonPackages.callPackage ( pname = name; inherit (fileInfo) file hash kind; }; - } - -) {} + } + ) { } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 04340ac4e89..d18e6b8293f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -1,4 +1,4 @@ -{ pkgs ? import <nixpkgs> {} +{ pkgs ? import <nixpkgs> { } , lib ? pkgs.lib , stdenv ? pkgs.stdenv }: @@ -6,202 +6,256 @@ self: super: { - astroid = super.astroid.overridePythonAttrs ( - old: rec { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + astroid = super.astroid.overridePythonAttrs + ( + old: rec { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - av = super.av.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; - } - ); + av = super.av.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + } + ); - bcrypt = super.bcrypt.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ); + bcrypt = super.bcrypt.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ); cffi = # cffi is bundled with pypy if self.python.implementation == "pypy" then null else ( - super.cffi.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ) + super.cffi.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ) ); - cftime = super.cftime.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - } - ); + cftime = super.cftime.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + } + ); - cryptography = super.cryptography.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); + configparser = super.configparser.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.toml + ]; - django = ( - super.django.overridePythonAttrs ( + postPatch = '' + substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")' + ''; + } + ); + + cryptography = super.cryptography.overridePythonAttrs + ( old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or []) - ++ [ pkgs.gettext ]; + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } - ) - ); + ); - django-bakery = super.django-bakery.overridePythonAttrs ( - old: { - configurePhase = '' - if ! test -e LICENSE; then - touch LICENSE - fi - '' + (old.configurePhase or ""); - } + django = ( + super.django.overridePythonAttrs + ( + old: { + propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) + ++ [ pkgs.gettext ]; + } + ) ); - dlib = super.dlib.overridePythonAttrs ( - old: { - # Parallel building enabled - inherit (pkgs.python.pkgs.dlib) patches; + django-bakery = super.django-bakery.overridePythonAttrs + ( + old: { + configurePhase = '' + if ! test -e LICENSE; then + touch LICENSE + fi + '' + (old.configurePhase or ""); + } + ); + + dlib = super.dlib.overridePythonAttrs + ( + old: { + # Parallel building enabled + inherit (pkgs.python.pkgs.dlib) patches; - enableParallelBuilding = true; - dontUseCmakeConfigure = true; + enableParallelBuilding = true; + dontUseCmakeConfigure = true; - nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; - buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; - } - ); + nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; + buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; + } + ); # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - faker = super.faker.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + faker = super.faker.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - fancycompleter = super.fancycompleter.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py \ - --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ - --replace 'versioning="devcommit"' 'version="${old.version}"' - ''; - } - ); + fancycompleter = super.fancycompleter.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ + --replace 'versioning="devcommit"' 'version="${old.version}"' + ''; + } + ); - fastparquet = super.fastparquet.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - } - ); + fastparquet = super.fastparquet.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); - grandalf = super.grandalf.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + grandalf = super.grandalf.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - h5py = super.h5py.overridePythonAttrs ( - old: rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; - configure_flags = "--hdf5=${pkgs.hdf5}"; - postConfigure = '' - ${self.python.executable} setup.py configure ${configure_flags} - ''; - } - ); + h5py = super.h5py.overridePythonAttrs + ( + old: + if old.format != "wheel" then rec { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + configure_flags = "--hdf5=${pkgs.hdf5}"; + postConfigure = '' + ${self.python.executable} setup.py configure ${configure_flags} + ''; + } else old + ); - horovod = super.horovod.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; - } - ); + horovod = super.horovod.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + } + ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; - } - ); + importlib-metadata = super.importlib-metadata.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; + } + ); - jupyter = super.jupyter.overridePythonAttrs ( - old: rec { - # jupyter is a meta-package. Everything relevant comes from the - # dependencies. It does however have a jupyter.py file that conflicts - # with jupyter-core so this meta solves this conflict. - meta.priority = 100; - } - ); + isort = super.isort.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + } + ); - lap = super.lap.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.numpy - ]; - } - ); + jupyter = super.jupyter.overridePythonAttrs + ( + old: rec { + # jupyter is a meta-package. Everything relevant comes from the + # dependencies. It does however have a jupyter.py file that conflicts + # with jupyter-core so this meta solves this conflict. + meta.priority = 100; + } + ); - llvmlite = super.llvmlite.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + kiwisolver = super.kiwisolver.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + # cppy is at the time of writing not in nixpkgs + (self.cppy or null) + ]; + } + ); - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - postPatch = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + lap = super.lap.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.numpy + ]; + } + ); - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; + llvmlite = super.llvmlite.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config - ''; + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + postPatch = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; - passthru = old.passthru // { llvm = pkgs.llvm; }; - } - ); + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config + ''; - lockfile = super.lockfile.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; - } - ); + __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - lxml = super.lxml.overridePythonAttrs ( - old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; - buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; - } - ); + passthru = old.passthru // { llvm = pkgs.llvm; }; + } + ); - markupsafe = super.markupsafe.overridePythonAttrs ( - old: { - src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; - } - ); + lockfile = super.lockfile.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; + } + ); + + lxml = super.lxml.overridePythonAttrs + ( + old: { + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + } + ); + + markupsafe = super.markupsafe.overridePythonAttrs + ( + old: { + src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; + } + ); - matplotlib = super.matplotlib.overridePythonAttrs ( - old: + matplotlib = super.matplotlib.overridePythonAttrs + ( + old: let enableGhostscript = old.passthru.enableGhostscript or false; enableGtk3 = old.passthru.enableTk or false; @@ -210,484 +264,583 @@ self: super: inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; in - { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + { + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - XDG_RUNTIME_DIR = "/tmp"; + XDG_RUNTIME_DIR = "/tmp"; - buildInputs = old.buildInputs + buildInputs = old.buildInputs ++ lib.optional enableGhostscript pkgs.ghostscript ++ lib.optional stdenv.isDarwin [ Cocoa ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.libpng - pkgs.freetype - ] + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.libpng + pkgs.freetype + ] ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] - ; + ; - inherit (super.matplotlib) patches; - } - ); + inherit (super.matplotlib) patches; + } + ); # Calls Cargo at build time for source builds and is really tricky to package maturin = super.maturin.override { preferWheel = true; }; - mccabe = super.mccabe.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + mccabe = super.mccabe.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - netcdf4 = super.netcdf4.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev pkgs.hdf5; - NETCDF4_DIR = pkgs.netcdf; - CURL_DIR = pkgs.curl.dev; - JPEG_DIR = pkgs.libjpeg.dev; - } - ); + netcdf4 = super.netcdf4.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; - numpy = super.numpy.overridePythonAttrs ( - old: + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.zlib + pkgs.netcdf + pkgs.hdf5 + pkgs.curl + pkgs.libjpeg + ]; + + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev pkgs.hdf5; + NETCDF4_DIR = pkgs.netcdf; + CURL_DIR = pkgs.curl.dev; + JPEG_DIR = pkgs.libjpeg.dev; + } + ); + + numpy = super.numpy.overridePythonAttrs + ( + old: let blas = old.passthru.args.blas or pkgs.openblasCompat; - lapack = old.passthru.args.lapack or pkgs.openblasCompat; + blasImplementation = lib.nameFromURL blas.name "-"; cfg = pkgs.writeTextFile { name = "site.cfg"; - text = (lib.generators.toINI {} { - ${blas.implementation} = { - include_dirs = "${blas}/include:${lapack}/include"; - library_dirs = "${blas}/lib:${lapack}/lib"; - }; - }); + text = ( + lib.generators.toINI { } { + ${blasImplementation} = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + } + ); }; in - { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - passthru = old.passthru // { - blsaImplementation = blas.implementation; - inherit blas cfg; - }; - } - ); + { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + buildInputs = old.buildInputs ++ [ blas self.cython ]; + enableParallelBuilding = true; + preBuild = '' + ln -s ${cfg} site.cfg + ''; + passthru = old.passthru // { + blas = blas; + inherit blasImplementation cfg; + }; + } + ); - openexr = super.openexr.overridePythonAttrs ( - old: rec { - buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; - } - ); + openexr = super.openexr.overridePythonAttrs + ( + old: rec { + buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; + } + ); - peewee = super.peewee.overridePythonAttrs ( - old: + peewee = super.peewee.overridePythonAttrs + ( + old: let withPostgres = old.passthru.withPostgres or false; withMysql = old.passthru.withMysql or false; in - { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs + { + buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; - } - ); + } + ); - pillow = super.pillow.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; - buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; - } - ); + pillow = super.pillow.overridePythonAttrs + ( + old: { + nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + } + ); - psycopg2 = super.psycopg2.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); + psycopg2 = super.psycopg2.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); - psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); + psycopg2-binary = super.psycopg2-binary.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); - pyarrow = super.pyarrow.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - } - ); + pyarrow = + if lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs + ( + old: + let + parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); + _arrow-cpp = pkgs.arrow-cpp.override { inherit (self) python; }; + ARROW_HOME = _arrow-cpp; + arrowCppVersion = parseMinor pkgs.arrow-cpp; + pyArrowVersion = parseMinor super.pyarrow; + errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; + in + if arrowCppVersion != pyArrowVersion then throw errorMessage else { - pycairo = ( - drv: ( - drv.overridePythonAttrs ( - _: { - format = "other"; - } - ) - ).overridePythonAttrs ( - old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + pkgs.pkgconfig + pkgs.cmake + ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.meson - pkgs.ninja - pkgs.pkgconfig - ]; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.cairo - pkgs.xlibsWrapper - ]; + PARQUET_HOME = _arrow-cpp; + inherit ARROW_HOME; - mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; - } - ) - ) super.pycairo; + buildInputs = old.buildInputs ++ [ + pkgs.arrow-cpp + ]; - pycocotools = super.pycocotools.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - self.numpy - ]; - } - ); + PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - pygobject = super.pygobject.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; - } - ); + # This doesn't use setup hook to call cmake so we need to workaround #54606 + # ourselves + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ]; - pylint = super.pylint.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + dontUseCmakeConfigure = true; + } + ) else super.pyarrow.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; + } + ); - pyopenssl = super.pyopenssl.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); + pycairo = + ( + drv: ( + drv.overridePythonAttrs + ( + _: { + format = "other"; + } + ) + ).overridePythonAttrs + ( + old: { - pyqt5 = let - drv = super.pyqt5; - withConnectivity = drv.passthru.args.withConnectivity or false; - withMultimedia = drv.passthru.args.withMultimedia or false; - withWebKit = drv.passthru.args.withWebKit or false; - withWebSockets = drv.passthru.args.withWebSockets or false; - in - super.pyqt5.overridePythonAttrs ( - old: { - format = "other"; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.meson + pkgs.ninja + pkgs.pkgconfig + ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - pkgs.qt5.qmake - pkgs.xorg.lndir - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - pkgs.qt5.qtwebchannel - # self.pyqt5-sip - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.cairo + pkgs.xlibsWrapper + ]; - buildInputs = old.buildInputs ++ [ - pkgs.dbus - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; + mesonFlags = [ "-Dpython=${ if self.isPy3k then "python3" else "python"}" ]; + } + ) + ) super.pycairo; - # Fix dbus mainloop - patches = pkgs.python3.pkgs.pyqt5.patches or []; + pycocotools = super.pycocotools.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + self.numpy + ]; + } + ); - configurePhase = '' - runHook preConfigure + pygobject = super.pygobject.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + } + ); - export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} + pylint = super.pylint.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - mkdir -p $out/${self.python.sitePackages}/dbus/mainloop - ${self.python.executable} configure.py -w \ - --confirm-license \ - --no-qml-plugin \ - --bindir=$out/bin \ - --destdir=$out/${self.python.sitePackages} \ - --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ - --sipdir=$out/share/sip/PyQt5 \ - --designer-plugindir=$out/plugins/designer + pyopenssl = super.pyopenssl.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + } + ); - runHook postConfigure - ''; + pyqt5 = + let + drv = super.pyqt5; + withConnectivity = drv.passthru.args.withConnectivity or false; + withMultimedia = drv.passthru.args.withMultimedia or false; + withWebKit = drv.passthru.args.withWebKit or false; + withWebSockets = drv.passthru.args.withWebSockets or false; + in + super.pyqt5.overridePythonAttrs + ( + old: { + format = "other"; - postInstall = '' - ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - - # Let's make it a namespace package - cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) - EOF - ''; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + pkgs.qt5.qmake + pkgs.xorg.lndir + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + pkgs.qt5.qtwebchannel + # self.pyqt5-sip + self.sip + ] + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets + ; - installCheckPhase = let - modules = [ - "PyQt5" - "PyQt5.QtCore" - "PyQt5.QtQml" - "PyQt5.QtWidgets" - "PyQt5.QtGui" + buildInputs = old.buildInputs ++ [ + pkgs.dbus + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + self.sip ] - ++ lib.optional withWebSockets "PyQt5.QtWebSockets" - ++ lib.optional withWebKit "PyQt5.QtWebKit" - ++ lib.optional withMultimedia "PyQt5.QtMultimedia" - ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets ; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in - '' - echo "Checking whether modules can be imported..." - ${self.python.interpreter} -c "${imports}" + # Fix dbus mainloop + patches = pkgs.python3.pkgs.pyqt5.patches or [ ]; + + configurePhase = '' + runHook preConfigure + + export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} + + mkdir -p $out/${self.python.sitePackages}/dbus/mainloop + ${self.python.executable} configure.py -w \ + --confirm-license \ + --no-qml-plugin \ + --bindir=$out/bin \ + --destdir=$out/${self.python.sitePackages} \ + --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ + --sipdir=$out/share/sip/PyQt5 \ + --designer-plugindir=$out/plugins/designer + + runHook postConfigure ''; - doCheck = true; + postInstall = '' + ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + + # Let's make it a namespace package + cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; - enableParallelBuilding = true; + installCheckPhase = + let + modules = [ + "PyQt5" + "PyQt5.QtCore" + "PyQt5.QtQml" + "PyQt5.QtWidgets" + "PyQt5.QtGui" + ] + ++ lib.optional withWebSockets "PyQt5.QtWebSockets" + ++ lib.optional withWebKit "PyQt5.QtWebKit" + ++ lib.optional withMultimedia "PyQt5.QtMultimedia" + ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in + '' + echo "Checking whether modules can be imported..." + ${self.python.interpreter} -c "${imports}" + ''; + + doCheck = true; + + enableParallelBuilding = true; + } + ); + + pytest-datadir = super.pytest-datadir.overridePythonAttrs + ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; } ); - pytest-datadir = super.pytest-datadir.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); - - pytest = super.pytest.overridePythonAttrs ( - old: { - doCheck = false; - } - ); + pytest = super.pytest.overridePythonAttrs + ( + old: { + doCheck = false; + } + ); pytest-runner = super.pytest-runner or super.pytestrunner; - python-prctl = super.python-prctl.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.libcap - ]; - } - ); + python-jose = super.python-jose.overridePythonAttrs + ( + old: { + postPath = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace "'pytest-runner'" "" + ''; + } + ); - pyzmq = super.pyzmq.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; - } - ); + python-prctl = super.python-prctl.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.libcap + ]; + } + ); - rockset = super.rockset.overridePythonAttrs ( - old: rec { - postPatch = '' - cp ./setup_rockset.py ./setup.py - ''; - } - ); + pyzmq = super.pyzmq.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; + } + ); - scaleapi = super.scaleapi.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true - ''; - } - ); + rockset = super.rockset.overridePythonAttrs + ( + old: rec { + postPatch = '' + cp ./setup_rockset.py ./setup.py + ''; + } + ); - pandas = super.pandas.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; - } - ); + scaleapi = super.scaleapi.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true + ''; + } + ); + + pandas = super.pandas.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + } + ); # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs # Make it not fail with infinite recursion - pybind11 = super.pybind11.overridePythonAttrs ( - old: { - cmakeFlags = (old.cmakeFlags or []) ++ [ - "-DPYBIND11_TEST=off" - ]; - doCheck = false; # Circular test dependency - } - ); - - scipy = super.scipy.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - enableParallelBuilding = true; - buildInputs = old.buildInputs ++ [ self.numpy.blas ]; - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - preBuild = '' - ln -s ${self.numpy.cfg} site.cfg - ''; - } - ); + pybind11 = super.pybind11.overridePythonAttrs + ( + old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DPYBIND11_TEST=off" + ]; + doCheck = false; # Circular test dependency + } + ); - scikit-learn = super.scikit-learn.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.gfortran - pkgs.glibcLocales - ] ++ lib.optionals stdenv.cc.isClang [ - pkgs.llvmPackages.openmp - ]; + scipy = super.scipy.overridePythonAttrs + ( + old: + if old.format != "wheel" then { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + enableParallelBuilding = true; + buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + preConfigure = '' + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + preBuild = '' + ln -s ${self.numpy.cfg} site.cfg + ''; + } else old + ); - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - ]; + scikit-learn = super.scikit-learn.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.gfortran + pkgs.glibcLocales + ] ++ lib.optionals stdenv.cc.isClang [ + pkgs.llvmPackages.openmp + ]; - enableParallelBuilding = true; - } - ); + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; - shapely = super.shapely.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; - inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; - } - ); + enableParallelBuilding = true; + } + ); - shellingham = if lib.versionAtLeast super.shellingham.version "1.3.2" then ( - super.shellingham.overridePythonAttrs ( + shapely = super.shapely.overridePythonAttrs + ( old: { - format = "pyproject"; + buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; } - ) - ) else super.shellingham; + ); - tables = super.tables.overridePythonAttrs ( - old: { - HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; - } - ); + shellingham = + if lib.versionAtLeast super.shellingham.version "1.3.2" then ( + super.shellingham.overridePythonAttrs + ( + old: { + format = "pyproject"; + } + ) + ) else super.shellingham; - tensorpack = super.tensorpack.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.cfg --replace "# will call find_packages()" "" - ''; - } - ); + tables = super.tables.overridePythonAttrs + ( + old: { + HDF5_DIR = "${pkgs.hdf5}"; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + } + ); - urwidtrees = super.urwidtrees.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.urwid - ]; - } - ); + tensorpack = super.tensorpack.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.cfg --replace "# will call find_packages()" "" + ''; + } + ); - vose-alias-method = super.vose-alias-method.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); + urwidtrees = super.urwidtrees.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.urwid + ]; + } + ); - uvloop = super.uvloop.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.ApplicationServices - pkgs.darwin.apple_sdk.frameworks.CoreServices - ]; - } - ); + vose-alias-method = super.vose-alias-method.overridePythonAttrs + ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; + } + ); + + uvloop = super.uvloop.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ + pkgs.darwin.apple_sdk.frameworks.ApplicationServices + pkgs.darwin.apple_sdk.frameworks.CoreServices + ]; + } + ); # Stop infinite recursion by using bootstrapped pkg from nixpkgs wheel = ( pkgs.python3.pkgs.override { python = self.python; } - ).wheel.overridePythonAttrs ( - _: { - inherit (super.wheel) pname name version src; - } - ); + ).wheel.overridePythonAttrs + ( + old: + if old.format == "other" then old else { + inherit (super.wheel) pname name version src; + } + ); zipp = ( if lib.versionAtLeast super.zipp.version "2.0.0" then ( - super.zipp.overridePythonAttrs ( - old: { - prePatch = '' - substituteInPlace setup.py --replace \ - 'setuptools.setup()' \ - 'setuptools.setup(version="${super.zipp.version}")' - ''; - } - ) + super.zipp.overridePythonAttrs + ( + old: { + prePatch = '' + substituteInPlace setup.py --replace \ + 'setuptools.setup()' \ + 'setuptools.setup(version="${super.zipp.version}")' + ''; + } + ) ) else super.zipp - ).overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.toml - ]; - } - ); + ).overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.toml + ]; + } + ); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index cda4e8c78d4..496c4ff1581 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -12,8 +12,7 @@ let major = builtins.elemAt ver 0; minor = builtins.elemAt ver 1; in - "cp${major}${minor}"; - + "cp${major}${minor}"; abiTag = "${pythonTag}m"; # @@ -24,13 +23,13 @@ let entries = splitString "-" str; p = removeSuffix ".whl" (builtins.elemAt entries 4); in - { - pkgName = builtins.elemAt entries 0; - pkgVer = builtins.elemAt entries 1; - pyVer = builtins.elemAt entries 2; - abi = builtins.elemAt entries 3; - platform = p; - }; + { + pkgName = builtins.elemAt entries 0; + pkgVer = builtins.elemAt entries 1; + pyVer = builtins.elemAt entries 2; + abi = builtins.elemAt entries 3; + platform = p; + }; # # Builds list of acceptable osx wheel files @@ -42,9 +41,9 @@ let v = lib.lists.head versions; vs = lib.lists.tail versions; in - if (builtins.length versions == 0) - then [] - else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); + if (builtins.length versions == 0) + then [ ] + else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); # pyver = "cpXX" # x = "cpXX" | "py2" | "py3" | "py2.py3" @@ -53,7 +52,7 @@ let normalize = y: ''cp${lib.strings.removePrefix "cp" (lib.strings.removePrefix "py" y)}''; isCompat = p: x: lib.strings.hasPrefix (normalize x) p; in - lib.lists.any (isCompat pyver) (lib.strings.splitString "." x); + lib.lists.any (isCompat pyver) (lib.strings.splitString "." x); # # Selects the best matching wheel file from a list of files @@ -61,42 +60,37 @@ let selectWheel = files: let filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); - isPyAbiCompatible = pyabi: x: x == "none" || pyabi == x; - withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi); - - withPlatform = if isLinux - then ( - x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" - || x.platform == "any" - ) - else (x: hasInfix "macosx" x.platform || x.platform == "any"); - + withPlatform = + if isLinux + then ( + x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" + || x.platform == "any" + ) + else (x: hasInfix "macosx" x.platform || x.platform == "any"); filterWheel = x: let f = toWheelAttrs x.file; in - (withPython pythonTag abiTag f) && (withPlatform f); - + (withPython pythonTag abiTag f) && (withPlatform f); filtered = builtins.filter filterWheel filesWithoutSources; - choose = files: let osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ]; linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ]; - chooseLinux = x: lib.singleton (builtins.head (findBestMatches linuxMatches x)); - chooseOSX = x: lib.singleton (builtins.head (findBestMatches osxMatches x)); + chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); + chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); in - if isLinux - then chooseLinux files - else chooseOSX files; + if isLinux + then chooseLinux files + else chooseOSX files; in - if (builtins.length filtered == 0) - then [] - else choose (filtered); + if (builtins.length filtered == 0) + then [ ] + else choose (filtered); in { inherit selectWheel toWheelAttrs isPyVersionCompatible; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index 67ffdddb4bd..773e0a60e09 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -7,7 +7,6 @@ let # Strip leading/trailing whitespace from string stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2; - findSubExpressionsFun = acc: c: ( if c == "(" then ( let @@ -15,23 +14,23 @@ let isOpen = acc.openP == 0; startPos = if isOpen then posNew else acc.startPos; in - acc // { - inherit startPos; - exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; - pos = posNew; - openP = acc.openP + 1; - } + acc // { + inherit startPos; + exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; + pos = posNew; + openP = acc.openP + 1; + } ) else if c == ")" then ( let openP = acc.openP - 1; exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); in - acc // { - inherit openP; - pos = acc.pos + 1; - exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; - exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; - } + acc // { + inherit openP; + pos = acc.pos + 1; + exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; + exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; + } ) else acc // { pos = acc.pos + 1; } ); @@ -39,7 +38,7 @@ let findSubExpressions = expr: let acc = builtins.foldl' findSubExpressionsFun { - exprs = []; + exprs = [ ]; expr = expr; pos = 0; openP = 0; @@ -47,18 +46,16 @@ let startPos = 0; } (lib.stringToCharacters expr); tailExpr = (substr acc.exprPos acc.pos expr); - tailExprs = if tailExpr != "" then [ tailExpr ] else []; + tailExprs = if tailExpr != "" then [ tailExpr ] else [ ]; in - acc.exprs ++ tailExprs; - + acc.exprs ++ tailExprs; parseExpressions = exprs: let splitCond = ( s: builtins.map - (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) + (x: stripStr ( if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) (builtins.split " (and|or) " (s + " ")) ); - mapfn = expr: ( if (builtins.match "^ ?$" expr != null) then null # Filter empty else if (builtins.elem expr [ "and" "or" ]) then { @@ -70,14 +67,12 @@ let value = expr; } ); - parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); in - builtins.foldl' ( - acc: v: acc ++ ( - if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] - ) - ) [] exprs; + builtins.foldl' + ( + acc: v: acc ++ ( if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]) + ) [ ] exprs; # Transform individual expressions to structured expressions # This function also performs variable substitution, replacing environment markers with their explicit values @@ -94,9 +89,10 @@ let else throw "Unsupported platform" ); platform_machine = stdenv.platform.kernelArch; - platform_python_implementation = let - impl = python.passthru.implementation; - in + platform_python_implementation = + let + impl = python.passthru.implementation; + in ( if impl == "cpython" then "CPython" else if impl == "pypy" then "PyPy" @@ -115,34 +111,32 @@ let implementation_version = python.version; extra = ""; }; - substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; - processVar = value: builtins.foldl' (acc: v: v acc) value [ stripStr substituteVar ]; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - mVal = ''[a-zA-Z0-9\'"_\. ]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); - in - { - type = "expr"; - value = { - op = builtins.elemAt m 1; - values = [ - (processVar (builtins.elemAt m 0)) - (processVar (builtins.elemAt m 2)) - ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mOp = "in|[!=<>]+"; + e = stripStr exprs.value; + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + in + { + type = "expr"; + value = { + op = builtins.elemAt m 1; + values = [ + (processVar (builtins.elemAt m 0)) + (processVar (builtins.elemAt m 2)) + ]; + }; + } + ) else exprs + ) else builtins.map transformExpressions exprs; # Recursively eval all expressions evalExpressions = exprs: @@ -165,32 +159,33 @@ let let parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString + ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in - op.">=" v c && op."<" v upperConstraint; + op.">=" v c && op."<" v upperConstraint; "===" = x: y: x == y; "in" = x: y: let values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); in - builtins.elem (unmarshal x) values; + builtins.elem (unmarshal x) values; }; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + expr = exprs; + result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); + in + { + type = "value"; + value = result; + } + ) else exprs + ) else builtins.map evalExpressions exprs; # Now that we have performed an eval all that's left to do is to concat the graph into a single bool reduceExpressions = exprs: @@ -217,18 +212,18 @@ let cond = "and"; } v; in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } + acc // { + value = cond."${acc.cond}" acc.value ret.value; + } ) else throw "Unsupported type" ); in - ( - builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } exprs - ).value; + ( + builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } exprs + ).value; in e: builtins.foldl' (acc: v: v acc) e [ findSubExpressions diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index 07dcbbc5eac..e86b1d3ac66 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -1,28 +1,28 @@ { lib, ireplace }: let inherit (builtins) elemAt match; - - operators = let - matchWildCard = s: match "([^\*])(\.[\*])" s; - mkComparison = ret: version: v: builtins.compareVersions version v == ret; - mkIdxComparison = idx: version: v: - let - ver = builtins.splitVersion v; - minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); - upper = builtins.concatStringsSep "." (ireplace idx minor ver); - in + operators = + let + matchWildCard = s: match "([^\*])(\.[\*])" s; + mkComparison = ret: version: v: builtins.compareVersions version v == ret; + mkIdxComparison = idx: version: v: + let + ver = builtins.splitVersion v; + minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); + upper = builtins.concatStringsSep "." (ireplace idx minor ver); + in operators.">=" version v && operators."<" version upper; - dropWildcardPrecision = f: version: constraint: - let - m = matchWildCard constraint; - hasWildcard = m != null; - c = if hasWildcard then (elemAt m 0) else constraint; - v = - if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) - else version; - in + dropWildcardPrecision = f: version: constraint: + let + m = matchWildCard constraint; + hasWildcard = m != null; + c = if hasWildcard then (elemAt m 0) else constraint; + v = + if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) + else version; + in f v c; - in + in { # Prefix operators "==" = dropWildcardPrecision (mkComparison 0); @@ -39,24 +39,23 @@ let # Prune constraint parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString + ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in - operators.">=" v c && operators."<" v upperConstraint; + operators.">=" v c && operators."<" v upperConstraint; # Infix operators "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; # Arbitrary equality clause, just run simple comparison "===" = v: c: v == c; # }; - re = { operators = "([=><!~\^]+)"; version = "([0-9\.\*x]+)"; }; - parseConstraint = constraint: let constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; @@ -65,26 +64,24 @@ let # There is also an infix operator to match ranges mIn = match "${re.version} *(-) *${re.version}" constraintStr; in - ( - if mPre != null then { - op = elemAt mPre 0; - v = elemAt mPre 1; - } - # Infix operators are range matches - else if mIn != null then { - op = elemAt mIn 1; - v = { - vl = (elemAt mIn 0); - vu = (elemAt mIn 2); - }; - } - else throw "Constraint \"${constraintStr}\" could not be parsed" - ); - + ( + if mPre != null then { + op = elemAt mPre 0; + v = elemAt mPre 1; + } + # Infix operators are range matches + else if mIn != null then { + op = elemAt mIn 1; + v = { + vl = (elemAt mIn 0); + vu = (elemAt mIn 2); + }; + } + else throw "Constraint \"${constraintStr}\" could not be parsed" + ); satisfiesSemver = version: constraint: let inherit (parseConstraint constraint) op v; - in - if constraint == "*" then true else operators."${op}" version v; + in if constraint == "*" then true else operators."${op}" version v; in { inherit satisfiesSemver; } diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update index 4840c23c3b8..5bea272f8a9 100755 --- a/pkgs/development/tools/poetry2nix/update +++ b/pkgs/development/tools/poetry2nix/update @@ -14,7 +14,7 @@ curl -L -s https://github.com/nix-community/poetry2nix/archive/master.tar.gz | t mv poetry2nix-master/* . mkdir build -cp *.nix *.json *.py build/ +cp *.* build/ cp -r hooks bin build/ rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix new file mode 100644 index 00000000000..6b11071b6fa --- /dev/null +++ b/pkgs/development/tools/pxview/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: + +stdenv.mkDerivation rec { + pname = "pxview"; + version = "0.2.5"; + src = fetchurl { + url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz"; + sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139"; + }; + + buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = [ "--with-pxlib=${pxlib.out}" ]; + + # https://sourceforge.net/p/pxlib/bugs/12/ + LDFLAGS = "-lm"; + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Program to convert Paradox databases"; + homepage = "http://pxlib.sourceforge.net/pxview/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 727a789c42f..deba6cc674c 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.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "0pmh6x7rb0v1g087xgyicw9mm4ayppgh7vzvq3hs8vip2zvy7r56"; + sha256 = "1d7zd2wpvfz1vq5ik67m6s1mscivh8b3kz4bfckw3cazk68vn9q1"; }; - cargoSha256 = "00lh6nxc17dyl8z2l70gzc7l1vpn448lzi1c69wxxcqnk8y0ka9w"; + cargoSha256 = "0jy10yfd9d5r0ildyxszs1ppzyd4ninl7lihdnwjqm6qifr1m5rp"; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 1f7b5c1d1b7..05868a4e1c2 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -38,9 +38,9 @@ checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "attohttpc" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de33d017f0add8b019c6d98c3132c82c8815ca96bbed8e8006e7402c840562b3" +checksum = "d5db1932a9d70d5091139d6b0e04ec6a4d9f9184041c15d71a5ef954cb3c5312" dependencies = [ "flate2", "http", @@ -75,9 +75,9 @@ checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" +checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42" [[package]] name = "bitflags" @@ -104,7 +104,7 @@ checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "cargo-make" -version = "0.30.6" +version = "0.30.7" dependencies = [ "ci_info", "clap", @@ -145,9 +145,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "ci_info" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b407009a4a51ae109dbdfcd7b6e4de38d148f37fad512b8c4623c642c4045e68" +checksum = "a19c5f9baeac8a1176ca7fc58a0cc1abadd84d360365a93d1dd31e926f3f502b" dependencies = [ "envmnt", ] @@ -244,21 +244,21 @@ dependencies = [ [[package]] name = "duckscript" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606ba1f416b4babf0971b0510b7e49ecb948ad381e4943d5b96a7a22ac701386" +checksum = "62b666b2baf849932922921c2ff4bdb30e49835468626561d18fda4949751b55" dependencies = [ "fsio", ] [[package]] name = "duckscriptsdk" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bdbd838e33acba34abb076b94db7bba43e9dbaccd00486322ce314ddc7d0979" +checksum = "dc9026058fdb6382c5fc62bc7a789d18b796236ddf48bee5a01332f576c1c109" dependencies = [ "attohttpc", - "base64 0.12.0", + "base64 0.12.1", "cfg-if", "duckscript", "fs_extra", @@ -429,9 +429,9 @@ dependencies = [ [[package]] name = "git_info" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" +checksum = "641b847f0375f4b2c595438eefc17a9c0fbf47b400cbdd1ad9332bf1e16b779d" [[package]] name = "glob" @@ -441,9 +441,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" +checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" dependencies = [ "libc", ] @@ -650,18 +650,18 @@ checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" [[package]] name = "proc-macro2" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" +checksum = "8872cf6f48eee44265156c111456a700ab3483686b3f96df4cf5481c89157319" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" +checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" dependencies = [ "proc-macro2", ] @@ -774,9 +774,9 @@ dependencies = [ [[package]] name = "rust_info" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" +checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" [[package]] name = "rusty-hook" @@ -872,9 +872,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9" +checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" dependencies = [ "itoa", "ryu", @@ -904,9 +904,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" +checksum = "e8e5aa70697bb26ee62214ae3288465ecec0000f05182f039b477001f08f5ae7" dependencies = [ "proc-macro2", "quote", @@ -1021,9 +1021,9 @@ checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" [[package]] name = "vec_map" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "walkdir" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 6054a43d227..98f21b23d48 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.6"; + version = "0.30.7"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "1kr3ay1gifyhwk6nlzq5vdi45583f5yvszk1pjsy2ki8l8j3ba3h"; + sha256 = "0i8jf3161qqazp8cy3kzn2cw7zrcv1ijf2w3s8d8l0y2i2b25cv1"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0zfylhfz2c8yfixjiv41kl1xgmbbh2c38cc8ajx1pxrhgn7ig5dv"; + cargoSha256 = "08mn1ckvyffys9wqnvva7w1qzvarqvmnkpliv118vnnr072jnc6y"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index ca347ca22de..a6089ffeac2 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.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "1xmlpn4j5lhbzd9icb3nga5irfknmxfml9sn677d9z6fwfjfpa0l"; + sha256 = "1drz0slv33p4spm52sb5lnmpb83q8l7k3cvp0zcsinbjv8glvvnv"; }; - cargoSha256 = "1si95pdhbi6pa94gh9vip95n37im6kcfsgslpnibck2157pg4la6"; + cargoSha256 = "13ynab3s563n2xwkls7nmksis0ngx5klw9wc9bpnxgc5na9k84ll"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 87e8e081a93..bc0ae5d33fe 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.13.2"; + version = "0.14.2"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "100ls8p8w6jwcjh3ligly5alg8fzp21aj7b1qbndn9fm0y1nmjam"; + sha256 = "15mk7q89rs723c7i9wwq4rrvakwh834wvrsmsnayji5k1kwaj351"; }; - cargoSha256 = "0d9sz46yzh01dx973q10xzw4k7r7ylvg82s5pkp3zpwcin8smaiw"; + cargoSha256 = "03irndd48ck62chm4vmlcnfm98gwd86xm1ssq9glw3b3y0n6x845"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index ec9de0610ea..89970c7dc98 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.5.0"; + version = "2.5.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1m7jdgndbjynhl98an6g9gxxpp9bd6p3xqgzfilak8pamjkdwdp4"; + outputHash = "113dn10y0q8d2agr0g4cnx5fzdxjcz67i9089j86nn5i76wilm5s"; }; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 5534492cf37..dce42380c50 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash zsh; do - $bin/bin/skaffold completion $shell > skaffold.$shell + $out/bin/skaffold completion $shell > skaffold.$shell installShellCompletion skaffold.$shell done ''; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 7d4e4e0c69e..f7e1478bbec 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -34,7 +34,7 @@ buildGoPackage { inherit version; inherit src goPackagePath; - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; excludedPackages = [ "integration" ]; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index a5c13e2266e..cdf3ed5b71a 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -15,8 +15,8 @@ buildGoPackage rec { buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}"; postInstall = '' - mv $bin/bin/cli $bin/bin/toxiproxy-cli - mv $bin/bin/cmd $bin/bin/toxiproxy-cmd + mv $out/bin/cli $out/bin/toxiproxy-cli + mv $out/bin/cmd $out/bin/toxiproxy-cmd ''; meta = { diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index cc1f1c8021a..32e205a6f8d 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.7"; + version = "2.2.8"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1z31y1nqiyj6rml9lz8gcbr29myhs5wcap8jsvgm3pb7p9p9y8m9"; + sha256 = "0nvxda0dyhncgcl9qs34l4rj0jbdbg65a3ii5765p4899z6gzx95"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 64f24f8270d..f5d70b912df 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -20,25 +20,24 @@ version = "3.2.4"; }; childprocess = { - dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv"; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; type = "gem"; }; - version = "0.6.3"; + version = "3.0.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; domain_name = { dependencies = ["unf"]; @@ -213,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh"; + sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; type = "gem"; }; - version = "3.2019.1009"; + version = "3.2020.0425"; }; multi_json = { groups = ["default"]; @@ -255,10 +254,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; netrc = { groups = ["default"]; @@ -285,10 +284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -348,10 +347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; unf = { dependencies = ["unf_ext"]; @@ -369,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.6"; + version = "0.0.7.7"; }; vagrant_cloud = { dependencies = ["rest-client"]; @@ -412,10 +411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fzg9liydl244xq6r7x0wy06zn1n4czdbnjavy3150c3qsnv71a"; + sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -423,9 +422,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6"; + sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 5f2a45f7427..880703383d1 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -9,16 +9,16 @@ buildGoPackage { pname = "vgo2nix"; - version = "unstable-2019-02-06"; + version = "unstable-2020-05-05"; goPackagePath = "github.com/adisbladis/vgo2nix"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { - owner = "adisbladis"; + owner = "nix-community"; repo = "vgo2nix"; - rev = "f2694cd352830f0561bc00bbcaa08cefb2e36439"; - sha256 = "10cwi67cyhqjq1pwhry2n1v8z7wybl4cawzmjmfgs5mbsvqp0h78"; + rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac"; + sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh"; }; goDeps = ./deps.nix; @@ -28,12 +28,12 @@ buildGoPackage { postInstall = with stdenv; let binPath = lib.makeBinPath [ nix-prefetch-git go ]; in '' - wrapProgram $bin/bin/vgo2nix --prefix PATH : ${binPath} + wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath} ''; meta = with stdenv.lib; { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; - homepage = "https://github.com/adisbladis/vgo2nix"; + homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; maintainers = with maintainers; [ adisbladis ]; }; diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix index 4f8506794d3..2d9a130e43e 100644 --- a/pkgs/development/tools/vgo2nix/deps.nix +++ b/pkgs/development/tools/vgo2nix/deps.nix @@ -127,12 +127,66 @@ }; } { + goPackagePath = "github.com/yuin/goldmark"; + fetch = { + type = "git"; + url = "https://github.com/yuin/goldmark"; + rev = "v1.1.27"; + sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "87dc89f01550"; + sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "v0.2.0"; + sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "0de0cce0169b"; + sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + }; + } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d99a578cf41b"; - sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm"; + rev = "97732733099d"; + sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } { @@ -140,8 +194,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "ded554d0681e"; - sha256 = "04rlq9hc3ccww9sbsrl48fl6wbjprb136rqxyr7dmgfj444aml56"; + rev = "0c9eba77bc32"; + sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; }; } ] diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 281d68d27de..a755cecc60b 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, python3, substituteAll }: +{ stdenv, fetchpatch, fetchFromGitHub, cmake, python3, substituteAll }: stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg"; + sha256 = "0zis0190zs37x1wq044qd2vyvzcrkm8kp0734byz1lpdlgl5257b"; fetchSubmodules = true; }; - patches = [ - (substituteAll { - src = ./version.patch; - inherit version; - }) - ]; + # https://github.com/WebAssembly/wabt/pull/1408 + patches = [ (fetchpatch { + url = "https://github.com/WebAssembly/wabt/pull/1408/commits/9115d0c55067435ec9c55924e8a2bb151bac095d.patch"; + sha256 = "1iklbz630vih08brsgq2d5q91kialg255sgd1mxl7023pvrhi44g"; + }) ]; nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; buildInputs = [ python3 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/wabt/version.patch b/pkgs/development/tools/wabt/version.patch deleted file mode 100644 index a49cd0bc155..00000000000 --- a/pkgs/development/tools/wabt/version.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 363a5660..ad3300ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,22 +68,7 @@ endif () - include(CheckTypeSize) - check_type_size(ssize_t SSIZE_T) - check_type_size(size_t SIZEOF_SIZE_T) -- --FIND_PACKAGE(Git QUIET REQUIRED) --EXECUTE_PROCESS(COMMAND -- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags -- RESULT_VARIABLE -- GIT_HASH_RESULT -- OUTPUT_VARIABLE -- GIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- --IF(${GIT_HASH_RESULT} EQUAL 0) -- SET(WABT_VERSION_INFO "${GIT_HASH}") --ELSE() -- MESSAGE(WARNING "Error running git describe to determine version") -- SET(WABT_VERSION_INFO "(unable to determine version)") --ENDIF() -+SET(WABT_VERSION_INFO "@version@") - - configure_file( - ${WABT_SOURCE_DIR}/src/config.h.in diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index 5d2550b89cb..ca8b40c4d53 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; postInstall = '' - mv $bin/bin/cli $bin/bin/wally + mv $out/bin/cli $out/bin/wally ''; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index 661865ee74e..95253895648 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -20,7 +20,6 @@ buildGoPackage rec { description = "websocket command line tool"; homepage = "https://github.com/hashrocket/ws"; license = licenses.mit; - maintainers = [ maintainers.the-kenny ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index cd7b8616366..861ef0fc847 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -110,11 +110,15 @@ runCommand "xcodebuild-${xcbuild.version}" { mkdir -p $out/Applications/Xcode.app/Contents ln -s $out $out/Applications/Xcode.app/Contents/Developer + # The native xcodebuild command supports an invocation like "xcodebuild -version -sdk" without specifying the specific SDK, so we simulate this by + # detecting this case and simulating the output; printing the header and appending the normal output via appending the sdk version to the positional + # arguments we pass through to the wrapped xcodebuild. makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ --set DEVELOPER_DIR "$out" \ --set SDKROOT ${sdkName} \ + --run '[ "$#" -eq 2 ] && [ "$1" = "-version" ] && [ "$2" = "-sdk" ] && echo ${sdkName}.sdk - macOS ${sdkVer} \(macosx${sdkVer}\) && set -- "$@" "${sdkName}"' \ --run '[ "$1" = "-version" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \ --run '[ "$1" = "-license" ] && exit 0' diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index e2f8dd7173c..1c9c353fd51 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.1.0"; - sha256 = "0pw39628y8qi2jagmmnfj0fkcbv00qcd1cqybiprf1v22hhij44n"; + version = "14.2.0"; + sha256 = "1kqnkqkv2chw9s0hazbaba5y1555h526825xqk4rr441wcxcrzcf"; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index ba304972d9a..2b3bf34807a 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.21.2"; + version = "7.23.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "18lb8csfmy5j97zdg3c5l23aaw9hjg04qhfc1sz9pgi7xhwz5g1b"; + sha256 = "0m3pjimpahc3kiwdq21rwyg6ckdh3avhzx3apmygisaz4gnab94d"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index c1ba8851f5c..1548a9de63a 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -195,6 +195,6 @@ buildPythonApplication rec { license = licenses.agpl3Plus; broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ]; + maintainers = with maintainers; [ oxij Profpatsch enzime ]; }; } diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 3dcfe201d2c..3ca8ee4693a 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu"; + postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; meta = with stdenv.lib; { description = "A new coffee-break roguelike game"; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index c1d1c38990d..1ec24e02be0 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bzflag"; - version = "2.4.18"; + version = "2.4.20"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx"; + sha256 = "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index c10e79418be..ea7c3c6e478 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.7.2"; + version = "5.8.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq"; + sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; }; postPatch = '' diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 75ff970a16a..e57d6bcab06 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A model-airplane flight simulator"; - maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 32e173de2b8..a293989d5e6 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "cutemaze"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; - sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj"; + sha256 = "0pw31j2i3ifndikhz9w684ia00r8zvcgnb66ign9w4lgs1zjgcrw"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/games/dwarf-fortress/df_permission b/pkgs/games/dwarf-fortress/df_permission index b0121bb3fa3..dc1c0c151e0 100644 --- a/pkgs/games/dwarf-fortress/df_permission +++ b/pkgs/games/dwarf-fortress/df_permission @@ -12,7 +12,7 @@ Tarn On Fri, Oct 29, 2010 at 6:56 AM, <roconnor@theorem.ca> wrote: > I'd like to distribute a *slightly* modified version of Dwarf Fortress which > is needed to run it under the NixOS distribution of Linux (see -> <http://nixos.org/> +> <https://nixos.org/> > > Modification: The interpreter location /lib/ld-linux.so.2 in > lib/Dwarf_Fortress is replaced with the location of ld-linux.so.2 under the diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 4485b3ae784..f5c093e1f16 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to manage dwarves in a running game of Dwarf Fortress"; - maintainers = with maintainers; [ the-kenny abbradar bendlas numinit jonringer ]; + maintainers = with maintainers; [ abbradar bendlas numinit jonringer ]; license = licenses.mit; platforms = platforms.unix; homepage = "https://github.com/Dwarf-Therapist/Dwarf-Therapist"; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 20fbd9fa18b..9200d01aa98 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation { inherit homepage; license = licenses.unfreeRedistributable; platforms = attrNames platforms; - maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar numinit shazow ]; + maintainers = with maintainers; [ a1russell robbinch roconnor abbradar numinit shazow ]; }; } diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 86db4a3209e..83dadb7192c 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ezquake"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ezQuake"; repo = pname + "-source"; rev = version; - sha256 = "0375jndynhkl59m80fhmq12v5g24zy16c7ly08h004cmjzqsikn4"; + sha256 = "11kyrqpc8w393kvfz2p2h2m7k8rm4w644m86w733b8w157f2fsk0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index d3c3271710a..c16c33666f3 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight simulator"; - maintainers = with maintainers; [ raskin the-kenny ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; hydraPlatforms = []; # disabled from hydra because it's so big license = licenses.gpl2; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index ac05aab3ce6..3f64d92f07f 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python +{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python3 , zlib, bzip2, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 @@ -12,19 +12,19 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1b3q5k9wpv7z24svz01ybw8d8wlzkkdr6ia5hgp6cxk6vq67n67s"; + sha256 = "023slffi06j52amrnmd8n12rmf778cngxx6xg4hbsgckj2nyfmg9"; }; postPatch = '' for f in {common,utility}/*.py; do substituteInPlace $f \ - --replace '/usr/bin/env python' ${python.interpreter} + --replace '/usr/bin/env python3' ${python3.interpreter} done ''; diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index 19074a309dd..fb9e1cf6617 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = "mv $bin/bin/harmonist.git $bin/bin/harmonist"; + postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist"; meta = with stdenv.lib; { description = "A stealth coffee-break roguelike game"; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index dffeb2ac556..771554192d8 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -6,8 +6,9 @@ }: let + # gameServer/hedgewars-server.cabal depends on network < 3 ghc = ghcWithPackages (pkgs: with pkgs; [ - SHA bytestring entropy hslogger network pkgs.zlib random + SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random regex-tdfa sandi utf8-string vector ]); @@ -40,6 +41,15 @@ mkDerivation rec { "-DNOSERVER=${if withServer then "OFF" else "ON"}" ]; + + # hslogger brings network-3 and network-bsd which conflict with + # network-2.6.3.1 + preConfigure = '' + substituteInPlace gameServer/CMakeLists.txt \ + --replace "haskell_flags}" \ + "haskell_flags} -package network-2.6.3.1 -hide-package network-bsd" + ''; + NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ SDL2.out SDL2_image diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 24ea0e8c5c0..1ef0fd147d8 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "11.3f"; + version = "11.3l"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "0i6dksxx33xga4pq41qsfllqras1hzk14ffqhnk11aj5lrfg98rm"; + sha256 = "0fniyaf9mgg99s03wbdc36zg909kshpdfk9pn8pkai0x99lghkwb"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix new file mode 100644 index 00000000000..b8c4ea281df --- /dev/null +++ b/pkgs/games/mari0/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, zip, love_11, lua, makeWrapper, makeDesktopItem }: + +let + pname = "mari0"; + version = "1.6.2"; + + desktopItem = makeDesktopItem { + name = "mari0"; + exec = pname; + comment = "Crossover between Super Mario Bros. and Portal"; + desktopName = "mari0"; + genericName = "mari0"; + categories = "Game"; + }; + +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "Stabyourself"; + repo = pname; + rev = "${version}"; + sha256 = "1zqaq4w599scsjvy1rsb21fd2r8j3srx9vym4ir9bh666dp36gxa"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ lua love_11 zip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = + '' + mkdir -p $out/bin $out/share/games/lovegames $out/share/applications + zip -9 -r ${pname}.love ./* + mv ${pname}.love $out/share/games/lovegames/${pname}.love + makeWrapper ${love_11}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + chmod +x $out/bin/${pname} + ''; + + meta = with stdenv.lib; { + description = "Crossover between Super Mario Bros. and Portal"; + platforms = platforms.linux; + license = licenses.mit; + downloadPage = "https://stabyourself.net/mari0/"; + }; + +} diff --git a/pkgs/games/netris/default.nix b/pkgs/games/netris/default.nix new file mode 100644 index 00000000000..994db4e67f8 --- /dev/null +++ b/pkgs/games/netris/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation { + pname = "netris"; + version = "0.52"; + + src = fetchFromGitHub { + owner = "naclander"; + repo = "netris"; + rev = "6773c9b2d39a70481a5d6eb5368e9ced6229ad2b"; + sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm"; + }; + + buildInputs = [ + ncurses + ]; + + configureScript = "./Configure"; + dontAddPrefix = true; + + installPhase = '' + mkdir -p $out/bin + cp ./netris $out/bin + ''; + + meta = with stdenv.lib; { + description = "A free networked version of T*tris"; + license = licenses.gpl2; + maintainers = with maintainers; [ patryk27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 2e115775d00..43376322cc7 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.openttd.org/"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jcumming the-kenny fpletz ]; + maintainers = with maintainers; [ jcumming fpletz ]; }; } diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 5d6316b1ddd..00b1f68e137 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase +{ mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite , wrapQtAppsHook , tinyxml2, target ? "client" }: @@ -16,7 +16,7 @@ let ''; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "pokerth-${target}-${version}"; version = "1.1.2"; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index dcf1081e4d0..70c5657508b 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,9 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig +{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper , openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }: let dir = "stk-code"; + assets = fetchsvn { + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "18212"; + sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf"; + name = "stk-assets"; + }; in stdenv.mkDerivation rec { pname = "supertuxkart"; @@ -17,15 +23,9 @@ in stdenv.mkDerivation rec { sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; name = dir; }) - (fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18212"; - sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf"; - name = "stk-assets"; - }) ]; - nativeBuildInputs = [ cmake gettext libtool pkgconfig ]; + nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ]; buildInputs = [ libX11 libXrandr @@ -38,8 +38,14 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 + "-DCHECK_ASSETS=OFF" ]; + # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds + preFixup = '' + wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" + ''; + sourceRoot = dir; meta = with stdenv.lib; { diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 13918d2f7a5..3035c02e262 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "teeworlds"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "teeworlds"; repo = "teeworlds"; rev = version; - sha256 = "1llrzcc9p8pswk58rj4qh4g67nlji8q2kw3hxh3qpli85jvkdmyx"; + sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz"; fetchSubmodules = true; }; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index d5f44daf156..14d51ee87bd 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, qt5, box2d, which, cmake, gettext }: +{ stdenv, mkDerivation, fetchgit, qt5, box2d, which, cmake, gettext }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "tbe"; version = "0.9.3.1"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index b16c0645cda..8736edd0e61 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.3.1"; + version = if stdenv.isDarwin then "2.2.6" else "2.3.3"; passthru = { inherit version; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = if version == "2.2.6" then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20" - else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv"; + else "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6"; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 9bee05bfb25..3ca64e0e8f8 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl cups dbus enscript ]; patches = [ - # for CVE-2015-8327 & CVE-2015-8560 (fetchpatch { + name = "CVE-2015-8327+CVE-2015-8560.patch"; url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4"; }) diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix new file mode 100644 index 00000000000..2f46d950d58 --- /dev/null +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -0,0 +1,38 @@ +{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: + +mkDerivation rec { + pname = "pentablet-driver"; + version = "1.2.13.1"; + + src = fetchzip { + url = "https://download01.xp-pen.com/file/2020/04/Linux_Pentablet_V${version}.tar.gz(20200428).zip"; + sha256 = "1r423hcpi26v82pzl59br1zw5vablikclqsy6mcqi0v5p84hfrdd"; + } + /Linux_Pentablet_V1.2.13.1.tar.gz; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + libusb1 + libX11 + libXtst + qtbase + libglvnd + stdenv.cc.cc.lib + ]; + + installPhase = '' + mkdir -p $out/bin + cp Pentablet_Driver $out/bin/pentablet-driver + cp config.xml $out/bin/config.xml + ''; + + meta = with stdenv.lib; { + homepage = "https://www.xp-pen.com/download-46.html"; + description = "Driver for XP-PEN Pentablet drawing tablets"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/misc/drivers/xp-pen-g430/default.nix b/pkgs/misc/drivers/xp-pen-g430/default.nix deleted file mode 100644 index c382239f26a..00000000000 --- a/pkgs/misc/drivers/xp-pen-g430/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: -stdenv.mkDerivation rec { - pname = "xp-pen-G430"; - version = "20190820"; - - src = fetchzip { - url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; - sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; - } + /Linux_Pentablet_V1.3.0.0.tar.gz; - - nativeBuildInputs = [ - autoPatchelfHook - wrapQtAppsHook - ]; - - buildInputs = [ - libusb1 - libX11 - libXtst - qtbase - libglvnd - stdenv.cc.cc.lib - ]; - - installPhase = '' - mkdir -p $out/bin - cp {Pentablet_Driver,config.xml} "$out"/bin - ''; - - meta = with stdenv.lib; { - homepage = "https://www.xp-pen.com/download-46.html"; - description = "Driver for the XP-PEN G430 drawing tablet"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ ivar ]; - }; -} diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 38730ec752b..214c1e6e75b 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "fs-uae"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "0v5c8ns00bam4myj7454hpkrnm9i81jwdzrp5nl7gaa18qb60hjq"; + sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index ea860af1fdf..a8ab7e908f2 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "1rszcy5lgfrw0f9b62sd69kgz1xziki3d55vpqh6k9jdmwzxyym4"; + sha256 = "0v3w0miyz86ihcir7ab82zjfklp550pk6g9xjxcx6mmvhp9dws8i"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 72dc48c1f4d..14189e5b387 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "1iwhslrkq887v035j68lhblybww8r792515rp2m5qzmdgnjzsvbb"; + sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 444ef29b784..ab183dfd38e 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { description = "A script to install DLLs needed to work around problems in Wine"; license = stdenv.lib.licenses.lgpl21; homepage = "https://github.com/Winetricks/winetricks"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch new file mode 100644 index 00000000000..c914634f579 --- /dev/null +++ b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch @@ -0,0 +1,862 @@ +From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001 +From: Chris Liddell <chris.liddell@artifex.com> +Date: Mon, 27 Apr 2020 11:04:57 +0100 +Subject: [PATCH] Bug 702364: Fix missing echogs dependencies + +Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c +to fix parallel build +--- + contrib/contrib.mak | 281 ++++++++++++++++++++++---------------------- + 1 file changed, 143 insertions(+), 138 deletions(-) + +diff --git a/contrib/contrib.mak b/contrib/contrib.mak +index 5411ae902..7dd9822a9 100644 +--- a/contrib/contrib.mak ++++ b/contrib/contrib.mak +@@ -22,6 +22,10 @@ + CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) + CONTRIBSRC=$(CONTRIBDIR)$(D) + ++# Almost all device drivers depend on the following: ++CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h) ++CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH) ++ + ###### --------------------------- Catalog -------------------------- ###### + + # The following drivers are user-contributed, and maintained (if at all) by +@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \ + $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c + + $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcmono $(bjc_) + + $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcgray $(bjc_) + + $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccmyk $(bjc_) + + $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccolor $(bjc_) + + +@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL) + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 670 + $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch) + # Printer: HP 850 + $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 890 + $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 1600 + $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) + + $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ +@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ + + # Author: Matthew Gelhaus (mgelhaus@proaxis.com) + # Printer: HP 880c +-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev ++$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \ ++ $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) + + +@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL) + # Author: Rene Harsch (rene@harsch.net) + # Printer: HP 970Cxi + $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) + + $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ +@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h + ### NOTE: Same as chp2200 (some PJL and CRD changes). + + $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) + + +@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ + ### NOTE: Depends on the presence of the cdj850 section. + + $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) + + +@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ + GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) + + $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)gdi $(GDIMONO) + + $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)samsunggdi $(GDIMONO) + + $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ +@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ + + hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) + $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1250 $(hl1250_) + + $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1240 $(hl1250_) + + # Author: Marek Michalkiewicz <marekm@linux.org.pl> + # Printer: Brother HL-1250 (may work with some other models too) + $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c + + +@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ) + # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) + # Printer: DEC LN03 + $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ln03 $(ln03_) + + # Author: Nick Brown (nick.brown@coe.int) + # Printer: DEClaser 2100 + $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)dl2100 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA50 + $(DD)la50.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la50 $(ln03_) + + # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu) + # Printer: DEC LA70 + $(DD)la70.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la70 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA75 + $(DD)la75.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75 $(ln03_) + + # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de) + # Printer: DEC LA75plus + $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75plus $(ln03_) + + $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ +@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) + $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c + + $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc1900 $(escv_) + + $(DD)alc2000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc2000 $(escv_) + + $(DD)alc4000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4000 $(escv_) + + $(DD)alc4100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4100 $(escv_) + + $(DD)alc8500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8500 $(escv_) + + $(DD)alc8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8600 $(escv_) + + $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ +@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)alc9100 $(escv_) + + $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp3000c $(escv_) + + $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8000c $(escv_) + + $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ +@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)lp8200c $(escv_) + + $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300c $(escv_) + + $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8500c $(escv_) + + $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8800c $(escv_) + + $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ +@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)lp9000c $(escv_) + + $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200c $(escv_) + + $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9500c $(escv_) + + $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9800c $(escv_) + + $(DD)lps6500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps6500 $(escv_) + + $(DD)epl2050.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050 $(escv_) + + $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050p $(escv_) + + $(DD)epl2120.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2120 $(escv_) + + $(DD)epl2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2500 $(escv_) + + $(DD)epl2750.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2750 $(escv_) + + $(DD)epl5800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5800 $(escv_) + + $(DD)epl5900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5900 $(escv_) + + $(DD)epl6100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6100 $(escv_) + + $(DD)epl6200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6200 $(escv_) + + $(DD)lp1800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1800 $(escv_) + + $(DD)lp1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1900 $(escv_) + + $(DD)lp2200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2200 $(escv_) + + $(DD)lp2400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2400 $(escv_) + + $(DD)lp2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2500 $(escv_) + + $(DD)lp7500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7500 $(escv_) + + $(DD)lp7700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7700 $(escv_) + + $(DD)lp7900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7900 $(escv_) + + $(DD)lp8100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8100 $(escv_) + + $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300f $(escv_) + + $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8400f $(escv_) + + $(DD)lp8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600 $(escv_) + + $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600f $(escv_) + + $(DD)lp8700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8700 $(escv_) + + $(DD)lp8900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8900 $(escv_) + + $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9000b $(escv_) + + $(DD)lp9100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9100 $(escv_) + + $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200b $(escv_) + + $(DD)lp9300.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9300 $(escv_) + + $(DD)lp9400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9400 $(escv_) + + $(DD)lp9600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600 $(escv_) + + $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600s $(escv_) + + $(DD)lps4500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps4500 $(escv_) + + $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplcolor $(escv_) + + $(DD)eplmono.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplmono $(escv_) + + # ------ The Lexmark 5700 and 7000 devices ------ # + + lex7000_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex7000 $(lex7000_) + + lex5700_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex5700 $(lex5700_) + + lex3200_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex3200 $(lex3200_) + + lex2050_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex2050 $(lex2050_) + + $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ +@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \ + $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c + + $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lxm3200 $(lxm3200_) + + +@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \ + $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c + + $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips4 $(lipsr_) + + lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ) + + $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)lips4v $(lipsv_) + $(ADDMOD) $(DD)lips4v -include $(GLD)vector + +@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\ + ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### + + $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips2p $(lipsr_) + + $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjc880j $(lipsr_) + + +@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ + md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) + + $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md2k $(md2k_) + + $(DD)md5k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md5k $(md2k_) + + $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c + + +@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ + + oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) + $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oki4w $(oki4w_) + + # Author: Ivan Schreter (ivan@shadow.sk) +@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\ + $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c + + $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)opvp $(opvp_) + + $(DD)oprp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oprp $(opvp_) + + +@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \ + + # The generic pcl3 device with selectable subdevices + $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pcl3 $(pcl3_) + + # Fixed devices for specific printers + $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjplus $(pcl3_) + $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjportable $(pcl3_) + $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj310 $(pcl3_) + $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj320 $(pcl3_) + $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj340 $(pcl3_) + $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj400 $(pcl3_) + $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500 $(pcl3_) + $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500c $(pcl3_) + $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj510 $(pcl3_) + $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj520 $(pcl3_) + $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj540 $(pcl3_) + $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj550c $(pcl3_) + $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj560c $(pcl3_) + $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj600 $(pcl3_) + $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj660c $(pcl3_) + $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj670c $(pcl3_) + $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj680c $(pcl3_) + $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj690c $(pcl3_) + $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj850c $(pcl3_) + $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj855c $(pcl3_) + $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj870c $(pcl3_) + $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj890c $(pcl3_) + $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj1120c $(pcl3_) + + #------------------------------------------------------------------------------ +@@ -985,7 +990,7 @@ pcl3-install: + + xes_=$(DEVOBJ)gdevxes.$(OBJ) + $(DD)xes.dev : $(xes_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)xes $(xes_) + + # Author: Peter Flass (flass@lbdrscs.bitnet) +@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D) + + pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr201 $(pr201_) + +-$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr150 $(pr201_) + +-$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000 $(pr201_) + +-$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000_4 $(pr201_) + + $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ +@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ + + jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)jj100 $(jj100_) + + $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ +@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ + bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)bj10v.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10v $(bj10v_) + + $(DD)bj10vh.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10vh $(bj10v_) + + # Uncomment the following line if you are using MS-DOS on PC9801 series. +@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \ + dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)dmprt $(dmprt_) + $(ADDMOD) $(DD)dmprt -ps dmp_init + +@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp + $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c + + $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj700v2c $(mj700v2c_) + + $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj500c $(mj700v2c_) + + $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj6000c $(mj700v2c_) + + $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj8000c $(mj700v2c_) + + ### ----------------- The Fujitsu FMPR printer device ----------------- ### +@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ + fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmpr $(fmpr_) + + $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ +@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ + fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmlbp $(fmlbp_) + + $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ +@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ + ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ml600 $(ml6_) + + $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ +@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ + lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) + + $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp310 $(lbp3x0_) + + $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp320 $(lbp3x0_) + + $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) +@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c + + $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)npdl $(npdl_) + + ### ------- EPSON ESC/Page printer device ----------------- ### +@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c + + $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)escpage $(escpage_) + + $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2000 $(escpage_) + + ### --- The RICOH RPDL language printer device ------ ### +@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c + + $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)rpdl $(rpdl_) + + ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### +@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ + # $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c + # + #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + # $(SETPDEV2) $(DD)nx100f $(rpdl_) + # + #$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + # $(SETPDEV2) $(DD)nx100v $(rpdl_) + + ### ------------ The ALPS Micro Dry printer devices ------------ ### +@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ + alps_=$(DEVOBJ)gdevalps.$(OBJ) + + $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Mono $(alps_) + + $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Eco $(alps_) + + $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md1xMono $(alps_) + + $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ +-- +2.26.2 + diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 161ee8471bc..7f6766cf462 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; }) + # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, + # Remove on update to version > 9.52 + ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch ]; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index d3f284a2ddb..c3bca18a9a4 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -47,7 +47,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index cdc8417a9c1..61c89339fe7 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -46,7 +46,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 3277abbb77b..7546c7626ed 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.6"; + version = "7.0.7"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0pc6xbwxljpj7h37za63kspdi90ap58x6x5b7hsmlhahblvlw0b8"; + sha256 = "0vgzb923x2q2w1zgbc56d50a5qj9xm77lg7czfzg3va7vd921gy8"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index d745198e6a4..5e1703c8cc3 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,6 +188,7 @@ let vam ? null, pathogen ? null, plug ? null, + beforePlugins ? "", customRC ? "" }: @@ -341,6 +342,8 @@ let " configuration generated by NIX set nocompatible + ${beforePlugins} + ${vamImpl} ${pathogenImpl} ${plugImpl} diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 475d18e3ac7..cb145ade054 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -158,8 +158,8 @@ in mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.6.3"; - sha256 = "1mc3awybzd2ql1b86inirhsw3j2c7cs0b0nvbjp38jjpq674bmj7"; + version = "1.9.0"; + sha256 = "0p2wbnw98zmjbfiz4mi1mh131s78r01kjnja339lwdigqxg88gi6"; }; meta = { license = stdenv.lib.licenses.asl20; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index e31f9b91f97..fad33b21d04 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { pname = "${targetPrefix}cctools-binutils-darwin"; inherit (cctools) version; - outputs = [ "out" "info" "man" ]; + outputs = [ "out" "man" ]; buildCommand = '' mkdir -p $out/bin $out/include @@ -42,12 +42,13 @@ stdenv.mkDerivation { ln -s ${cctools}/libexec $out/libexec - mkdir -p "$info/nix-support" "$man/nix-support" - printWords ${binutils-unwrapped.info} \ - >> $info/nix-support/propagated-build-inputs - # FIXME: cctools missing man pages - printWords ${binutils-unwrapped.man} \ - >> $man/nix-support/propagated-build-inputs + mkdir -p "$man"/share/man/man{1,5} + for i in ${builtins.concatStringsSep " " cmds}; do + for path in "${cctools.man}"/share/man/man?/$i.*; do + dest_path="$man''${path#${cctools.man}}" + ln -sv "$path" "$dest_path" + done + done ''; passthru = { diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 368f2938064..0c25f225291 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +, installShellFiles , libcxxabi, libuuid , libobjc ? null, maloader ? null , enableTapiSupport ? true, libtapi @@ -28,9 +29,9 @@ let sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optional enableTapiSupport libtapi; @@ -88,6 +89,8 @@ let pushd include make DSTROOT=$out/include RC_OS=common install popd + + installManPage ar/ar.{1,5} ''; passthru = { diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix new file mode 100644 index 00000000000..9cbd6e62c7a --- /dev/null +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + pname = "spacebar"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "somdoron"; + repo = pname; + rev = "v${version}"; + sha256 = "0v8v4xsc67qpzm859r93ggq7rr7hmaj6dahdlg6g3ppj81cq0khz"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1/ + cp ./bin/spacebar $out/bin/spacebar + cp ./doc/spacebar.1 $out/share/man/man1/spacebar.1 + ''; + + meta = with stdenv.lib; { + description = "A status bar for yabai tiling window management"; + homepage = "https://github.com/somdoron/spacebar"; + platforms = platforms.darwin; + maintainers = [ maintainers.cmacrae ]; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-topology-conf/default.nix index 26febf0daa7..f73bbbdba35 100644 --- a/pkgs/os-specific/linux/alsa-topology-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-topology-conf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "https://www.alsa-project.org/"; description = "ALSA topology configuration files"; longDescription = '' diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix index 6f2766ef9ff..685ba3e2c3e 100644 --- a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "https://www.alsa-project.org/"; description = "ALSA Use Case Manager configuration"; longDescription = '' diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 79e32a05f46..7f95ef47ee9 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx"; + sha256 = "1hw02bib06fjyw61as5pmhf0qxy0wv0nw8fff2i8a9d1zcd8xf3p"; }; format = "other"; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 8346fb1c73c..80785015e76 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "conntrack-tools"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; - sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; + sha256 = "0psx41bclqrh4514yzq03rvs3cq3scfpd1v4kkyxnic2hk65j22r"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 4f7dae930aa..462658396c8 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "criu"; - version = "3.13"; + version = "3.14"; src = fetchurl { url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; - sha256 = "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa"; + sha256 = "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 13f4f71c3c1..2a0e52c658a 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "V131/l05FKYFavRMXRaiW1bQkTCEn7MTyyD+bqYClU4="; + sha256 = "ga8MpbY9tTwr0jsmjEAMyFxDC+yD4LBTx5gXRXig31M="; }; # libfwupd goes to lib @@ -154,34 +154,6 @@ stdenv.mkDerivation rec { # they are not really part of the library. ./install-fwupdplugin-to-out.patch - # Make it easier to patch installed-tests directory. - # https://github.com/fwupd/fwupd/pull/2002 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/2f12e38e61d982dea63778736e2b71d16f0e9925.patch"; - sha256 = "goTyDj0v50FOQYCS+LhPjo0AEugubr6aBIGfO9ztZOA="; - }) - - # Install systemd files to our prefix. - # https://github.com/fwupd/fwupd/pull/2006 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/463db5162fe4f6fea417973ff95a44ed51ec6402.patch"; - sha256 = "I0TIfnCca83QpINABUINtl8nIB78dG8OR9MC/hP2hg8="; - }) - - # Fix installed tests. - # https://github.com/fwupd/fwupd/issues/2007 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/c727742df3702fc934e2d9488c883dcbdfa59e9c.patch"; - sha256 = "b9D2Xblf1VbpS5XZpHtwEJhzuq7+840l7skW5w0NMBU="; - }) - - # Fix build with bash-completion 2.10 - # https://github.com/fwupd/fwupd/pull/2014 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/0f035013dfb150c2c3fc7f51090103ba84bd1c06.patch"; - sha256 = "VXRf5N3inaWThudk6pc4mtp6cMEIyybkdfqKin+9XSw="; - }) - # Installed tests are installed to different output # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. (substituteAll { diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix new file mode 100644 index 00000000000..73ab46b3c8a --- /dev/null +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "sof-firmware"; + version = "1.4.2"; + + src = fetchurl { + url = "https://www.alsa-project.org/files/pub/misc/sof/${pname}-${version}.tar.bz2"; + sha256 = "1nkh020gjm45vxd6fvmz63hj16ilff2nl5avvsklajjs6xci1sf5"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + rm lib/firmware/intel/{sof/LICENCE,sof-tplg/LICENCE} + mkdir $out + cp -r lib $out/lib + ''; + + meta = with stdenv.lib; { + description = "Sound Open Firmware"; + homepage = "https://www.sofproject.org/"; + license = with licenses; [ bsd3 isc ]; + maintainers = with maintainers; [ lblasc ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e254891b001..636d174b155 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -254,6 +254,27 @@ let SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) PSS_MIXER = whenOlder "4.12" yes; + # Enable Sound Open Firmware support + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && + versionAtLeast version "5.5") { + SND_SOC_SOF_TOPLEVEL = yes; + SND_SOC_SOF_ACPI = module; + SND_SOC_SOF_PCI = module; + SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes; + SND_SOC_SOF_CANNONLAKE_SUPPORT = yes; + SND_SOC_SOF_COFFEELAKE_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_H_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes; + SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes; + SND_SOC_SOF_GEMINILAKE_SUPPORT = yes; + SND_SOC_SOF_HDA_AUDIO_CODEC = yes; + SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = yes; + SND_SOC_SOF_HDA_LINK = yes; + SND_SOC_SOF_ICELAKE_SUPPORT = yes; + SND_SOC_SOF_INTEL_TOPLEVEL = yes; + SND_SOC_SOF_JASPERLAKE_SUPPORT = yes; + SND_SOC_SOF_MERRIFIELD_SUPPORT = yes; + SND_SOC_SOF_TIGERLAKE_SUPPORT = yes; }; usb-serial = { diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix new file mode 100644 index 00000000000..447704eedc8 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, linux }: + +with lib; + +assert versionAtLeast linux.version "4.6"; + +stdenv.mkDerivation { + name = "gpio-utils-${linux.version}"; + + inherit (linux) src makeFlags; + + preConfigure = '' + cd tools/gpio + ''; + + separateDebugInfo = true; + installFlags = [ "install" "DESTDIR=$(out)" "bindir=/bin" ]; + + meta = { + description = "Linux tools to inspect the gpiochip interface"; + maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json deleted file mode 100644 index d2f6f4b3e83..00000000000 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "4.14": { - "name": "linux-hardened-4.14.178.a.patch", - "sha256": "1klwymsd19y2sifbny5ikgry9rx9q2cbb13h1xqy42573add6q8c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.178.a/linux-hardened-4.14.178.a.patch" - }, - "4.19": { - "name": "linux-hardened-4.19.120.a.patch", - "sha256": "14l30127nd8d2q72k51alwmh8h57fyam0q6sggdljh16qlqilirl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.120.a/linux-hardened-4.19.120.a.patch" - }, - "5.4": { - "name": "linux-hardened-5.4.38.a.patch", - "sha256": "1aaky36azfagk0nf5k92glil3f7ymijcvx03g8rnlinlsm3i2614", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.38.a/linux-hardened-5.4.38.a.patch" - }, - "5.5": { - "name": "linux-hardened-5.5.19.a.patch", - "sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" - }, - "5.6": { - "name": "linux-hardened-5.6.10.a.patch", - "sha256": "0jmyk7pl9ddbyhskzadd1z9svhm18v8gdv6kgb0ca6dbhf6ggsgy", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.10.a/linux-hardened-5.6.10.a.patch" - } -} diff --git a/pkgs/os-specific/linux/kernel/anthraxx.asc b/pkgs/os-specific/linux/kernel/hardened/anthraxx.asc index 101ccfbf0f2..101ccfbf0f2 100644 --- a/pkgs/os-specific/linux/kernel/anthraxx.asc +++ b/pkgs/os-specific/linux/kernel/hardened/anthraxx.asc diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened/config.nix index 95510fe218e..95510fe218e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened/config.nix diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json new file mode 100644 index 00000000000..76d27e29508 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -0,0 +1,27 @@ +{ + "4.14": { + "name": "linux-hardened-4.14.180.a.patch", + "sha256": "0rpk5lq947i4v48d6jv75rgwpncayr4agc3f2iich3hlkh5p72p3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.180.a/linux-hardened-4.14.180.a.patch" + }, + "4.19": { + "name": "linux-hardened-4.19.122.a.patch", + "sha256": "0jh5wyrwrmm9rqqi8fn6d6bd8lzkhj1aylnphsajyyx5v28hn1b2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.122.a/linux-hardened-4.19.122.a.patch" + }, + "5.4": { + "name": "linux-hardened-5.4.40.a.patch", + "sha256": "1w9yc0j8vshjyvb2qgxjvrdgwiy5lmjn3s1rmlch649vqp97j9w7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.40.a/linux-hardened-5.4.40.a.patch" + }, + "5.5": { + "name": "linux-hardened-5.5.19.a.patch", + "sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" + }, + "5.6": { + "name": "linux-hardened-5.6.12.a.patch", + "sha256": "1b6cwffb2b21h9xh2acm9q9j55cay87zbv9jjayv69znry4mzsx3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.12.a/linux-hardened-5.6.12.a.patch" + } +} diff --git a/pkgs/os-specific/linux/kernel/tag-hardened.patch b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch index ff8a3a12797..ff8a3a12797 100644 --- a/pkgs/os-specific/linux/kernel/tag-hardened.patch +++ b/pkgs/os-specific/linux/kernel/hardened/tag-hardened.patch diff --git a/pkgs/os-specific/linux/kernel/hardened/update.py b/pkgs/os-specific/linux/kernel/hardened/update.py new file mode 100755 index 00000000000..d6443d2e751 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/hardened/update.py @@ -0,0 +1,276 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p "python38.withPackages (ps: [ps.PyGithub])" git gnupg + +# This is automatically called by ../update.sh. + +from __future__ import annotations + +import json +import os +import re +import subprocess +import sys +from dataclasses import dataclass +from pathlib import Path +from tempfile import TemporaryDirectory +from typing import ( + Dict, + Iterator, + List, + Optional, + Sequence, + Tuple, + TypedDict, + Union, +) + +from github import Github +from github.GitRelease import GitRelease + +VersionComponent = Union[int, str] +Version = List[VersionComponent] + + +Patch = TypedDict("Patch", {"name": str, "url": str, "sha256": str}) + + +@dataclass +class ReleaseInfo: + version: Version + release: GitRelease + + +HERE = Path(__file__).resolve().parent +NIXPKGS_KERNEL_PATH = HERE.parent +NIXPKGS_PATH = HERE.parents[4] +HARDENED_GITHUB_REPO = "anthraxx/linux-hardened" +HARDENED_TRUSTED_KEY = HERE / "anthraxx.asc" +HARDENED_PATCHES_PATH = HERE / "patches.json" +MIN_KERNEL_VERSION: Version = [4, 14] + + +def run(*args: Union[str, Path]) -> subprocess.CompletedProcess[bytes]: + try: + return subprocess.run( + args, + check=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + encoding="utf-8", + ) + except subprocess.CalledProcessError as err: + print( + f"error: `{err.cmd}` failed unexpectedly\n" + f"status code: {err.returncode}\n" + f"stdout:\n{err.stdout.strip()}\n" + f"stderr:\n{err.stderr.strip()}", + file=sys.stderr, + ) + sys.exit(1) + + +def nix_prefetch_url(url: str) -> Tuple[str, Path]: + output = run("nix-prefetch-url", "--print-path", url).stdout + sha256, path = output.strip().split("\n") + return sha256, Path(path) + + +def verify_openpgp_signature( + *, name: str, trusted_key: Path, sig_path: Path, data_path: Path, +) -> bool: + with TemporaryDirectory(suffix=".nixpkgs-gnupg-home") as gnupg_home_str: + gnupg_home = Path(gnupg_home_str) + run("gpg", "--homedir", gnupg_home, "--import", trusted_key) + keyring = gnupg_home / "pubring.kbx" + try: + subprocess.run( + ("gpgv", "--keyring", keyring, sig_path, data_path), + check=True, + stderr=subprocess.PIPE, + encoding="utf-8", + ) + return True + except subprocess.CalledProcessError as err: + print( + f"error: signature for {name} failed to verify!", + file=sys.stderr, + ) + print(err.stderr, file=sys.stderr, end="") + return False + + +def fetch_patch(*, name: str, release: GitRelease) -> Optional[Patch]: + def find_asset(filename: str) -> str: + try: + it: Iterator[str] = ( + asset.browser_download_url + for asset in release.get_assets() + if asset.name == filename + ) + return next(it) + except StopIteration: + raise KeyError(filename) + + patch_filename = f"{name}.patch" + try: + patch_url = find_asset(patch_filename) + sig_url = find_asset(patch_filename + ".sig") + except KeyError: + print(f"error: {patch_filename}{{,.sig}} not present", file=sys.stderr) + return None + + sha256, patch_path = nix_prefetch_url(patch_url) + _, sig_path = nix_prefetch_url(sig_url) + sig_ok = verify_openpgp_signature( + name=name, + trusted_key=HARDENED_TRUSTED_KEY, + sig_path=sig_path, + data_path=patch_path, + ) + if not sig_ok: + return None + + return Patch(name=patch_filename, url=patch_url, sha256=sha256) + + +def parse_version(version_str: str) -> Version: + version: Version = [] + for component in version_str.split("."): + try: + version.append(int(component)) + except ValueError: + version.append(component) + return version + + +def version_string(version: Version) -> str: + return ".".join(str(component) for component in version) + + +def major_kernel_version_key(kernel_version: Version) -> str: + return version_string(kernel_version[:-1]) + + +def commit_patches(*, kernel_key: str, message: str) -> None: + new_patches_path = HARDENED_PATCHES_PATH.with_suffix(".new") + with open(new_patches_path, "w") as new_patches_file: + json.dump(patches, new_patches_file, indent=4, sort_keys=True) + new_patches_file.write("\n") + os.rename(new_patches_path, HARDENED_PATCHES_PATH) + message = f"linux/hardened/patches/{kernel_key}: {message}" + print(message) + if os.environ.get("COMMIT"): + run( + "git", + "-C", + NIXPKGS_PATH, + "commit", + f"--message={message}", + HARDENED_PATCHES_PATH, + ) + + +# Load the existing patches. +patches: Dict[str, Patch] +with open(HARDENED_PATCHES_PATH) as patches_file: + patches = json.load(patches_file) + +# Get the set of currently packaged kernel versions. +kernel_versions = {} +for filename in os.listdir(NIXPKGS_KERNEL_PATH): + filename_match = re.fullmatch(r"linux-(\d+)\.(\d+)\.nix", filename) + if filename_match: + nix_version_expr = f""" + with import {NIXPKGS_PATH} {{}}; + (callPackage {NIXPKGS_KERNEL_PATH / filename} {{}}).version + """ + kernel_version_json = run( + "nix-instantiate", "--eval", "--json", "--expr", nix_version_expr, + ).stdout + kernel_version = parse_version(json.loads(kernel_version_json)) + if kernel_version < MIN_KERNEL_VERSION: + continue + kernel_key = major_kernel_version_key(kernel_version) + kernel_versions[kernel_key] = kernel_version + +# Remove patches for unpackaged kernel versions. +for kernel_key in sorted(patches.keys() - kernel_versions.keys()): + commit_patches(kernel_key=kernel_key, message="remove") + +g = Github(os.environ.get("GITHUB_TOKEN")) +repo = g.get_repo(HARDENED_GITHUB_REPO) +failures = False + +# Match each kernel version with the best patch version. +releases = {} +for release in repo.get_releases(): + version = parse_version(release.tag_name) + # needs to look like e.g. 5.6.3.a + if len(version) < 4: + continue + + kernel_version = version[:-1] + kernel_key = major_kernel_version_key(kernel_version) + try: + packaged_kernel_version = kernel_versions[kernel_key] + except KeyError: + continue + + release_info = ReleaseInfo(version=version, release=release) + + if kernel_version == packaged_kernel_version: + releases[kernel_key] = release_info + else: + # Fall back to the latest patch for this major kernel version, + # skipping patches for kernels newer than the packaged one. + if kernel_version > packaged_kernel_version: + continue + elif ( + kernel_key not in releases or releases[kernel_key].version < version + ): + releases[kernel_key] = release_info + +# Update hardened-patches.json for each release. +for kernel_key in sorted(releases.keys()): + release_info = releases[kernel_key] + release = release_info.release + version = release_info.version + version_str = release.tag_name + name = f"linux-hardened-{version_str}" + + old_version: Optional[Version] = None + old_version_str: Optional[str] = None + update: bool + try: + old_filename = patches[kernel_key]["name"] + old_version_str = old_filename.replace("linux-hardened-", "").replace( + ".patch", "" + ) + old_version = parse_version(old_version_str) + update = old_version < version + except KeyError: + update = True + + if update: + patch = fetch_patch(name=name, release=release) + if patch is None: + failures = True + else: + patches[kernel_key] = patch + if old_version: + message = f"{old_version_str} -> {version_str}" + else: + message = f"init at {version_str}" + commit_patches(kernel_key=kernel_key, message=message) + +missing_kernel_versions = kernel_versions.keys() - patches.keys() + +if missing_kernel_versions: + print( + f"warning: no patches for kernel versions " + + ", ".join(missing_kernel_versions), + file=sys.stderr, + ) + +if failures: + sys.exit(1) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 013893c1cdd..8629eb8cf72 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.178"; + version = "4.14.180"; # 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 = "1pcqxmq9ir4f963aiw5bab9w2mp4vfiwaq2bk7nksbl2bs3k6b7x"; + sha256 = "03pd4wpg526n391jwc0kbmbxi059mvq8d42a9qbym9mnv5rzjkj4"; }; } // (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 4edc8359c51..577138542b3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.120"; + version = "4.19.122"; # 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 = "03mjng5ws9y56id99619ysarz73qqyylgc3mlknga1yphbhh16qb"; + sha256 = "1980vza1vf6cl772dynn4m0rgdjazbn125kd6sb3s06gqn72cl2h"; }; } // (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 09b34e26a47..58131815e0f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.221"; + version = "4.4.223"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06rpjnvrdp71flz948mfmx7jv8x2vmdg54zz1xpkb2458mwh5hbq"; + sha256 = "09fln0sdfif2zv2jifp24yiqi0vcyj8fqx2jz91g21zvsxk3x5nd"; }; } // (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 0db1d2908e3..9f2c7659abb 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.221"; + version = "4.9.223"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gh1x73xblxkb927igc3shrqnn49lcscwrq2fixmk9n7jb7q2hp6"; + sha256 = "1r9ag1fhy0g429q44qlqh0qkf42qkhzxa04gxlmnrinqypk00lyg"; }; } // (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 31d485877b7..ffe59480915 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.38"; + version = "5.4.40"; # 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 = "03pks3jx5kk0wnhjkm92wxdbgw8qbdg93sfwchnx88m2wfj9yaz7"; + sha256 = "1ar001rljlr15rcl77la5y1cj3plaqhdblnh87xsmv47fq13yml3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index eb60cfd9497..844fb18c21a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.10"; + version = "5.6.12"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1f81b0icn0r9gww95rckyxs5d4g8bwf4mmqkrmwxxf4xga19dp3v"; + sha256 = "0892ar2irfhd612sb8jpx85w0wwh4n76jgsv8wb92fp6mim37sns"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 05617f86917..8b5f1e58d14 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc3"; + version = "5.7-rc4"; extraMeta.branch = "5.7"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0gq4bdzz2px85l3fa9dq3jh3lp4c9kgph4njq6yxf9g3h0ifq7c6"; + sha256 = "1mnknjiax24iaj9n5k0s55vp6fvmb40s931qxj24v5p1lc5fznvb"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 71505840b86..d73e0a8ac90 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,6 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio -, utillinux +, utillinuxMinimal , writeTextFile }: @@ -281,7 +281,7 @@ let in assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; +assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; inherit version; @@ -292,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 1c4af8c32a6..8ce1ac2b587 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -35,7 +35,7 @@ tag_hardened = { name = "tag-hardened"; - patch = ./tag-hardened.patch; + patch = ./hardened/tag-hardened.patch; }; hardened = let @@ -43,7 +43,7 @@ name = lib.removeSuffix ".patch" src.name; patch = fetchurl src; }; - patches = builtins.fromJSON (builtins.readFile ./hardened-patches.json); + patches = builtins.fromJSON (builtins.readFile ./hardened/patches.json); in lib.mapAttrs mkPatch patches; # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 diff --git a/pkgs/os-specific/linux/kernel/update-hardened.py b/pkgs/os-specific/linux/kernel/update-hardened.py deleted file mode 100755 index 7f6949653af..00000000000 --- a/pkgs/os-specific/linux/kernel/update-hardened.py +++ /dev/null @@ -1,229 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python -p "python3.withPackages (ps: [ps.PyGithub])" git gnupg - -# This is automatically called by ./update.sh. - -import re -import json -import sys -import os.path -from glob import glob -import subprocess -from tempfile import TemporaryDirectory - -from github import Github - -HERE = os.path.dirname(os.path.realpath(__file__)) -HARDENED_GITHUB_REPO = 'anthraxx/linux-hardened' -HARDENED_TRUSTED_KEY = os.path.join(HERE, 'anthraxx.asc') -HARDENED_PATCHES_PATH = os.path.join(HERE, 'hardened-patches.json') -MIN_KERNEL_VERSION = [4, 14] - -def run(*args, **kwargs): - try: - return subprocess.run( - args, **kwargs, - check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - ) - except subprocess.CalledProcessError as err: - print( - f'error: `{err.cmd}` failed unexpectedly\n' - f'status code: {err.returncode}\n' - f'stdout:\n{err.stdout.decode("utf-8").strip()}\n' - f'stderr:\n{err.stderr.decode("utf-8").strip()}', - file=sys.stderr, - ) - sys.exit(1) - -def nix_prefetch_url(url): - output = run('nix-prefetch-url', '--print-path', url).stdout - return output.decode('utf-8').strip().split('\n') - -def verify_openpgp_signature(*, name, trusted_key, sig_path, data_path): - with TemporaryDirectory(suffix='.nixpkgs-gnupg-home') as gnupg_home: - run('gpg', '--homedir', gnupg_home, '--import', trusted_key) - keyring = os.path.join(gnupg_home, 'pubring.kbx') - try: - subprocess.run( - ('gpgv', '--keyring', keyring, sig_path, data_path), - check=True, stderr=subprocess.PIPE, - ) - return True - except subprocess.CalledProcessError as err: - print( - f'error: signature for {name} failed to verify!', - file=sys.stderr, - ) - print(err.stderr.decode('utf-8'), file=sys.stderr, end='') - return False - -def fetch_patch(*, name, release): - def find_asset(filename): - try: - return next( - asset.browser_download_url - for asset in release.get_assets() - if asset.name == filename - ) - except StopIteration: - raise KeyError(filename) - - patch_filename = f'{name}.patch' - try: - patch_url = find_asset(patch_filename) - sig_url = find_asset(patch_filename + '.sig') - except KeyError: - print(f'error: {patch_filename}{{,.sig}} not present', file=sys.stderr) - return None - - sha256, patch_path = nix_prefetch_url(patch_url) - _, sig_path = nix_prefetch_url(sig_url) - sig_ok = verify_openpgp_signature( - name=name, - trusted_key=HARDENED_TRUSTED_KEY, - sig_path=sig_path, - data_path=patch_path, - ) - if not sig_ok: - return None - - return { - 'name': patch_filename, - 'url': patch_url, - 'sha256': sha256, - } - -def parse_version(version_str): - version = [] - for component in version_str.split('.'): - try: - version.append(int(component)) - except ValueError: - version.append(component) - return version - -def version_string(version): - return '.'.join(str(component) for component in version) - -def major_kernel_version_key(kernel_version): - return version_string(kernel_version[:-1]) - -def commit_patches(*, kernel_key, message): - with open(HARDENED_PATCHES_PATH + '.new', 'w') as new_patches_file: - json.dump(patches, new_patches_file, indent=4, sort_keys=True) - new_patches_file.write('\n') - os.rename(HARDENED_PATCHES_PATH + '.new', HARDENED_PATCHES_PATH) - message = f'linux/hardened-patches/{kernel_key}: {message}' - print(message) - if os.environ.get('COMMIT'): - run( - 'git', '-C', HERE, 'commit', f'--message={message}', - 'hardened-patches.json', - ) - -# Load the existing patches. -with open(HARDENED_PATCHES_PATH) as patches_file: - patches = json.load(patches_file) - -NIX_VERSION_RE = re.compile(r''' - \s* version \s* = - \s* " (?P<version> [^"]*) " - \s* ; \s* \n -''', re.VERBOSE) - -# Get the set of currently packaged kernel versions. -kernel_versions = {} -for filename in os.listdir(HERE): - filename_match = re.fullmatch(r'linux-(\d+)\.(\d+)\.nix', filename) - if filename_match: - with open(os.path.join(HERE, filename)) as nix_file: - for nix_line in nix_file: - match = NIX_VERSION_RE.fullmatch(nix_line) - if match: - kernel_version = parse_version(match.group('version')) - if kernel_version < MIN_KERNEL_VERSION: - continue - kernel_key = major_kernel_version_key(kernel_version) - kernel_versions[kernel_key] = kernel_version - -# Remove patches for unpackaged kernel versions. -for kernel_key in sorted(patches.keys() - kernel_versions.keys()): - commit_patches(kernel_key=kernel_key, message='remove') - -g = Github(os.environ.get('GITHUB_TOKEN')) -repo = g.get_repo(HARDENED_GITHUB_REPO) - -failures = False - -# Match each kernel version with the best patch version. -releases = {} -for release in repo.get_releases(): - version = parse_version(release.tag_name) - # needs to look like e.g. 5.6.3.a - if len(version) < 4: - continue - - kernel_version = version[:-1] - kernel_key = major_kernel_version_key(kernel_version) - try: - packaged_kernel_version = kernel_versions[kernel_key] - except KeyError: - continue - - release_info = { - 'version': version, - 'release': release, - } - - if kernel_version == packaged_kernel_version: - releases[kernel_key] = release_info - else: - # Fall back to the latest patch for this major kernel version, - # skipping patches for kernels newer than the packaged one. - if kernel_version > packaged_kernel_version: - continue - elif (kernel_key not in releases or - releases[kernel_key]['version'] < version): - releases[kernel_key] = release_info - -# Update hardened-patches.json for each release. -for kernel_key, release_info in releases.items(): - release = release_info['release'] - version = release_info['version'] - version_str = release.tag_name - name = f'linux-hardened-{version_str}' - - try: - old_filename = patches[kernel_key]['name'] - old_version_str = (old_filename - .replace('linux-hardened-', '') - .replace('.patch', '')) - old_version = parse_version(old_version_str) - update = old_version < version - except KeyError: - update = True - old_version = None - - if update: - patch = fetch_patch(name=name, release=release) - if patch is None: - failures = True - else: - patches[kernel_key] = patch - if old_version: - message = f'{old_version_str} -> {version_str}' - else: - message = f'init at {version_str}' - commit_patches(kernel_key=kernel_key, message=message) - -missing_kernel_versions = kernel_versions.keys() - patches.keys() - -if missing_kernel_versions: - print( - f'warning: no patches for kernel versions ' + - ', '.join(missing_kernel_versions), - file=sys.stderr, - ) - -if failures: - sys.exit(1) diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index c483661b6f5..55fdce06c97 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -62,4 +62,4 @@ done COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh # Update linux-hardened -COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-hardened.py +COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 603d2855f56..bbc341caf11 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.the-kenny ]; repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index b9626aac22d..aefb5ff6835 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -6,13 +6,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "1jcqhqvfbnbijm4jn949ibw1qywai9rwhyijf6lg8cvnyxkib2bs"; + sha256 = "02vbpg9v5sjcw7ihximy63cjmz82q5izkp91i44m1qp6qj5qn4sr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 026b43fc615..4d93c3bb4fe 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + name = "CVE-2018-14348.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5"; sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5"; }) diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 65615f5c240..68d05f0be65 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-4.0.1"; + name = "lxcfs-4.0.3"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "09y26ln2wxpi809kd3r352my64aal0yz2a5kin0i25gnvivl32cs"; + sha256 = "0v6c5vc3i1l4sy4iamzdqvwibj6xr1lna4w1hxkn3s6jggcbxwca"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index c224595a984..9ead1f6ad4b 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "168"; + version = "169"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0mcmmjvvc80nk20n4dknimv0jzvdkj1ajgyq33b2i4v6xq0bz1pb"; + sha256 = "0ghkwfaky026qwj6hmcvz2w2hm8qqj3ysbkxxi603vslmwj56chv"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 4bf1c02d2df..b57c97c99e5 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20191115"; + version = "20200508"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0pzi5qmrcrdf6nsds4bvyq1hnvv9d1dlrvqrbzcrpxk84rcjwq1x"; + sha256 = "1cs4b7q9j2lw2y09rfa82aijbfmy4lddahz8qlz9gwajf2ziqns8"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 30e5d16b60f..dbe18ace40a 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -45,6 +45,17 @@ installPhase() { cp -prd tls "$out/lib/" fi + # Install systemd power management executables + if [ -e nvidia-sleep.sh ]; then + sed -E 's#(PATH=).*#\1"$PATH"#' nvidia-sleep.sh > nvidia-sleep.sh.fixed + install -Dm755 nvidia-sleep.sh.fixed $out/bin/nvidia-sleep.sh + fi + + if [ -e nvidia ]; then + sed -E "s#/usr(/bin/nvidia-sleep.sh)#$out\\1#" nvidia > nvidia.fixed + install -Dm755 nvidia.fixed $out/lib/systemd/system-sleep/nvidia + fi + for i in $lib32 $out; do rm -f $i/lib/lib{glx,nvidia-wfb}.so.* # handled separately rm -f $i/lib/libnvidia-gtk* # built from source @@ -91,7 +102,6 @@ installPhase() { done - if [ -n "$bin" ]; then # Install the X drivers. mkdir -p $bin/lib/xorg/modules @@ -167,5 +177,4 @@ installPhase() { fi } - genericBuild diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index f8c75b1913b..f69b2bd7fce 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.5"; + version = "1.2.6"; src = fetchurl { url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; - sha256 = "1v4jwbda25w07qhlx5xc5i0hwsv3pjy8hfy0r93vnmfjxq61grvw"; + sha256 = "08bzvgv1z3371sqf7zlm9i0b1y3wdymj2dqdvzvf192k3nix4hlp"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b0becd82d19..59577eb8d51 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.6"; + version = "0.26.7"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1rw9s5lamr02036z26vfmnp5dnn97f00hcnp4xv6gdxim6rpmbz7"; + sha256 = "09m6j2cl70jxb0k4ydsgrida381bipf0v026xz661152cy23r3ff"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 06b31302eb8..edb951dae3d 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -70,7 +70,8 @@ stdenv.mkDerivation { "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" - ]; + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; doCheck = false; # fails. some fail in a sandbox, others require qemu diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index 5418a6d9d91..c88d0eeeff2 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,7 +1,7 @@ -From a6c9317a905ef478b8e0d3dad263990feb5d11cb Mon Sep 17 00:00:00 2001 +From b873e4c0de3e24f2ec9370e5a217247217e90587 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 8 Jan 2013 15:46:30 +0100 -Subject: [PATCH 01/27] Start device units for uninitialised encrypted devices +Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices This is necessary because the NixOS service that initialises the filesystem depends on the appearance of the device unit. Also, this @@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index 75110faf923..4f94cb465d4 100644 --- a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,21 +1,21 @@ -From fd9c882581877eef8ba1b34a9502a1ff546b3833 Mon Sep 17 00:00:00 2001 +From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 12 Apr 2013 13:16:57 +0200 -Subject: [PATCH 03/27] Don't try to unmount /nix or /nix/store +Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 --- - src/core/mount.c | 4 +++- + src/core/mount.c | 2 ++ src/shutdown/umount.c | 2 ++ - 2 files changed, 5 insertions(+), 1 deletion(-) + 2 files changed, 4 insertions(+) diff --git a/src/core/mount.c b/src/core/mount.c -index a0dfa6a1a7..4ca6adcdc6 100644 +index 1c4aefd734..a5553226f8 100644 --- a/src/core/mount.c +++ b/src/core/mount.c -@@ -414,6 +414,8 @@ static bool mount_is_extrinsic(Mount *m) { +@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) { if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ @@ -25,10 +25,10 @@ index a0dfa6a1a7..4ca6adcdc6 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 2d07d3d6c1..8b112f464e 100644 +index 8a5e80eeaa..fab35ed6f3 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -373,6 +373,8 @@ static int delete_dm(dev_t devnum) { +@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") @@ -38,5 +38,5 @@ index 2d07d3d6c1..8b112f464e 100644 || path_equal(path, "/usr") #endif -- -2.25.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index ffb139b71e1..73aab8dd91c 100644 --- a/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,7 +1,7 @@ -From 58c4a7b4e9d9c34b92deded6aea814738821059d Mon Sep 17 00:00:00 2001 +From c28b3b2e254433e93549ee6fe8c93b43ce455776 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Wed, 16 Apr 2014 10:59:28 +0200 -Subject: [PATCH 04/27] Fix NixOS containers +Subject: [PATCH 03/18] Fix NixOS containers In NixOS containers, the init script is bind-mounted into the container, so checking early whether it exists will fail. @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 5d9290b1cf..26615901c3 100644 +index 734dee1130..a97b1a4bc9 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -4924,6 +4924,7 @@ static int run(int argc, char *argv[]) { +@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 5d9290b1cf..26615901c3 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -4938,6 +4939,7 @@ static int run(int argc, char *argv[]) { +@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 5d9290b1cf..26615901c3 100644 } else { -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 5972b646867..e10726a2cb1 100644 --- a/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,17 +1,17 @@ -From c841ffab8fb6174b51382b9d4334f78c74018730 Mon Sep 17 00:00:00 2001 +From baf52609ad18785aa1d2cd043185ae9438d59411 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 1 May 2014 14:10:10 +0200 -Subject: [PATCH 06/27] Look for fsck in the right place +Subject: [PATCH 04/18] Look for fsck in the right place --- src/fsck/fsck.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 55e6544d31..3626aadda7 100644 +index 80f7107b9d..74e48a385f 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c -@@ -371,7 +371,7 @@ static int run(int argc, char *argv[]) { +@@ -370,7 +370,7 @@ static int run(int argc, char *argv[]) { } else dash_c[0] = 0; @@ -21,5 +21,5 @@ index 55e6544d31..3626aadda7 100644 cmdline[i++] = "-T"; -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 7d537197fae..23aa893362b 100644 --- a/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,12 +1,12 @@ -From 8c0be07ccbad35d0c1106015057996aa55b9a1f9 Mon Sep 17 00:00:00 2001 +From 45f80155b7c2edb1e73c233283f1ab1582e1cfbe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 19 Dec 2014 14:46:17 +0100 -Subject: [PATCH 07/27] Add some NixOS-specific unit directories +Subject: [PATCH 05/18] Add some NixOS-specific unit directories -Look in /nix/var/nix/profiles/default/lib/systemd for units provided -by packages in the default (system-wide) profile, and in -/etc/systemd-mutable/system for persistent, mutable units (not -recommended). +Look in `/nix/var/nix/profiles/default/lib/systemd` for units provided +by packages installed into the default profile via +`nix-env -iA nixos.$package`, and into `/etc/systemd-mutable/system` for +persistent, mutable units (used for Dysnomia). Also, remove /usr and /lib as these don't exist on NixOS. --- @@ -15,7 +15,7 @@ Also, remove /usr and /lib as these don't exist on NixOS. 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index 5d1ddd7620..21b977d6fc 100644 +index 8331832c7a..bedb97115d 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user @@ -28,12 +28,12 @@ index 5d1ddd7620..21b977d6fc 100644 +systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators systemdusergeneratordir=${prefix}/lib/systemd/user-generators - systemdsleepdir=${rootprefix}/lib/systemd/system-sleep + systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 6bf0ff0316..2b6324ad8c 100644 +index 48e0eec09a..a9d38f16d0 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c -@@ -99,17 +99,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { @@ -103,5 +103,5 @@ index 6bf0ff0316..2b6324ad8c 100644 default: -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index c15b8a2a9e1..0b57dc1f9c8 100644 --- a/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,7 +1,7 @@ -From 99c86daa5244d45a19f75f6ce92bd4255edef420 Mon Sep 17 00:00:00 2001 +From d52058070c0c12bb05f82460f0b4b55678b724e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Mon, 11 May 2015 15:39:38 +0200 -Subject: [PATCH 09/27] Get rid of a useless message in user sessions +Subject: [PATCH 06/18] Get rid of a useless message in user sessions Namely lots of variants of @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index a1dc76aa6a..07670af8e2 100644 +index 97e1b0004c..d3cc2ba9ec 100644 --- a/src/core/unit.c +++ b/src/core/unit.c -@@ -2045,7 +2045,8 @@ static void unit_check_binds_to(Unit *u) { +@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { } assert(other); @@ -27,5 +27,5 @@ index a1dc76aa6a..07670af8e2 100644 /* A unit we need to run is gone. Sniff. Let's stop this. */ r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index 635da4634a8..5703c4f43fd 100644 --- a/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,7 +1,7 @@ -From cec1430f72edfedb951fe34e87765ef422ea9843 Mon Sep 17 00:00:00 2001 +From 409fc808794942ad1736c2cc74853d9792e4ad02 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner <gebner@gebner.org> Date: Sun, 6 Dec 2015 14:26:36 +0100 -Subject: [PATCH 10/27] hostnamed, localed, timedated: disable methods that +Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that change system settings. --- @@ -11,10 +11,10 @@ Subject: [PATCH 10/27] hostnamed, localed, timedated: disable methods that 3 files changed, 28 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 9e4f4fb59e..141b8acc08 100644 +index 21f6471495..8c5af7619f 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -423,6 +423,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -422,6 +422,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -24,7 +24,7 @@ index 9e4f4fb59e..141b8acc08 100644 if (isempty(name)) name = c->data[PROP_STATIC_HOSTNAME]; -@@ -479,6 +482,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -34,7 +34,7 @@ index 9e4f4fb59e..141b8acc08 100644 name = empty_to_null(name); if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) -@@ -536,6 +542,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -45,10 +45,10 @@ index 9e4f4fb59e..141b8acc08 100644 if (streq_ptr(name, c->data[prop])) diff --git a/src/locale/localed.c b/src/locale/localed.c -index 8d0eec96a5..0b1c1d664e 100644 +index 09f16d25f4..c1cb87cef1 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -276,6 +276,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; @@ -58,7 +58,7 @@ index 8d0eec96a5..0b1c1d664e 100644 /* If single locale without variable name is provided, then we assume it is LANG=. */ if (strv_length(l) == 1 && !strchr(*l, '=')) { if (!locale_is_valid(*l)) -@@ -411,6 +414,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro +@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -68,7 +68,7 @@ index 8d0eec96a5..0b1c1d664e 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -587,6 +593,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -79,10 +79,10 @@ index 8d0eec96a5..0b1c1d664e 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 6c94b23de4..fa20d22cde 100644 +index 5e2fb50d83..63865f557c 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -653,6 +653,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -93,7 +93,7 @@ index 6c94b23de4..fa20d22cde 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -732,6 +736,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -103,7 +103,7 @@ index 6c94b23de4..fa20d22cde 100644 if (lrtc == c->local_rtc) return sd_bus_reply_method_return(m, NULL); -@@ -924,6 +931,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; @@ -114,5 +114,5 @@ index 6c94b23de4..fa20d22cde 100644 if (r < 0) return r; -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index 624811f5ea3..a9bf9abee52 100644 --- a/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,7 +1,7 @@ -From 0f434c6baee63eff913f36aee839df3718a75d4a Mon Sep 17 00:00:00 2001 +From b56fc7b6ae8014eb2f71924c89498f395a1a81bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 7 Jul 2016 02:47:13 +0300 -Subject: [PATCH 11/27] Fix hwdb paths +Subject: [PATCH 08/18] Fix hwdb paths Patch by vcunat. --- @@ -9,10 +9,10 @@ Patch by vcunat. 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c -index 58124abd21..d80e408b8c 100644 +index b3febdbb31..eba00a5bc7 100644 --- a/src/libsystemd/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/sd-hwdb/sd-hwdb.c -@@ -298,13 +298,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { +@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { } static const char hwdb_bin_paths[] = @@ -28,5 +28,5 @@ index 58124abd21..d80e408b8c 100644 _public_ int sd_hwdb_new(sd_hwdb **ret) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index ad76fda7d95..12a9dd5a77f 100644 --- a/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,7 +1,7 @@ -From 78479b75c9f9342646223b3db6b4b0744817dc24 Mon Sep 17 00:00:00 2001 +From 4d304a321796db4de827aa39a149bea23d039214 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Tue, 11 Oct 2016 13:12:08 +0300 -Subject: [PATCH] Change /usr/share/zoneinfo to /etc/zoneinfo +Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo NixOS uses this path. --- @@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 528e6452cf..c712ca9072 100644 +index 901fbf0815..b57bdd8fbe 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -443,7 +443,7 @@ static int process_timezone(void) { +@@ -431,7 +431,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -79,10 +79,10 @@ index 528e6452cf..c712ca9072 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 873a76596f..a024b10f32 100644 +index a97b1a4bc9..aed60439e3 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1642,8 +1642,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u +@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -94,7 +94,7 @@ index 873a76596f..a024b10f32 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 5e2fb50d83..02eb2ca11d 100644 +index 63865f557c..8021a8b753 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -264,7 +264,7 @@ static int context_read_data(Context *c) { @@ -128,5 +128,5 @@ index 5e2fb50d83..02eb2ca11d 100644 return -ENOMEM; -- -2.25.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 309ae70881a..7e6453f2ddd 100644 --- a/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,7 +1,7 @@ -From 5365ffbfba2de03628e8bbb6cc0bc022272436a1 Mon Sep 17 00:00:00 2001 +From cb3f1ec1793cbf74c4b5663e038bd49ff4576192 Mon Sep 17 00:00:00 2001 From: Imuli <i@imu.li> Date: Wed, 19 Oct 2016 08:46:47 -0400 -Subject: [PATCH 13/27] localectl: use /etc/X11/xkb for list-x11-* +Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* NixOS has an option to link the xkb data files to /etc/X11, but not to /usr/share/X11. @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 9fb5152110..9554c2cf76 100644 +index 6f2d37d222..7aa2310d48 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -287,7 +287,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -23,5 +23,5 @@ index 9fb5152110..9554c2cf76 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index ed1187473be..080cd4670e6 100644 --- a/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,17 +1,17 @@ -From 1408762890aba25e58598d1e4dfa17ed2b75de26 Mon Sep 17 00:00:00 2001 +From 0ffb786d0e12a61899af448b1e4dd32a53ea5a8e Mon Sep 17 00:00:00 2001 From: Franz Pletz <fpletz@fnordicwalking.de> Date: Sun, 11 Feb 2018 04:37:44 +0100 -Subject: [PATCH 16/27] build: don't create statedir and don't touch prefixdir +Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir --- meson.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index 8ccc947e37..263cc7189a 100644 +index fc216d22da..078db3bb5d 100644 --- a/meson.build +++ b/meson.build -@@ -2944,9 +2944,6 @@ install_data('LICENSE.GPL2', +@@ -3176,9 +3176,6 @@ install_data('LICENSE.GPL2', 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) @@ -22,5 +22,5 @@ index 8ccc947e37..263cc7189a 100644 meson_check_help = find_program('tools/meson-check-help.sh') -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 3911d1b0181..2961a2ebe56 100644 --- a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,7 +1,7 @@ -From a087cb535b2d3c7a5d989b5aabc0a257369e9f9d Mon Sep 17 00:00:00 2001 +From 3dbcdab1ba22c4eeca6d61718c09bcb9b5551764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Mon, 26 Feb 2018 14:25:57 +0000 -Subject: [PATCH 18/27] Install default configuration into $out/share/factory +Subject: [PATCH 12/18] Install default configuration into $out/share/factory By default systemd should read all its configuration from /etc. Therefor we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately @@ -11,7 +11,7 @@ this commit introduces two new configuration variables `factoryconfdir` and `factorypkgconfdir` to install systemd's own configuration into nix store again, while having executables looking up files in /etc. --- - hwdb.d/meson.build | 2 +- + hwdb.d/meson.build | 2 +- meson.build | 11 +++++++---- network/meson.build | 2 +- src/core/meson.build | 10 +++++----- @@ -27,14 +27,14 @@ store again, while having executables looking up files in /etc. src/udev/meson.build | 4 ++-- sysctl.d/meson.build | 2 +- tmpfiles.d/meson.build | 2 +- - units/meson.build | 3 ++- - 17 files changed, 30 insertions(+), 26 deletions(-) + units/meson.build | 2 +- + 17 files changed, 29 insertions(+), 26 deletions(-) diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build -index badf39f555..8fd9c7639f 100644 +index 4df6dabf89..02d8d69095 100644 --- a/hwdb.d/meson.build +++ b/hwdb.d/meson.build -@@ -26,7 +26,7 @@ if conf.get('ENABLE_HWDB') == 1 +@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1 install_dir : udevhwdbdir) meson.add_install_script('sh', '-c', @@ -43,15 +43,11 @@ index badf39f555..8fd9c7639f 100644 meson.add_install_script('sh', '-c', 'test -n "$DESTDIR" || @0@/systemd-hwdb update' - .format(rootbindir)) - endif - - ############################################################ diff --git a/meson.build b/meson.build -index 263cc7189a..7a67078208 100644 +index 078db3bb5d..6e1a6483fc 100644 --- a/meson.build +++ b/meson.build -@@ -151,6 +151,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') +@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') factorydir = join_paths(datadir, 'factory') @@ -61,7 +57,7 @@ index 263cc7189a..7a67078208 100644 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') testsdir = join_paths(prefixdir, 'lib/systemd/tests') systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2287,7 +2290,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -2503,7 +2506,7 @@ if conf.get('ENABLE_BINFMT') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', @@ -69,8 +65,8 @@ index 263cc7189a..7a67078208 100644 + mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d'))) endif - if conf.get('ENABLE_VCONSOLE') == 1 -@@ -2373,7 +2376,7 @@ executable('systemd-sleep', + if conf.get('ENABLE_REPART') == 1 +@@ -2604,7 +2607,7 @@ executable('systemd-sleep', install_dir : rootlibexecdir) install_data('src/sleep/sleep.conf', @@ -79,7 +75,7 @@ index 263cc7189a..7a67078208 100644 exe = executable('systemd-sysctl', 'src/sysctl/sysctl.c', -@@ -2685,7 +2688,7 @@ if conf.get('HAVE_KMOD') == 1 +@@ -2916,7 +2919,7 @@ if conf.get('HAVE_KMOD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', @@ -88,7 +84,7 @@ index 263cc7189a..7a67078208 100644 endif exe = executable('systemd-nspawn', -@@ -2927,7 +2930,7 @@ install_subdir('factory/etc', +@@ -3159,7 +3162,7 @@ install_subdir('factory/etc', install_dir : factorydir) install_data('xorg/50-systemd-user.sh', @@ -98,10 +94,10 @@ index 263cc7189a..7a67078208 100644 install_dir : modprobedir) install_data('LICENSE.GPL2', diff --git a/network/meson.build b/network/meson.build -index 59d4be1a17..72da2c16a2 100644 +index 544dcf4387..1828c50863 100644 --- a/network/meson.build +++ b/network/meson.build -@@ -7,7 +7,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1 install_dir : networkdir) meson.add_install_script('sh', '-c', @@ -111,7 +107,7 @@ index 59d4be1a17..72da2c16a2 100644 install_data('99-default.link', diff --git a/src/core/meson.build b/src/core/meson.build -index df3aa5c6c1..305f67a80a 100644 +index 3586838f59..02ddf1a123 100644 --- a/src/core/meson.build +++ b/src/core/meson.build @@ -179,8 +179,8 @@ libcore = static_library( @@ -125,7 +121,7 @@ index df3aa5c6c1..305f67a80a 100644 ['systemd.pc', pkgconfigdatadir], ['triggers.systemd', '']] -@@ -210,6 +210,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) +@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) @@ -207,10 +203,10 @@ index 0a7d3d5440..ff90149c1c 100644 install_data('org.freedesktop.login1.conf', install_dir : dbuspolicydir) diff --git a/src/network/meson.build b/src/network/meson.build -index 6bed37a170..35f15bcaf1 100644 +index c1c02cfda1..1bfa79a03b 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -168,7 +168,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1 endif install_data('networkd.conf', @@ -231,10 +227,10 @@ index adbac24b54..e9dc88dfa2 100644 + install_dir : factorypkgconfdir) endif diff --git a/src/resolve/meson.build b/src/resolve/meson.build -index 92b67b6333..ac5b9a0b0a 100644 +index c4d8d4e5d9..f550c289a5 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build -@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1 +@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1 output : 'resolved.conf', configuration : substs) install_data(resolved_conf, @@ -257,10 +253,10 @@ index e5c118c8db..19235df9ca 100644 install_dir : dbuspolicydir) install_data('org.freedesktop.timesync1.service', diff --git a/src/udev/meson.build b/src/udev/meson.build -index 511fe428b9..32333efea6 100644 +index 173b10be50..82638cf5a9 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build -@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'], +@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'], endforeach install_data('udev.conf', @@ -269,7 +265,7 @@ index 511fe428b9..32333efea6 100644 configure_file( input : 'udev.pc.in', -@@ -195,7 +195,7 @@ configure_file( +@@ -196,7 +196,7 @@ configure_file( install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) meson.add_install_script('sh', '-c', @@ -300,10 +296,10 @@ index e77f46d06b..04d2ef621d 100644 + mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) endif diff --git a/units/meson.build b/units/meson.build -index 476991edba..3d9dc6e1c8 100644 +index ea91f0cc9e..8622054ca5 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -308,7 +308,7 @@ install_data('user-.slice.d/10-defaults.conf', +@@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf', meson.add_install_script(meson_make_symlink, join_paths(pkgsysconfdir, 'user'), @@ -313,5 +309,5 @@ index 476991edba..3d9dc6e1c8 100644 join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index f4f1e6d37b5..5aa397afe8e 100644 --- a/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,7 +1,7 @@ -From 3eb1716dd80c245a2883da04156af79fb9097519 Mon Sep 17 00:00:00 2001 +From 0b0510aa72cf8026f34f300efa3f150f45971404 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Fri, 2 Nov 2018 21:15:42 +0100 -Subject: [PATCH 19/27] inherit systemd environment when calling generators. +Subject: [PATCH 13/18] inherit systemd environment when calling generators. Systemd generators need access to the environment configured in stage-2-init.sh since it schedules fsck and mkfs executions based on @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index d9114bb0c5..22c3b6ff76 100644 +index 25afdbea04..7afd5e5a37 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3868,9 +3868,14 @@ static int manager_run_generators(Manager *m) { +@@ -3896,9 +3896,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) @@ -38,5 +38,5 @@ index d9114bb0c5..22c3b6ff76 100644 finish: -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index 39bbe7e9dac..91c091baa9e 100644 --- a/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,7 +1,7 @@ -From 8d1618a97ad08078815f409f03b45aff3ae6bd0a Mon Sep 17 00:00:00 2001 +From 4bd20cf0450455e2f9831b09ba91811ba3d58961 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Thu, 9 May 2019 11:15:22 +0200 -Subject: [PATCH 21/27] add rootprefix to lookup dir paths +Subject: [PATCH 14/18] add rootprefix to lookup dir paths systemd does not longer use the UDEVLIBEXEC directory as root for discovery default udev rules. By adding `$out/lib` to the lookup paths @@ -12,7 +12,7 @@ files that I might have missed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/def.h b/src/basic/def.h -index 2af0b763f0..17959b07e8 100644 +index 970654a1ad..bb261040f8 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -39,13 +39,15 @@ @@ -34,5 +34,5 @@ index 2af0b763f0..17959b07e8 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 9f0ea254890..2bc75e27928 100644 --- a/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,7 +1,7 @@ -From 859c16c52cdd61ec99d256bf5b35637d59e5dac9 Mon Sep 17 00:00:00 2001 +From f23a1e00de028048a2a21d322493039cce7ee214 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:45:55 +0300 -Subject: [PATCH 22/27] systemd-shutdown: execute scripts in +Subject: [PATCH 15/18] systemd-shutdown: execute scripts in /etc/systemd/system-shutdown This is needed for NixOS to use such scripts as systemd directory is immutable. @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 0eb17989d0..93e619c58a 100644 +index 15e6c1799e..412bdefe74 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { +@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *cgroup = NULL; char *arguments[3], *watchdog_device; int cmd, r, umount_log_level = LOG_INFO; @@ -23,5 +23,5 @@ index 0eb17989d0..93e619c58a 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index e8aa5cf2271..97f63c02c38 100644 --- a/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,7 +1,7 @@ -From 9be689d5243d0c78bec7b285774c58749da08c9c Mon Sep 17 00:00:00 2001 +From 758b8211e6e76524d62a2e0ffcf37dcf55e3be87 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:46:58 +0300 -Subject: [PATCH 23/27] systemd-sleep: execute scripts in +Subject: [PATCH 16/18] systemd-sleep: execute scripts in /etc/systemd/system-sleep This is needed for NixOS to use such scripts as systemd directory is immutable. @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f1c3ca06a3 100644 +index fbfddc0262..d2530b9421 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -191,6 +191,7 @@ static int execute(char **modes, char **states) { +@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, @@ -22,5 +22,5 @@ index b9fe96635d..f1c3ca06a3 100644 }; -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index df16b52660b..2a0bb0103f5 100644 --- a/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,7 +1,7 @@ -From 7db89c2236158461c99fe5c5da7ddb7feab825cf Mon Sep 17 00:00:00 2001 +From ce9fe2249c91fdfb224eaffce63e3dbdb4a5c25d Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sat, 7 Mar 2020 22:40:27 +0100 -Subject: [PATCH] kmod-static-nodes.service: Update ConditionFileNotEmpty +Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty On NixOS, kernel modules of the currently booted systems are located at /run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. @@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644 [Service] Type=oneshot -- -2.25.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 10bf54708f0..08b2fa056f8 100644 --- a/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,7 +1,7 @@ -From 0939ac4be7ced099670979f26adf8a579173ce4b Mon Sep 17 00:00:00 2001 +From 55b69fc1b5441e3aff8f1ab684ba8eed3718a32d Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sun, 8 Mar 2020 01:05:54 +0100 -Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL +Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL This will be the $PATH used to lookup ExecStart= etc. options, which systemd itself uses extensively. @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index 111d85d445..cfd92aeb73 100644 +index 30031fca8e..d97145539a 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -24,11 +24,11 @@ @@ -29,5 +29,5 @@ index 111d85d445..cfd92aeb73 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.25.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5728431b059..00a545ed3f5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "245.3"; + version = "245.5"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -39,29 +39,29 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "0f5047b7d393cfba37f91e25cae559a0bc910582"; - sha256 = "0wyh14gbvvpgdmk1mjgpxr9i4pv1i9n7pnwpa0gvjh6hq948fyn2"; + rev = "9a506b7e9291d997a920af9ac299e7b834368119"; + sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr"; }; patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch - ./0003-Don-t-try-to-unmount-nix-or-nix-store.patch - ./0004-Fix-NixOS-containers.patch - ./0006-Look-for-fsck-in-the-right-place.patch - ./0007-Add-some-NixOS-specific-unit-directories.patch - ./0009-Get-rid-of-a-useless-message-in-user-sessions.patch - ./0010-hostnamed-localed-timedated-disable-methods-that-cha.patch - ./0011-Fix-hwdb-paths.patch - ./0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch - ./0013-localectl-use-etc-X11-xkb-for-list-x11.patch - ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch - ./0018-Install-default-configuration-into-out-share-factory.patch - ./0019-inherit-systemd-environment-when-calling-generators.patch - ./0021-add-rootprefix-to-lookup-dir-paths.patch - ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch - ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch - ./0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0003-Fix-NixOS-containers.patch + ./0004-Look-for-fsck-in-the-right-place.patch + ./0005-Add-some-NixOS-specific-unit-directories.patch + ./0006-Get-rid-of-a-useless-message-in-user-sessions.patch + ./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch + ./0008-Fix-hwdb-paths.patch + ./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch + ./0010-localectl-use-etc-X11-xkb-for-list-x11.patch + ./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch + ./0012-Install-default-configuration-into-out-share-factory.patch + ./0013-inherit-systemd-environment-when-calling-generators.patch + ./0014-add-rootprefix-to-lookup-dir-paths.patch + ./0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch + ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch ]; postPatch = '' diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 5f401411074..c9da86b7898 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -48,7 +48,7 @@ let UCLIBC_HAS_FPU n ''; - version = "1.0.32"; + version = "1.0.33"; in stdenv.mkDerivation { @@ -58,7 +58,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; # from "${url}.sha256"; - sha256 = "0cp4xf3k0ib76xaz6n6i7yybw7s92s607ak8svq1kakwk0d1jjbv"; + sha256 = "0qy9xsqacrhhrxd16azm26pqb2ks6c43wbrlq3i8xmq2917kw3xi"; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 4acf1e3faa1..85f769d9dba 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation { description = "A simple tool to automatically mount removable drives using UDisks2 and D-Bus"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 63487733605..c68dfd5fc5e 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200429"; + version = "1.0.20200506"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "161srq06qa6ag2lycqz19mfms4ha2pmwn778jhvi96729rmivjkd"; + sha256 = "05dphmcxm3lg860r5bj1b995avh43d1pap8p18p4ig4kv2r2g9nq"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index b6a1887bf80..9bc10989efd 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildGoPackage +, buildGoModule , lib , fetchFromGitHub , rocksdb @@ -12,25 +12,31 @@ , lz4 }: -buildGoPackage rec { +buildGoModule rec { pname = "blockbook"; - version = "0.3.2"; - - goPackagePath = "blockbook"; + version = "0.3.3"; + commit = "b6961ca"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "0hcgz4b7k8ia4dnjg6bbii95sqg3clc40ybwwc4qz3jv21ikc54x"; + sha256 = "01nb4if2dix2h95xvqvafil325jjw2a4v1izb9mad0cjqcf8rk6n"; }; - goDeps = ./deps.nix; + modSha256 = "1zp06mpkxaxykw8pr679fg9dd7039qj13j5lknxp7hr8dga0jvpy"; buildInputs = [ bzip2 zlib snappy zeromq lz4 ]; nativeBuildInputs = [ pkg-config packr ]; + buildFlagsArray = '' + -ldflags= + -X github.com/trezor/blockbook/common.version=${version} + -X github.com/trezor/blockbook/common.gitcommit=${commit} + -X github.com/trezor/blockbook/common.buildDate=unknown + ''; + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' @@ -45,7 +51,7 @@ buildGoPackage rec { description = "Trezor address/account balance backend"; homepage = "https://github.com/trezor/blockbook"; license = licenses.agpl3; - maintainers = with maintainers; [ mmahut ]; - platforms = platforms.all; + maintainers = with maintainers; [ mmahut maintainers."1000101" ]; + platforms = remove "aarch64-linux" platforms.unix; }; } diff --git a/pkgs/servers/blockbook/deps.nix b/pkgs/servers/blockbook/deps.nix deleted file mode 100644 index 9f9ae0a4704..00000000000 --- a/pkgs/servers/blockbook/deps.nix +++ /dev/null @@ -1,372 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/Groestlcoin/go-groestl-hash"; - fetch = { - type = "git"; - url = "https://github.com/Groestlcoin/go-groestl-hash"; - rev = "790653ac190c4029ee200e82a8f21b5d1afaf7d6"; - sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4"; - }; - } - { - goPackagePath = "github.com/allegro/bigcache"; - fetch = { - type = "git"; - url = "https://github.com/allegro/bigcache"; - rev = "69ea0af04088faa57adb9ac683934277141e92a5"; - sha256 = "0ac9pgzgi9lhklkqmc5f5x3d0cbyxjfpadc6mdbd7hdr7rfrjmxf"; - }; - } - { - goPackagePath = "github.com/aristanetworks/goarista"; - fetch = { - type = "git"; - url = "https://github.com/aristanetworks/goarista"; - rev = "8e7d5b18fe7ad671e07097d5445dbc70422663b2"; - sha256 = "1jbjviz8qi8izhvdvnbc5d9nqyxfww75ffcvxyhw5yxw9r1v0sn2"; - }; - } - { - goPackagePath = "github.com/agl/ed25519"; - fetch = { - type = "git"; - url = "https://github.com/agl/ed25519"; - rev = "5312a61534124124185d41f09206b9fef1d88403"; - sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/bsm/go-vlq"; - fetch = { - type = "git"; - url = "https://github.com/bsm/go-vlq"; - rev = "ec6e8d4f5f4ec0f6e808ffc7f4dcc7516d4d7d49"; - sha256 = "13nhgpigaqdvcksi6jrav0rqr5mzqkx3wrsans9ql89nva51r9sz"; - }; - } - { - goPackagePath = "github.com/martinboehm/btcd"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/btcd"; - rev = "8e7c0427fee5d4778c5d4eb987150369e3ca1d0e"; - sha256 = "10fwzl8hzqpsq1rk5iz3xs8hbn3wqans12hszvlxlmm2xb0f6z9b"; - }; - } - { - goPackagePath = "github.com/btcsuite/btclog"; - fetch = { - type = "git"; - url = "https://github.com/btcsuite/btclog"; - rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; - sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; - }; - } - { - goPackagePath = "github.com/dchest/blake256"; - fetch = { - type = "git"; - url = "https://github.com/dchest/blake256"; - rev = "dee3fe6eb0e98dc774a94fc231f85baf7c29d360"; - sha256 = "18hkfm1zlkf6fsjzljiz5cjxxcf3kl5p9617si8xjggb33adzhyg"; - }; - } - { - goPackagePath = "github.com/deckarep/golang-set"; - fetch = { - type = "git"; - url = "https://github.com/deckarep/golang-set"; - rev = "1d4478f51bed434f1dadf96dcd9b43aabac66795"; - sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff"; - }; - } - { - goPackagePath = "github.com/decred/base58"; - fetch = { - type = "git"; - url = "https://github.com/decred/base58"; - rev = "dbeddd8aab76c31eb2ea98351a63fa2c6bf46888"; - sha256 = "0fm0gsz5myin4n15gx3fhi9pk82p6v0sxza945yvny7n13q44ns5"; - }; - } - { - goPackagePath = "github.com/decred/dcrd"; - fetch = { - type = "git"; - url = "https://github.com/decred/dcrd"; - rev = "e3e8c47c68b010dbddeb783ebad32a3a4993dd71"; - sha256 = "0zifsxhrjx282kvsqj80qr3v4af8hx4g6dqvrb6xggpkcaski8b4"; - }; - } - { - goPackagePath = "github.com/decred/slog"; - fetch = { - type = "git"; - url = "https://github.com/decred/slog"; - rev = "fbd821ef791ba2b8ae945f5d44f4e49396d230c5"; - sha256 = "0n3c7saiv4j22kjc1pf3771n6khx4g99n8vn4qvvv0i5vv04585n"; - }; - } - { - goPackagePath = "github.com/ethereum/go-ethereum"; - fetch = { - type = "git"; - url = "https://github.com/ethereum/go-ethereum"; - rev = "24d727b6d6e2c0cde222fa12155c4a6db5caaf2e"; - sha256 = "0vrhwfavx3gciihf406f2qfrhvhnygvlj2icbswq0d01dx3s566m"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"; - sha256 = "0irkqifyj84cbnq4n66ax2r591id2285diw5hzcz2k3bga8d8lqr"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packr"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packr"; - rev = "5a2cbb54c4e7d482e3f518c56f1f86f133d5204f"; - sha256 = "0hs62w1bv96zzfqqmnq18w71v0kmh4qrqpkf2y8qngvwgan761gd"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; - sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "925541529c1fa6821df4e44ce2723319eb2be768"; - sha256 = "1d3zjvhl115l23xakj0014qpjchivlg098h10v5nfirkk1i9f9sa"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a641470496b2327abcac10b36396bd98e45c9"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"; - sha256 = "1bhgs2542qs49p1dafybqxfs2qc072xv41w5nswyrknwyjxxs2a1"; - }; - } - { - goPackagePath = "github.com/martinboehm/bchutil"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/bchutil"; - rev = "6373f11b6efe1ea81e8713b8788a695b2c144d38"; - sha256 = "1wp7ixa0n0jj7y9phxm6p3fymc2555fb2k71s91jhis14fil2jim"; - }; - } - { - goPackagePath = "github.com/martinboehm/btcutil"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/btcutil"; - rev = "a3d2b8457b77d37c3813742d4030e199b6e09111"; - sha256 = "0152cyabklv9l39dm1g30jb7hzdv9rj45mp3v9x4kvaza58nz0x4"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; - sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; - }; - } - { - goPackagePath = "github.com/martinboehm/golang-socketio"; - fetch = { - type = "git"; - url = "https://github.com/martinboehm/golang-socketio"; - rev = "f60b0a8befde091474a624a8ffd81ee9912957b3"; - sha256 = "1zln03qgzzbkr7zwm7ah1iikjdnipacp60bbg9lzkxsdcw2h1vd5"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "3247c84500bff8d9fb6d579d800f20b3e091582c"; - sha256 = "12hcych25wf725zxdkpnyx4wa0gyxl8v4m8xmhdmmaki9bbmqd0d"; - }; - } - { - goPackagePath = "github.com/mr-tron/base58"; - fetch = { - type = "git"; - url = "https://github.com/mr-tron/base58"; - rev = "c1bdf7c52f59d6685ca597b9955a443ff95eeee6"; - sha256 = "1dq6i8619manxdhb0fwhdm9ar23kx88pc2xwl1pjla9djrgql6a8"; - }; - } - { - goPackagePath = "github.com/pebbe/zmq4"; - fetch = { - type = "git"; - url = "https://github.com/pebbe/zmq4"; - rev = "5b443b6471cea4b4f9f85025530c04c93233f76a"; - sha256 = "0vnwlabrlrzszqyfbw4vypalhsxi4l4ywcbjhfhwl1fpvcph5dar"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6"; - sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"; - sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf"; - }; - } - { - goPackagePath = "github.com/rs/cors"; - fetch = { - type = "git"; - url = "https://github.com/rs/cors"; - rev = "feef513b9575b32f84bafa580aad89b011259019"; - sha256 = "0wjm0yjsnxhnp6924mq8v04srqa8sxrlnd7rkb19h4j6b9zagsik"; - }; - } - { - goPackagePath = "github.com/schancel/cashaddr-converter"; - fetch = { - type = "git"; - url = "https://github.com/schancel/cashaddr-converter"; - rev = "0a38f5822f795dc3727b4caacc298e02938d9eb1"; - sha256 = "0d0dsn029yckgjp26vkmg7r476hb6b9ayf2njcgdi648ln8rrad8"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "714f901b98fdb3aa954b4193d8cbd64a28d80cad"; - sha256 = "0fn70vzqmww5v2xy0lamc319vrmfpza085d196cffhfw0jzw9i18"; - }; - } - { - goPackagePath = "github.com/tecbot/gorocksdb"; - fetch = { - type = "git"; - url = "https://github.com/tecbot/gorocksdb"; - rev = "214b6b7bc0f06812ab5602fdc502a3e619916f38"; - sha256 = "1mqpp14z4igr9jip39flpd7nf4rhr3z85y8mg74jjl1yrnwrwsld"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a832865fa7ada6126f4c6124ac49f71be71bff2a"; - sha256 = "0bikp74pdi9fsvfdgy0k0r8ipzz96hy28zm8qpky0vdbwqci0a8p"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "61147c48b25b599e5b561d2e9c4f3e1ef489ca41"; - sha256 = "1520pdlw9a9s41ad1cf1z6y2ff4j96zbn82qffrxqk02bqlr9f5w"; - }; - } - { - goPackagePath = "gopkg.in/karalabe/cookiejar.v2"; - fetch = { - type = "git"; - url = "https://github.com/karalabe/cookiejar"; - rev = "8dcd6a7f4951f6ff3ee9cbb919a06d8925822e57"; - sha256 = "1dbizcklsfn6b5i182nf9pgkk4ac8jnmq8zix73si7x2n53wyb3b"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/npipe.v2"; - fetch = { - type = "git"; - url = "https://github.com/natefinch/npipe"; - rev = "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6"; - sha256 = "1qplrvhks05pay169d9lph3hl7apdam4vj1kx3yzik7cphx6b24f"; - }; - } -] \ No newline at end of file diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 35c1f497850..4175dfa20fc 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -1,10 +1,8 @@ -{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "caddy"; - version = "2.0.0-rc.1"; - - goPackagePath = "github.com/caddyserver/caddy"; + version = "2.0.0"; subPackages = [ "cmd/caddy" ]; @@ -12,9 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "0ir394nmdrqvslghqky4d2py65ff77fqsp0nmxdlsdps49szwh7h"; + sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; }; - modSha256 = "0sqnw81l73gssnpd4dsl3vd10584riq0417z4dvbhjnc8b3z4xwv"; + + modSha256 = "19sxyvfq1bpg85w8cd1yk2s6rd8759cf2zqs5b6wyny4cak2bl83"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 299ad0bdbcb..dd6484344e8 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,33 +1,38 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "consul"; - version = "1.7.2"; + version = "1.7.3"; rev = "v${version}"; - # Note: Currently only release tags are supported, because they have the Consul UI - # vendored. See - # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 - # If you want to use a non-release commit as `src`, you probably want to improve - # this derivation so that it can build the UI's JavaScript from source. - # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. - # Or, if you want to patch something that doesn't touch the UI, you may want + # Note: Currently only release tags are supported, because they have the Consul UI + # vendored. See + # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 + # If you want to use a non-release commit as `src`, you probably want to improve + # this derivation so that it can build the UI's JavaScript from source. + # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. + # Or, if you want to patch something that doesn't touch the UI, you may want # to apply your changes as patches on top of a release commit. src = fetchFromGitHub { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4"; + sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph"; }; + passthru.tests.consul = nixosTests.consul; + # This corresponds to paths with package main - normally unneeded but consul # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b"; + modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr"; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + preBuild = '' + buildFlagsArray+=("-ldflags" + "-X github.com/hashicorp/consul/version.GitDescribe=v${version} + -X github.com/hashicorp/consul/version.Version=${version} + -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 51502c3fd97..f50a5afa81e 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -2,24 +2,19 @@ stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.1"; + version = "4.5.1.2"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr"; + sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2"; }; buildInputs = [ openssl libevent ]; patches = [ ./pure-configure.patch - (fetchpatch { - name = "CVE-2020-6061+6062.patch"; - url = "https://sources.debian.org/data/main/c/coturn/4.5.1.1-1.2/debian/patches/CVE-2020-6061+6062.patch"; - sha256 = "0fcy1wp91bb4hlhnp96sf9bs0d9hf3pwx5f7b1r9cfvr3l5c1bk2"; - }) ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 799b73294e8..09a3cd877ab 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -22,8 +22,8 @@ buildGoPackage rec { ]; postInstall = '' - mkdir -p $bin/share - cp -r $src/web $bin/share/web + mkdir -p $out/share + cp -r $src/web $out/share/web ''; meta = with lib; { diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 73881ff1092..d76b51bcc66 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -8,11 +8,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e"; + sha256 = "57f3c93a1b40dfa0431508203f559b7ea257afab79078c38bcddf960d5a4a501"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index d815771c66c..43c2900443e 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "15qy25210j9nq2i3pm8rwphnc6b5gq83js10078fvw9hbmjps03s"; + sha256 = "11w9kl99fs888f3zwx2j92i8lcp78vq91jac8s317a2icv74mczl"; }; prePatch = '' diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 9a2bf7ce590..bdb4b4883da 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin + install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; passthru.tests = with nixosTests; { diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 3f9f59a4aee..8c358154e8c 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -38,6 +38,10 @@ buildGoModule rec { cp -r ${ui}/libexec/gotify-ui/deps/gotify-ui/build ui/build && packr ''; + passthru = { + updateScript = ./update.sh; + }; + # Otherwise, all other subpackages are built as well and from some reason, # produce binaries which panic when executed and are not interesting at all subPackages = [ "." ]; diff --git a/pkgs/servers/gotify/mod-sha.nix b/pkgs/servers/gotify/mod-sha.nix index 16a3eddadb5..f115be8e1a7 100644 --- a/pkgs/servers/gotify/mod-sha.nix +++ b/pkgs/servers/gotify/mod-sha.nix @@ -1 +1 @@ -"119f249rvlvxjhwc6wh10yyk3z41488mydmvxs44b5a4p67yvjfw" \ No newline at end of file +"0zpdbj8a0akhzi1ian8zs6y7ymhlpcfy13q64xdlwc5w0286554r" \ No newline at end of file diff --git a/pkgs/servers/gotify/package.json b/pkgs/servers/gotify/package.json index 00f71337071..7e8defe3858 100644 --- a/pkgs/servers/gotify/package.json +++ b/pkgs/servers/gotify/package.json @@ -9,23 +9,23 @@ "@material-ui/icons": "^4.9.1", "axios": "^0.19.0", "codemirror": "^5.43.0", - "detect-browser": "^3.0.0", + "detect-browser": "^5.1.0", "js-base64": "^2.5.1", "mobx": "^5.1.1", - "mobx-react": "^5.2.8", + "mobx-react": "^6.2.2", "mobx-utils": "^5.0.2", "notifyjs": "^3.0.0", "prop-types": "^15.6.2", "react": "^16.4.2", - "react-codemirror2": "^5.1.0", + "react-codemirror2": "^7.1.0", "react-dom": "^16.4.2", "react-infinite": "^0.13.0", "react-markdown": "^4.0.6", - "react-router": "^4.3.1", - "react-router-dom": "^4.3.1", + "react-router": "^5.1.2", + "react-router-dom": "^5.1.2", "react-timeago": "^4.1.9", "remove-markdown": "^0.3.0", - "typeface-roboto": "0.0.54" + "typeface-roboto": "0.0.75" }, "scripts": { "start": "react-scripts start", @@ -38,30 +38,30 @@ "testformat": "prettier \"src/**/*.{ts,tsx}\" --list-different" }, "devDependencies": { - "@types/codemirror": "0.0.71", - "@types/detect-browser": "^2.0.1", + "@types/codemirror": "0.0.91", + "@types/detect-browser": "^4.0.0", "@types/get-port": "^4.0.0", - "@types/jest": "^23.3.1", + "@types/jest": "^25.2.1", "@types/js-base64": "^2.3.1", - "@types/node": "^10.9.0", + "@types/node": "^13.13.5", "@types/notifyjs": "^3.0.0", - "@types/puppeteer": "^1.6.3", + "@types/puppeteer": "^2.0.1", "@types/react": "^16.4.11", "@types/react-dom": "^16.0.7", - "@types/react-infinite": "0.0.33", - "@types/react-router-dom": "^4.3.0", + "@types/react-infinite": "0.0.34", + "@types/react-router-dom": "^5.1.5", "@types/remove-markdown": "^0.1.1", - "@types/rimraf": "^2.0.2", - "get-port": "^4.0.0", - "prettier": "^1.14.2", - "puppeteer": "^1.8.0", - "react-scripts": "3.1.1", - "rimraf": "^2.6.2", + "@types/rimraf": "^3.0.0", + "get-port": "^5.1.1", + "prettier": "^2.0.5", + "puppeteer": "^3.0.4", + "react-scripts": "^3.4.1", + "rimraf": "^3.0.2", "tree-kill": "^1.2.0", - "tslint": "^5.20.0", + "tslint": "^6.1.2", "tslint-sonarts": "^1.7.0", - "typescript": "3.6.2", - "wait-on": "^3.0.1" + "typescript": "3.8.3", + "wait-on": "^5.0.0" }, "eslintConfig": { "extends": "react-app" diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix index c11391fb85c..ddac1b24614 100644 --- a/pkgs/servers/gotify/source-sha.nix +++ b/pkgs/servers/gotify/source-sha.nix @@ -1 +1 @@ -"0igzgpzrxkz31njhybsap505mlr32k4qma32v5rafqdi2naz5iyl" \ No newline at end of file +"18y2kaf0v7275a0b8ab5y3qk7qwh19aqxyy0gmlflzgr2nimpmrn" \ No newline at end of file diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix index fbd14b6742d..fdfe425152c 100644 --- a/pkgs/servers/gotify/version.nix +++ b/pkgs/servers/gotify/version.nix @@ -1 +1 @@ -"2.0.15" +"2.0.16" diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index ef9d7cedd8e..798c2787e34 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -2,755 +2,875 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; - sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; }; } { - name = "_babel_core___core_7.5.5.tgz"; + name = "_babel_compat_data___compat_data_7.9.6.tgz"; path = fetchurl { - name = "_babel_core___core_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz"; - sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30"; + name = "_babel_compat_data___compat_data_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz"; + sha1 = "3f604c40e420131affe6f2c8052e9a275ae2049b"; }; } { - name = "_babel_generator___generator_7.5.5.tgz"; + name = "_babel_core___core_7.9.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz"; - sha1 = "873a7f936a3c89491b43536d12245b626664e3cf"; + name = "_babel_core___core_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz"; + sha1 = "ac977b538b77e132ff706f3b8a4dbad09c03c56e"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + name = "_babel_core___core_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; - sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"; + name = "_babel_core___core_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz"; + sha1 = "d9aa1f580abf3b2286ef40b6904d390904c63376"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + name = "_babel_generator___generator_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; - sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"; + name = "_babel_generator___generator_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; + sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; - sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; + sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; - sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; + sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; - sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.5.tgz"; + sha1 = "0b4b3e04e6123f03b404ca4dfd6528fe6bb92fe3"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; - sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; - sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; + sha1 = "1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; - sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; + sha1 = "965c8b0a9f051801fd9d3b372ca0ccf200a90897"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; - sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; + sha1 = "5d84180b588f560b7864efaeea89243e58312087"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; - sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; + sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; - sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; + sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; - sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; + sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; - sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; + sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; - sha1 = "a2920c5702b073c15de51106200aa8cad20497d5"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; + sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; - sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; + sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; }; } { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz"; - sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; + sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; - sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; - sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; + sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; - sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; + sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; - sha1 = "ff94894a340be78f53f06af038b205c49d993677"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; + sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz"; - sha1 = "c4e0012445769e2815b55296ead43a958549f6fa"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; + sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; }; } { - name = "_babel_helpers___helpers_7.5.5.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz"; - sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; + sha1 = "03149d7e6a5586ab6764996cd31d6981a17e1444"; }; } { - name = "_babel_highlight___highlight_7.5.0.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; - sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; + sha1 = "7f8109928b4dab4654076986af575231deb639ae"; }; } { - name = "_babel_parser___parser_7.5.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz"; - sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; + sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz"; - sha1 = "b289b306669dce4ad20b0252889a15768c9d417e"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; - sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; + sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; + name = "_babel_helpers___helpers_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz"; - sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"; + name = "_babel_helpers___helpers_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz"; + sha1 = "092c774743471d0bb6c7de3ad465ab3d3486d580"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + name = "_babel_highlight___highlight_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; - sha1 = "e532202db4838723691b10a67b8ce509e397c506"; + name = "_babel_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + name = "_babel_parser___parser_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz"; - sha1 = "568ecc446c6148ae6b267f02551130891e29f317"; + name = "_babel_parser___parser_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; + sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; - sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; + sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz"; - sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz"; + sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; - sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz"; + sha1 = "2156860ab65c5abf068c3f67042184041066543e"; }; } { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz"; - sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; + sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; - sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; + sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; }; } { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; - sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; - sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz"; + sha1 = "5d6769409699ec9b3b68684cd8116cedff93bad8"; }; } { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz"; - sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; + sha1 = "7a093586fcb18b08266eb1a7177da671ac575b63"; }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; - sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; + sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; }; } { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; - sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha1 = "31db16b154c39d6b8a645292472b98394c292a58"; }; } { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz"; - sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; + sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz"; - sha1 = "a7cc3f66119a9f7ebe2de5383cce193473d65991"; + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz"; - sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz"; + sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; - sha1 = "89a3848a0166623b5bc481164b5936ab947e887e"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz"; - sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz"; + sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; - sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce"; + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; - sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz"; + sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz"; - sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da"; + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; - sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; + sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; - sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3"; + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; - sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853"; + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz"; - sha1 = "a63868289e5b4007f7054d46491af51435766008"; + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; - sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; + sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; - sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; + sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; - sha1 = "e1436116abb0610c2259094848754ac5230922ad"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; + sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz"; - sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; + sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; - sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; + sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; - sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; + sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; - sha1 = "425127e6045231360858eeaa47a71d75eded7a74"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz"; + sha1 = "800597ddb8aefc2c293ed27459c1fcc935a26c2c"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; - sha1 = "e75266a13ef94202db2a0620977756f51d52d249"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; + sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz"; - sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz"; + sha1 = "72c97cf5f38604aea3abf3b935b0e17b1db76a50"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; - sha1 = "9d269fd28a370258199b4294736813a60bbdd106"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; + sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; - sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; + sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; - sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; + sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; - sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha1 = "8a3538aa40434e000b8f44a3c5c9ac7229bd2392"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; - sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.5.0.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz"; - sha1 = "4d6ae4033bc38f8a65dfca2b6235c44522a422fc"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; + sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; - sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; + sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; - sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; + sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; - sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; + sha1 = "8539ec42c153d12ea3836e0e3ac30d5aae7b258e"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; - sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; + sha1 = "64b7474a4279ee588cacd1906695ca721687c277"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; - sha1 = "629dc82512c55cee01341fb27bdfcb210354680f"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; + sha1 = "207f1461c78a231d5337a92140e52422510d81a4"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; - sha1 = "4792af87c998a49367597d07fedf02636d2e1634"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.5.5.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.5.5.tgz"; - sha1 = "a6331afbfc59189d2135b2e09474457a8e3d28bc"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; + sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"; }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz"; - sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; + sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz"; - sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; + sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz"; - sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz"; + sha1 = "173b265746f5e15b2afe527eeda65b73623a0795"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; - sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; + sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz"; - sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; + sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.5.5.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz"; - sha1 = "6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz"; + sha1 = "70ded987c91609f78353dd76d2fb2a0bb991e8e5"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; - sha1 = "ab4634bb4f14d36728bf5978322b35587787970f"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; + sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; }; } { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz"; - sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; + sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; }; } { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; - sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; + sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; }; } { - name = "_babel_preset_typescript___preset_typescript_7.3.3.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz"; - sha1 = "88669911053fa16b2b276ea2ede2ca603b3f307a"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz"; + sha1 = "86f576c8540bd06d0e95e0b61ea76d55f6cbd03f"; }; } { - name = "_babel_runtime___runtime_7.5.5.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz"; - sha1 = "74fba56d35efbeca444091c7850ccd494fd2f132"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; + sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; }; } { - name = "_babel_runtime___runtime_7.6.2.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.2.tgz"; - sha1 = "c3d6e41b304ef10dcf13777a33e7694ec4a9a6dd"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; + sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; }; } { - name = "_babel_runtime___runtime_7.6.3.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz"; - sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha1 = "45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"; }; } { - name = "_babel_runtime___runtime_7.8.7.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.8.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz"; - sha1 = "8fefce9802db54881ba59f90bb28719b4996324d"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; + sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; }; } { - name = "_babel_template___template_7.4.4.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_template___template_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz"; - sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; + sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; }; } { - name = "_babel_traverse___traverse_7.5.5.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz"; - sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; + sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; }; } { - name = "_babel_types___types_7.5.5.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_types___types_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz"; - sha1 = "97b9f728e182785909aa4ab56264f090a028d18a"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; + sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; }; } { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; path = fetchurl { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz"; - sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; + sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; + }; + } + { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; + sha1 = "2248971416a506fc78278fc0c0ea3179224af1e9"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; + sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; + }; + } + { + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha1 = "a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"; + }; + } + { + name = "_babel_preset_env___preset_env_7.9.6.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha1 = "df063b276c6455ec6fcfc6e53aacc38da9b0aea6"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + }; + } + { + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz"; + sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a"; + }; + } + { + name = "_babel_preset_react___preset_react_7.9.4.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.4.tgz"; + sha1 = "c6c97693ac65b6b9c0b4f25b948a8f665463014d"; + }; + } + { + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + path = fetchurl { + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha1 = "87705a72b1f0d59df21c179f7c3d2ef4b16ce192"; + }; + } + { + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; + }; + } + { + name = "_babel_runtime___runtime_7.9.0.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz"; + sha1 = "337eda67401f5b066a6f205a3113d4ac18ba495b"; + }; + } + { + name = "_babel_runtime___runtime_7.9.6.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; + }; + } + { + name = "_babel_template___template_7.8.6.tgz"; + path = fetchurl { + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.6.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; + sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + }; + } + { + name = "_babel_types___types_7.9.6.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; + sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; }; } { @@ -762,27 +882,35 @@ }; } { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; + path = fetchurl { + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz"; + sha1 = "f0950bba18819512d42f7197e56c518aa491cf18"; + }; + } + { + name = "_emotion_hash___hash_0.8.0.tgz"; path = fetchurl { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz"; - sha1 = "c27b391d8457d1e893f1eddeaf5e5412d12ffbb5"; + name = "_emotion_hash___hash_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; + sha1 = "bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"; }; } { - name = "_emotion_hash___hash_0.7.4.tgz"; + name = "_hapi_address___address_2.1.4.tgz"; path = fetchurl { - name = "_emotion_hash___hash_0.7.4.tgz"; - url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.4.tgz"; - sha1 = "f14932887422c9056b15a8d222a9074a7dfa2831"; + name = "_hapi_address___address_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz"; + sha1 = "5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"; }; } { - name = "_hapi_address___address_2.1.0.tgz"; + name = "_hapi_address___address_4.0.1.tgz"; path = fetchurl { - name = "_hapi_address___address_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.0.tgz"; - sha1 = "d86223d40c73942cc6151838d9f264997e6673f9"; + name = "_hapi_address___address_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz"; + sha1 = "267301ddf7bc453718377a6fb3832a2f04a721dd"; }; } { @@ -794,11 +922,27 @@ }; } { - name = "_hapi_hoek___hoek_8.2.2.tgz"; + name = "_hapi_formula___formula_2.0.0.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_8.2.2.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.2.tgz"; - sha1 = "6eaa2e1ec3b50dfb8dccbe705dc289094652bc2d"; + name = "_hapi_formula___formula_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz"; + sha1 = "edade0619ed58c8e4f164f233cda70211e787128"; + }; + } + { + name = "_hapi_hoek___hoek_8.5.1.tgz"; + path = fetchurl { + name = "_hapi_hoek___hoek_8.5.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha1 = "fde96064ca446dec8c55a8c2f130957b070c6e06"; + }; + } + { + name = "_hapi_hoek___hoek_9.0.4.tgz"; + path = fetchurl { + name = "_hapi_hoek___hoek_9.0.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.4.tgz"; + sha1 = "e80ad4e8e8d2adc6c77d985f698447e8628b6010"; }; } { @@ -810,11 +954,35 @@ }; } { - name = "_hapi_topo___topo_3.1.3.tgz"; + name = "_hapi_joi___joi_17.1.1.tgz"; + path = fetchurl { + name = "_hapi_joi___joi_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz"; + sha1 = "9cc8d7e2c2213d1e46708c6260184b447c661350"; + }; + } + { + name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; path = fetchurl { - name = "_hapi_topo___topo_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.3.tgz"; - sha1 = "c7a02e0d936596d29f184e6d7fdc07e8b5efce11"; + name = "_hapi_pinpoint___pinpoint_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz"; + sha1 = "805b40d4dbec04fc116a73089494e00f073de8df"; + }; + } + { + name = "_hapi_topo___topo_3.1.6.tgz"; + path = fetchurl { + name = "_hapi_topo___topo_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.6.tgz"; + sha1 = "68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"; + }; + } + { + name = "_hapi_topo___topo_5.0.0.tgz"; + path = fetchurl { + name = "_hapi_topo___topo_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz"; + sha1 = "c19af8577fa393a06e9c77b60995af959be721e7"; }; } { @@ -898,11 +1066,19 @@ }; } { - name = "_material_ui_core___core_4.9.5.tgz"; + name = "_jest_types___types_25.5.0.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.9.5.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.5.tgz"; - sha1 = "384869f2840b243241f7881a902f5ffc48360830"; + name = "_jest_types___types_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; + sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + }; + } + { + name = "_material_ui_core___core_4.9.13.tgz"; + path = fetchurl { + name = "_material_ui_core___core_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.13.tgz"; + sha1 = "024962bcdda05139e1bad17a1815bf4088702b15"; }; } { @@ -914,35 +1090,43 @@ }; } { - name = "_material_ui_styles___styles_4.9.0.tgz"; + name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; path = fetchurl { - name = "_material_ui_styles___styles_4.9.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.0.tgz"; - sha1 = "10c31859f6868cfa9d3adf6b6c3e32c9d676bc76"; + name = "_material_ui_react_transition_group___react_transition_group_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/react-transition-group/-/react-transition-group-4.3.0.tgz"; + sha1 = "92529142addb5cc179dbf42d246c7e3fe4d6104b"; }; } { - name = "_material_ui_system___system_4.9.3.tgz"; + name = "_material_ui_styles___styles_4.9.13.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.9.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.3.tgz"; - sha1 = "ee48990d7941237fdaf21b7b399981d614bb0875"; + name = "_material_ui_styles___styles_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.13.tgz"; + sha1 = "08b3976bdd21c38bc076693d95834f97539f3b15"; }; } { - name = "_material_ui_types___types_5.0.0.tgz"; + name = "_material_ui_system___system_4.9.13.tgz"; path = fetchurl { - name = "_material_ui_types___types_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.0.tgz"; - sha1 = "26d6259dc6b39f4c2e1e9aceff7a11e031941741"; + name = "_material_ui_system___system_4.9.13.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.13.tgz"; + sha1 = "adefb3b6a5ddf0b00fe4e82ac63bb48276e9749d"; }; } { - name = "_material_ui_utils___utils_4.7.1.tgz"; + name = "_material_ui_types___types_5.0.1.tgz"; path = fetchurl { - name = "_material_ui_utils___utils_4.7.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.7.1.tgz"; - sha1 = "dc16c7f0d2cd02fbcdd5cfe601fd6863ae3cc652"; + name = "_material_ui_types___types_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.1.tgz"; + sha1 = "c4954063cdc196eb327ee62c041368b1aebb6d61"; + }; + } + { + name = "_material_ui_utils___utils_4.9.12.tgz"; + path = fetchurl { + name = "_material_ui_utils___utils_4.9.12.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.9.12.tgz"; + sha1 = "0d639f1c1ed83fffb2ae10c21d15a938795d9e65"; }; } { @@ -994,11 +1178,11 @@ }; } { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.1.tgz"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.3.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.1.tgz"; - sha1 = "646c2f5b5770c2fe318d6e51492344c3d62ddb63"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-4.3.3.tgz"; + sha1 = "2cdedd747e5b1b29ed4c241e46256aac8110dd93"; }; } { @@ -1026,19 +1210,19 @@ }; } { - name = "_svgr_babel_preset___babel_preset_4.3.1.tgz"; + name = "_svgr_babel_preset___babel_preset_4.3.3.tgz"; path = fetchurl { - name = "_svgr_babel_preset___babel_preset_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.1.tgz"; - sha1 = "62ffcb85d756580e8ce608e9d2ac3b9063be9e28"; + name = "_svgr_babel_preset___babel_preset_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-4.3.3.tgz"; + sha1 = "a75d8c2f202ac0e5774e6bfc165d028b39a1316c"; }; } { - name = "_svgr_core___core_4.3.2.tgz"; + name = "_svgr_core___core_4.3.3.tgz"; path = fetchurl { - name = "_svgr_core___core_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.2.tgz"; - sha1 = "939c89be670ad79b762f4c063f213f0e02535f2e"; + name = "_svgr_core___core_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/core/-/core-4.3.3.tgz"; + sha1 = "b37b89d5b757dc66e8c74156d00c368338d24293"; }; } { @@ -1050,11 +1234,11 @@ }; } { - name = "_svgr_plugin_jsx___plugin_jsx_4.3.2.tgz"; + name = "_svgr_plugin_jsx___plugin_jsx_4.3.3.tgz"; path = fetchurl { - name = "_svgr_plugin_jsx___plugin_jsx_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.2.tgz"; - sha1 = "ce9ddafc8cdd74da884c9f7af014afcf37f93d3c"; + name = "_svgr_plugin_jsx___plugin_jsx_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-4.3.3.tgz"; + sha1 = "e2ba913dbdfbe85252a34db101abc7ebd50992fa"; }; } { @@ -1066,27 +1250,27 @@ }; } { - name = "_svgr_webpack___webpack_4.3.2.tgz"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; path = fetchurl { - name = "_svgr_webpack___webpack_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.2.tgz"; - sha1 = "319d4471c8f3d5c3af35059274834d9b5b8fb956"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.3.tgz"; + sha1 = "13cc2423bf3dff2d494f16b17eb7eacb86895017"; }; } { - name = "_types_babel__core___babel__core_7.1.2.tgz"; + name = "_types_babel__core___babel__core_7.1.7.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz"; - sha1 = "608c74f55928033fce18b99b213c16be4b3d114f"; + name = "_types_babel__core___babel__core_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz"; + sha1 = "1dacad8840364a57c98d0dd4855c6dd3752c6b89"; }; } { - name = "_types_babel__generator___babel__generator_7.0.2.tgz"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; path = fetchurl { - name = "_types_babel__generator___babel__generator_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz"; - sha1 = "d2112a6b21fad600d7674274293c85dce0cb47fc"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; + sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; }; } { @@ -1098,27 +1282,35 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; + sha1 = "1ae3010e8bf8851d324878b42acec71986486d18"; + }; + } + { + name = "_types_codemirror___codemirror_0.0.91.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz"; - sha1 = "2496e9ff56196cc1429c72034e07eab6121b6f3f"; + name = "_types_codemirror___codemirror_0.0.91.tgz"; + url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.91.tgz"; + sha1 = "4cb9832388726e57e747f0e3a8ab69105ad02a66"; }; } { - name = "_types_codemirror___codemirror_0.0.71.tgz"; + name = "_types_color_name___color_name_1.1.1.tgz"; path = fetchurl { - name = "_types_codemirror___codemirror_0.0.71.tgz"; - url = "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.71.tgz"; - sha1 = "861f1bcb3100c0a064567c5400f2981cf4ae8ca7"; + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; }; } { - name = "_types_detect_browser___detect_browser_2.0.1.tgz"; + name = "_types_detect_browser___detect_browser_4.0.0.tgz"; path = fetchurl { - name = "_types_detect_browser___detect_browser_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/detect-browser/-/detect-browser-2.0.1.tgz"; - sha1 = "ae49b3b3f5fae163f0988487fe76fb121b56ac53"; + name = "_types_detect_browser___detect_browser_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/detect-browser/-/detect-browser-4.0.0.tgz"; + sha1 = "5672576f9621aad8773489593fca2e4c57c29fb5"; }; } { @@ -1130,11 +1322,11 @@ }; } { - name = "_types_estree___estree_0.0.39.tgz"; + name = "_types_estree___estree_0.0.44.tgz"; path = fetchurl { - name = "_types_estree___estree_0.0.39.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz"; - sha1 = "e177e699ee1b8c22d23174caaa7422644389509f"; + name = "_types_estree___estree_0.0.44.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.44.tgz"; + sha1 = "980cc5a29a3ef3bea6ff1f7d021047d7ea575e21"; }; } { @@ -1162,11 +1354,11 @@ }; } { - name = "_types_history___history_4.7.3.tgz"; + name = "_types_history___history_4.7.5.tgz"; path = fetchurl { - name = "_types_history___history_4.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz"; - sha1 = "856c99cdc1551d22c22b18b5402719affec9839a"; + name = "_types_history___history_4.7.5.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz"; + sha1 = "527d20ef68571a4af02ed74350164e7a67544860"; }; } { @@ -1178,11 +1370,11 @@ }; } { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; path = fetchurl { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz"; - sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c"; + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; }; } { @@ -1194,11 +1386,11 @@ }; } { - name = "_types_jest___jest_23.3.14.tgz"; + name = "_types_jest___jest_25.2.1.tgz"; path = fetchurl { - name = "_types_jest___jest_23.3.14.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.14.tgz"; - sha1 = "37daaf78069e7948520474c87b80092ea912520a"; + name = "_types_jest___jest_25.2.1.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.1.tgz"; + sha1 = "9544cd438607955381c1bdbdb97767a249297db5"; }; } { @@ -1210,11 +1402,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.3.tgz"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz"; - sha1 = "bdfd69d61e464dcc81b25159c270d75a73c1a636"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; + sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; }; } { @@ -1226,19 +1418,11 @@ }; } { - name = "_types_node___node_12.7.4.tgz"; + name = "_types_node___node_13.13.5.tgz"; path = fetchurl { - name = "_types_node___node_12.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.7.4.tgz"; - sha1 = "64db61e0359eb5a8d99b55e05c729f130a678b04"; - }; - } - { - name = "_types_node___node_10.14.17.tgz"; - path = fetchurl { - name = "_types_node___node_10.14.17.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-10.14.17.tgz"; - sha1 = "b96d4dd3e427382482848948041d3754d40fd5ce"; + name = "_types_node___node_13.13.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.13.5.tgz"; + sha1 = "96ec3b0afafd64a4ccea9107b75bf8489f0e5765"; }; } { @@ -1250,6 +1434,14 @@ }; } { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { name = "_types_prop_types___prop_types_15.7.3.tgz"; path = fetchurl { name = "_types_prop_types___prop_types_15.7.3.tgz"; @@ -1258,11 +1450,11 @@ }; } { - name = "_types_puppeteer___puppeteer_1.19.1.tgz"; + name = "_types_puppeteer___puppeteer_2.0.1.tgz"; path = fetchurl { - name = "_types_puppeteer___puppeteer_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-1.19.1.tgz"; - sha1 = "942ca62288953a0f5fbbc25c103b5f2ba28b60ab"; + name = "_types_puppeteer___puppeteer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-2.0.1.tgz"; + sha1 = "83a1d7f0a1c2e0edbbb488b4d8fb54b14ec9d455"; }; } { @@ -1274,59 +1466,51 @@ }; } { - name = "_types_react_dom___react_dom_16.9.0.tgz"; + name = "_types_react_dom___react_dom_16.9.7.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.0.tgz"; - sha1 = "ba6ddb00bf5de700b0eb91daa452081ffccbfdea"; + name = "_types_react_dom___react_dom_16.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.7.tgz"; + sha1 = "60844d48ce252d7b2dccf0c7bb937130e27c0cd2"; }; } { - name = "_types_react_infinite___react_infinite_0.0.33.tgz"; + name = "_types_react_infinite___react_infinite_0.0.34.tgz"; path = fetchurl { - name = "_types_react_infinite___react_infinite_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.33.tgz"; - sha1 = "08724d4a7095f3fa1d4e6cb5d05bcbe42ce135da"; + name = "_types_react_infinite___react_infinite_0.0.34.tgz"; + url = "https://registry.yarnpkg.com/@types/react-infinite/-/react-infinite-0.0.34.tgz"; + sha1 = "0b514f65c4ba80ad22dea079075e04345ddcaae2"; }; } { - name = "_types_react_router_dom___react_router_dom_4.3.5.tgz"; + name = "_types_react_router_dom___react_router_dom_5.1.5.tgz"; path = fetchurl { - name = "_types_react_router_dom___react_router_dom_4.3.5.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-4.3.5.tgz"; - sha1 = "72f229967690c890d00f96e6b85e9ee5780db31f"; + name = "_types_react_router_dom___react_router_dom_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.5.tgz"; + sha1 = "7c334a2ea785dbad2b2dcdd83d2cf3d9973da090"; }; } { - name = "_types_react_router___react_router_5.0.3.tgz"; + name = "_types_react_router___react_router_5.1.7.tgz"; path = fetchurl { - name = "_types_react_router___react_router_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.0.3.tgz"; - sha1 = "855a1606e62de3f4d69ea34fb3c0e50e98e964d5"; + name = "_types_react_router___react_router_5.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.7.tgz"; + sha1 = "e9d12ed7dcfc79187e4d36667745b69a5aa11556"; }; } { - name = "_types_react_transition_group___react_transition_group_4.2.2.tgz"; + name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; path = fetchurl { - name = "_types_react_transition_group___react_transition_group_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.2.tgz"; - sha1 = "8c851c4598a23a3a34173069fb4c5c9e41c02e3f"; + name = "_types_react_transition_group___react_transition_group_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.2.4.tgz"; + sha1 = "c7416225987ccdb719262766c1483da8f826838d"; }; } { - name = "_types_react___react_16.9.3.tgz"; + name = "_types_react___react_16.9.34.tgz"; path = fetchurl { - name = "_types_react___react_16.9.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.3.tgz"; - sha1 = "6d13251e441a3e67fb60d719d1fc8785b984a2ec"; - }; - } - { - name = "_types_react___react_16.9.2.tgz"; - path = fetchurl { - name = "_types_react___react_16.9.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.2.tgz"; - sha1 = "6d1765431a1ad1877979013906731aae373de268"; + name = "_types_react___react_16.9.34.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz"; + sha1 = "f7d5e331c468f53affed17a8a4d488cd44ea9349"; }; } { @@ -1338,11 +1522,11 @@ }; } { - name = "_types_rimraf___rimraf_2.0.2.tgz"; + name = "_types_rimraf___rimraf_3.0.0.tgz"; path = fetchurl { - name = "_types_rimraf___rimraf_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz"; - sha1 = "7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"; + name = "_types_rimraf___rimraf_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.0.tgz"; + sha1 = "b9d03f090ece263671898d57bb7bb007023ac19f"; }; } { @@ -1362,51 +1546,67 @@ }; } { - name = "_types_yargs_parser___yargs_parser_13.0.0.tgz"; + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + }; + } + { + name = "_types_yargs___yargs_13.0.8.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_13.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz"; + sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99"; + }; + } + { + name = "_types_yargs___yargs_15.0.4.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_13.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.0.0.tgz"; - sha1 = "453743c5bbf9f1bed61d959baab5b06be029b2d0"; + name = "_types_yargs___yargs_15.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.4.tgz"; + sha1 = "7e5d0f8ca25e9d5849f2ea443cf7c402decd8299"; }; } { - name = "_types_yargs___yargs_13.0.2.tgz"; + name = "_types_yauzl___yauzl_2.9.1.tgz"; path = fetchurl { - name = "_types_yargs___yargs_13.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.2.tgz"; - sha1 = "a64674fc0149574ecd90ba746e932b5a5f7b3653"; + name = "_types_yauzl___yauzl_2.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha1 = "d10f69f9f522eef3cf98e30afb684a1e1ec923af"; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_1.13.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.13.0.tgz"; - sha1 = "22fed9b16ddfeb402fd7bcde56307820f6ebc49f"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; + sha1 = "942c921fec5e200b79593c71fafb1e3f57aa2e36"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_1.13.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz"; - sha1 = "b08c60d780c0067de2fb44b04b432f540138301e"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; + sha1 = "a9ec514bf7fd5e5e82bc10dcb6a86d58baae9508"; }; } { - name = "_typescript_eslint_parser___parser_1.13.0.tgz"; + name = "_typescript_eslint_parser___parser_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz"; - sha1 = "61ac7811ea52791c47dc9fd4dd4a184fae9ac355"; + name = "_typescript_eslint_parser___parser_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.31.0.tgz"; + sha1 = "beddd4e8efe64995108b229b2862cd5752d40d6f"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_1.13.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz"; - sha1 = "8140f17d0f60c03619798f1d628b8434913dc32e"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.31.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; + sha1 = "ac536c2d46672aa1f27ba0ec2140d53670635cfd"; }; } { @@ -1570,19 +1770,11 @@ }; } { - name = "abab___abab_2.0.1.tgz"; + name = "abab___abab_2.0.3.tgz"; path = fetchurl { - name = "abab___abab_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.1.tgz"; - sha1 = "3fa17797032b71410ec372e11668f4b4ffc86a82"; - }; - } - { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + name = "abab___abab_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; + sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; }; } { @@ -1594,19 +1786,19 @@ }; } { - name = "acorn_globals___acorn_globals_4.3.3.tgz"; + name = "acorn_globals___acorn_globals_4.3.4.tgz"; path = fetchurl { - name = "acorn_globals___acorn_globals_4.3.3.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.3.tgz"; - sha1 = "a86f75b69680b8780d30edd21eee4e0ea170c05e"; + name = "acorn_globals___acorn_globals_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz"; + sha1 = "9fa1926addc11c97308c4e66d7add0d40c3272e7"; }; } { - name = "acorn_jsx___acorn_jsx_5.0.2.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz"; - sha1 = "84b68ea44b373c4f8686023a551f61a21b7c4a4f"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -1618,35 +1810,27 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.3.0.tgz"; + name = "acorn___acorn_6.4.1.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.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { - name = "acorn___acorn_7.0.0.tgz"; + name = "acorn___acorn_7.1.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.0.0.tgz"; - sha1 = "26b8d1cd9a9b700350b71c0905546f64d1284e7a"; - }; - } - { - name = "address___address_1.1.0.tgz"; - path = fetchurl { - name = "address___address_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/address/-/address-1.1.0.tgz"; - sha1 = "ef8e047847fcd2c5b6f50c16965f924fd99fe709"; + name = "acorn___acorn_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; + sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; }; } { @@ -1666,11 +1850,19 @@ }; } { - name = "agent_base___agent_base_4.3.0.tgz"; + name = "agent_base___agent_base_5.1.1.tgz"; + path = fetchurl { + name = "agent_base___agent_base_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; + sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; + }; + } + { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; path = fetchurl { - name = "agent_base___agent_base_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; - sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; }; } { @@ -1698,11 +1890,11 @@ }; } { - name = "ajv___ajv_6.10.2.tgz"; + name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + name = "ajv___ajv_6.12.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; + sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; }; } { @@ -1730,6 +1922,14 @@ }; } { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + }; + } + { name = "ansi_html___ansi_html_0.0.7.tgz"; path = fetchurl { name = "ansi_html___ansi_html_0.0.7.tgz"; @@ -1762,6 +1962,14 @@ }; } { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; @@ -1778,6 +1986,14 @@ }; } { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { name = "anymatch___anymatch_2.0.0.tgz"; path = fetchurl { name = "anymatch___anymatch_2.0.0.tgz"; @@ -1786,19 +2002,19 @@ }; } { - name = "aproba___aproba_1.2.0.tgz"; + name = "anymatch___anymatch_3.1.1.tgz"; path = fetchurl { - name = "aproba___aproba_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; }; } { @@ -1858,14 +2074,6 @@ }; } { - name = "array_filter___array_filter_0.0.1.tgz"; - path = fetchurl { - name = "array_filter___array_filter_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz"; - sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; - }; - } - { name = "array_flatten___array_flatten_1.1.1.tgz"; path = fetchurl { name = "array_flatten___array_flatten_1.1.1.tgz"; @@ -1882,27 +2090,11 @@ }; } { - name = "array_includes___array_includes_3.0.3.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_map___array_map_0.0.0.tgz"; - path = fetchurl { - name = "array_map___array_map_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz"; - sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; - }; - } - { - name = "array_reduce___array_reduce_0.0.0.tgz"; + name = "array_includes___array_includes_3.1.1.tgz"; path = fetchurl { - name = "array_reduce___array_reduce_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz"; - sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; }; } { @@ -1930,11 +2122,19 @@ }; } { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; path = fetchurl { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; - sha1 = "630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; + sha1 = "3baca26108ca7affb08db06bf0be6cb3115a969c"; + }; + } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.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"; }; } { @@ -2034,11 +2234,11 @@ }; } { - name = "async___async_1.5.2.tgz"; + name = "async___async_2.6.3.tgz"; path = fetchurl { - name = "async___async_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; }; } { @@ -2058,11 +2258,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; + name = "autoprefixer___autoprefixer_9.7.6.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.6.1.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz"; - sha1 = "51967a02d2d2300bb01866c1611ec8348d355a47"; + name = "autoprefixer___autoprefixer_9.7.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.6.tgz"; + sha1 = "63ac5bbc0ce7934e6997207d5bb00d68fa8293a4"; }; } { @@ -2074,27 +2274,27 @@ }; } { - name = "aws4___aws4_1.8.0.tgz"; + name = "aws4___aws4_1.9.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; - sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + name = "aws4___aws4_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; + sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; }; } { - name = "axios___axios_0.19.0.tgz"; + name = "axios___axios_0.19.2.tgz"; path = fetchurl { - name = "axios___axios_0.19.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz"; - sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"; + name = "axios___axios_0.19.2.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz"; + sha1 = "3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"; }; } { - name = "axobject_query___axobject_query_2.0.2.tgz"; + name = "axobject_query___axobject_query_2.1.2.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz"; - sha1 = "ea187abe5b9002b377f925d8bf7d1c561adf38f9"; + name = "axobject_query___axobject_query_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; + sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; }; } { @@ -2106,11 +2306,11 @@ }; } { - name = "babel_eslint___babel_eslint_10.0.2.tgz"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; path = fetchurl { - name = "babel_eslint___babel_eslint_10.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.2.tgz"; - sha1 = "182d5ac204579ff0881684b040560fdcc1558456"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; }; } { @@ -2130,19 +2330,19 @@ }; } { - name = "babel_loader___babel_loader_8.0.6.tgz"; + name = "babel_loader___babel_loader_8.1.0.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.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz"; + sha1 = "c611d5112bd5209abe8b9fa84c3e4da25275f1c3"; }; } { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; path = fetchurl { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; }; } { @@ -2162,19 +2362,19 @@ }; } { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; path = fetchurl { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz"; - sha1 = "41f7ead616fc36f6a93180e89697f69f51671181"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; }; } { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.3.tgz"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; path = fetchurl { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.3.tgz"; - sha1 = "9ba2f3ac4dc78b042651654f07e847adfe50667c"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz"; + sha1 = "c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"; }; } { @@ -2210,11 +2410,11 @@ }; } { - name = "babel_preset_react_app___babel_preset_react_app_9.0.1.tgz"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.0.1.tgz"; - sha1 = "16a2cf84363045b530b6a03460527a5c6eac42ba"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz"; + sha1 = "54775d976588a8a6d1a99201a702befecaf48030"; }; } { @@ -2234,11 +2434,11 @@ }; } { - name = "bail___bail_1.0.4.tgz"; + name = "bail___bail_1.0.5.tgz"; path = fetchurl { - name = "bail___bail_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz"; - sha1 = "7181b66d508aa3055d3f6c13f0a0c720641dde9b"; + name = "bail___bail_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz"; + sha1 = "b6fa133404a392cbc1f8c4bf63f5953351e7a776"; }; } { @@ -2298,11 +2498,35 @@ }; } { - name = "bluebird___bluebird_3.5.5.tgz"; + name = "binary_extensions___binary_extensions_2.0.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c"; + }; + } + { + name = "bindings___bindings_1.5.0.tgz"; path = fetchurl { - name = "bluebird___bluebird_3.5.5.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz"; - sha1 = "a8d0afd73251effbbd5fe384a77d73003c17a71f"; + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bl___bl_4.0.2.tgz"; + path = fetchurl { + name = "bl___bl_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz"; + sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; }; } { @@ -2314,6 +2538,14 @@ }; } { + name = "bn.js___bn.js_5.1.1.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.1.tgz"; + sha1 = "48efc4031a9c4041b9c99c6941d903463ab62eb5"; + }; + } + { name = "body_parser___body_parser_1.19.0.tgz"; path = fetchurl { name = "body_parser___body_parser_1.19.0.tgz"; @@ -2354,6 +2586,14 @@ }; } { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { name = "brorand___brorand_1.1.0.tgz"; path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; @@ -2362,11 +2602,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; - sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } { @@ -2410,11 +2650,11 @@ }; } { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; + name = "browserify_sign___browserify_sign_4.1.0.tgz"; path = fetchurl { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + name = "browserify_sign___browserify_sign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.1.0.tgz"; + sha1 = "4fe971b379a5aeb4925e06779f9fa1f41d249d70"; }; } { @@ -2426,27 +2666,35 @@ }; } { - name = "browserslist___browserslist_4.6.6.tgz"; + name = "browserslist___browserslist_4.10.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.6.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz"; - sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453"; + name = "browserslist___browserslist_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz"; + sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"; }; } { - name = "browserslist___browserslist_4.7.0.tgz"; + name = "browserslist___browserslist_4.12.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz"; - sha1 = "9ee89225ffc07db03409f2fee524dc8227458a17"; + name = "browserslist___browserslist_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz"; + sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d"; }; } { - name = "bser___bser_2.1.0.tgz"; + name = "bser___bser_2.1.1.tgz"; path = fetchurl { - name = "bser___bser_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz"; - sha1 = "65fc784bf7f87c009b973c12db6546902fa9c7b5"; + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; }; } { @@ -2474,11 +2722,19 @@ }; } { - name = "buffer___buffer_4.9.1.tgz"; + name = "buffer___buffer_4.9.2.tgz"; + path = fetchurl { + name = "buffer___buffer_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; + sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; + }; + } + { + name = "buffer___buffer_5.6.0.tgz"; path = fetchurl { - name = "buffer___buffer_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + name = "buffer___buffer_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz"; + sha1 = "a31749dc7d81d84db08abf937b6b8c4033f62786"; }; } { @@ -2514,11 +2770,19 @@ }; } { - name = "cacache___cacache_12.0.3.tgz"; + name = "cacache___cacache_12.0.4.tgz"; path = fetchurl { - name = "cacache___cacache_12.0.3.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; - sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + name = "cacache___cacache_12.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; + sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; + }; + } + { + name = "cacache___cacache_13.0.1.tgz"; + path = fetchurl { + name = "cacache___cacache_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz"; + sha1 = "a8000c21697089082f85287a1aec6e382024a71c"; }; } { @@ -2570,11 +2834,11 @@ }; } { - name = "camel_case___camel_case_3.0.0.tgz"; + name = "camel_case___camel_case_4.1.1.tgz"; path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + name = "camel_case___camel_case_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; + sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; }; } { @@ -2586,14 +2850,6 @@ }; } { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - } - { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { name = "camelcase___camelcase_5.3.1.tgz"; @@ -2610,11 +2866,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30000989.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30000989.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz"; - sha1 = "b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"; + name = "caniuse_lite___caniuse_lite_1.0.30001054.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001054.tgz"; + sha1 = "7e82fc42d927980b0ce1426c4813df12381e1a75"; }; } { @@ -2626,11 +2882,11 @@ }; } { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; path = fetchurl { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz"; - sha1 = "3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; + sha1 = "23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"; }; } { @@ -2658,27 +2914,35 @@ }; } { - name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; path = fetchurl { - name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz"; - sha1 = "3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"; + name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; + sha1 = "94bc1845dce70a5bb9d2ecc748725661293d8fc1"; }; } { - name = "character_entities___character_entities_1.2.3.tgz"; + name = "character_entities___character_entities_1.2.4.tgz"; path = fetchurl { - name = "character_entities___character_entities_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz"; - sha1 = "bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"; + name = "character_entities___character_entities_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz"; + sha1 = "e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"; }; } { - name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz"; + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; path = fetchurl { - name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz"; - sha1 = "1647f4f726638d3ea4a750cf5d1975c1c7919a85"; + name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; + sha1 = "083329cda0eae272ab3dbbf37e9a382c13af1560"; }; } { @@ -2698,11 +2962,19 @@ }; } { - name = "chownr___chownr_1.1.2.tgz"; + name = "chokidar___chokidar_3.4.0.tgz"; path = fetchurl { - name = "chownr___chownr_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz"; - sha1 = "a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"; + name = "chokidar___chokidar_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz"; + sha1 = "b30611423ce376357c765b9b8f904b9fba3c0be8"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; }; } { @@ -2738,27 +3010,35 @@ }; } { - name = "clean_css___clean_css_4.2.1.tgz"; + name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { - name = "clean_css___clean_css_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz"; - sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"; + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; }; } { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; + name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; }; } { - name = "cli_width___cli_width_2.2.0.tgz"; + name = "cli_cursor___cli_cursor_3.1.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 = "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.1.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; }; } { @@ -2794,11 +3074,11 @@ }; } { - name = "clsx___clsx_1.0.4.tgz"; + name = "clsx___clsx_1.1.0.tgz"; path = fetchurl { - name = "clsx___clsx_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clsx/-/clsx-1.0.4.tgz"; - sha1 = "0c0171f6d5cb2fe83848463c15fcc26b4df8c2ec"; + name = "clsx___clsx_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/clsx/-/clsx-1.1.0.tgz"; + sha1 = "62937c6adfea771247c34b54d320fb99624f5702"; }; } { @@ -2826,19 +3106,19 @@ }; } { - name = "codemirror___codemirror_5.48.4.tgz"; + name = "codemirror___codemirror_5.53.2.tgz"; path = fetchurl { - name = "codemirror___codemirror_5.48.4.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.48.4.tgz"; - sha1 = "4210fbe92be79a88f0eea348fab3ae78da85ce47"; + name = "codemirror___codemirror_5.53.2.tgz"; + url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.53.2.tgz"; + sha1 = "9799121cf8c50809cca487304e9de3a74d33f428"; }; } { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; + name = "collapse_white_space___collapse_white_space_1.0.6.tgz"; path = fetchurl { - name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; - sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a"; + name = "collapse_white_space___collapse_white_space_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz"; + sha1 = "e63629c0016665792060dbbeb79c42239d2c5287"; }; } { @@ -2858,6 +3138,14 @@ }; } { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; @@ -2898,27 +3186,19 @@ }; } { - name = "commander___commander_2.17.1.tgz"; - path = fetchurl { - name = "commander___commander_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; - sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf"; - }; - } - { - name = "commander___commander_2.20.0.tgz"; + name = "commander___commander_2.20.3.tgz"; path = fetchurl { - name = "commander___commander_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; - sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } { - name = "commander___commander_2.19.0.tgz"; + name = "commander___commander_4.1.1.tgz"; path = fetchurl { - name = "commander___commander_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz"; - sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"; + name = "commander___commander_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; + sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068"; }; } { @@ -2954,11 +3234,11 @@ }; } { - name = "compressible___compressible_2.0.17.tgz"; + name = "compressible___compressible_2.0.18.tgz"; path = fetchurl { - name = "compressible___compressible_2.0.17.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz"; - sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1"; + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; }; } { @@ -2986,11 +3266,11 @@ }; } { - name = "confusing_browser_globals___confusing_browser_globals_1.0.8.tgz"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz"; - sha1 = "93ffec1f82a6e2bf2bc36769cc3a92fa20e502f3"; + 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"; }; } { @@ -3002,19 +3282,11 @@ }; } { - name = "console_browserify___console_browserify_1.1.0.tgz"; - path = fetchurl { - name = "console_browserify___console_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; - }; - } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; + name = "console_browserify___console_browserify_1.2.0.tgz"; path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; }; } { @@ -3050,11 +3322,11 @@ }; } { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; + name = "convert_source_map___convert_source_map_1.7.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz"; - sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20"; + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; }; } { @@ -3098,19 +3370,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.2.1.tgz"; + name = "core_js_compat___core_js_compat_3.6.5.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.2.1.tgz"; - sha1 = "0cbdbc2e386e8e00d3b85dc81c848effec5b8150"; + name = "core_js_compat___core_js_compat_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha1 = "2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"; }; } { - name = "core_js___core_js_3.1.4.tgz"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; path = fetchurl { - name = "core_js___core_js_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz"; - sha1 = "3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; }; } { @@ -3122,11 +3394,19 @@ }; } { - name = "core_js___core_js_2.6.9.tgz"; + name = "core_js___core_js_2.6.11.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz"; - sha1 = "6b4b214620c834152e179323727fc19741b084f2"; + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + }; + } + { + name = "core_js___core_js_3.6.5.tgz"; + path = fetchurl { + name = "core_js___core_js_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz"; + sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a"; }; } { @@ -3146,6 +3426,14 @@ }; } { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } + { name = "create_ecdh___create_ecdh_4.0.3.tgz"; path = fetchurl { name = "create_ecdh___create_ecdh_4.0.3.tgz"; @@ -3170,6 +3458,14 @@ }; } { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz"; + sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; + }; + } + { name = "cross_spawn___cross_spawn_6.0.5.tgz"; path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; @@ -3218,11 +3514,11 @@ }; } { - name = "css_loader___css_loader_2.1.1.tgz"; + name = "css_loader___css_loader_3.4.2.tgz"; path = fetchurl { - name = "css_loader___css_loader_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz"; - sha1 = "d8254f72e412bb2238bb44dd674ffbef497333ea"; + name = "css_loader___css_loader_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz"; + sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202"; }; } { @@ -3250,43 +3546,35 @@ }; } { - name = "css_select___css_select_2.0.2.tgz"; + name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { - name = "css_select___css_select_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz"; - sha1 = "ab4386cec9e1f668855564b17c3733b43b2a5ede"; + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha1 = "6a34653356635934a81baca68d0255432105dbef"; }; } { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; - sha1 = "3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; }; } { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz"; - sha1 = "970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e"; + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; }; } { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; + name = "css_vendor___css_vendor_2.0.8.tgz"; path = fetchurl { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz"; - sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996"; - }; - } - { - name = "css_vendor___css_vendor_2.0.7.tgz"; - path = fetchurl { - name = "css_vendor___css_vendor_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz"; - sha1 = "4e6d53d953c187981576d6a542acc9fb57174bda"; + name = "css_vendor___css_vendor_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz"; + sha1 = "e47f91d3bd3117d49180a3c935e62e3d9f7f449d"; }; } { @@ -3298,6 +3586,14 @@ }; } { + name = "css_what___css_what_3.2.1.tgz"; + path = fetchurl { + name = "css_what___css_what_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz"; + sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1"; + }; + } + { name = "css___css_2.2.4.tgz"; path = fetchurl { name = "css___css_2.2.4.tgz"; @@ -3378,11 +3674,11 @@ }; } { - name = "csso___csso_3.5.1.tgz"; + name = "csso___csso_4.0.3.tgz"; path = fetchurl { - name = "csso___csso_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz"; - sha1 = "7b9eb8be61628973c1b261e169d2f024008e758b"; + name = "csso___csso_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; + sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; }; } { @@ -3402,19 +3698,19 @@ }; } { - name = "csstype___csstype_2.6.6.tgz"; + name = "csstype___csstype_2.6.10.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.6.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz"; - sha1 = "c34f8226a94bbb10c32cc0d714afdf942291fc41"; + name = "csstype___csstype_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; + sha1 = "e63af50e66d7c266edb6b32909cfd0aabe03928b"; }; } { - name = "cyclist___cyclist_0.2.2.tgz"; + name = "cyclist___cyclist_1.0.1.tgz"; path = fetchurl { - name = "cyclist___cyclist_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz"; - sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; }; } { @@ -3426,11 +3722,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz"; - sha1 = "780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; + sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; }; } { @@ -3450,14 +3746,6 @@ }; } { - name = "date_now___date_now_0.1.4.tgz"; - path = fetchurl { - name = "date_now___date_now_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; - }; - } - { name = "debug___debug_2.6.9.tgz"; path = fetchurl { name = "debug___debug_2.6.9.tgz"; @@ -3466,6 +3754,14 @@ }; } { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { name = "debug___debug_3.1.0.tgz"; path = fetchurl { name = "debug___debug_3.1.0.tgz"; @@ -3482,14 +3778,6 @@ }; } { - name = "debug___debug_4.1.1.tgz"; - path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; - }; - } - { name = "decamelize___decamelize_1.2.0.tgz"; path = fetchurl { name = "decamelize___decamelize_1.2.0.tgz"; @@ -3498,14 +3786,6 @@ }; } { - name = "decamelize___decamelize_2.0.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz"; - sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7"; - }; - } - { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; path = fetchurl { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; @@ -3514,19 +3794,11 @@ }; } { - name = "deep_equal___deep_equal_1.1.0.tgz"; + name = "deep_equal___deep_equal_1.1.1.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz"; - sha1 = "3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"; - }; - } - { - name = "deep_extend___deep_extend_0.6.0.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; }; } { @@ -3578,11 +3850,11 @@ }; } { - name = "del___del_3.0.0.tgz"; + name = "del___del_4.1.1.tgz"; path = fetchurl { - name = "del___del_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; }; } { @@ -3594,14 +3866,6 @@ }; } { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - } - { name = "depd___depd_1.1.2.tgz"; path = fetchurl { name = "depd___depd_1.1.2.tgz"; @@ -3610,11 +3874,11 @@ }; } { - name = "des.js___des.js_1.0.0.tgz"; + name = "des.js___des.js_1.0.1.tgz"; path = fetchurl { - name = "des.js___des.js_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; }; } { @@ -3626,19 +3890,11 @@ }; } { - name = "detect_browser___detect_browser_3.0.1.tgz"; - path = fetchurl { - name = "detect_browser___detect_browser_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-3.0.1.tgz"; - sha1 = "39beead014347a8a2be1f3c4cb30a0aef2127c44"; - }; - } - { - name = "detect_libc___detect_libc_1.0.3.tgz"; + name = "detect_browser___detect_browser_5.1.0.tgz"; path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + name = "detect_browser___detect_browser_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.1.0.tgz"; + sha1 = "0c51c66b747ad8f98a6832bf3026a5a23a7850ff"; }; } { @@ -3674,11 +3930,19 @@ }; } { - name = "diff___diff_4.0.1.tgz"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; path = fetchurl { - name = "diff___diff_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz"; - sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; + sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + }; + } + { + name = "diff___diff_4.0.2.tgz"; + path = fetchurl { + name = "diff___diff_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; + sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; }; } { @@ -3754,19 +4018,19 @@ }; } { - name = "dom_helpers___dom_helpers_5.1.0.tgz"; + name = "dom_helpers___dom_helpers_5.1.4.tgz"; path = fetchurl { - name = "dom_helpers___dom_helpers_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.0.tgz"; - sha1 = "57a726de04abcc2a8bbfe664b3e21c584bde514e"; + name = "dom_helpers___dom_helpers_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.4.tgz"; + sha1 = "4609680ab5c79a45f2531441f1949b79d6587f4b"; }; } { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; path = fetchurl { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz"; - sha1 = "13650c850daffea35d8b626a4cfc4d3a17643fdb"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } { @@ -3842,27 +4106,35 @@ }; } { - name = "dot_prop___dot_prop_4.2.0.tgz"; + name = "dot_case___dot_case_3.0.3.tgz"; + path = fetchurl { + name = "dot_case___dot_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz"; + sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"; + }; + } + { + name = "dot_prop___dot_prop_5.2.0.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_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; + sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; }; } { - name = "dotenv_expand___dotenv_expand_4.2.0.tgz"; + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; path = fetchurl { - name = "dotenv_expand___dotenv_expand_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-4.2.0.tgz"; - sha1 = "def1f1ca5d6059d24a766e587942c21106ce1275"; + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; }; } { - name = "dotenv___dotenv_6.2.0.tgz"; + name = "dotenv___dotenv_8.2.0.tgz"; path = fetchurl { - name = "dotenv___dotenv_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz"; - sha1 = "941c0410535d942c8becf28d3f357dbd9d476064"; + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; }; } { @@ -3898,19 +4170,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.252.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.252.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.252.tgz"; - sha1 = "5b6261965b564a0f4df0f1c86246487897017f52"; + name = "electron_to_chromium___electron_to_chromium_1.3.431.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.431.tgz"; + sha1 = "705dd8ef46200415ba837b31d927cdc1e43db303"; }; } { - name = "elliptic___elliptic_6.5.1.tgz"; + name = "elliptic___elliptic_6.5.2.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz"; - sha1 = "c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"; + name = "elliptic___elliptic_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; + sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; }; } { @@ -3922,6 +4194,14 @@ }; } { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { name = "emojis_list___emojis_list_2.1.0.tgz"; path = fetchurl { name = "emojis_list___emojis_list_2.1.0.tgz"; @@ -3930,6 +4210,14 @@ }; } { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { name = "encodeurl___encodeurl_1.0.2.tgz"; path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; @@ -3946,19 +4234,19 @@ }; } { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.1.1.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_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; + sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66"; }; } { @@ -3986,11 +4274,11 @@ }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.0.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz"; - sha1 = "96e3730d76b872f593e54ce1c51fa3a451422d93"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz"; + sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78"; }; } { @@ -4010,27 +4298,27 @@ }; } { - name = "es_abstract___es_abstract_1.14.1.tgz"; + name = "es_abstract___es_abstract_1.17.5.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.14.1.tgz"; - sha1 = "6e8d84b445ec9c610781e74a6d52cc31aac5b4ca"; + name = "es_abstract___es_abstract_1.17.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; + sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { - name = "es5_ext___es5_ext_0.10.51.tgz"; + name = "es5_ext___es5_ext_0.10.53.tgz"; path = fetchurl { - name = "es5_ext___es5_ext_0.10.51.tgz"; - url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.51.tgz"; - sha1 = "ed2d7d9d48a12df86e0299287e93a09ff478842f"; + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; }; } { @@ -4042,27 +4330,11 @@ }; } { - name = "es6_promise___es6_promise_4.2.8.tgz"; - path = fetchurl { - name = "es6_promise___es6_promise_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; - sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; - }; - } - { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; + name = "es6_symbol___es6_symbol_3.1.3.tgz"; path = fetchurl { - name = "es6_promisify___es6_promisify_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - } - { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } { @@ -4074,6 +4346,14 @@ }; } { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } + { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; @@ -4082,59 +4362,59 @@ }; } { - name = "escodegen___escodegen_1.12.0.tgz"; + name = "escodegen___escodegen_1.14.1.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz"; - sha1 = "f763daf840af172bb3a2b6dd7219c0e17f7ff541"; + name = "escodegen___escodegen_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; + sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; }; } { - name = "eslint_config_react_app___eslint_config_react_app_5.0.1.tgz"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.0.1.tgz"; - sha1 = "5f3d666ba3ee3cb384eb943e260e868f6c72251b"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz"; + sha1 = "698bf7aeee27f0cea0139eaef261c7bf7dd623df"; }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.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.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; + sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; }; } { - name = "eslint_loader___eslint_loader_2.2.1.tgz"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; path = fetchurl { - name = "eslint_loader___eslint_loader_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-2.2.1.tgz"; - sha1 = "28b9c12da54057af0845e2a6112701a2f6bf8337"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.3.tgz"; + sha1 = "e018e3d2722381d982b1201adb56819c73b480ca"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz"; - sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c"; + 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"; }; } { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; path = fetchurl { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz"; - sha1 = "e241ebd39c0ce519345a3f074ec1ebde4cf80f2c"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz"; + sha1 = "82b2bd6f21770e0e5deede0228e456cb35308451"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz"; - sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6"; + 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"; }; } { @@ -4154,19 +4434,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz"; - sha1 = "911030dd7e98ba49e1b2208599571846a66bdf13"; - }; - } - { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz"; + sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } { @@ -4186,43 +4458,43 @@ }; } { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz"; - sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab"; + 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_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + name = "eslint_utils___eslint_utils_2.0.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_utils___eslint_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz"; + sha1 = "7be1cc70f27a72a76cd14aa698bcabed6890e1cd"; }; } { - name = "eslint___eslint_6.3.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { - name = "eslint___eslint_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.3.0.tgz"; - sha1 = "1f1a902f67bfd4c354e7288b81e40654d927eb6a"; + 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 = "espree___espree_6.1.1.tgz"; + name = "eslint___eslint_6.8.0.tgz"; path = fetchurl { - name = "espree___espree_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz"; - sha1 = "7f80e5f7257fc47db450022d723e356daeb1e5de"; + name = "eslint___eslint_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; + sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; }; } { - name = "esprima___esprima_3.1.3.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "esprima___esprima_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -4234,11 +4506,11 @@ }; } { - 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"; }; } { @@ -4258,6 +4530,14 @@ }; } { + name = "estraverse___estraverse_5.1.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; + sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + }; + } + { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; @@ -4274,19 +4554,19 @@ }; } { - name = "eventemitter3___eventemitter3_3.1.2.tgz"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz"; - sha1 = "2d3d48f9c346698fce83a85d7d664e98535df6e7"; + name = "eventemitter3___eventemitter3_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; + sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; }; } { - name = "events___events_3.0.0.tgz"; + name = "events___events_3.1.0.tgz"; path = fetchurl { - name = "events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz"; - sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88"; + name = "events___events_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; + sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; }; } { @@ -4306,11 +4586,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.2.tgz"; + name = "exec_sh___exec_sh_0.3.4.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz"; - sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; + name = "exec_sh___exec_sh_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; + sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; }; } { @@ -4354,6 +4634,14 @@ }; } { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } + { name = "extend_shallow___extend_shallow_2.0.1.tgz"; path = fetchurl { name = "extend_shallow___extend_shallow_2.0.1.tgz"; @@ -4394,11 +4682,11 @@ }; } { - name = "extract_zip___extract_zip_1.6.7.tgz"; + name = "extract_zip___extract_zip_2.0.0.tgz"; path = fetchurl { - name = "extract_zip___extract_zip_1.6.7.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz"; - sha1 = "a840b4b8af6403264c8db57f4f1a74333ef81fe9"; + name = "extract_zip___extract_zip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz"; + sha1 = "f53b71d44f4ff5a4527a2259ade000fb8b303492"; }; } { @@ -4418,11 +4706,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; }; } { @@ -4434,11 +4722,11 @@ }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; }; } { @@ -4466,11 +4754,11 @@ }; } { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz"; - sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; }; } { @@ -4482,27 +4770,27 @@ }; } { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; path = fetchurl { - name = "fd_slicer___fd_slicer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; }; } { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; }; } { - name = "figures___figures_2.0.0.tgz"; + name = "figures___figures_3.2.0.tgz"; path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; }; } { @@ -4514,19 +4802,27 @@ }; } { - name = "file_loader___file_loader_3.0.1.tgz"; + name = "file_loader___file_loader_4.3.0.tgz"; + path = fetchurl { + name = "file_loader___file_loader_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz"; + sha1 = "780f040f729b3d18019f20605f723e844b8a58af"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; path = fetchurl { - name = "file_loader___file_loader_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz"; - sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa"; + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; }; } { - name = "filesize___filesize_3.6.1.tgz"; + name = "filesize___filesize_6.0.1.tgz"; path = fetchurl { - name = "filesize___filesize_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz"; - sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317"; + name = "filesize___filesize_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz"; + sha1 = "f850b509909c7c86f7e450ea19006c31c2ed3d2f"; }; } { @@ -4538,6 +4834,14 @@ }; } { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { name = "finalhandler___finalhandler_1.1.2.tgz"; path = fetchurl { name = "finalhandler___finalhandler_1.1.2.tgz"; @@ -4562,11 +4866,19 @@ }; } { - name = "find_up___find_up_3.0.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; path = fetchurl { - name = "find_up___find_up_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; - sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + 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"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; }; } { @@ -4586,6 +4898,14 @@ }; } { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { name = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { name = "flat_cache___flat_cache_2.0.1.tgz"; @@ -4594,19 +4914,19 @@ }; } { - name = "flatted___flatted_2.0.1.tgz"; + name = "flatted___flatted_2.0.2.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; - sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; }; } { - name = "flatten___flatten_1.0.2.tgz"; + name = "flatten___flatten_1.0.3.tgz"; path = fetchurl { - name = "flatten___flatten_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz"; - sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; + name = "flatten___flatten_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz"; + sha1 = "c1283ac9f27b368abc1e36d1ff7b04501a30356b"; }; } { @@ -4626,11 +4946,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.8.1.tgz"; + name = "follow_redirects___follow_redirects_1.11.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.8.1.tgz"; - sha1 = "24804f9eaab67160b0e840c085885d606371a35b"; + name = "follow_redirects___follow_redirects_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz"; + sha1 = "afa14f08ba12a52963140fe43212658897bc0ecb"; }; } { @@ -4666,11 +4986,11 @@ }; } { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; path = fetchurl { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz"; - sha1 = "ce1d77190b44d81a761b10b6284a373795e41f0c"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha1 = "a1642c0d3e65f50c2cc1742e9c0a80f441f86b19"; }; } { @@ -4714,11 +5034,11 @@ }; } { - name = "fs_extra___fs_extra_7.0.1.tgz"; + name = "fs_constants___fs_constants_1.0.0.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; - sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; }; } { @@ -4730,11 +5050,27 @@ }; } { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; + name = "fs_extra___fs_extra_7.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; path = fetchurl { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz"; - sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"; + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; }; } { @@ -4754,19 +5090,27 @@ }; } { - name = "fsevents___fsevents_2.0.7.tgz"; + name = "fsevents___fsevents_2.1.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz"; + sha1 = "4c0a1fb34bc68e543b4b82a9ec392bfbda840805"; + }; + } + { + name = "fsevents___fsevents_1.2.13.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz"; - sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"; + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; }; } { - name = "fsevents___fsevents_1.2.9.tgz"; + name = "fsevents___fsevents_2.1.3.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.9.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz"; - sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f"; + name = "fsevents___fsevents_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; + sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; }; } { @@ -4778,11 +5122,11 @@ }; } { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.1.tgz"; - sha1 = "6d252350803085abc2ad423d4fe3be2f9cbda392"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz"; + sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45"; }; } { @@ -4794,19 +5138,19 @@ }; } { - name = "functions_have_names___functions_have_names_1.1.1.tgz"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; path = fetchurl { - name = "functions_have_names___functions_have_names_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.1.1.tgz"; - sha1 = "79d35927f07b8e7103d819fed475b64ccf7225ea"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz"; + sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91"; }; } { - name = "gauge___gauge_2.7.4.tgz"; + name = "gensync___gensync_1.0.0_beta.1.tgz"; path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + name = "gensync___gensync_1.0.0_beta.1.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; }; } { @@ -4826,27 +5170,19 @@ }; } { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz"; - sha1 = "b877b49a5c16aefac3655f2ed2ea5b684df8d203"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; }; } { - name = "get_port___get_port_5.0.0.tgz"; + name = "get_port___get_port_5.1.1.tgz"; path = fetchurl { - name = "get_port___get_port_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-5.0.0.tgz"; - sha1 = "aa22b6b86fd926dd7884de3e23332c9f70c031a6"; - }; - } - { - name = "get_port___get_port_4.2.0.tgz"; - path = fetchurl { - name = "get_port___get_port_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz"; - sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119"; + name = "get_port___get_port_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz"; + sha1 = "0469ed07563479de6efb986baf053dcd7d4e3193"; }; } { @@ -4858,6 +5194,14 @@ }; } { + name = "get_stream___get_stream_5.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; + sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + }; + } + { name = "get_value___get_value_2.0.6.tgz"; path = fetchurl { name = "get_value___get_value_2.0.6.tgz"; @@ -4882,11 +5226,11 @@ }; } { - name = "glob_parent___glob_parent_5.0.0.tgz"; + name = "glob_parent___glob_parent_5.1.1.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz"; - sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954"; + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; }; } { @@ -4898,11 +5242,11 @@ }; } { - name = "glob___glob_7.1.4.tgz"; + name = "glob___glob_7.1.6.tgz"; path = fetchurl { - name = "glob___glob_7.1.4.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz"; - sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"; + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } { @@ -4930,6 +5274,14 @@ }; } { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + }; + } + { name = "globby___globby_8.0.2.tgz"; path = fetchurl { name = "globby___globby_8.0.2.tgz"; @@ -4946,11 +5298,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz"; - sha1 = "6f0952605d0140c1cfdb138ed005775b92d67b02"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -4962,27 +5314,27 @@ }; } { - name = "gzip_size___gzip_size_5.1.1.tgz"; + name = "gud___gud_1.0.0.tgz"; path = fetchurl { - name = "gzip_size___gzip_size_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz"; - sha1 = "cb9bee692f87c0612b232840a873904e4c135274"; + name = "gud___gud_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/gud/-/gud-1.0.0.tgz"; + sha1 = "a489581b17e6a70beca9abe3ae57de7a499852c0"; }; } { - name = "handle_thing___handle_thing_2.0.0.tgz"; + name = "gzip_size___gzip_size_5.1.1.tgz"; path = fetchurl { - name = "handle_thing___handle_thing_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz"; - sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754"; + name = "gzip_size___gzip_size_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz"; + sha1 = "cb9bee692f87c0612b232840a873904e4c135274"; }; } { - name = "handlebars___handlebars_4.2.0.tgz"; + name = "handle_thing___handle_thing_2.0.1.tgz"; path = fetchurl { - name = "handlebars___handlebars_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.2.0.tgz"; - sha1 = "57ce8d2175b9bbb3d8b3cf3e4217b1aec8ddcb2e"; + name = "handle_thing___handle_thing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; + sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; }; } { @@ -5026,19 +5378,19 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; }; } { - name = "has_unicode___has_unicode_2.0.1.tgz"; + name = "has_symbols___has_symbols_1.0.1.tgz"; path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } { @@ -5082,11 +5434,11 @@ }; } { - name = "hash_base___hash_base_3.0.4.tgz"; + name = "hash_base___hash_base_3.1.0.tgz"; path = fetchurl { - name = "hash_base___hash_base_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; }; } { @@ -5114,11 +5466,11 @@ }; } { - name = "history___history_4.9.0.tgz"; + name = "history___history_4.10.1.tgz"; path = fetchurl { - name = "history___history_4.9.0.tgz"; - url = "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz"; - sha1 = "84587c2068039ead8af769e9d6a6860a14fa1bca"; + name = "history___history_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; + sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; }; } { @@ -5130,22 +5482,6 @@ }; } { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"; - sha1 = "c5903cf409c0dfd908f388e619d86b9c1174cb47"; - }; - } - { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.0.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz"; - sha1 = "b09178f0122184fb95acf525daaecb4d8f45958b"; - }; - } - { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; path = fetchurl { name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; @@ -5154,11 +5490,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz"; - sha1 = "44119abaf4bc64692a16ace34700fed9c03e2546"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -5202,35 +5538,43 @@ }; } { - name = "html_entities___html_entities_1.2.1.tgz"; + name = "html_entities___html_entities_1.3.1.tgz"; + path = fetchurl { + name = "html_entities___html_entities_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; + sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; + }; + } + { + name = "html_escaper___html_escaper_2.0.2.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_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; }; } { - name = "html_minifier___html_minifier_3.5.21.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; path = fetchurl { - name = "html_minifier___html_minifier_3.5.21.tgz"; - url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz"; - sha1 = "d0040e054730e354db008463593194015212d20c"; + name = "html_minifier_terser___html_minifier_terser_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz"; + sha1 = "95d3df037f04835e9d1a09d1767c0e361a7de916"; }; } { - name = "html_to_react___html_to_react_1.4.1.tgz"; + name = "html_to_react___html_to_react_1.4.2.tgz"; path = fetchurl { - name = "html_to_react___html_to_react_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.1.tgz"; - sha1 = "64f67657c6335056866e334c097556f25894dd47"; + name = "html_to_react___html_to_react_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/html-to-react/-/html-to-react-1.4.2.tgz"; + sha1 = "7b628ab56cd63a52f2d0b79d0fa838a51f088a57"; }; } { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; + name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; path = fetchurl { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; - url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz"; - sha1 = "2c53083c1151bfec20479b1f8aaf0039e77b5513"; + name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; + url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz"; + sha1 = "3059a69144b5aecef97708196ca32f9e68677715"; }; } { @@ -5242,11 +5586,11 @@ }; } { - name = "htmlparser2___htmlparser2_4.0.0.tgz"; + name = "htmlparser2___htmlparser2_4.1.0.tgz"; path = fetchurl { - name = "htmlparser2___htmlparser2_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.0.0.tgz"; - sha1 = "6034658db65b7713a572a9ebf79f650832dceec8"; + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; }; } { @@ -5298,11 +5642,11 @@ }; } { - name = "http_proxy___http_proxy_1.17.0.tgz"; + name = "http_proxy___http_proxy_1.18.0.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz"; - sha1 = "7ad38494658f84605e2f6db4436df410f4e5be9a"; + name = "http_proxy___http_proxy_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; + sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; }; } { @@ -5322,11 +5666,11 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_2.2.2.tgz"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz"; - sha1 = "271ea8e90f836ac9f119daccd39c19ff7dfb0793"; + name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; + sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; }; } { @@ -5346,14 +5690,6 @@ }; } { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - path = fetchurl { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"; - sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; - }; - } - { name = "icss_utils___icss_utils_4.1.1.tgz"; path = fetchurl { name = "icss_utils___icss_utils_4.1.1.tgz"; @@ -5386,14 +5722,6 @@ }; } { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8"; - }; - } - { name = "ignore___ignore_3.3.10.tgz"; path = fetchurl { name = "ignore___ignore_3.3.10.tgz"; @@ -5442,11 +5770,11 @@ }; } { - name = "import_fresh___import_fresh_3.1.0.tgz"; + name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz"; - sha1 = "6d33fa1dcef6df930fae003446f33415af905118"; + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } { @@ -5474,6 +5802,14 @@ }; } { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { name = "indexes_of___indexes_of_1.0.1.tgz"; path = fetchurl { name = "indexes_of___indexes_of_1.0.1.tgz"; @@ -5530,19 +5866,19 @@ }; } { - name = "inquirer___inquirer_6.5.0.tgz"; + name = "inquirer___inquirer_7.0.4.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz"; - sha1 = "2303317efc9a4ea7ec2e2df6f86569b734accf42"; + name = "inquirer___inquirer_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz"; + sha1 = "99af5bde47153abca23f5c7fc30db247f39da703"; }; } { - name = "inquirer___inquirer_6.5.2.tgz"; + name = "inquirer___inquirer_7.1.0.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + name = "inquirer___inquirer_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; + sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; }; } { @@ -5554,6 +5890,14 @@ }; } { + name = "internal_slot___internal_slot_1.0.2.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + }; + } + { name = "invariant___invariant_2.2.4.tgz"; path = fetchurl { name = "invariant___invariant_2.2.4.tgz"; @@ -5586,14 +5930,6 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; - }; - } - { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; @@ -5610,6 +5946,14 @@ }; } { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; + }; + } + { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; @@ -5626,19 +5970,19 @@ }; } { - name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; path = fetchurl { - name = "is_alphabetical___is_alphabetical_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz"; - sha1 = "eb04cc47219a8895d8450ace4715abff2258a1f8"; + name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; + sha1 = "9e7d6b94916be22153745d184c298cbf986a686d"; }; } { - name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; path = fetchurl { - name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz"; - sha1 = "57ae21c374277b3defe0274c640a5704b8f6657c"; + name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; + sha1 = "7eb9a2431f855f6b1ef1a78e326df515696c4dbf"; }; } { @@ -5674,27 +6018,27 @@ }; } { - name = "is_buffer___is_buffer_1.1.6.tgz"; + name = "is_binary_path___is_binary_path_2.1.0.tgz"; path = fetchurl { - name = "is_buffer___is_buffer_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; }; } { - name = "is_buffer___is_buffer_2.0.3.tgz"; + name = "is_buffer___is_buffer_1.1.6.tgz"; path = fetchurl { - name = "is_buffer___is_buffer_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz"; - sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725"; + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; }; } { - name = "is_callable___is_callable_1.1.4.tgz"; + name = "is_callable___is_callable_1.1.5.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + name = "is_callable___is_callable_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; + sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } { @@ -5730,19 +6074,19 @@ }; } { - name = "is_date_object___is_date_object_1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.2.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; }; } { - name = "is_decimal___is_decimal_1.0.3.tgz"; + name = "is_decimal___is_decimal_1.0.4.tgz"; path = fetchurl { - name = "is_decimal___is_decimal_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz"; - sha1 = "381068759b9dc807d8c0dc0bfbae2b68e1da48b7"; + name = "is_decimal___is_decimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz"; + sha1 = "65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"; }; } { @@ -5770,6 +6114,14 @@ }; } { + name = "is_docker___is_docker_2.0.0.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz"; + sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"; + }; + } + { name = "is_extendable___is_extendable_0.1.1.tgz"; path = fetchurl { name = "is_extendable___is_extendable_0.1.1.tgz"; @@ -5810,6 +6162,14 @@ }; } { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; path = fetchurl { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; @@ -5834,11 +6194,11 @@ }; } { - name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; path = fetchurl { - name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz"; - sha1 = "e8a426a69b6d31470d3a33a47bb825cda02506ee"; + name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; + sha1 = "cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"; }; } { @@ -5858,6 +6218,14 @@ }; } { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { name = "is_obj___is_obj_1.0.1.tgz"; path = fetchurl { name = "is_obj___is_obj_1.0.1.tgz"; @@ -5866,27 +6234,35 @@ }; } { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; path = fetchurl { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; }; } { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha1 = "5ac48b345ef675339bd6c7a48a912110b241cf52"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; }; } { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; + name = "is_path_inside___is_path_inside_2.1.0.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; }; } { @@ -5906,19 +6282,11 @@ }; } { - name = "is_promise___is_promise_2.1.0.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.4.tgz"; + name = "is_regex___is_regex_1.0.5.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + name = "is_regex___is_regex_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; + sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; }; } { @@ -5954,6 +6322,14 @@ }; } { + 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_svg___is_svg_3.0.0.tgz"; path = fetchurl { name = "is_svg___is_svg_3.0.0.tgz"; @@ -5962,11 +6338,11 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -5978,11 +6354,11 @@ }; } { - name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; + name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz"; path = fetchurl { - name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz"; - sha1 = "b3ad9546d916d7d3ffa78204bca0c26b56257fac"; + name = "is_whitespace_character___is_whitespace_character_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"; + sha1 = "0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"; }; } { @@ -5994,11 +6370,11 @@ }; } { - name = "is_word_character___is_word_character_1.0.3.tgz"; + name = "is_word_character___is_word_character_1.0.4.tgz"; path = fetchurl { - name = "is_word_character___is_word_character_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz"; - sha1 = "264d15541cbad0ba833d3992c34e6b40873b08aa"; + name = "is_word_character___is_word_character_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.4.tgz"; + sha1 = "ce0e73216f98599060592f62ff31354ddbeb0230"; }; } { @@ -6010,6 +6386,14 @@ }; } { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } + { name = "isarray___isarray_0.0.1.tgz"; path = fetchurl { name = "isarray___isarray_0.0.1.tgz"; @@ -6098,11 +6482,11 @@ }; } { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz"; - sha1 = "7b4f2660d82b29303a8fe6091f8ca4bf058da1af"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; + sha1 = "5d939f6237d7b48393cc0959eab40cd4fd056931"; }; } { @@ -6138,6 +6522,14 @@ }; } { + name = "jest_diff___jest_diff_25.5.0.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; + sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; + }; + } + { name = "jest_docblock___jest_docblock_24.9.0.tgz"; path = fetchurl { name = "jest_docblock___jest_docblock_24.9.0.tgz"; @@ -6154,11 +6546,11 @@ }; } { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; path = fetchurl { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-0.1.0.tgz"; - sha1 = "aad6393a9d4b565b69a609109bf469f62bf18ccc"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-1.0.1.tgz"; + sha1 = "4cd0042f58b4ab666950d96532ecb2fc188f96fb"; }; } { @@ -6186,6 +6578,14 @@ }; } { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; + }; + } + { name = "jest_haste_map___jest_haste_map_24.9.0.tgz"; path = fetchurl { name = "jest_haste_map___jest_haste_map_24.9.0.tgz"; @@ -6258,14 +6658,6 @@ }; } { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; - path = fetchurl { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz"; - sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f"; - }; - } - { name = "jest_resolve___jest_resolve_24.9.0.tgz"; path = fetchurl { name = "jest_resolve___jest_resolve_24.9.0.tgz"; @@ -6322,11 +6714,11 @@ }; } { - name = "jest_watch_typeahead___jest_watch_typeahead_0.3.1.tgz"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; path = fetchurl { - name = "jest_watch_typeahead___jest_watch_typeahead_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.3.1.tgz"; - sha1 = "47701024b64b444aa325d801b4b3a6d61ed70701"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.2.tgz"; + sha1 = "e5be959698a7fa2302229a5082c488c3c8780a4a"; }; } { @@ -6346,27 +6738,27 @@ }; } { - name = "jest___jest_24.8.0.tgz"; + name = "jest_worker___jest_worker_25.5.0.tgz"; path = fetchurl { - name = "jest___jest_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz"; - sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081"; + name = "jest_worker___jest_worker_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz"; + sha1 = "2611d071b79cea0f43ee57a3d118593ac1547db1"; }; } { - name = "js_base64___js_base64_2.5.1.tgz"; + name = "jest___jest_24.9.0.tgz"; path = fetchurl { - name = "js_base64___js_base64_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz"; - sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121"; + name = "jest___jest_24.9.0.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-24.9.0.tgz"; + sha1 = "987d290c05a08b52c56188c1002e368edb007171"; }; } { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; + name = "js_base64___js_base64_2.5.2.tgz"; path = fetchurl { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; - sha1 = "c6cee58eb3550372df8deb85fad5ce66ce01d59d"; + name = "js_base64___js_base64_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz"; + sha1 = "313b6274dda718f714d00b3330bbae6e38e90209"; }; } { @@ -6498,11 +6890,11 @@ }; } { - name = "json5___json5_2.1.0.tgz"; + name = "json5___json5_2.1.3.tgz"; path = fetchurl { - name = "json5___json5_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz"; - sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850"; + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } { @@ -6530,75 +6922,75 @@ }; } { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.4.tgz"; - sha1 = "3dedecec1e5bba0bf6141c2c05e2ab11ea4b468d"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.1.1.tgz"; + sha1 = "8e73ecc4f1d0f8dfe4dd31f6f9f2782588970e78"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.4.tgz"; - sha1 = "df03885de20f20a1fc1c21bdb7c62e865ee400d9"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.1.1.tgz"; + sha1 = "2df86016dfe73085eead843f5794e3890e9c5c47"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.4.tgz"; - sha1 = "412245b56133cc88bec654a70d82d5922619f4c5"; + name = "jss_plugin_global___jss_plugin_global_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.1.1.tgz"; + sha1 = "36b0d6d9facb74dfd99590643708a89260747d14"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.4.tgz"; - sha1 = "4d15ad13995fb6e4125618006473a096d2475d75"; + name = "jss_plugin_nested___jss_plugin_nested_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.1.1.tgz"; + sha1 = "5c3de2b8bda344de1ebcef3a4fd30870a29a8a8c"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.4.tgz"; - sha1 = "43c880ff8dfcf858f809f663ece5e65a1d945b5a"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.1.1.tgz"; + sha1 = "34bddcbfaf9430ec8ccdf92729f03bb10caf1785"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.4.tgz"; - sha1 = "2f4cf4a86ad3eba875bb48cb9f4a7ed35cb354e7"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.1.1.tgz"; + sha1 = "be00dac6fc394aaddbcef5860b9eca6224d96382"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.4.tgz"; - sha1 = "1626ef612a4541cff17cf96815e1740155214ed2"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.1.1.tgz"; + sha1 = "8348b20749f790beebab3b6a8f7075b07c2cfcfd"; }; } { - name = "jss___jss_10.0.4.tgz"; + name = "jss___jss_10.1.1.tgz"; path = fetchurl { - name = "jss___jss_10.0.4.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.0.4.tgz"; - sha1 = "46ebdde1c40c9a079d64f3334cb88ae28fd90bfd"; + name = "jss___jss_10.1.1.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.1.1.tgz"; + sha1 = "450b27d53761af3e500b43130a54cdbe157ea332"; }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz"; - sha1 = "4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; + sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; }; } { @@ -6642,11 +7034,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"; }; } { @@ -6706,6 +7098,14 @@ }; } { + name = "levenary___levenary_1.1.1.tgz"; + path = fetchurl { + name = "levenary___levenary_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz"; + sha1 = "842a9ee98d2075aa7faeedbe32679e9205f46f77"; + }; + } + { name = "levn___levn_0.3.0.tgz"; path = fetchurl { name = "levn___levn_0.3.0.tgz"; @@ -6714,6 +7114,14 @@ }; } { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { name = "load_json_file___load_json_file_2.0.0.tgz"; path = fetchurl { name = "load_json_file___load_json_file_2.0.0.tgz"; @@ -6730,11 +7138,11 @@ }; } { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; path = fetchurl { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz"; - sha1 = "54cedf6b727e1779fd8f01205f05f6e88706f086"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha1 = "f08657646d607078be2f0a032f8bd69dd6f277d9"; }; } { @@ -6754,6 +7162,14 @@ }; } { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { name = "locate_path___locate_path_2.0.0.tgz"; @@ -6770,6 +7186,14 @@ }; } { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; path = fetchurl { name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; @@ -6834,14 +7258,6 @@ }; } { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - path = fetchurl { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz"; - sha1 = "bf2249886ce514cda112fae9218cdc065211fc9c"; - }; - } - { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; @@ -6858,11 +7274,11 @@ }; } { - name = "loglevel___loglevel_1.6.3.tgz"; + name = "loglevel___loglevel_1.6.8.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz"; - sha1 = "77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"; + name = "loglevel___loglevel_1.6.8.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; + sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; }; } { @@ -6874,11 +7290,11 @@ }; } { - name = "lower_case___lower_case_1.1.4.tgz"; + name = "lower_case___lower_case_2.0.1.tgz"; path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + name = "lower_case___lower_case_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; + sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; }; } { @@ -6898,6 +7314,14 @@ }; } { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { name = "makeerror___makeerror_1.0.11.tgz"; path = fetchurl { name = "makeerror___makeerror_1.0.11.tgz"; @@ -6938,11 +7362,11 @@ }; } { - name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; path = fetchurl { - name = "markdown_escapes___markdown_escapes_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz"; - sha1 = "6155e10416efaafab665d466ce598216375195f5"; + name = "markdown_escapes___markdown_escapes_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; + sha1 = "c95415ef451499d7602b91095f3c8e8975f78535"; }; } { @@ -6970,11 +7394,11 @@ }; } { - name = "mdn_data___mdn_data_1.1.4.tgz"; + name = "mdn_data___mdn_data_2.0.6.tgz"; path = fetchurl { - name = "mdn_data___mdn_data_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz"; - sha1 = "50b5d4ffc4575276573c4eedb8780812a8419f01"; + name = "mdn_data___mdn_data_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; + sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; }; } { @@ -7002,6 +7426,14 @@ }; } { + 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 = "merge_deep___merge_deep_3.0.2.tgz"; path = fetchurl { name = "merge_deep___merge_deep_3.0.2.tgz"; @@ -7026,11 +7458,11 @@ }; } { - name = "merge2___merge2_1.2.4.tgz"; + name = "merge2___merge2_1.3.0.tgz"; path = fetchurl { - name = "merge2___merge2_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz"; - sha1 = "c9269589e6885a60cf80605d9522d4b67ca646e3"; + name = "merge2___merge2_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; + sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; }; } { @@ -7066,27 +7498,19 @@ }; } { - name = "mime_db___mime_db_1.40.0.tgz"; + name = "mime_db___mime_db_1.44.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.40.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz"; - sha1 = "a65057e998db090f732a68f6c276d387d4126c32"; + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; }; } { - name = "mime_db___mime_db_1.41.0.tgz"; + name = "mime_types___mime_types_2.1.27.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.41.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.41.0.tgz"; - sha1 = "9110408e1f6aa1b34aef51f2c9df3caddf46b6a0"; - }; - } - { - name = "mime_types___mime_types_2.1.24.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.24.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz"; - sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81"; + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; }; } { @@ -7098,19 +7522,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; - path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; - }; - } - { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; + name = "mime___mime_2.4.5.tgz"; path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; + name = "mime___mime_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.5.tgz"; + sha1 = "d8de2ecb92982dedbb6541c9b6841d7f218ea009"; }; } { @@ -7122,11 +7538,19 @@ }; } { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.5.0.tgz"; + name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz"; - sha1 = "ac0059b02b9692515a637115b0cc9fed3a35c7b0"; + name = "mini_create_react_context___mini_create_react_context_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz"; + sha1 = "79fc598f283dd623da8e088b05db8cddab250189"; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha1 = "47f2cf07aa165ab35733b1fc97d4c46c0564339e"; }; } { @@ -7154,43 +7578,43 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.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.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; }; } { - name = "minimist___minimist_0.0.10.tgz"; + name = "minipass_flush___minipass_flush_1.0.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.10.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; }; } { - name = "minipass___minipass_2.5.0.tgz"; + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; path = fetchurl { - name = "minipass___minipass_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-2.5.0.tgz"; - sha1 = "dddb1d001976978158a05badfcbef4a771612857"; + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; + sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; }; } { - name = "minizlib___minizlib_1.2.1.tgz"; + name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { - name = "minizlib___minizlib_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz"; - sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614"; + name = "minipass___minipass_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; + sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; }; } { @@ -7218,35 +7642,51 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + path = fetchurl { + name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mobx_react_lite___mobx_react_lite_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.0.6.tgz"; + sha1 = "e1307a2b271c6a6016c8ad815a25014b7f95997d"; }; } { - name = "mobx_react___mobx_react_5.4.4.tgz"; + name = "mobx_react___mobx_react_6.2.2.tgz"; path = fetchurl { - name = "mobx_react___mobx_react_5.4.4.tgz"; - url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-5.4.4.tgz"; - sha1 = "b3de9c6eabcd0ed8a40036888cb0221ab9568b80"; + name = "mobx_react___mobx_react_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.2.2.tgz"; + sha1 = "45e8e7c4894cac8399bba0a91060d7cfb8ea084b"; }; } { - name = "mobx_utils___mobx_utils_5.4.1.tgz"; + name = "mobx_utils___mobx_utils_5.5.7.tgz"; path = fetchurl { - name = "mobx_utils___mobx_utils_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.4.1.tgz"; - sha1 = "18ff5f9723b27e1ff50ae0b362938a4792eb077a"; + name = "mobx_utils___mobx_utils_5.5.7.tgz"; + url = "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-5.5.7.tgz"; + sha1 = "0ef58f2d5e05ca0e59ba2322f84f9c763de6ce14"; }; } { - name = "mobx___mobx_5.13.0.tgz"; + name = "mobx___mobx_5.15.4.tgz"; path = fetchurl { - name = "mobx___mobx_5.13.0.tgz"; - url = "https://registry.yarnpkg.com/mobx/-/mobx-5.13.0.tgz"; - sha1 = "0fd68f10aa5ff2d146a4ed9e145b53337cfbca59"; + name = "mobx___mobx_5.15.4.tgz"; + url = "https://registry.yarnpkg.com/mobx/-/mobx-5.15.4.tgz"; + sha1 = "9da1a84e97ba624622f4e55a0bf3300fb931c2ab"; }; } { @@ -7298,19 +7738,19 @@ }; } { - name = "mute_stream___mute_stream_0.0.7.tgz"; + name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { - name = "mute_stream___mute_stream_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + 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.0.tgz"; + name = "nan___nan_2.14.1.tgz"; path = fetchurl { - name = "nan___nan_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; - sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + name = "nan___nan_2.14.1.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; + sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; }; } { @@ -7330,14 +7770,6 @@ }; } { - name = "needle___needle_2.4.0.tgz"; - path = fetchurl { - name = "needle___needle_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz"; - sha1 = "6833e74975c444642590e15a750288c5f939b57c"; - }; - } - { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; @@ -7370,11 +7802,11 @@ }; } { - name = "no_case___no_case_2.3.2.tgz"; + name = "no_case___no_case_3.0.3.tgz"; path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + name = "no_case___no_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; + sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; }; } { @@ -7386,11 +7818,11 @@ }; } { - name = "node_forge___node_forge_0.7.5.tgz"; + name = "node_forge___node_forge_0.9.0.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.7.5.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz"; - sha1 = "6c152c345ce11c52f465c2abd957e8639cd674df"; + name = "node_forge___node_forge_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz"; + sha1 = "d624050edbb44874adca12bb9a52ec63cb782579"; }; } { @@ -7426,27 +7858,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; - path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha1 = "39ba4bb1439da030295f899e3b520b7785766149"; - }; - } - { - name = "node_releases___node_releases_1.1.29.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.29.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.29.tgz"; - sha1 = "86a57c6587a30ecd6726449e5d293466b0a0bb86"; - }; - } - { - name = "nopt___nopt_4.0.1.tgz"; + name = "node_releases___node_releases_1.1.55.tgz"; path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + name = "node_releases___node_releases_1.1.55.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz"; + sha1 = "8af23b7c561d8e2e6e36a46637bab84633b07cee"; }; } { @@ -7482,6 +7898,14 @@ }; } { + name = "normalize_url___normalize_url_1.9.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + }; + } + { name = "normalize_url___normalize_url_3.3.0.tgz"; path = fetchurl { name = "normalize_url___normalize_url_3.3.0.tgz"; @@ -7498,22 +7922,6 @@ }; } { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - path = fetchurl { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz"; - sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd"; - }; - } - { - name = "npm_packlist___npm_packlist_1.4.4.tgz"; - path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz"; - sha1 = "866224233850ac534b63d1a6e76050092b5d2f44"; - }; - } - { name = "npm_run_path___npm_run_path_2.0.2.tgz"; path = fetchurl { name = "npm_run_path___npm_run_path_2.0.2.tgz"; @@ -7522,14 +7930,6 @@ }; } { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; - }; - } - { name = "nth_check___nth_check_1.0.2.tgz"; path = fetchurl { name = "nth_check___nth_check_1.0.2.tgz"; @@ -7554,11 +7954,11 @@ }; } { - name = "nwsapi___nwsapi_2.1.4.tgz"; + name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { - name = "nwsapi___nwsapi_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz"; - sha1 = "e006a878db23636f8e8a67d33ca0e4edf61a842f"; + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; }; } { @@ -7594,27 +7994,27 @@ }; } { - name = "object_hash___object_hash_1.3.1.tgz"; + name = "object_hash___object_hash_2.0.3.tgz"; path = fetchurl { - name = "object_hash___object_hash_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz"; - sha1 = "fde452098a951cb145f039bb7d455449ddc126df"; + name = "object_hash___object_hash_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz"; + sha1 = "d12db044e03cd2ca3d77c0570d87225b02e1e6ea"; }; } { - name = "object_inspect___object_inspect_1.6.0.tgz"; + name = "object_inspect___object_inspect_1.7.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz"; - sha1 = "c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"; + 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_is___object_is_1.0.1.tgz"; + name = "object_is___object_is_1.1.2.tgz"; path = fetchurl { - name = "object_is___object_is_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; - sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + name = "object_is___object_is_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz"; + sha1 = "c5d2e87ff9e119f78b7a088441519e2eec1573b6"; }; } { @@ -7650,27 +8050,27 @@ }; } { - name = "object.entries___object.entries_1.1.0.tgz"; + name = "object.entries___object.entries_1.1.1.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz"; - sha1 = "2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"; + 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.fromentries___object.fromentries_2.0.0.tgz"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz"; - sha1 = "49a543d92151f8277b3ac9600f1e930b189d30ab"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; }; } { @@ -7682,11 +8082,11 @@ }; } { - name = "object.values___object.values_1.1.0.tgz"; + name = "object.values___object.values_1.1.1.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.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; }; } { @@ -7722,19 +8122,19 @@ }; } { - name = "onetime___onetime_2.0.1.tgz"; + name = "onetime___onetime_5.1.0.tgz"; path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + name = "onetime___onetime_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; + sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; }; } { - name = "open___open_6.4.0.tgz"; + name = "open___open_7.0.3.tgz"; path = fetchurl { - name = "open___open_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz"; - sha1 = "5c13e96d0dc894686164f18965ecfe889ecfc8a9"; + name = "open___open_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; + sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; }; } { @@ -7746,14 +8146,6 @@ }; } { - name = "optimist___optimist_0.6.1.tgz"; - path = fetchurl { - name = "optimist___optimist_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - } - { name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; path = fetchurl { name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; @@ -7762,11 +8154,11 @@ }; } { - name = "optionator___optionator_0.8.2.tgz"; + name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { - name = "optionator___optionator_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } { @@ -7786,14 +8178,6 @@ }; } { - name = "os_homedir___os_homedir_1.0.2.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - } - { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { name = "os_locale___os_locale_3.1.0.tgz"; @@ -7810,14 +8194,6 @@ }; } { - name = "osenv___osenv_0.1.5.tgz"; - path = fetchurl { - name = "osenv___osenv_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; - sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; - }; - } - { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { name = "p_defer___p_defer_1.0.0.tgz"; @@ -7858,11 +8234,11 @@ }; } { - name = "p_limit___p_limit_2.2.1.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz"; - sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } { @@ -7882,11 +8258,27 @@ }; } { - name = "p_map___p_map_1.2.0.tgz"; + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; path = fetchurl { - name = "p_map___p_map_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz"; - sha1 = "e4e94f311eabbc8633a1e79908165fca26241b6b"; + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_3.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"; }; } { @@ -7898,6 +8290,14 @@ }; } { + name = "p_retry___p_retry_3.0.1.tgz"; + path = fetchurl { + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; + }; + } + { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { name = "p_try___p_try_1.0.0.tgz"; @@ -7914,27 +8314,27 @@ }; } { - name = "pako___pako_1.0.10.tgz"; + name = "pako___pako_1.0.11.tgz"; path = fetchurl { - name = "pako___pako_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz"; - sha1 = "4328badb5086a426aa90f541977d4955da5c9732"; + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; }; } { - name = "parallel_transform___parallel_transform_1.1.0.tgz"; + name = "parallel_transform___parallel_transform_1.2.0.tgz"; path = fetchurl { - name = "parallel_transform___parallel_transform_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz"; - sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; }; } { - name = "param_case___param_case_2.1.1.tgz"; + name = "param_case___param_case_3.0.3.tgz"; path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + name = "param_case___param_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; + sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; }; } { @@ -7946,11 +8346,11 @@ }; } { - name = "parse_asn1___parse_asn1_5.1.4.tgz"; + name = "parse_asn1___parse_asn1_5.1.5.tgz"; path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.4.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz"; - sha1 = "37f6628f823fbdeb2273b4d540434a22f3ef1fcc"; + name = "parse_asn1___parse_asn1_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz"; + sha1 = "003271343da58dc94cace494faef3d2147ecea0e"; }; } { @@ -7978,6 +8378,14 @@ }; } { + name = "parse_json___parse_json_5.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; + sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + }; + } + { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { name = "parse5___parse5_4.0.0.tgz"; @@ -8002,6 +8410,14 @@ }; } { + name = "pascal_case___pascal_case_3.1.1.tgz"; + path = fetchurl { + name = "pascal_case___pascal_case_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz"; + sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f"; + }; + } + { name = "pascalcase___pascalcase_0.1.1.tgz"; path = fetchurl { name = "pascalcase___pascalcase_0.1.1.tgz"; @@ -8042,6 +8458,14 @@ }; } { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; @@ -8066,6 +8490,14 @@ }; } { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { name = "path_parse___path_parse_1.0.6.tgz"; path = fetchurl { name = "path_parse___path_parse_1.0.6.tgz"; @@ -8082,11 +8514,11 @@ }; } { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; path = fetchurl { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; + sha1 = "887b3ba9d84393e87a0a0b9f4cb756198b53548a"; }; } { @@ -8106,6 +8538,14 @@ }; } { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { name = "pbkdf2___pbkdf2_3.0.17.tgz"; path = fetchurl { name = "pbkdf2___pbkdf2_3.0.17.tgz"; @@ -8130,6 +8570,14 @@ }; } { + name = "picomatch___picomatch_2.2.2.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + }; + } + { name = "pify___pify_2.3.0.tgz"; path = fetchurl { name = "pify___pify_2.3.0.tgz"; @@ -8202,6 +8650,22 @@ }; } { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pkg_up___pkg_up_3.1.0.tgz"; + path = fetchurl { + name = "pkg_up___pkg_up_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz"; + sha1 = "100ec235cc150e4fd42519412596a28512a0def5"; + }; + } + { name = "pkg_up___pkg_up_2.0.0.tgz"; path = fetchurl { name = "pkg_up___pkg_up_2.0.0.tgz"; @@ -8218,27 +8682,27 @@ }; } { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; path = fetchurl { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz"; - sha1 = "62a1cd3068f46d564bb33c56eb250e4d586676eb"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"; + sha1 = "c9711ac4dc48a685dabafc86f8b6dd9f8df84149"; }; } { - name = "popper.js___popper.js_1.15.0.tgz"; + name = "popper.js___popper.js_1.16.1.tgz"; path = fetchurl { - name = "popper.js___popper.js_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz"; - sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2"; + name = "popper.js___popper.js_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; + sha1 = "2a223cb3dc7b6213d740e40372be40de43e65b1b"; }; } { - name = "portfinder___portfinder_1.0.23.tgz"; + name = "portfinder___portfinder_1.0.26.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.23.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.23.tgz"; - sha1 = "894db4bcc5daf02b6614517ce89cd21a38226b82"; + name = "portfinder___portfinder_1.0.26.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.26.tgz"; + sha1 = "475658d56ca30bed72ac7f1378ed350bd1b64e70"; }; } { @@ -8250,27 +8714,27 @@ }; } { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; path = fetchurl { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz"; - sha1 = "b2a721a0d279c2f9103a36331c88981526428cc7"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz"; + sha1 = "d93e46b504589e94ac7277b0463226c68041a880"; }; } { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; path = fetchurl { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-2.0.0.tgz"; - sha1 = "dc48d6a8ddbff188a80a000b7393436cb18aed88"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz"; + sha1 = "1248d2d935fb72053c8e1f61a84a57292d9f65e9"; }; } { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; + name = "postcss_calc___postcss_calc_7.0.2.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz"; - sha1 = "36d77bab023b0ecbb9789d84dcb23c4941145436"; + name = "postcss_calc___postcss_calc_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1"; }; } { @@ -8458,11 +8922,11 @@ }; } { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; path = fetchurl { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.1.tgz"; - sha1 = "99d319669a13d6c06ef8e70d852f68cb1b399b61"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz"; + sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d"; }; } { @@ -8562,27 +9026,27 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz"; - sha1 = "dd9953f6dd476b5fd1ef2d8830c8929760b56e63"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; + sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915"; }; } { - name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz"; - sha1 = "ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; }; } { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz"; - sha1 = "479b46dc0c5ca3dc7fa5270851836b9ec7152f64"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha1 = "5b5000d6ebae29b4255301b4a3a54574423e7f10"; }; } { @@ -8666,11 +9130,11 @@ }; } { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; path = fetchurl { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-7.0.1.tgz"; - sha1 = "eb51568d962b8aa61a8318383c8bb7e54332282e"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-8.0.1.tgz"; + sha1 = "90e80a7763d7fdf2da6f2f0f82be832ce4f66776"; }; } { @@ -8770,11 +9234,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; - sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; }; } { @@ -8818,11 +9282,11 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz"; - sha1 = "482282c09a42706d1fc9a069b73f44ec08391dc9"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; }; } { @@ -8834,19 +9298,19 @@ }; } { - name = "postcss___postcss_7.0.14.tgz"; + name = "postcss___postcss_7.0.21.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.14.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz"; - sha1 = "4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"; + name = "postcss___postcss_7.0.21.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz"; + sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17"; }; } { - name = "postcss___postcss_7.0.17.tgz"; + name = "postcss___postcss_7.0.29.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.17.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz"; - sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f"; + name = "postcss___postcss_7.0.29.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.29.tgz"; + sha1 = "d3a903872bd52280b83bce38cdc83ce55c06129e"; }; } { @@ -8858,11 +9322,19 @@ }; } { - name = "prettier___prettier_1.18.2.tgz"; + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prettier___prettier_2.0.5.tgz"; path = fetchurl { - name = "prettier___prettier_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; - sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + name = "prettier___prettier_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz"; + sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; }; } { @@ -8890,6 +9362,14 @@ }; } { + name = "pretty_format___pretty_format_25.5.0.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; + sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; + }; + } + { name = "private___private_0.1.8.tgz"; path = fetchurl { name = "private___private_0.1.8.tgz"; @@ -8930,14 +9410,6 @@ }; } { - name = "promise___promise_8.0.3.tgz"; - path = fetchurl { - name = "promise___promise_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz"; - sha1 = "f592e099c6cddc000d538ee7283bb190452b0bf6"; - }; - } - { name = "promise___promise_7.3.1.tgz"; path = fetchurl { name = "promise___promise_7.3.1.tgz"; @@ -8946,11 +9418,19 @@ }; } { - name = "prompts___prompts_2.2.1.tgz"; + name = "promise___promise_8.1.0.tgz"; + path = fetchurl { + name = "promise___promise_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; + sha1 = "697c25c3dfe7435dd79fcd58c38a135888eaf05e"; + }; + } + { + name = "prompts___prompts_2.3.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.2.1.tgz"; - sha1 = "f901dd2a2dfee080359c0e20059b24188d75ad35"; + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; }; } { @@ -8970,19 +9450,19 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; }; } { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; path = fetchurl { - name = "proxy_from_env___proxy_from_env_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; - sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee"; + name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; }; } { @@ -8994,11 +9474,11 @@ }; } { - name = "psl___psl_1.3.1.tgz"; + name = "psl___psl_1.8.0.tgz"; path = fetchurl { - name = "psl___psl_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.3.1.tgz"; - sha1 = "d5aa3873a35ec450bc7db9012ad5a7246f6fc8bd"; + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; }; } { @@ -9058,11 +9538,11 @@ }; } { - name = "puppeteer___puppeteer_1.19.0.tgz"; + name = "puppeteer___puppeteer_3.0.4.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-1.19.0.tgz"; - sha1 = "e3b7b448c2c97933517078d7a2c53687361bebea"; + name = "puppeteer___puppeteer_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz"; + sha1 = "f445aae0a6732c65bbb90e963dcd6fd8fde0d780"; }; } { @@ -9090,6 +9570,14 @@ }; } { + name = "query_string___query_string_4.3.4.tgz"; + path = fetchurl { + name = "query_string___query_string_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + } + { name = "querystring_es3___querystring_es3_0.2.1.tgz"; path = fetchurl { name = "querystring_es3___querystring_es3_0.2.1.tgz"; @@ -9162,51 +9650,43 @@ }; } { - name = "rc___rc_1.2.8.tgz"; - path = fetchurl { - name = "rc___rc_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; - }; - } - { - name = "react_app_polyfill___react_app_polyfill_1.0.2.tgz"; + name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; path = fetchurl { - name = "react_app_polyfill___react_app_polyfill_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.2.tgz"; - sha1 = "2a51175885c88245a2a356dc46df29f38ec9f060"; + name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz"; + sha1 = "890f8d7f2842ce6073f030b117de9130a5f385f0"; }; } { - name = "react_codemirror2___react_codemirror2_5.1.0.tgz"; + name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; path = fetchurl { - name = "react_codemirror2___react_codemirror2_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-5.1.0.tgz"; - sha1 = "62de4460178adea40eb52eabf7491669bf3794b8"; + name = "react_codemirror2___react_codemirror2_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/react-codemirror2/-/react-codemirror2-7.1.0.tgz"; + sha1 = "b874a275ad4f6f2ee5adb23b550c0f4b8b82776d"; }; } { - name = "react_dev_utils___react_dev_utils_9.0.3.tgz"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; path = fetchurl { - name = "react_dev_utils___react_dev_utils_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.0.3.tgz"; - sha1 = "7607455587abb84599451460eb37cef0b684131a"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; + sha1 = "f6de325ae25fa4d546d09df4bb1befdc6dd19c19"; }; } { - name = "react_dom___react_dom_16.9.0.tgz"; + name = "react_dom___react_dom_16.13.1.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz"; - sha1 = "5e65527a5e26f22ae3701131bcccaee9fb0d3962"; + name = "react_dom___react_dom_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; + sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; }; } { - name = "react_error_overlay___react_error_overlay_6.0.1.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.1.tgz"; - sha1 = "b8d3cf9bb991c02883225c48044cb3ee20413e0f"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz"; + sha1 = "1dcfb459ab671d53f660a991513cb2f0a0553108"; }; } { @@ -9218,43 +9698,19 @@ }; } { - name = "react_is___react_is_16.9.0.tgz"; + name = "react_is___react_is_16.13.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz"; - sha1 = "21ca9561399aad0ff1a7701c01683e8ca981edcb"; + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; }; } { - name = "react_is___react_is_16.13.0.tgz"; + name = "react_markdown___react_markdown_4.3.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.13.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; - sha1 = "0f37c3613c34fe6b37cd7f763a0d6293ab15c527"; - }; - } - { - name = "react_is___react_is_16.10.0.tgz"; - path = fetchurl { - name = "react_is___react_is_16.10.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.10.0.tgz"; - sha1 = "3d6a031e57fff73c3cfa0347feb3e8f40c5141e5"; - }; - } - { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; - path = fetchurl { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; - sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362"; - }; - } - { - name = "react_markdown___react_markdown_4.2.2.tgz"; - path = fetchurl { - name = "react_markdown___react_markdown_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-4.2.2.tgz"; - sha1 = "b378774fcffb354653db8749153fc8740f9ed2f1"; + name = "react_markdown___react_markdown_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/react-markdown/-/react-markdown-4.3.1.tgz"; + sha1 = "39f0633b94a027445b86c9811142d05381300f2f"; }; } { @@ -9266,35 +9722,35 @@ }; } { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; + name = "react_router_dom___react_router_dom_5.1.2.tgz"; path = fetchurl { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz"; - sha1 = "4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"; + name = "react_router_dom___react_router_dom_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.1.2.tgz"; + sha1 = "06701b834352f44d37fbb6311f870f84c76b9c18"; }; } { - name = "react_router___react_router_4.3.1.tgz"; + name = "react_router___react_router_5.1.2.tgz"; path = fetchurl { - name = "react_router___react_router_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz"; - sha1 = "aada4aef14c809cb2e686b05cee4742234506c4e"; + name = "react_router___react_router_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/react-router/-/react-router-5.1.2.tgz"; + sha1 = "6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"; }; } { - name = "react_scripts___react_scripts_3.1.1.tgz"; + name = "react_scripts___react_scripts_3.4.1.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.1.1.tgz"; - sha1 = "1796bc92447f3a2d3072c3b71ca99f88d099c48d"; + name = "react_scripts___react_scripts_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz"; + sha1 = "f551298b5c71985cc491b9acf3c8e8c0ae3ada0a"; }; } { - name = "react_test_renderer___react_test_renderer_16.9.0.tgz"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.9.0.tgz"; - sha1 = "7ed657a374af47af88f66f33a3ef99c9610c8ae9"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz"; + sha1 = "de25ea358d9012606de51e012d9742e7f0deabc1"; }; } { @@ -9306,19 +9762,19 @@ }; } { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; + name = "react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz"; - sha1 = "fea832e386cf8796c58b61874a3319704f5ce683"; + name = "react_transition_group___react_transition_group_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz"; + sha1 = "63868f9325a38ea5ee9535d828327f85773345c9"; }; } { - name = "react___react_16.9.0.tgz"; + name = "react___react_16.13.1.tgz"; path = fetchurl { - name = "react___react_16.9.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.9.0.tgz"; - sha1 = "40ba2f9af13bc1a38d75dbf2f4359a5185c4f7aa"; + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; }; } { @@ -9354,19 +9810,19 @@ }; } { - name = "readable_stream___readable_stream_2.3.6.tgz"; + name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } { - name = "readable_stream___readable_stream_3.4.0.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; - sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } { @@ -9378,6 +9834,14 @@ }; } { + name = "readdirp___readdirp_3.4.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz"; + sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; + }; + } + { name = "realpath_native___realpath_native_1.1.0.tgz"; path = fetchurl { name = "realpath_native___realpath_native_1.1.0.tgz"; @@ -9402,11 +9866,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; }; } { @@ -9418,14 +9882,6 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; - }; - } - { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; @@ -9442,11 +9898,11 @@ }; } { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; - sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; }; } { @@ -9466,19 +9922,11 @@ }; } { - name = "regexp_tree___regexp_tree_0.1.13.tgz"; - path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.13.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.13.tgz"; - sha1 = "5b19ab9377edc68bc3679256840bb29afc158d7f"; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; }; } { @@ -9490,27 +9938,35 @@ }; } { - name = "regexpu_core___regexpu_core_4.5.5.tgz"; + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + }; + } + { + name = "regexpu_core___regexpu_core_4.7.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.5.5.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.5.tgz"; - sha1 = "aaffe61c2af58269b3e516b61a73790376326411"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; }; } { - name = "regjsgen___regjsgen_0.5.0.tgz"; + name = "regjsgen___regjsgen_0.5.1.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz"; - sha1 = "a7634dc08f89209c2049adda3525711fb97265dd"; + name = "regjsgen___regjsgen_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; + sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; }; } { - name = "regjsparser___regjsparser_0.6.0.tgz"; + name = "regjsparser___regjsparser_0.6.4.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz"; - sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"; + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; }; } { @@ -9578,27 +10034,27 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz"; - sha1 = "339f6aababcafdb31c799ff158700336301d3346"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; + sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; }; } { - name = "request_promise_native___request_promise_native_1.0.7.tgz"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz"; - sha1 = "a49868a624bdea5069f1251d0a836e0d89aa2c59"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; + sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; }; } { - name = "request___request_2.88.0.tgz"; + name = "request___request_2.88.2.tgz"; path = fetchurl { - name = "request___request_2.88.0.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; - sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; }; } { @@ -9658,19 +10114,19 @@ }; } { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; path = fetchurl { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz"; - sha1 = "7e9ae21ed815fd63ab189adeee64dc831eefa879"; + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; + sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; }; } { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz"; - sha1 = "54d8181d33cd1b66a59544d05cadf8e4aa7d37cc"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz"; + sha1 = "28931895fa1eab9be0647d3b2958c100ae3c0bf0"; }; } { @@ -9690,19 +10146,27 @@ }; } { - name = "resolve___resolve_1.12.0.tgz"; + name = "resolve___resolve_1.15.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz"; + sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5"; + }; + } + { + name = "resolve___resolve_1.17.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz"; - sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6"; + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; }; } { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; }; } { @@ -9714,6 +10178,14 @@ }; } { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { name = "rework_visit___rework_visit_1.0.0.tgz"; path = fetchurl { name = "rework_visit___rework_visit_1.0.0.tgz"; @@ -9762,6 +10234,14 @@ }; } { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { name = "ripemd160___ripemd160_2.0.2.tgz"; path = fetchurl { name = "ripemd160___ripemd160_2.0.2.tgz"; @@ -9778,11 +10258,11 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "run_async___run_async_2.4.1.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_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { @@ -9794,19 +10274,11 @@ }; } { - name = "rx___rx_4.1.0.tgz"; - path = fetchurl { - name = "rx___rx_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; - }; - } - { - name = "rxjs___rxjs_6.5.3.tgz"; + name = "rxjs___rxjs_6.5.5.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz"; - sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"; + name = "rxjs___rxjs_6.5.5.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; + sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; }; } { @@ -9850,11 +10322,19 @@ }; } { - name = "sass_loader___sass_loader_7.2.0.tgz"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; path = fetchurl { - name = "sass_loader___sass_loader_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz"; - sha1 = "e34115239309d15b2527cb62b5dfefb62a96ff7f"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz"; + sha1 = "b5cb2547e96d8629a60947544665243b1dc3657a"; + }; + } + { + name = "sass_loader___sass_loader_8.0.2.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz"; + sha1 = "debecd8c3ce243c76454f2e8290482150380090d"; }; } { @@ -9874,11 +10354,11 @@ }; } { - name = "scheduler___scheduler_0.15.0.tgz"; + name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.15.0.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz"; - sha1 = "6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"; + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; }; } { @@ -9890,11 +10370,11 @@ }; } { - name = "schema_utils___schema_utils_2.2.0.tgz"; + name = "schema_utils___schema_utils_2.6.6.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz"; - sha1 = "48a065ce219e0cacf4631473159037b2c1ae82da"; + name = "schema_utils___schema_utils_2.6.6.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.6.tgz"; + sha1 = "299fe6bd4a3365dc23d99fd446caff8f1d6c330c"; }; } { @@ -9906,11 +10386,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.4.tgz"; + name = "selfsigned___selfsigned_1.10.7.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.4.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz"; - sha1 = "cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"; + name = "selfsigned___selfsigned_1.10.7.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz"; + sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"; }; } { @@ -9922,14 +10402,6 @@ }; } { - name = "semver___semver_5.5.0.tgz"; - path = fetchurl { - name = "semver___semver_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz"; - sha1 = "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"; - }; - } - { name = "semver___semver_6.3.0.tgz"; path = fetchurl { name = "semver___semver_6.3.0.tgz"; @@ -9938,6 +10410,14 @@ }; } { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } + { name = "send___send_0.17.1.tgz"; path = fetchurl { name = "send___send_0.17.1.tgz"; @@ -9946,11 +10426,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_1.9.0.tgz"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.0.tgz"; - sha1 = "5b77019d7c3b85fe91b33ae424c53dcbfb6618bd"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; }; } { @@ -10042,6 +10522,14 @@ }; } { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { name = "shebang_regex___shebang_regex_1.0.0.tgz"; path = fetchurl { name = "shebang_regex___shebang_regex_1.0.0.tgz"; @@ -10050,11 +10538,19 @@ }; } { - name = "shell_quote___shell_quote_1.6.1.tgz"; + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "shell_quote___shell_quote_1.7.2.tgz"; path = fetchurl { - name = "shell_quote___shell_quote_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + name = "shell_quote___shell_quote_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz"; + sha1 = "67a7d02c76c9da24f99d20808fcaded0e0e04be2"; }; } { @@ -10066,11 +10562,19 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "side_channel___side_channel_1.0.2.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "side_channel___side_channel_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; + sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; }; } { @@ -10082,11 +10586,11 @@ }; } { - name = "sisteransi___sisteransi_1.0.3.tgz"; + name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.3.tgz"; - sha1 = "98168d62b79e3a5e758e27ae63c4a053d748f4eb"; + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; }; } { @@ -10106,6 +10610,14 @@ }; } { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { name = "slice_ansi___slice_ansi_2.1.0.tgz"; path = fetchurl { name = "slice_ansi___slice_ansi_2.1.0.tgz"; @@ -10138,11 +10650,11 @@ }; } { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; path = fetchurl { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz"; - sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177"; + name = "sockjs_client___sockjs_client_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; + sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; }; } { @@ -10154,6 +10666,14 @@ }; } { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + } + { name = "source_list_map___source_list_map_2.0.1.tgz"; path = fetchurl { name = "source_list_map___source_list_map_2.0.1.tgz"; @@ -10162,19 +10682,19 @@ }; } { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; }; } { - name = "source_map_support___source_map_support_0.5.13.tgz"; + name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.13.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; - sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932"; + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } { @@ -10210,11 +10730,11 @@ }; } { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; }; } { @@ -10242,11 +10762,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"; }; } { @@ -10282,6 +10802,14 @@ }; } { + name = "ssri___ssri_7.1.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 = "stable___stable_0.1.8.tgz"; path = fetchurl { name = "stable___stable_0.1.8.tgz"; @@ -10298,11 +10826,11 @@ }; } { - name = "state_toggle___state_toggle_1.0.2.tgz"; + name = "state_toggle___state_toggle_1.0.3.tgz"; path = fetchurl { - name = "state_toggle___state_toggle_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz"; - sha1 = "75e93a61944116b4959d665c8db2d243631d6ddc"; + name = "state_toggle___state_toggle_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz"; + sha1 = "e123b16a88e143139b09c6852221bc9815917dfe"; }; } { @@ -10354,11 +10882,19 @@ }; } { - name = "stream_shift___stream_shift_1.0.0.tgz"; + name = "stream_shift___stream_shift_1.0.1.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; path = fetchurl { - name = "stream_shift___stream_shift_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; }; } { @@ -10370,6 +10906,14 @@ }; } { + name = "string_length___string_length_3.1.0.tgz"; + path = fetchurl { + name = "string_length___string_length_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-3.1.0.tgz"; + sha1 = "107ef8c23456e187a8abd4a61162ff4ac6e25837"; + }; + } + { name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; @@ -10394,19 +10938,51 @@ }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.0.0.tgz"; + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.0.0.tgz"; - sha1 = "68b6aa8e162c6a80e76e3a8a0c2e747186e271ff"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; }; } { - name = "string.prototype.trimright___string.prototype.trimright_2.0.0.tgz"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.0.0.tgz"; - sha1 = "ab4a56d802a01fbe7293e11e84f24dc8164661dd"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; }; } { @@ -10434,11 +11010,11 @@ }; } { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; + name = "strip_ansi___strip_ansi_6.0.0.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; }; } { @@ -10458,6 +11034,14 @@ }; } { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { name = "strip_bom___strip_bom_3.0.0.tgz"; path = fetchurl { name = "strip_bom___strip_bom_3.0.0.tgz"; @@ -10482,27 +11066,19 @@ }; } { - name = "strip_json_comments___strip_json_comments_3.0.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_2.0.1.tgz"; + name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + name = "strip_json_comments___strip_json_comments_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; + sha1 = "7638d31422129ecf4457440009fba03f9f9ac180"; }; } { - name = "style_loader___style_loader_1.0.0.tgz"; + name = "style_loader___style_loader_0.23.1.tgz"; path = fetchurl { - name = "style_loader___style_loader_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz"; - sha1 = "1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"; + name = "style_loader___style_loader_0.23.1.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz"; + sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; }; } { @@ -10538,19 +11114,27 @@ }; } { - name = "svg_parser___svg_parser_2.0.2.tgz"; + name = "supports_color___supports_color_7.1.0.tgz"; path = fetchurl { - name = "svg_parser___svg_parser_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz"; - sha1 = "d134cc396fa2681dc64f518330784e98bd801ec8"; + name = "supports_color___supports_color_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; + sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; }; } { - name = "svgo___svgo_1.3.0.tgz"; + name = "svg_parser___svg_parser_2.0.4.tgz"; path = fetchurl { - name = "svgo___svgo_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz"; - sha1 = "bae51ba95ded9a33a36b7c46ce9c359ae9154313"; + name = "svg_parser___svg_parser_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz"; + sha1 = "fdc2e29e13951736140b76cb122c8ee6630eb6b5"; + }; + } + { + name = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; }; } { @@ -10578,27 +11162,43 @@ }; } { - name = "tar___tar_4.4.10.tgz"; + name = "tar_fs___tar_fs_2.0.1.tgz"; + path = fetchurl { + name = "tar_fs___tar_fs_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz"; + sha1 = "e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"; + }; + } + { + name = "tar_stream___tar_stream_2.1.2.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz"; + sha1 = "6d5ef1a7e5783a95ff70b69b97455a5968dc1325"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; path = fetchurl { - name = "tar___tar_4.4.10.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz"; - sha1 = "946b2810b9a5e0b26140cf78bea6b0b0d689eba1"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz"; + sha1 = "5ad971acce5c517440ba873ea4f09687de2f4a81"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; - sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; }; } { - name = "terser___terser_4.2.1.tgz"; + name = "terser___terser_4.6.13.tgz"; path = fetchurl { - name = "terser___terser_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.2.1.tgz"; - sha1 = "1052cfe17576c66e7bc70fcc7119f22b155bdac1"; + name = "terser___terser_4.6.13.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.13.tgz"; + sha1 = "e879a7364a5e0db52ba4891ecde007422c56a916"; }; } { @@ -10642,11 +11242,11 @@ }; } { - name = "thunky___thunky_1.0.3.tgz"; + name = "thunky___thunky_1.1.0.tgz"; path = fetchurl { - name = "thunky___thunky_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz"; - sha1 = "f5df732453407b09191dae73e2a8cc73f381a826"; + name = "thunky___thunky_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; + sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; }; } { @@ -10666,11 +11266,11 @@ }; } { - name = "tiny_invariant___tiny_invariant_1.0.6.tgz"; + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; path = fetchurl { - name = "tiny_invariant___tiny_invariant_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.0.6.tgz"; - sha1 = "b3f9b38835e36a41c843a3b0907a5a7b3755de73"; + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; + sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; }; } { @@ -10730,6 +11330,14 @@ }; } { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { name = "to_regex___to_regex_3.0.2.tgz"; path = fetchurl { name = "to_regex___to_regex_3.0.2.tgz"; @@ -10754,14 +11362,6 @@ }; } { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; - }; - } - { name = "tr46___tr46_1.0.1.tgz"; path = fetchurl { name = "tr46___tr46_1.0.1.tgz"; @@ -10770,27 +11370,19 @@ }; } { - name = "tree_kill___tree_kill_1.2.1.tgz"; + name = "tree_kill___tree_kill_1.2.2.tgz"; path = fetchurl { - name = "tree_kill___tree_kill_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz"; - sha1 = "5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"; + name = "tree_kill___tree_kill_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz"; + sha1 = "4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"; }; } { - name = "trim_right___trim_right_1.0.1.tgz"; + name = "trim_trailing_lines___trim_trailing_lines_1.1.3.tgz"; path = fetchurl { - name = "trim_right___trim_right_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - } - { - name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; - path = fetchurl { - name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz"; - sha1 = "d2f1e153161152e9f02fabc670fb40bec2ea2e3a"; + name = "trim_trailing_lines___trim_trailing_lines_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz"; + sha1 = "7f0739881ff76657b7776e10874128004b625a94"; }; } { @@ -10802,35 +11394,35 @@ }; } { - name = "trough___trough_1.0.4.tgz"; + name = "trough___trough_1.0.5.tgz"; path = fetchurl { - name = "trough___trough_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz"; - sha1 = "3b52b1f13924f460c3fbfd0df69b587dbcbc762e"; + name = "trough___trough_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz"; + sha1 = "b8b639cefad7d0bb2abd37d433ff8293efa5f406"; }; } { - name = "ts_pnp___ts_pnp_1.1.2.tgz"; + name = "ts_pnp___ts_pnp_1.1.6.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz"; - sha1 = "be8e4bfce5d00f0f58e0666a82260c34a57af552"; + name = "ts_pnp___ts_pnp_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; + sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; }; } { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.4.tgz"; - sha1 = "ae27126960ebaefb874c6d7fa4729729ab200d90"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz"; + sha1 = "a500ad084b0798f1c3071af391e65912c86bca92"; }; } { - name = "tslib___tslib_1.10.0.tgz"; + name = "tslib___tslib_1.11.2.tgz"; path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + name = "tslib___tslib_1.11.2.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz"; + sha1 = "9c79d83272c9a7aaf166f73915c9667ecdde3cc9"; }; } { @@ -10842,11 +11434,11 @@ }; } { - name = "tslint___tslint_5.20.0.tgz"; + name = "tslint___tslint_6.1.2.tgz"; path = fetchurl { - name = "tslint___tslint_5.20.0.tgz"; - url = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.0.tgz"; - sha1 = "fac93bfa79568a5a24e7be9cdde5e02b02d00ec1"; + name = "tslint___tslint_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.2.tgz"; + sha1 = "2433c248512cc5a7b2ab88ad44a6b1b34c6911cf"; }; } { @@ -10898,11 +11490,19 @@ }; } { - name = "type_fest___type_fest_0.3.1.tgz"; + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz"; - sha1 = "63d00d204e059474fe5e1b7c011112bbd1dc29e1"; + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; }; } { @@ -10914,67 +11514,67 @@ }; } { - name = "type___type_1.0.3.tgz"; + name = "type___type_1.2.0.tgz"; path = fetchurl { - name = "type___type_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-1.0.3.tgz"; - sha1 = "16f5d39f27a2d28d86e48f8981859e9d3296c179"; + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; }; } { - name = "typedarray___typedarray_0.0.6.tgz"; + name = "type___type_2.0.0.tgz"; path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + name = "type___type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; + sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; }; } { - name = "typeface_roboto___typeface_roboto_0.0.54.tgz"; + name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { - name = "typeface_roboto___typeface_roboto_0.0.54.tgz"; - url = "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz"; - sha1 = "8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2"; + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; } { - name = "typescript___typescript_3.6.2.tgz"; + name = "typeface_roboto___typeface_roboto_0.0.75.tgz"; path = fetchurl { - name = "typescript___typescript_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz"; - sha1 = "105b0f1934119dde543ac8eb71af3a91009efe54"; + name = "typeface_roboto___typeface_roboto_0.0.75.tgz"; + url = "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.75.tgz"; + sha1 = "98d5ba35ec234bbc7172374c8297277099cc712b"; }; } { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; + name = "typescript___typescript_3.8.3.tgz"; path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz"; - sha1 = "7527178b82f6a62a0f243d1f94fd30e3e3c21098"; + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; }; } { - name = "uglify_js___uglify_js_3.4.10.tgz"; + name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.4.10.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz"; - sha1 = "9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"; + name = "ua_parser_js___ua_parser_js_0.7.21.tgz"; + url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz"; + sha1 = "853cf9ce93f642f67174273cc34565ae6f308777"; }; } { - name = "uglify_js___uglify_js_3.6.0.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz"; - sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5"; + name = "unbzip2_stream___unbzip2_stream_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; + sha1 = "84eb9e783b186d8fb397515fbb656f312f1a7dbf"; }; } { - name = "unherit___unherit_1.1.2.tgz"; + name = "unherit___unherit_1.1.3.tgz"; path = fetchurl { - name = "unherit___unherit_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz"; - sha1 = "14f1f397253ee4ec95cec167762e77df83678449"; + name = "unherit___unherit_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.3.tgz"; + sha1 = "6c9b503f2b41b262330c80e91c8614abdaa69c22"; }; } { @@ -10994,19 +11594,19 @@ }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; }; } { @@ -11066,11 +11666,11 @@ }; } { - name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; + name = "unist_util_remove_position___unist_util_remove_position_1.1.4.tgz"; path = fetchurl { - name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; - sha1 = "d91aa8b89b30cb38bad2924da11072faa64fd972"; + name = "unist_util_remove_position___unist_util_remove_position_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz"; + sha1 = "ec037348b6102c897703eee6d0294ca4755a2020"; }; } { @@ -11146,14 +11746,6 @@ }; } { - name = "upper_case___upper_case_1.1.3.tgz"; - path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; - }; - } - { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { name = "uri_js___uri_js_4.2.2.tgz"; @@ -11170,11 +11762,11 @@ }; } { - name = "url_loader___url_loader_2.1.0.tgz"; + name = "url_loader___url_loader_2.3.0.tgz"; path = fetchurl { - name = "url_loader___url_loader_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz"; - sha1 = "bcc1ecabbd197e913eca23f5e0378e24b4412961"; + name = "url_loader___url_loader_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz"; + sha1 = "e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"; }; } { @@ -11218,6 +11810,14 @@ }; } { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + }; + } + { name = "util___util_0.10.3.tgz"; path = fetchurl { name = "util___util_0.10.3.tgz"; @@ -11250,11 +11850,11 @@ }; } { - name = "uuid___uuid_3.3.3.tgz"; + name = "uuid___uuid_3.4.0.tgz"; path = fetchurl { - name = "uuid___uuid_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz"; - sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866"; + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; }; } { @@ -11274,11 +11874,11 @@ }; } { - name = "value_equal___value_equal_0.4.0.tgz"; + name = "value_equal___value_equal_1.0.1.tgz"; path = fetchurl { - name = "value_equal___value_equal_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz"; - sha1 = "c5bdd2f54ee093c04839d71ce2e4758a6890abc7"; + name = "value_equal___value_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; + sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; }; } { @@ -11290,11 +11890,11 @@ }; } { - name = "vendors___vendors_1.0.3.tgz"; + name = "vendors___vendors_1.0.4.tgz"; path = fetchurl { - name = "vendors___vendors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz"; - sha1 = "a6467781abd366217c050f8202e7e50cc9eef8c0"; + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; }; } { @@ -11306,11 +11906,11 @@ }; } { - name = "vfile_location___vfile_location_2.0.5.tgz"; + name = "vfile_location___vfile_location_2.0.6.tgz"; path = fetchurl { - name = "vfile_location___vfile_location_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz"; - sha1 = "c83eb02f8040228a8d2b3f10e485be3e3433e0a2"; + name = "vfile_location___vfile_location_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz"; + sha1 = "8a274f39411b8719ea5728802e10d9e0dff1519e"; }; } { @@ -11330,19 +11930,19 @@ }; } { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; path = fetchurl { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz"; - sha1 = "bd76d6a23323e2ca8ffa12028dc04559c75f9019"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; - sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } { @@ -11354,11 +11954,11 @@ }; } { - name = "wait_on___wait_on_3.3.0.tgz"; + name = "wait_on___wait_on_5.0.0.tgz"; path = fetchurl { - name = "wait_on___wait_on_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/wait-on/-/wait-on-3.3.0.tgz"; - sha1 = "9940981d047a72a9544a97b8b5fca45b2170a082"; + name = "wait_on___wait_on_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/wait-on/-/wait-on-5.0.0.tgz"; + sha1 = "72e554b338490bbc7131362755ca1af04f46d029"; }; } { @@ -11370,19 +11970,11 @@ }; } { - name = "warning___warning_4.0.3.tgz"; + name = "watchpack___watchpack_1.6.1.tgz"; path = fetchurl { - name = "warning___warning_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz"; - sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"; - }; - } - { - name = "watchpack___watchpack_1.6.0.tgz"; - path = fetchurl { - name = "watchpack___watchpack_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz"; - sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"; + name = "watchpack___watchpack_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.1.tgz"; + sha1 = "280da0a8718592174010c078c7585a74cd8cd0e2"; }; } { @@ -11402,19 +11994,19 @@ }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.1.tgz"; - sha1 = "1167aea02afa034489869b8368fe9fed1aea7d09"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; + sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; }; } { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz"; - sha1 = "1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"; + 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"; }; } { @@ -11426,11 +12018,11 @@ }; } { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.0.4.tgz"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; path = fetchurl { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.4.tgz"; - sha1 = "e4ca2999b09557716b8ba4475fb79fab5986f0cd"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; + sha1 = "19ca69b435b0baec7e29fbe90fb4015de2de4f16"; }; } { @@ -11442,11 +12034,11 @@ }; } { - name = "webpack___webpack_4.39.1.tgz"; + name = "webpack___webpack_4.42.0.tgz"; path = fetchurl { - name = "webpack___webpack_4.39.1.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.39.1.tgz"; - sha1 = "60ed9fb2b72cd60f26ea526c404d2a4cc97a1bd8"; + name = "webpack___webpack_4.42.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz"; + sha1 = "b901635dd6179391d90740a63c93f76f39883eb8"; }; } { @@ -11498,11 +12090,11 @@ }; } { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz"; - sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; + sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06"; }; } { @@ -11522,27 +12114,19 @@ }; } { - name = "wide_align___wide_align_1.1.3.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; - }; - } - { - name = "wordwrap___wordwrap_0.0.3.tgz"; + name = "which___which_2.0.2.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; }; } { - name = "wordwrap___wordwrap_1.0.0.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; }; } { @@ -11746,6 +12330,14 @@ }; } { + name = "ws___ws_7.2.5.tgz"; + path = fetchurl { + name = "ws___ws_7.2.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz"; + sha1 = "abb1370d4626a5a9cd79d8de404aa18b3465d10d"; + }; + } + { name = "x_is_string___x_is_string_0.1.0.tgz"; path = fetchurl { name = "x_is_string___x_is_string_0.1.0.tgz"; @@ -11762,19 +12354,19 @@ }; } { - name = "xmlchars___xmlchars_2.1.1.tgz"; + name = "xmlchars___xmlchars_2.2.0.tgz"; path = fetchurl { - name = "xmlchars___xmlchars_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.1.1.tgz"; - sha1 = "ef1a81c05bff629c2280007f12daca21bd6f6c93"; + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; }; } { - name = "xregexp___xregexp_4.0.0.tgz"; + name = "xregexp___xregexp_4.3.0.tgz"; path = fetchurl { - name = "xregexp___xregexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz"; - sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020"; + name = "xregexp___xregexp_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; + sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; }; } { @@ -11794,51 +12386,67 @@ }; } { - name = "yallist___yallist_3.0.3.tgz"; + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yaml___yaml_1.9.2.tgz"; path = fetchurl { - name = "yallist___yallist_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz"; - sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9"; + name = "yaml___yaml_1.9.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.9.2.tgz"; + sha1 = "f0cfa865f003ab707663e4f04b3956957ea564ed"; }; } { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; + name = "yargs_parser___yargs_parser_11.1.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8"; + 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.1.tgz"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { - name = "yargs___yargs_12.0.2.tgz"; + name = "yargs___yargs_12.0.5.tgz"; path = fetchurl { - name = "yargs___yargs_12.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz"; - sha1 = "fe58234369392af33ecbef53819171eff0f5aadc"; + name = "yargs___yargs_12.0.5.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; + sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; }; } { - name = "yargs___yargs_13.3.0.tgz"; + name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { - name = "yargs___yargs_13.3.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz"; - sha1 = "4c657a55e07e5f2cf947f8a366567c04a0dedc83"; + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; }; } { - name = "yauzl___yauzl_2.4.1.tgz"; + name = "yauzl___yauzl_2.10.0.tgz"; path = fetchurl { - name = "yauzl___yauzl_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; }; } ]; diff --git a/pkgs/servers/hasura/ci-info.nix b/pkgs/servers/hasura/ci-info.nix new file mode 100644 index 00000000000..53c85a2e5ba --- /dev/null +++ b/pkgs/servers/hasura/ci-info.nix @@ -0,0 +1,22 @@ +{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable +, hpack, stdenv, template-haskell, text, th-lift-instances +, unordered-containers +}: +mkDerivation { + pname = "ci-info"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/ci-info-hs.git"; + sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc"; + rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing base hashable template-haskell text + th-lift-instances unordered-containers + ]; + libraryToolDepends = [ hpack ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/ci-info-hs#readme"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix new file mode 100644 index 00000000000..f19ffe12f5d --- /dev/null +++ b/pkgs/servers/hasura/cli.nix @@ -0,0 +1,33 @@ +{ buildGoModule, hasura-graphql-engine }: + +buildGoModule rec { + name = "hasura-${version}"; + version = hasura-graphql-engine.version; + + src = hasura-graphql-engine.src; + modRoot = "./cli"; + + goPackagePath = "github.com/hasura/graphql-engine/cli"; + subPackages = [ "cmd/hasura" ]; + + modSha256 = "0bpb9r0n8n8c1p8sas3qanhvqw45rq8kygb4dmkfhj3d9vlgn6d2"; + + buildFlagsArray = [''-ldflags= + -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} + -s + -w + '']; + + postInstall = '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + + export HOME=$PWD + $out/bin/hasura completion bash > $out/share/bash-completion/completions/hasura + $out/bin/hasura completion zsh > $out/share/zsh/site-functions/_hasura + ''; + + meta = { + inherit (hasura-graphql-engine.meta) license homepage maintainers; + description = "Hasura GraphQL Engine CLI"; + }; +} diff --git a/pkgs/servers/hasura/default.nix b/pkgs/servers/hasura/default.nix new file mode 100644 index 00000000000..08527466035 --- /dev/null +++ b/pkgs/servers/hasura/default.nix @@ -0,0 +1,63 @@ +{ haskell }: + +with haskell.lib; + +let + # version in cabal file is invalid + version = "1.2.1"; + + pkgs = haskell.packages.ghc865.override { + overrides = self: super: { + # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git + hasura-graphql-engine = justStaticExecutables + ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: { + name = "graphql-engine-${version}"; + + inherit version; + + # hasura needs VERSION env exported during build + preBuild = "export VERSION=${version}"; + })); + + hasura-cli = self.callPackage ./cli.nix { + hasura-graphql-engine = self.hasura-graphql-engine // { + inherit version; + }; + }; + + # internal dependencies, non published on hackage (find revisions in cabal.project file) + # cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git + ci-info = self.callPackage ./ci-info.nix { }; + # cabal2nix --revision <rev> https://github.com/hasura/graphql-parser-hs.git + graphql-parser = self.callPackage ./graphql-parser.nix { }; + # cabal2nix --revision <rev> https://github.com/hasura/pg-client-hs.git + pg-client = self.callPackage ./pg-client.nix { }; + + # version constrained dependencies, without these hasura will not build, + # find versions in graphql-engine.cabal + # cabal2nix cabal://dependent-map-0.2.4.0 + dependent-map = self.callPackage ./dependent-map.nix { }; + # cabal2nix cabal://dependent-sum-0.4 + dependent-sum = self.callPackage ./dependent-sum.nix { }; + # cabal2nix cabal://these-0.7.6 + these = doJailbreak (self.callPackage ./these.nix { }); + # cabal2nix cabal://immortal-0.2.2.1 + immortal = self.callPackage ./immortal.nix { }; + # cabal2nix cabal://network-uri-2.6.1.0 + network-uri = self.callPackage ./network-uri.nix { }; + # cabal2nix cabal://ghc-heap-view-0.6.0 + ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { }); + + # unmark broewn packages and do required modifications + stm-hamt = doJailbreak (unmarkBroken super.stm-hamt); + superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer)); + Spock-core = dontCheck (unmarkBroken super.Spock-core); + stm-containers = dontCheck (unmarkBroken super.stm-containers); + ekg-json = unmarkBroken super.ekg-json; + list-t = dontCheck (unmarkBroken super.list-t); + primitive-extras = unmarkBroken super.primitive-extras; + }; + }; +in { + inherit (pkgs) hasura-graphql-engine hasura-cli; +} diff --git a/pkgs/servers/hasura/dependent-map.nix b/pkgs/servers/hasura/dependent-map.nix new file mode 100644 index 00000000000..68ebb616b5f --- /dev/null +++ b/pkgs/servers/hasura/dependent-map.nix @@ -0,0 +1,13 @@ +{ mkDerivation, base, containers, dependent-sum, stdenv }: +mkDerivation { + pname = "dependent-map"; + version = "0.2.4.0"; + sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; + revision = "1"; + editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; + libraryHaskellDepends = [ base containers dependent-sum ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; +} diff --git a/pkgs/servers/hasura/dependent-sum.nix b/pkgs/servers/hasura/dependent-sum.nix new file mode 100644 index 00000000000..90717b87366 --- /dev/null +++ b/pkgs/servers/hasura/dependent-sum.nix @@ -0,0 +1,10 @@ +{ mkDerivation, base, stdenv }: +mkDerivation { + pname = "dependent-sum"; + version = "0.4"; + sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; +} diff --git a/pkgs/servers/hasura/ghc-heap-view.nix b/pkgs/servers/hasura/ghc-heap-view.nix new file mode 100644 index 00000000000..54c873baee4 --- /dev/null +++ b/pkgs/servers/hasura/ghc-heap-view.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, binary, bytestring, Cabal, containers +, deepseq, filepath, ghc-heap, stdenv, template-haskell +, transformers +}: +mkDerivation { + pname = "ghc-heap-view"; + version = "0.6.0"; + sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + base binary bytestring containers ghc-heap template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq ]; + description = "Extract the heap representation of Haskell values and thunks"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/graphql-engine.nix b/pkgs/servers/hasura/graphql-engine.nix new file mode 100644 index 00000000000..05ba895be08 --- /dev/null +++ b/pkgs/servers/hasura/graphql-engine.nix @@ -0,0 +1,71 @@ +{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding +, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update +, base, base64-bytestring, byteorder, bytestring, case-insensitive +, ci-info, containers, criterion, cryptonite, data-has, deepseq +, dependent-map, dependent-sum, directory, ekg-core, ekg-json +, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary +, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core +, hspec-expectations-lifted, http-client, http-client-tls +, http-types, immortal, insert-ordered-containers, jose, lens +, lifted-async, lifted-base, list-t, mime-types, monad-control +, monad-time, monad-validate, mtl, mustache, mwc-probability +, mwc-random, natural-transformation, network, network-uri +, optparse-applicative, pem, pg-client, postgresql-binary +, postgresql-libpq, process, profunctors, psqueues, QuickCheck +, regex-tdfa, safe, scientific, semver, shakespeare, split +, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, text-builder, text-conversions, th-lift-instances, these, time +, transformers, transformers-base, unix, unordered-containers +, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets +, wreq, x509, yaml, zlib +}: +mkDerivation { + pname = "graphql-engine"; + version = "1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-engine.git"; + sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l"; + rev = "27b0b59361cebecd074bd59123f602e7b013bac1"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async + attoparsec attoparsec-iso8601 auto-update base base64-bytestring + byteorder bytestring case-insensitive ci-info containers cryptonite + data-has deepseq dependent-map dependent-sum directory ekg-core + ekg-json fast-logger file-embed filepath generic-arbitrary + ghc-heap-view graphql-parser hashable http-client http-client-tls + http-types immortal insert-ordered-containers jose lens + lifted-async lifted-base list-t mime-types monad-control monad-time + monad-validate mtl mustache network network-uri + optparse-applicative pem pg-client postgresql-binary + postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa + scientific semver shakespeare split Spock-core stm stm-containers + template-haskell text text-builder text-conversions + th-lift-instances these time transformers transformers-base unix + unordered-containers uri-encode uuid vector wai wai-websockets warp + websockets wreq x509 yaml zlib + ]; + executableHaskellDepends = [ + base bytestring pg-client text text-conversions + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-core hspec-expectations-lifted + http-client http-client-tls lifted-base monad-control mtl + natural-transformation optparse-applicative pg-client process + QuickCheck safe split text time transformers-base + unordered-containers + ]; + benchmarkHaskellDepends = [ + async base bytestring criterion deepseq mwc-probability mwc-random + split text vector + ]; + doCheck = false; + homepage = "https://www.hasura.io"; + description = "GraphQL API over Postgres"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ offline ]; +} diff --git a/pkgs/servers/hasura/graphql-parser.nix b/pkgs/servers/hasura/graphql-parser.nix new file mode 100644 index 00000000000..8066bb83dd0 --- /dev/null +++ b/pkgs/servers/hasura/graphql-parser.nix @@ -0,0 +1,35 @@ +{ mkDerivation, aeson, attoparsec, base, bytestring, containers +, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter +, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, text-builder, th-lift-instances, unordered-containers, vector +}: +mkDerivation { + pname = "graphql-parser"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-parser-hs.git"; + sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v"; + rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + libraryToolDepends = [ hpack ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring containers criterion filepath + hedgehog prettyprinter protolude regex-tdfa scientific + template-haskell text text-builder th-lift-instances + unordered-containers vector + ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/graphql-parser-hs#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/immortal.nix b/pkgs/servers/hasura/immortal.nix new file mode 100644 index 00000000000..c53f0f18709 --- /dev/null +++ b/pkgs/servers/hasura/immortal.nix @@ -0,0 +1,17 @@ +{ mkDerivation, base, lifted-base, monad-control, stdenv, stm +, tasty, tasty-hunit, transformers, transformers-base +}: +mkDerivation { + pname = "immortal"; + version = "0.2.2.1"; + sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e"; + libraryHaskellDepends = [ + base lifted-base monad-control stm transformers-base + ]; + testHaskellDepends = [ + base lifted-base stm tasty tasty-hunit transformers + ]; + homepage = "https://github.com/feuerbach/immortal"; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/servers/hasura/network-uri.nix b/pkgs/servers/hasura/network-uri.nix new file mode 100644 index 00000000000..45016d470a8 --- /dev/null +++ b/pkgs/servers/hasura/network-uri.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, deepseq, HUnit, parsec, stdenv +, test-framework, test-framework-hunit, test-framework-quickcheck2 +}: +mkDerivation { + pname = "network-uri"; + version = "2.6.1.0"; + sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0"; + revision = "1"; + editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32"; + libraryHaskellDepends = [ base deepseq parsec ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell/network-uri"; + description = "URI manipulation"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/pg-client.nix b/pkgs/servers/hasura/pg-client.nix new file mode 100644 index 00000000000..725e5e7f640 --- /dev/null +++ b/pkgs/servers/hasura/pg-client.nix @@ -0,0 +1,30 @@ +{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring +, criterion, fetchgit, file-embed, hashable, hashtables, hasql +, hasql-pool, hasql-transaction, monad-control, mtl +, postgresql-binary, postgresql-libpq, resource-pool, retry +, scientific, stdenv, template-haskell, text, text-builder, th-lift +, th-lift-instances, time, transformers-base, uuid, vector +}: +mkDerivation { + pname = "pg-client"; + version = "0.1.0"; + src = fetchgit { + url = "https://github.com/hasura/pg-client-hs.git"; + sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l"; + rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring hashable hashtables + monad-control mtl postgresql-binary postgresql-libpq resource-pool + retry scientific template-haskell text text-builder th-lift + th-lift-instances time transformers-base uuid vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base bytestring criterion file-embed hashable hasql hasql-pool + hasql-transaction mtl postgresql-libpq text text-builder + ]; + homepage = "https://github.com/hasura/platform"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/these.nix b/pkgs/servers/hasura/these.nix new file mode 100644 index 00000000000..396f9e2a282 --- /dev/null +++ b/pkgs/servers/hasura/these.nix @@ -0,0 +1,25 @@ +{ mkDerivation, aeson, base, base-compat, bifunctors, binary +, containers, data-default-class, deepseq, hashable, keys, lens +, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv +, tasty, tasty-quickcheck, transformers, transformers-compat +, unordered-containers, vector, vector-instances +}: +mkDerivation { + pname = "these"; + version = "0.7.6"; + sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers + data-default-class deepseq hashable keys lens mtl QuickCheck + semigroupoids transformers transformers-compat unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers hashable lens + QuickCheck quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 28c0322720a..96ca0c83898 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.109.0"; + version = "0.109.6"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 03805344ae6..9471a5faad8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.109.0"; + hassVersion = "0.109.6"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1b5y464yhngivxkz3cg2b7j2ssawy7fqr3si5pdmqkgz1dbqihhn"; + sha256 = "133l6n165yivnc9qmrahk423hmns0hn0dbnx4ys7yaw3x5hqwyns"; }; propagatedBuildInputs = [ @@ -98,6 +98,9 @@ in with py.pkgs; buildPythonApplication rec { sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601 ] ++ componentBuildInputs ++ extraBuildInputs; + # upstream only tests on Linux, so do we. + doCheck = stdenv.isLinux; + checkInputs = [ asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher ]; @@ -118,6 +121,10 @@ in with py.pkgs; buildPythonApplication rec { makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; + passthru = { + inherit (py.pkgs) hass-frontend; + }; + meta = with lib; { homepage = "https://home-assistant.io/"; description = "Open-source home automation platform running on Python 3"; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index bcb770b8dc6..9fb543d06ce 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200427.1"; + version = "20200505.0"; src = fetchPypi { inherit pname version; - sha256 = "0ch669asyjqbh73y4a170j86hw9in2fw3xmxaxwh5r6sgx28k4v7"; + sha256 = "0h19ddgnws5l49fwr4b0j99j4xkhpxkwdsmq71q36akd4s5lj0ll"; }; # no Python tests implemented diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 99dd63c7ce6..f8c4b800204 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -4,6 +4,7 @@ , doxygen , fetchurl , fuse +, libevent , lzma , openssl , pkgconfig @@ -14,15 +15,15 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.2"; + version = "3.5"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0"; + sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; - buildInputs = [ bzip2 fuse lzma openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; meta = with stdenv.lib; { description = "A caching proxy specialized for linux distribution files"; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index bf69d902aa5..9157c09cbeb 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = "http://www.fefe.de/gatling/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 67a914b6a98..80bc1458ad7 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -68,6 +68,14 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withStream [ @@ -99,26 +107,28 @@ stdenv.mkDerivation { preConfigure = preConfigure + concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; - patches = map fixPatch - (singleton (substituteAll { + patches = map fixPatch ([ + (substituteAll { src = ./nix-etag-1.15.4.patch; preInstall = '' export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" ''; - }) ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; - sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; - sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; - sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; - }) - ] ++ mapModules "patches"); + }) + ./nix-skip-check-logs-path.patch + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; + sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; + sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; + sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; + }) + ] ++ mapModules "patches"); hardeningEnable = optional (!stdenv.isDarwin) "pie"; diff --git a/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch b/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch new file mode 100644 index 00000000000..a823660cc32 --- /dev/null +++ b/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch @@ -0,0 +1,27 @@ +diff --git a/auto/install b/auto/install +index d884487..dccc411 100644 +--- a/auto/install ++++ b/auto/install +@@ -148,12 +148,6 @@ install: build $NGX_INSTALL_PERL_MODULES + || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' + cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' + +- test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' +- +- test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' +- + test -d '\$(DESTDIR)$NGX_PREFIX/html' \\ + || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX' + END +@@ -161,9 +155,6 @@ END + + if test -n "$NGX_ERROR_LOG_PATH"; then + cat << END >> $NGX_MAKEFILE +- +- test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' + END + + fi diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 0e87b971985..9c01cfb19e1 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -16,10 +16,11 @@ callPackage ../nginx/generic.nix args rec { sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n"; }; - fixPatch = patch: - runCommand "openresty-${patch.name}" { src = patch; } '' + fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in + runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ - --replace "src/" "bundle/nginx-${nginxVersion}/src/" + --replace "a/" "a/bundle/nginx-${nginxVersion}/" \ + --replace "b/" "b/bundle/nginx-${nginxVersion}/" ''; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 1593ad0c06f..f3cae597ef9 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt -, gd, geoip, gperftools, jemalloc +, substituteAll, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false , withStream ? false @@ -24,8 +24,14 @@ stdenv.mkDerivation rec { [ openssl zlib pcre libxml2 libxslt gd geoip gperftools jemalloc ] ++ concatMap (mod: mod.inputs or []) modules; - patches = [ + patches = singleton (substituteAll { + src = ../nginx/nix-etag-1.15.4.patch; + preInstall = '' + export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" + ''; + }) ++ [ ./check-resolv-conf.patch + ../nginx/nix-skip-check-logs-path.patch ]; configureFlags = [ @@ -53,6 +59,14 @@ stdenv.mkDerivation rec { "--with-poll_module" "--with-google_perftools_module" "--with-jemalloc" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withMail [ diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index 57ab2a96b4d..17c4367866f 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.23"; + version = "1.2.24"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee"; + sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f"; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 0779a31f106..c161566d329 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchFromGitHub, which +{ stdenv, fetchFromGitHub, nixosTests, which , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses , withPHP72 ? false, php72 -, withPHP73 ? true, php73 +, withPHP73 ? false, php73 +, withPHP74 ? true, php74 , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -28,22 +29,19 @@ let php72-unit = php72.override phpConfig; php73-unit = php73.override phpConfig; + php74-unit = php74.override phpConfig; + in stdenv.mkDerivation rec { - version = "1.16.0"; + version = "1.17.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l"; + sha256 = "1q3659vw8rxv4fk7ljkjav8ga72sb3arljfxcqw8b080f9hvi7hh"; }; - patches = [ - # https://github.com/nginx/unit/issues/357 - ./drop_cap.patch - ]; - nativeBuildInputs = [ which ]; buildInputs = [ ] @@ -51,6 +49,7 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP72 php72-unit ++ optional withPHP73 php73-unit + ++ optional withPHP73 php74-unit ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 ++ optional withPerldevel perldevel @@ -73,6 +72,7 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} ''; + passthru.tests.unit-php = nixosTests.unit-php; + meta = { description = "Dynamic web and application server, designed to run applications in multiple languages."; homepage = "https://unit.nginx.org/"; diff --git a/pkgs/servers/http/unit/drop_cap.patch b/pkgs/servers/http/unit/drop_cap.patch deleted file mode 100644 index 87caf77904e..00000000000 --- a/pkgs/servers/http/unit/drop_cap.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -r ed17ce89119f src/nxt_capability.c ---- a/src/nxt_capability.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.c Mon Dec 09 23:23:00 2019 +0000 -@@ -93,6 +93,26 @@ nxt_capability_specific_set(nxt_task_t * - return NXT_OK; - } - -+ -+nxt_int_t -+nxt_capability_drop_all(nxt_task_t *task) -+{ -+ struct __user_cap_header_struct hdr; -+ struct __user_cap_data_struct data[2]; -+ -+ hdr.version = nxt_capability_linux_get_version(); -+ hdr.pid = nxt_pid; -+ -+ nxt_memset(data, 0, sizeof(data)); -+ -+ if (nxt_slow_path(nxt_capset(&hdr, data) == -1)) { -+ nxt_alert(task, "failed to drop capabilities %E", nxt_errno); -+ return NXT_ERROR; -+ } -+ -+ return NXT_OK; -+} -+ - #else - - static nxt_int_t -diff -r ed17ce89119f src/nxt_capability.h ---- a/src/nxt_capability.h Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.h Mon Dec 09 23:23:00 2019 +0000 -@@ -14,4 +14,6 @@ typedef struct { - NXT_EXPORT nxt_int_t nxt_capability_set(nxt_task_t *task, - nxt_capabilities_t *cap); - -+NXT_EXPORT nxt_int_t nxt_capability_drop_all(nxt_task_t *task); -+ - #endif /* _NXT_CAPABILITY_INCLUDED_ */ -diff -r ed17ce89119f src/nxt_process.c ---- a/src/nxt_process.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_process.c Mon Dec 09 23:23:00 2019 +0000 -@@ -264,7 +264,7 @@ cleanup: - static void - nxt_process_start(nxt_task_t *task, nxt_process_t *process) - { -- nxt_int_t ret, cap_setid; -+ nxt_int_t ret, cap_setid, drop_caps; - nxt_port_t *port, *main_port; - nxt_thread_t *thread; - nxt_runtime_t *rt; -@@ -285,9 +285,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - - cap_setid = rt->capabilities.setid; - -+ drop_caps = cap_setid; -+ - #if (NXT_HAVE_CLONE_NEWUSER) -- if (!cap_setid && NXT_CLONE_USER(init->isolation.clone.flags)) { -+ if (NXT_CLONE_USER(init->isolation.clone.flags)) { - cap_setid = 1; -+ drop_caps = 0; - } - #endif - -@@ -301,6 +304,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - if (nxt_slow_path(ret != NXT_OK)) { - goto fail; - } -+ -+#if (NXT_HAVE_LINUX_CAPABILITY) -+ if (drop_caps && nxt_capability_drop_all(task) != NXT_OK) { -+ goto fail; -+ } -+#endif - } - - rt->type = init->type; \ No newline at end of file diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 301aec5c34b..1d57a951dc7 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://yaws.hyber.org"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu the-kenny ]; + maintainers = with maintainers; [ goibhniu ]; }; } diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index e0ff9f8de38..46a26a659ac 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "oidentd"; - version = "2.4.0"; + version = "2.5.0"; nativeBuildInputs = [ bison flex ]; src = fetchurl { url = "https://files.janikrabe.com/pub/oidentd/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "132bzlbjp437lrlxv5k9aqa1q9w5pghk02rnazg33cw6av00q2li"; + sha256 = "1d5mqlknfywbx2bgj7ap7x6qzvz257hhqcqhy6zk45dqpsirdn7a"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 932081ad22f..35476db9215 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.5.4"; + version = "10.5.5"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0jfqkbr5n5l7k3dpmjsy0bhvy4y1s6sccwcmcx239r6dhc7x0f9y"; + sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; }; buildInputs = [ diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 803ba0ee6c7..6c29de8cddb 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "opensmtpd-extras"; - version = "6.4.0"; + version = "6.7.1"; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb"; + sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index 9af470f8310..7de8cd858a3 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -13,13 +13,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/highlight-7.8.3" = { + "@babel/helper-validator-identifier-7.9.5" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; + }; + }; + "@babel/highlight-7.9.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; "@slack/logger-1.1.1" = { @@ -31,31 +40,31 @@ let sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA=="; }; }; - "@slack/rtm-api-5.0.3" = { + "@slack/rtm-api-5.0.4" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.3.tgz"; - sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g=="; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.4.tgz"; + sha512 = "5xXOjLPb4H8a+URLrCjnFXA62Kf4IrvSfp9KtuOxv6vTtFVvxNW4WqhWgAcxwXolD43xRuB/pikxLu76vLDTfw=="; }; }; - "@slack/types-1.5.0" = { + "@slack/types-1.6.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz"; - sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA=="; + url = "https://registry.npmjs.org/@slack/types/-/types-1.6.0.tgz"; + sha512 = "SrrAD/ZxDN4szQ35V/mY2TvKSyGsUWP8def1C8NMg9AvdYG0VyaL5f+Dd6jw8STosMFXd3zqjekMowT9LB9/IQ=="; }; }; - "@slack/web-api-5.8.0" = { + "@slack/web-api-5.8.1" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz"; - sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ=="; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.1.tgz"; + sha512 = "MONzkjWOXV39Dejo8B9WSl/F0dxcVh9wyeW6R0jf6T6BhwN4f24iErYtTh19g+MRhb0oiyeKfnFsJTSKQulfDA=="; }; }; "@types/body-parser-1.19.0" = { @@ -103,22 +112,22 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.3" = { + "@types/express-4.17.6" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz"; + sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w=="; }; }; - "@types/express-serve-static-core-4.17.2" = { + "@types/express-serve-static-core-4.17.6" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.2"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.6.tgz"; + sha512 = "U2oynuRIB17GIbEdvjFrrEACOy7GQkzsX7bPEBz1H41vZYEU4j0fLL97sawmHDwHUXpUQDBMHIyM9vejqP9o1A=="; }; }; "@types/is-stream-1.1.0" = { @@ -139,13 +148,13 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/mocha-5.2.7" = { + "@types/mocha-7.0.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "5.2.7"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz"; - sha512 = "NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz"; + sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; "@types/nedb-1.8.9" = { @@ -157,13 +166,13 @@ let sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; }; }; - "@types/node-12.12.30" = { + "@types/node-13.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.30"; + version = "13.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz"; - sha512 = "sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; + sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk"; }; }; "@types/node-emoji-1.8.1" = { @@ -184,6 +193,15 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; + "@types/qs-6.9.2" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz"; + sha512 = "a9bDi4Z3zCZf4Lv1X/vwnvbbDYSNz59h3i3KdyuYYN+YrLjSeJD0dnphdULDfySvUv6Exy/O0K6wX/kQpnPQ+A=="; + }; + }; "@types/randomstring-1.1.6" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; @@ -238,22 +256,22 @@ let sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; - "@types/tough-cookie-2.3.6" = { + "@types/tough-cookie-4.0.0" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "2.3.6"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz"; - sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uuid-3.4.8" = { + "@types/uuid-7.0.3" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "3.4.8"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.8.tgz"; - sha512 = "zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz"; + sha512 = "PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw=="; }; }; "@types/ws-5.1.2" = { @@ -311,13 +329,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "another-json-0.2.0" = { @@ -365,6 +383,15 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "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=="; + }; + }; "arg-4.1.3" = { name = "arg"; packageName = "arg"; @@ -410,13 +437,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-options-0.6.0" = { + "assert-options-0.6.2" = { name = "assert-options"; packageName = "assert-options"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.0.tgz"; - sha512 = "xmBFb5sY0AO8SNihIfavR6uMhOyzq6D7RoFKJxxAditMQc876szBBQ9RQVwLi6Bm3zUoG0nexZK11Gy5TBX69A=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; + sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; }; }; "assert-plus-1.0.0" = { @@ -545,6 +572,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "binary-extensions-2.0.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + }; + }; "binary-search-tree-0.2.5" = { name = "binary-search-tree"; packageName = "binary-search-tree"; @@ -599,6 +635,15 @@ let 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=="; + }; + }; "browser-request-0.3.3" = { name = "browser-request"; packageName = "browser-request"; @@ -707,6 +752,15 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -950,6 +1004,15 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -1040,13 +1103,13 @@ let sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-to-primitive-1.2.1" = { @@ -1094,15 +1157,6 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "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=="; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -1202,6 +1256,15 @@ let sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ=="; }; }; + "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=="; + }; + }; "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; @@ -1301,6 +1364,15 @@ let 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"; @@ -1364,6 +1436,15 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; + "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=="; + }; + }; "growl-1.10.5" = { name = "growl"; packageName = "growl"; @@ -1499,6 +1580,15 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; + "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-buffer-2.0.4" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1526,6 +1616,15 @@ let 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"; @@ -1535,6 +1634,15 @@ let 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-my-ip-valid-1.0.0" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; @@ -1553,6 +1661,15 @@ let sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; + "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-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -1751,13 +1868,13 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; - "log-symbols-2.2.0" = { + "log-symbols-3.0.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; "logform-1.10.0" = { @@ -1778,13 +1895,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.8" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "make-error-1.3.6" = { @@ -1796,15 +1913,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "manakin-0.5.2" = { - name = "manakin"; - packageName = "manakin"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/manakin/-/manakin-0.5.2.tgz"; - sha512 = "pfDSB7QYoVg0Io4KMV9hhPoXpj6p0uBscgtyUSKCOFZe8bqgbpStfgnKIbF/ulnr6U3ICu4OqdyxAqBgOhZwBQ=="; - }; - }; "matrix-appservice-0.4.1" = { name = "matrix-appservice"; packageName = "matrix-appservice"; @@ -1814,13 +1922,13 @@ let sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA=="; }; }; - "matrix-appservice-bridge-1.11.1" = { + "matrix-appservice-bridge-1.12.2" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.11.1.tgz"; - sha512 = "xrtjxScBIx33HRkiK/5G6wkUxZ9jxF9GqTiKzM/Fn7CgMZoHVDIms3sTc7ybZKA6RHAqH68bg4Eg4JbGCtUrhw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz"; + sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ=="; }; }; "matrix-js-sdk-2.4.6" = { @@ -1868,22 +1976,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "minimatch-3.0.4" = { @@ -1895,15 +2003,6 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; @@ -1913,49 +2012,40 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-0.5.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; - }; - }; - "mocha-6.2.2" = { + "mocha-7.1.2" = { name = "mocha"; packageName = "mocha"; - version = "6.2.2"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz"; - sha512 = "FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; + sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="; }; }; - "moment-2.24.0" = { + "moment-2.25.3" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; + sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; }; }; - "morgan-1.9.1" = { + "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; - sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "ms-2.0.0" = { @@ -2012,13 +2102,13 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; - "node-environment-flags-1.0.5" = { + "node-environment-flags-1.0.6" = { name = "node-environment-flags"; packageName = "node-environment-flags"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz"; - sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ=="; + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; "nopt-3.0.6" = { @@ -2030,6 +2120,15 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; + "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=="; + }; + }; "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -2138,13 +2237,13 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-3.0.0" = { @@ -2165,13 +2264,13 @@ let sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.4.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-retry-4.2.0" = { @@ -2273,13 +2372,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-7.12.1" = { + "pg-8.0.3" = { name = "pg"; packageName = "pg"; - version = "7.12.1"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz"; - sha512 = "l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA=="; + url = "https://registry.npmjs.org/pg/-/pg-8.0.3.tgz"; + sha512 = "fvcNXn4o/iq4jKq15Ix/e58q3jPSmzOp6/8C3CaHoSR/bsxdg+1FXfDRePdtE/zBb3++TytvOrS1hNef3WC/Kg=="; }; }; "pg-connection-string-0.1.3" = { @@ -2300,31 +2399,40 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.5.1" = { + "pg-minify-1.5.2" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.1.tgz"; - sha512 = "nqUTo8y9T0VhiJoWC0sK0+2S8hYDiu7CdH0Z9ijPi2iikiQ44mfcAFxEJxfvF8H3h/bDBvXthtOQPIB3pLWIow=="; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.2.tgz"; + sha512 = "uZn/gXkGmO5JBdopxNLSpFMS1lXr+KJqynI8Di1Qyr8ZVXt67ruh+XNfzLMVdLzYv+MQRdNYQdVwWPSs0qM7xQ=="; }; }; - "pg-pool-2.0.10" = { + "pg-pool-3.1.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "2.0.10"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz"; - sha512 = "qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.1.1.tgz"; + sha512 = "kYH6S0mcZF1TPg1F9boFee2JlCSm2oqnlR2Mz2Wgn1psQbEBNVeNTJCw2wCK48QsctwvGUzbxLMg/lYV6hL/3A=="; }; }; - "pg-promise-9.3.6" = { + "pg-promise-10.5.3" = { name = "pg-promise"; packageName = "pg-promise"; - version = "9.3.6"; + version = "10.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.3.tgz"; + sha512 = "cfHgFpcqOc0IIRDABre//k1eda7s94Wys67P9r3q590nmvO0AzZucqWTVmgRUzNTIrDChUwY4hVOMBTIsU/ZiA=="; + }; + }; + "pg-protocol-1.2.2" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-9.3.6.tgz"; - sha512 = "b64UalKAkUImn01z7LeG2NtTTsp0TYfqMzo1vXjO2bDAshL+kXJ2HvCyHstJ4Nj8hLeqtCe0Tar5TbB4QGUHfw=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz"; + sha512 = "r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg=="; }; }; "pg-types-2.2.0" = { @@ -2345,6 +2453,15 @@ let sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; }; }; + "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=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -2363,13 +2480,13 @@ let sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; }; }; - "postgres-date-1.0.4" = { + "postgres-date-1.0.5" = { name = "postgres-date"; packageName = "postgres-date"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz"; - sha512 = "bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="; + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz"; + sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="; }; }; "postgres-interval-1.2.0" = { @@ -2408,13 +2525,13 @@ let sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -2444,13 +2561,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-4.0.1" = { + "quick-lru-5.1.0" = { name = "quick-lru"; packageName = "quick-lru"; - version = "4.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; - sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.0.tgz"; + sha512 = "WjAKQ9ORzvqjLijJXiXWqc3Gcs1ivoxCj6KJmEjoWBE6OtHwuaDLSAUqGHALUiid7A1KqGqsSHZs8prxF5xxAQ=="; }; }; "randomstring-1.1.5" = { @@ -2498,6 +2615,15 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -2552,13 +2678,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.15.1" = { + "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "retry-0.12.0" = { @@ -2678,22 +2804,22 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; - "spex-3.0.0" = { + "spex-3.0.1" = { name = "spex"; packageName = "spex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spex/-/spex-3.0.0.tgz"; - sha512 = "JoMfgbrJcEPn53JCLkSNH1o7fZ9rzkb24UKEt5LTcsp0YsaN+yxtb5MEmibbMRltj9CdXDNGitPrYi11JY2hog=="; + url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz"; + sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA=="; }; }; "split-1.0.1" = { @@ -2768,22 +2894,40 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.1" = { + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + }; + }; + "string.prototype.trimleft-2.1.2" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; }; }; - "string.prototype.trimright-2.1.1" = { + "string.prototype.trimright-2.1.2" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-1.1.1" = { @@ -2876,6 +3020,15 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; + "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=="; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -2903,31 +3056,31 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.7.0" = { + "ts-node-8.10.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.7.0"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz"; - sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; + sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw=="; }; }; - "tslib-1.11.1" = { + "tslib-1.11.2" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz"; + sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="; }; }; - "tslint-5.20.1" = { + "tslint-6.1.2" = { name = "tslint"; packageName = "tslint"; - version = "5.20.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz"; - sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; }; }; "tsutils-2.29.0" = { @@ -3047,6 +3200,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "uuid-7.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -3173,15 +3335,6 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; - "yargs-13.3.0" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -3191,15 +3344,6 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; - "yargs-parser-13.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -3230,26 +3374,27 @@ let }; in { - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" = nodeEnv.buildNodePackage { + "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" = nodeEnv.buildNodePackage { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.1.0"; + version = "1.2.0"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "62b2a05c99bbefb0b268adc8b0fedfe91a4f76bd"; - sha256 = "64e930cecb11de9df3cb03367a22ff7dc78d44b7f992d9379fae8b692bf35157"; + rev = "2967f02484a3cdb386336b328438ec65fa8be382"; + sha256 = "bc7f87744046561d8dcd5b75d2469950f11ceac9d6d69a49eac4e05354f34834"; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" sources."@slack/logger-1.1.1" - (sources."@slack/rtm-api-5.0.3" // { + (sources."@slack/rtm-api-5.0.4" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.5.0" - (sources."@slack/web-api-5.8.0" // { + sources."@slack/types-1.6.0" + (sources."@slack/web-api-5.8.1" // { dependencies = [ sources."p-queue-2.4.2" ]; @@ -3259,40 +3404,42 @@ in sources."@types/chai-4.2.11" sources."@types/connect-3.4.33" sources."@types/events-3.0.0" - sources."@types/express-4.17.3" - sources."@types/express-serve-static-core-4.17.2" + sources."@types/express-4.17.6" + sources."@types/express-serve-static-core-4.17.6" sources."@types/is-stream-1.1.0" sources."@types/mime-2.0.1" - sources."@types/mocha-5.2.7" + sources."@types/mocha-7.0.2" sources."@types/nedb-1.8.9" - sources."@types/node-12.12.30" + sources."@types/node-13.9.3" sources."@types/node-emoji-1.8.1" sources."@types/p-queue-2.3.2" + sources."@types/qs-6.9.2" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" sources."@types/request-2.48.4" sources."@types/request-promise-native-1.0.17" sources."@types/retry-0.12.0" sources."@types/serve-static-1.13.3" - sources."@types/tough-cookie-2.3.6" - sources."@types/uuid-3.4.8" + sources."@types/tough-cookie-4.0.0" + sources."@types/uuid-7.0.3" sources."@types/ws-5.1.2" sources."@types/yargs-13.0.8" sources."@types/yargs-parser-13.1.0" sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."another-json-0.2.0" sources."ansi-colors-3.2.3" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-uniq-1.0.2" sources."asn1-0.2.4" - sources."assert-options-0.6.0" + sources."assert-options-0.6.2" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" sources."async-0.2.10" @@ -3306,6 +3453,7 @@ in sources."base-x-3.0.8" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."binary-extensions-2.0.0" sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" sources."bluebird-2.11.0" @@ -3315,6 +3463,7 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browser-request-0.3.3" sources."browser-stdout-1.3.1" sources."bs58-4.0.1" @@ -3331,6 +3480,7 @@ in ]; }) sources."check-error-1.0.2" + sources."chokidar-3.3.0" sources."cliui-5.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -3365,12 +3515,11 @@ in sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."env-variable-0.0.6" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-3.1.2" (sources."express-4.17.1" // { @@ -3385,6 +3534,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" sources."file-stream-rotator-0.4.1" + sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -3399,6 +3549,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" @@ -3406,6 +3557,7 @@ in sources."get-func-name-2.0.0" sources."getpass-0.1.7" sources."glob-7.1.3" + sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -3421,12 +3573,16 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" + sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.1.5" 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-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" + sources."is-number-7.0.0" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-stream-1.1.0" @@ -3449,17 +3605,16 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.toarray-4.4.0" - sources."log-symbols-2.2.0" + sources."log-symbols-3.0.0" (sources."logform-2.1.2" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."make-error-1.3.6" - sources."manakin-0.5.2" sources."matrix-appservice-0.4.1" - sources."matrix-appservice-bridge-1.11.1" + sources."matrix-appservice-bridge-1.12.2" (sources."matrix-js-sdk-2.4.6" // { dependencies = [ sources."bluebird-3.5.5" @@ -3469,39 +3624,37 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.3" - (sources."mocha-6.2.2" // { + sources."mkdirp-0.5.5" + (sources."mocha-7.1.2" // { dependencies = [ sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" sources."ms-2.1.1" sources."supports-color-6.0.0" - sources."yargs-13.3.0" - sources."yargs-parser-13.1.1" ]; }) - sources."moment-2.24.0" - (sources."morgan-1.9.1" // { + sources."moment-2.25.3" + (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" + sources."depd-2.0.0" ]; }) sources."ms-2.0.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."node-emoji-1.10.0" - (sources."node-environment-flags-1.0.5" // { + (sources."node-environment-flags-1.0.6" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."nopt-3.0.6" + sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."object-hash-1.3.1" sources."object-inspect-1.7.0" @@ -3514,9 +3667,9 @@ in sources."one-time-0.0.4" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" - (sources."p-queue-6.3.0" // { + (sources."p-queue-6.4.0" // { dependencies = [ sources."eventemitter3-4.0.0" ]; @@ -3532,41 +3685,45 @@ in sources."path-to-regexp-0.1.7" sources."pathval-1.1.0" sources."performance-now-2.1.0" - sources."pg-7.12.1" + sources."pg-8.0.3" sources."pg-connection-string-0.1.3" sources."pg-int8-1.0.1" - sources."pg-minify-1.5.1" - sources."pg-pool-2.0.10" - sources."pg-promise-9.3.6" + sources."pg-minify-1.5.2" + sources."pg-pool-3.1.1" + sources."pg-promise-10.5.3" + sources."pg-protocol-1.2.2" sources."pg-types-2.2.0" sources."pgpass-1.0.2" + sources."picomatch-2.2.2" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.4" + sources."postgres-date-1.0.5" sources."postgres-interval-1.2.0" sources."process-nextick-args-2.0.1" sources."prom-client-11.5.3" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-4.0.1" + sources."quick-lru-5.1.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-3.6.0" + sources."readdirp-3.2.0" sources."regenerator-runtime-0.11.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" sources."qs-6.5.2" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."retry-0.12.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -3586,8 +3743,8 @@ in sources."setprototypeof-1.1.1" sources."simple-swizzle-0.2.2" sources."source-map-0.6.1" - sources."source-map-support-0.5.16" - sources."spex-3.0.0" + sources."source-map-support-0.5.19" + sources."spex-3.0.1" sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -3595,8 +3752,10 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."string-width-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.0" @@ -3608,16 +3767,17 @@ in sources."tdigest-0.1.1" sources."text-hex-1.0.0" sources."through-2.3.8" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - (sources."ts-node-8.7.0" // { + (sources."ts-node-8.10.1" // { dependencies = [ sources."diff-4.0.2" ]; }) - sources."tslib-1.11.1" - (sources."tslint-5.20.1" // { + sources."tslib-1.11.2" + (sources."tslint-6.1.2" // { dependencies = [ sources."diff-4.0.2" sources."semver-5.7.1" @@ -3635,7 +3795,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-7.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -3689,4 +3849,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index 8fb44891dd4..a197abdda2e 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,3 +1,3 @@ [ - {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" } + {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" } ] diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 3088ee190e7..4c5521e97bb 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -35,9 +35,9 @@ buildGoPackage { ''; installPhase = '' - mkdir -p $bin/bin $bin/share/meguca - cp meguca $bin/bin - cp -r www $bin/share/meguca + mkdir -p $out/bin $out/share/meguca + cp meguca $out/bin + cp -r www $out/share/meguca ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 89d3220aa69..fb284970af0 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.3"; + version = "1.6.5"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "0h0mlg3xz1y889xj6lcsb4sz9bar1birc2wzjf7x4ig31qib6r0w"; + sha256 = "1pr7igk7ic9wc2yax26wy3ar223vilf2qyzrknz36g61dxqa6k8z"; }; configureFlags = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index b2e040748ab..5d50f8c9b0c 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.35.1"; + version = "0.35.3"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1c8mxadf8siakhgdkbw5d8r6ph9lqxrw5wlrrc8a5ycp43h0z226"; + sha256 = "1iax99id47a8mkdyr5wp2dwvl0d1lfh9gsamd1m0qpxw9mbvpkbq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index b6abec241a5..0a0d3aa7bd8 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.9.3"; + version = "1.10.1"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1njp2db939w3ah5k943bkgm62k969fj47qwmlzvhmmg87xwnq3fb"; + sha256 = "1xck7pi7rhkgssic7adbg1slypjjkqxa18wlf3jffbgj0zzr87nx"; }; #dontStrip = true; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index bb841da74d2..43c41250970 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/miniflux.app $bin/bin/miniflux + mv $out/bin/miniflux.app $out/bin/miniflux ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 953cc9fb77c..8b30d7dbbc8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,24 +1,26 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; - version = "2020-03-25T07-03-04Z"; + version = "2020-05-01T22-19-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5"; + sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn"; }; - modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k"; + modSha256 = "1g5vwllxpiy4qlfhn3v5k6sn4g4qpbv0hpg32y1vi2q342lag116"; subPackages = [ "." ]; buildFlagsArray = [''-ldflags= - -X github.com/minio/minio/cmd.Version=${version} + -s -w -X github.com/minio/minio/cmd.Version=${version} '']; + passthru.tests.minio = nixosTests.minio; + meta = with stdenv.lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 2c529ef7b32..be748035430 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "airsonic"; - version = "10.5.0"; + version = "10.6.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0nja33x3qh8zylqc7dn6x8j1wyxf7pzf9vdg9rzaq1hl6mi573jq"; + sha256 = "0dgk9i7981wydp44zax21y48psybcsd4i68cmlp9izl8aa5gk2vb"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 24756cc8bd2..d6f3c28d82b 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; postInstall = '' - wrapProgram $bin/bin/grafana-reporter \ + wrapProgram $out/bin/grafana-reporter \ --prefix PATH : ${makeBinPath [ tetex ]} ''; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 66e534a0f9a..7fdd9c70d9a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -29,10 +29,10 @@ buildGoPackage rec { postInstall = '' tar -xvf $srcStatic - mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,tools} $bin/share/grafana/ + mkdir -p $out/share/grafana + mv grafana-*/{public,conf,tools} $out/share/grafana/ '' + lib.optionalString phantomJsSupport '' - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs + ln -sf ${phantomjs2}/bin/phantomjs $out/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index a4117d923e3..e8804702f0d 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $bin/bin/promtail \ + wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 02a81bfe33c..ecbed520bbd 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.59"; + version = "2.0.61"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1i28ba53gh9z0mb3fk0y3cb88wh73qdlbg7rl5g9mc6iwqrbvg97"; + sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs"; }; buildInputs = [ diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index dc0ad6ae2cf..b8246c27b47 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.5"; + version = "4.4.6"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "079rgi3dqdg6h511c96hrch62rxsap9p4x37hm2nj672zb9f4sdz"; + sha256 = "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 9074c19e109..9402fa44eed 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -27,7 +27,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/amtool --completion-script-bash > amtool.bash + $out/bin/amtool --completion-script-bash > amtool.bash installShellCompletion amtool.bash ''; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index e43e625e449..c0b161954b2 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.17.2"; + version = "2.18.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "1q89c98rdypfcw8sqzipwlmxg8vrm4b9vdryygnacxv4am7bxsia"; + sha256 = "0ixgjp3j9dkdb0vv5n83h8w48xgi70m83im660z97y7mflr5s2cf"; }; webui = mkYarnPackage { @@ -54,9 +54,9 @@ in buildGoPackage rec { ''; preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus" + cp -a $src/documentation/* $out/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 8202a8c8c29..b5a93343252 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -43,7 +43,7 @@ buildGoPackage rec { ]; postInstall = optionalString withSystemdSupport '' - wrapProgram $bin/bin/postfix_exporter \ + wrapProgram $out/bin/postfix_exporter \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0cb41f099c6..1425fccdca4 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -29,7 +29,7 @@ buildGoPackage rec { doInstallCheck = true; installCheckPhase = '' - export PATH=$PATH:$bin/bin + export PATH=$PATH:$out/bin pushgateway --help diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json index 5ae33ae62df..64ac8689bbd 100644 --- a/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/pkgs/servers/monitoring/prometheus/webui-package.json @@ -34,7 +34,7 @@ "react-copy-to-clipboard": "^5.0.1", "react-dom": "^16.7.0", "react-resize-detector": "^4.2.1", - "react-scripts": "^3.4.0", + "react-scripts": "3.4.0", "react-test-renderer": "^16.9.0", "reactstrap": "^8.0.1", "sanitize-html": "^1.20.1", @@ -71,7 +71,6 @@ "@types/sinon": "^7.5.0", "@typescript-eslint/eslint-plugin": "2.x", "@typescript-eslint/parser": "2.x", - "babel-eslint": "10.x", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.15.1", "eslint": "6.x", diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 0d8652982cd..5eed837c910 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -10,11 +10,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; + name = "_babel_compat_data___compat_data_7.9.0.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz"; - sha1 = "d28ce872778c23551cbb9432fc68d28495b613b9"; + name = "_babel_compat_data___compat_data_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz"; + sha1 = "04815556fc90b0c174abd2c0c1bb966faa036a6c"; }; } { @@ -26,11 +26,27 @@ }; } { - name = "_babel_generator___generator_7.8.4.tgz"; + name = "_babel_core___core_7.9.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz"; - sha1 = "35bbc74486956fe4251829f9f6c48330e8d0985e"; + name = "_babel_core___core_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz"; + sha1 = "ac977b538b77e132ff706f3b8a4dbad09c03c56e"; + }; + } + { + name = "_babel_generator___generator_7.9.0.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz"; + sha1 = "0f67adea4ec39dad6e63345f70eec33014d78c89"; + }; + } + { + name = "_babel_generator___generator_7.9.4.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz"; + sha1 = "12441e90c3b3c4159cdecf312075bf1a8ce2dbce"; }; } { @@ -50,43 +66,51 @@ }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz"; + sha1 = "066d80262ade488f9c1b1823ce5db88a4cedaa43"; + }; + } + { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz"; - sha1 = "dee98d7d79cc1f003d80b76fe01c7f8945665ff6"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; + sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz"; - sha1 = "de82619898aa605d409c42be6ffb8d7204579692"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz"; + sha1 = "28a279c2e6c622a6233da548127f980751324cab"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz"; - sha1 = "03d7ecd454b7ebe19a254f76617e61770aed2c88"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; + sha1 = "dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz"; - sha1 = "5b94be88c255f140fd2c10dd151e7f98f4bff397"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz"; + sha1 = "243a5b46e2f8f0f674dc1387631eb6b28b851de0"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz"; - sha1 = "c774268c95ec07ee92476a3862b75cc2839beb79"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; + sha1 = "5d84180b588f560b7864efaeea89243e58312087"; }; } { @@ -146,11 +170,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz"; - sha1 = "d305e35d02bee720fbc2c3c3623aa0c316c01590"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; + sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; }; } { @@ -186,11 +210,11 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz"; - sha1 = "91192d25f6abbcd41da8a989d4492574fb1530bc"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; + sha1 = "5ada744fd5ad73203bf1d67459a27dcba67effc8"; }; } { @@ -210,6 +234,14 @@ }; } { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; + sha1 = "ad53562a7fc29b3b9a91bbf7d10397fd146346ed"; + }; + } + { name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; path = fetchurl { name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; @@ -218,27 +250,35 @@ }; } { - name = "_babel_helpers___helpers_7.8.4.tgz"; + name = "_babel_helpers___helpers_7.9.2.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz"; + sha1 = "b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"; + }; + } + { + name = "_babel_highlight___highlight_7.9.0.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz"; - sha1 = "754eb3ee727c165e0a240d6c207de7c455f36f73"; + name = "_babel_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_highlight___highlight_7.8.3.tgz"; + name = "_babel_parser___parser_7.9.4.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; - sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + name = "_babel_parser___parser_7.9.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz"; + sha1 = "68a35e6b0319bbc014465be43828300113f2f2e8"; }; } { - name = "_babel_parser___parser_7.8.4.tgz"; + name = "_babel_parser___parser_7.9.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz"; - sha1 = "d1dbe64691d60358a974295fa53da074dd2ce8e8"; + name = "_babel_parser___parser_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz"; + sha1 = "4e767f424b479c514077544484d1f9bdba7f1158"; }; } { @@ -298,11 +338,11 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz"; - sha1 = "eb5ae366118ddca67bed583b53d7554cad9951bb"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; + sha1 = "a28993699fc13df165995362693962ba6b061d6f"; }; } { @@ -314,19 +354,19 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz"; - sha1 = "ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz"; + sha1 = "31db16b154c39d6b8a645292472b98394c292a58"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz"; - sha1 = "b646c3adea5f98800c9ab45105ac34d06cd4a47f"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; + sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; }; } { @@ -466,11 +506,11 @@ }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz"; - sha1 = "46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; + sha1 = "8603fc3cc449e31fdbdbc257f67717536a11af8d"; }; } { @@ -482,11 +522,11 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz"; - sha1 = "20ddfbd9e4676906b1056ee60af88590cc7aaa0b"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; + sha1 = "fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b"; }; } { @@ -514,19 +554,19 @@ }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz"; - sha1 = "da705a655466b2a9b36046b57bf0cbcd53551bd4"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz"; + sha1 = "8a3538aa40434e000b8f44a3c5c9ac7229bd2392"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz"; - sha1 = "6fe8eae5d6875086ee185dd0b098a8513783b47d"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; + sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; }; } { @@ -554,35 +594,35 @@ }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz"; - sha1 = "65606d44616b50225e76f5578f33c568a0b876a5"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; + sha1 = "19755ee721912cf5bb04c07d50280af3484efef4"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz"; - sha1 = "df251706ec331bd058a34bdd72613915f82928a5"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; + sha1 = "e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz"; - sha1 = "d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; + sha1 = "e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz"; - sha1 = "592d578ce06c52f5b98b02f913d653ffe972661a"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; + sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; }; } { @@ -610,11 +650,11 @@ }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz"; - sha1 = "1d5155de0b65db0ccf9971165745d3bb990d77d3"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz"; + sha1 = "0381de466c85d5404565243660c4496459525daf"; }; } { @@ -626,11 +666,11 @@ }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz"; - sha1 = "784c25294bddaad2323eb4ff0c9f4a3f6c87d6bc"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; + sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; }; } { @@ -642,35 +682,43 @@ }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; + sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz"; - sha1 = "c4f178b2aa588ecfa8d077ea80d4194ee77ed702"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; + sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz"; - sha1 = "951e75a8af47f9f120db731be095d2b2c34920e0"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; + sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz"; - sha1 = "4220349c0390fdefa505365f68c103562ab2fc4a"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.1.tgz"; + sha1 = "d03af29396a6dc51bfa24eefd8005a9fd381152a"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz"; - sha1 = "b31031e8059c07495bf23614c97f3d9698bc6ec8"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; + sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; }; } { @@ -682,11 +730,11 @@ }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz"; - sha1 = "c0153bc0a5375ebc1f1591cb7eea223adea9f169"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; + sha1 = "45468c0ae74cc13204e1d3b1f4ce6ee83258af0b"; }; } { @@ -730,11 +778,11 @@ }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz"; - sha1 = "be6f01a7ef423be68e65ace1f04fc407e6d88917"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.0.tgz"; + sha1 = "8b52649c81cb7dee117f760952ab46675a258836"; }; } { @@ -746,59 +794,83 @@ }; } { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; + name = "_babel_preset_env___preset_env_7.9.0.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz"; - sha1 = "9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"; + name = "_babel_preset_env___preset_env_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz"; + sha1 = "a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"; }; } { - name = "_babel_preset_react___preset_react_7.8.3.tgz"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz"; - sha1 = "23dc63f1b5b0751283e04252e78cf1d6589273d2"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; }; } { - name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; + name = "_babel_preset_react___preset_react_7.9.1.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz"; - sha1 = "90af8690121beecd9a75d0cc26c6be39d1595d13"; + name = "_babel_preset_react___preset_react_7.9.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.9.1.tgz"; + sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a"; }; } { - name = "_babel_runtime___runtime_7.8.4.tgz"; + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; - sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308"; + name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz"; + sha1 = "87705a72b1f0d59df21c179f7c3d2ef4b16ce192"; }; } { - name = "_babel_template___template_7.8.3.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; path = fetchurl { - name = "_babel_template___template_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz"; - sha1 = "e02ad04fe262a657809327f578056ca15fd4d1b8"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; + sha1 = "26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"; }; } { - name = "_babel_traverse___traverse_7.8.4.tgz"; + name = "_babel_runtime___runtime_7.9.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz"; - sha1 = "f0845822365f9d5b0e312ed3959d3f827f869e3c"; + name = "_babel_runtime___runtime_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.0.tgz"; + sha1 = "337eda67401f5b066a6f205a3113d4ac18ba495b"; }; } { - name = "_babel_types___types_7.8.3.tgz"; + name = "_babel_runtime___runtime_7.9.2.tgz"; path = fetchurl { - name = "_babel_types___types_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz"; - sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c"; + name = "_babel_runtime___runtime_7.9.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz"; + sha1 = "d90df0583a3a252f09aaa619665367bae518db06"; + }; + } + { + name = "_babel_template___template_7.8.6.tgz"; + path = fetchurl { + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.0.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz"; + sha1 = "d3882c2830e513f4fe4cec9fe76ea1cc78747892"; + }; + } + { + name = "_babel_types___types_7.9.0.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz"; + sha1 = "00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"; }; } { @@ -850,11 +922,11 @@ }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.8.tgz"; - sha1 = "cb6d4dd3aeec45b6ff2d48c812317a6627618511"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.9.tgz"; + sha1 = "c865b9286c707407effcec99958043711367cd02"; }; } { @@ -994,11 +1066,11 @@ }; } { - name = "_reach_router___router_1.3.1.tgz"; + name = "_reach_router___router_1.3.3.tgz"; path = fetchurl { - name = "_reach_router___router_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.1.tgz"; - sha1 = "0a49f75fa9621323d6e21c803447bcfcde1713b2"; + name = "_reach_router___router_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.3.tgz"; + sha1 = "58162860dce6c9449d49be86b0561b5ef46d80db"; }; } { @@ -1154,11 +1226,11 @@ }; } { - name = "_types_babel__core___babel__core_7.1.5.tgz"; + name = "_types_babel__core___babel__core_7.1.6.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.5.tgz"; - sha1 = "e4d84704b4df868b3ad538365a13da2fa6dbc023"; + name = "_types_babel__core___babel__core_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz"; + sha1 = "16ff42a5ae203c9af1c6e190ed1f30f83207b610"; }; } { @@ -1186,11 +1258,19 @@ }; } { - name = "_types_cheerio___cheerio_0.22.16.tgz"; + name = "_types_cheerio___cheerio_0.22.17.tgz"; path = fetchurl { - name = "_types_cheerio___cheerio_0.22.16.tgz"; - url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.16.tgz"; - sha1 = "c748a97b8a6f781b04bbda4a552e11b35bcc77e4"; + name = "_types_cheerio___cheerio_0.22.17.tgz"; + url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.17.tgz"; + sha1 = "e54f71c3135f71ebc16c8dc62edad533872c9e72"; + }; + } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; }; } { @@ -1306,11 +1386,11 @@ }; } { - name = "_types_jquery___jquery_3.3.32.tgz"; + name = "_types_jquery___jquery_3.3.33.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.3.32.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.32.tgz"; - sha1 = "93e27fdc45dd38ee07f2f0acf34b59c1ccee036f"; + name = "_types_jquery___jquery_3.3.33.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.33.tgz"; + sha1 = "61d9cbd4004ffcdf6cf7e34720a87a5625a7d8e9"; }; } { @@ -1338,19 +1418,19 @@ }; } { - name = "_types_node___node_13.7.4.tgz"; + name = "_types_node___node_13.9.2.tgz"; path = fetchurl { - name = "_types_node___node_13.7.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz"; - sha1 = "76c3cb3a12909510f52e5dc04a6298cdf9504ffd"; + name = "_types_node___node_13.9.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz"; + sha1 = "ace1880c03594cc3e80206d96847157d8e7fa349"; }; } { - name = "_types_node___node_12.12.28.tgz"; + name = "_types_node___node_12.12.30.tgz"; path = fetchurl { - name = "_types_node___node_12.12.28.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz"; - sha1 = "3a2b5f8d21f96ace690a8832ae9779114612575f"; + name = "_types_node___node_12.12.30.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz"; + sha1 = "3501e6f09b954de9c404671cefdbcc5d9d7c45f6"; }; } { @@ -1378,11 +1458,11 @@ }; } { - name = "_types_reach__router___reach__router_1.3.0.tgz"; + name = "_types_reach__router___reach__router_1.3.1.tgz"; path = fetchurl { - name = "_types_reach__router___reach__router_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.0.tgz"; - sha1 = "4c05a947ccecca05c72bb335a0f7bb43fec12446"; + name = "_types_reach__router___reach__router_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.1.tgz"; + sha1 = "ca8b431acb12bb897d2b806f6fdd815f056d6d02"; }; } { @@ -1418,35 +1498,35 @@ }; } { - name = "_types_react___react_16.9.21.tgz"; + name = "_types_react___react_16.9.25.tgz"; path = fetchurl { - name = "_types_react___react_16.9.21.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.21.tgz"; - sha1 = "99e274e2ecfab6bb93920e918341daa3198b348d"; + name = "_types_react___react_16.9.25.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.25.tgz"; + sha1 = "6ae2159b40138c792058a23c3c04fd3db49e929e"; }; } { - name = "_types_reactstrap___reactstrap_8.4.1.tgz"; + name = "_types_reactstrap___reactstrap_8.4.2.tgz"; path = fetchurl { - name = "_types_reactstrap___reactstrap_8.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.1.tgz"; - sha1 = "6dff4d1fdf59233877925e3caec406272050b632"; + name = "_types_reactstrap___reactstrap_8.4.2.tgz"; + url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.2.tgz"; + sha1 = "e7066d0e67e2924dab0a52c6aedcf922f2be53b6"; }; } { - name = "_types_sanitize_html___sanitize_html_1.20.2.tgz"; + name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; path = fetchurl { - name = "_types_sanitize_html___sanitize_html_1.20.2.tgz"; - url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.20.2.tgz"; - sha1 = "59777f79f015321334e3a9f28882f58c0a0d42b8"; + name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.22.0.tgz"; + sha1 = "9bf3a13aeab6e38d130d8ba34bb443956b75bc3d"; }; } { - name = "_types_sinon___sinon_7.5.1.tgz"; + name = "_types_sinon___sinon_7.5.2.tgz"; path = fetchurl { - name = "_types_sinon___sinon_7.5.1.tgz"; - url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.1.tgz"; - sha1 = "d27b81af0d1cfe1f9b24eebe7a24f74ae40f5b7c"; + name = "_types_sinon___sinon_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.2.tgz"; + sha1 = "5e2f1d120f07b9cda07e5dedd4f3bf8888fccdb9"; }; } { @@ -1490,35 +1570,35 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.20.0.tgz"; - sha1 = "a522d0e1e4898f7c9c6a8e1ed3579b60867693fa"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz"; + sha1 = "a86cf618c965a462cddf3601f594544b134d6d68"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.20.0.tgz"; - sha1 = "3b6fa5a6b8885f126d5a4280e0d44f0f41e73e32"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz"; + sha1 = "a5cb2ed89fedf8b59638dc83484eb0c8c35e1143"; }; } { - name = "_typescript_eslint_parser___parser_2.20.0.tgz"; + name = "_typescript_eslint_parser___parser_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.20.0.tgz"; - sha1 = "608e5bb06ba98a415b64ace994c79ab20f9772a9"; + name = "_typescript_eslint_parser___parser_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz"; + sha1 = "2cf0eae6e6dd44d162486ad949c126b887f11eb8"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.20.0.tgz"; - sha1 = "90a0f5598826b35b966ca83483b1a621b1a4d0c9"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz"; + sha1 = "38bbc8bb479790d2f324797ffbcdb346d897c62a"; }; } { @@ -1690,14 +1770,6 @@ }; } { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; - }; - } - { name = "accepts___accepts_1.3.7.tgz"; path = fetchurl { name = "accepts___accepts_1.3.7.tgz"; @@ -1714,11 +1786,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz"; - sha1 = "294adb71b57398b0680015f0a38c563ee1db5384"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -1730,27 +1802,27 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.4.0.tgz"; + name = "acorn___acorn_6.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz"; - sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"; + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { - name = "acorn___acorn_7.1.0.tgz"; + name = "acorn___acorn_7.1.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz"; - sha1 = "949d36f2c292535da602283586c2477c57eb2d6c"; + name = "acorn___acorn_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; + sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; }; } { @@ -1802,11 +1874,11 @@ }; } { - name = "ajv___ajv_6.11.0.tgz"; + name = "ajv___ajv_6.12.0.tgz"; path = fetchurl { - name = "ajv___ajv_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; - sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; + name = "ajv___ajv_6.12.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; + sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7"; }; } { @@ -1834,11 +1906,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz"; - sha1 = "a4ce2b33d6b214b7950d8595c212f12ac9cc569d"; + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; }; } { @@ -1898,6 +1970,14 @@ }; } { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } + { name = "anymatch___anymatch_2.0.0.tgz"; path = fetchurl { name = "anymatch___anymatch_2.0.0.tgz"; @@ -1922,14 +2002,6 @@ }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; - }; - } - { name = "argparse___argparse_1.0.10.tgz"; path = fetchurl { name = "argparse___argparse_1.0.10.tgz"; @@ -2050,11 +2122,11 @@ }; } { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; path = fetchurl { - name = "array.prototype.find___array.prototype.find_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.0.tgz"; - sha1 = "630f2eaf70a39e608ac3573e45cf8ccd0ede9ad7"; + name = "array.prototype.find___array.prototype.find_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.1.1.tgz"; + sha1 = "3baca26108ca7affb08db06bf0be6cb3115a969c"; }; } { @@ -2330,11 +2402,11 @@ }; } { - name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.1.tgz"; - sha1 = "d1ceb47cbe48b285fdd5c562c54c432ed5a41e0e"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.2.tgz"; + sha1 = "54775d976588a8a6d1a99201a702befecaf48030"; }; } { @@ -2506,11 +2578,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; - sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } { @@ -2570,19 +2642,11 @@ }; } { - name = "browserslist___browserslist_4.8.6.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.8.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz"; - sha1 = "96406f3f5f0755d272e27a66f4163ca821590a7e"; - }; - } - { - name = "browserslist___browserslist_4.8.7.tgz"; + name = "browserslist___browserslist_4.10.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.8.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz"; - sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0"; + name = "browserslist___browserslist_4.10.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz"; + sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"; }; } { @@ -2746,11 +2810,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz"; - sha1 = "f2241242ac70e0fa9cda55c2776d32a0867971c2"; + name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz"; + sha1 = "2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"; }; } { @@ -2794,6 +2858,14 @@ }; } { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { name = "chardet___chardet_0.7.0.tgz"; path = fetchurl { name = "chardet___chardet_0.7.0.tgz"; @@ -2978,6 +3050,14 @@ }; } { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; @@ -3130,14 +3210,6 @@ }; } { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; - }; - } - { name = "constants_browserify___constants_browserify_1.0.0.tgz"; path = fetchurl { name = "constants_browserify___constants_browserify_1.0.0.tgz"; @@ -3218,11 +3290,11 @@ }; } { - name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; + name = "copy_to_clipboard___copy_to_clipboard_3.3.1.tgz"; path = fetchurl { - name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.1.tgz"; - sha1 = "b1a1137100e5665d5a96015cb579e30e90e07c44"; + name = "copy_to_clipboard___copy_to_clipboard_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz"; + sha1 = "115aa1a9998ffab6196f93076ad6da3b913662ae"; }; } { @@ -3234,6 +3306,14 @@ }; } { + name = "core_js_pure___core_js_pure_3.6.4.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.6.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz"; + sha1 = "4bf1ba866e25814f149d4e9aaa08c36173506e3a"; + }; + } + { name = "core_js___core_js_2.6.11.tgz"; path = fetchurl { name = "core_js___core_js_2.6.11.tgz"; @@ -3658,14 +3738,6 @@ }; } { - name = "deep_extend___deep_extend_0.6.0.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; - }; - } - { name = "deep_is___deep_is_0.1.3.tgz"; path = fetchurl { name = "deep_is___deep_is_0.1.3.tgz"; @@ -3730,14 +3802,6 @@ }; } { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - } - { name = "depd___depd_1.1.2.tgz"; path = fetchurl { name = "depd___depd_1.1.2.tgz"; @@ -3762,14 +3826,6 @@ }; } { - name = "detect_libc___detect_libc_1.0.3.tgz"; - path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - } - { name = "detect_newline___detect_newline_2.1.0.tgz"; path = fetchurl { name = "detect_newline___detect_newline_2.1.0.tgz"; @@ -3954,6 +4010,14 @@ }; } { + name = "domhandler___domhandler_3.0.0.tgz"; + path = fetchurl { + name = "domhandler___domhandler_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz"; + sha1 = "51cd13efca31da95bbb0c5bee3a48300e333b3e9"; + }; + } + { name = "domutils___domutils_1.5.1.tgz"; path = fetchurl { name = "domutils___domutils_1.5.1.tgz"; @@ -3970,6 +4034,14 @@ }; } { + name = "domutils___domutils_2.0.0.tgz"; + path = fetchurl { + name = "domutils___domutils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz"; + sha1 = "15b8278e37bfa8468d157478c58c367718133c08"; + }; + } + { name = "dot_case___dot_case_3.0.3.tgz"; path = fetchurl { name = "dot_case___dot_case_3.0.3.tgz"; @@ -4042,11 +4114,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.356.tgz"; - sha1 = "fb985ee0f3023e6e11b97547ff3f738bdd8643d2"; + name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.380.tgz"; + sha1 = "1e1f07091b42b54bccd0ad6d3a14f2b73b60dc9d"; }; } { @@ -4266,11 +4338,11 @@ }; } { - name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz"; - sha1 = "135110ba56a9e378f7acfe5f36e2ae76a2317899"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz"; + sha1 = "698bf7aeee27f0cea0139eaef261c7bf7dd623df"; }; } { @@ -4362,11 +4434,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz"; - sha1 = "8be671b7f6be095098e79d27ac32f9580f599bc8"; + name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz"; + sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } { @@ -4410,11 +4482,11 @@ }; } { - name = "espree___espree_6.1.2.tgz"; + name = "espree___espree_6.2.1.tgz"; path = fetchurl { - name = "espree___espree_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; - sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; + name = "espree___espree_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; + sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } { @@ -4762,11 +4834,11 @@ }; } { - name = "find_cache_dir___find_cache_dir_3.2.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz"; - sha1 = "e7fe44c1abc1299f516146e563108fd1006c1874"; + 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"; }; } { @@ -4946,14 +5018,6 @@ }; } { - name = "fs_minipass___fs_minipass_1.2.7.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz"; - sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7"; - }; - } - { name = "fs_minipass___fs_minipass_2.1.0.tgz"; path = fetchurl { name = "fs_minipass___fs_minipass_2.1.0.tgz"; @@ -4986,11 +5050,11 @@ }; } { - name = "fsevents___fsevents_1.2.11.tgz"; + name = "fsevents___fsevents_1.2.12.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.11.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; - sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3"; + name = "fsevents___fsevents_1.2.12.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz"; + sha1 = "db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"; }; } { @@ -5034,14 +5098,6 @@ }; } { - name = "gauge___gauge_2.7.4.tgz"; - path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - } - { name = "gensync___gensync_1.0.0_beta.1.tgz"; path = fetchurl { name = "gensync___gensync_1.0.0_beta.1.tgz"; @@ -5162,11 +5218,11 @@ }; } { - name = "globals___globals_12.3.0.tgz"; + name = "globals___globals_12.4.0.tgz"; path = fetchurl { - name = "globals___globals_12.3.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; - sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; }; } { @@ -5282,14 +5338,6 @@ }; } { - name = "has_unicode___has_unicode_2.0.1.tgz"; - path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; - }; - } - { name = "has_value___has_value_0.3.1.tgz"; path = fetchurl { name = "has_value___has_value_0.3.1.tgz"; @@ -5370,11 +5418,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.5.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz"; - sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -5434,11 +5482,11 @@ }; } { - name = "html_escaper___html_escaper_2.0.0.tgz"; + name = "html_escaper___html_escaper_2.0.1.tgz"; path = fetchurl { - name = "html_escaper___html_escaper_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz"; - sha1 = "71e87f931de3fe09e56661ab9a29aadec707b491"; + name = "html_escaper___html_escaper_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.1.tgz"; + sha1 = "beed86b5d2b921e92533aa11bce6d8e3b583dee7"; }; } { @@ -5466,6 +5514,14 @@ }; } { + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz"; + sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; + }; + } + { name = "http_deceiver___http_deceiver_1.2.7.tgz"; path = fetchurl { name = "http_deceiver___http_deceiver_1.2.7.tgz"; @@ -5586,14 +5642,6 @@ }; } { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37"; - }; - } - { name = "ignore___ignore_3.3.10.tgz"; path = fetchurl { name = "ignore___ignore_3.3.10.tgz"; @@ -5738,6 +5786,14 @@ }; } { + name = "inquirer___inquirer_7.1.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; + sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; + }; + } + { name = "internal_ip___internal_ip_4.3.0.tgz"; path = fetchurl { name = "internal_ip___internal_ip_4.3.0.tgz"; @@ -5786,14 +5842,6 @@ }; } { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz"; - sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; - }; - } - { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; @@ -6730,11 +6778,11 @@ }; } { - name = "json5___json5_2.1.1.tgz"; + name = "json5___json5_2.1.2.tgz"; path = fetchurl { - name = "json5___json5_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz"; - sha1 = "81b6cb04e9ba496f1c7005d07b4368a2638f90b6"; + name = "json5___json5_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz"; + sha1 = "43ef1f0af9835dd624751a6b7fa48874fb2d608e"; }; } { @@ -6770,11 +6818,11 @@ }; } { - name = "just_extend___just_extend_4.0.2.tgz"; + name = "just_extend___just_extend_4.1.0.tgz"; path = fetchurl { - name = "just_extend___just_extend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz"; - sha1 = "f3f47f7dfca0f989c55410a7ebc8854b07108afc"; + name = "just_extend___just_extend_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz"; + sha1 = "7278a4027d889601640ee0ce0e5a00b992467da4"; }; } { @@ -6922,11 +6970,11 @@ }; } { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; path = fetchurl { - name = "loader_fs_cache___loader_fs_cache_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz"; - sha1 = "54cedf6b727e1779fd8f01205f05f6e88706f086"; + name = "loader_fs_cache___loader_fs_cache_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha1 = "f08657646d607078be2f0a032f8bd69dd6f277d9"; }; } { @@ -7394,19 +7442,11 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.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.2.0.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { @@ -7434,14 +7474,6 @@ }; } { - name = "minipass___minipass_2.9.0.tgz"; - path = fetchurl { - name = "minipass___minipass_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz"; - sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6"; - }; - } - { name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { name = "minipass___minipass_3.1.1.tgz"; @@ -7450,14 +7482,6 @@ }; } { - name = "minizlib___minizlib_1.3.3.tgz"; - path = fetchurl { - name = "minizlib___minizlib_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz"; - sha1 = "2290de96818a34c29551c8a8d301216bd65a861d"; - }; - } - { name = "mississippi___mississippi_3.0.0.tgz"; path = fetchurl { name = "mississippi___mississippi_3.0.0.tgz"; @@ -7482,11 +7506,11 @@ }; } { - name = "mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp___mkdirp_0.5.3.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp___mkdirp_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz"; + sha1 = "5a514b7179259287952881e94410ec5465659f8c"; }; } { @@ -7498,11 +7522,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.27.tgz"; + name = "moment_timezone___moment_timezone_0.5.28.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.27.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz"; - sha1 = "73adec8139b6fe30452e78f210f27b1f346b8877"; + name = "moment_timezone___moment_timezone_0.5.28.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.28.tgz"; + sha1 = "f093d789d091ed7b055d82aa81a82467f72e4338"; }; } { @@ -7610,14 +7634,6 @@ }; } { - name = "needle___needle_2.3.2.tgz"; - path = fetchurl { - name = "needle___needle_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; - sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; - }; - } - { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; @@ -7714,27 +7730,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; - path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83"; - }; - } - { - name = "node_releases___node_releases_1.1.49.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.49.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz"; - sha1 = "67ba5a3fac2319262675ef864ed56798bb33b93e"; - }; - } - { - name = "nopt___nopt_4.0.1.tgz"; + name = "node_releases___node_releases_1.1.52.tgz"; path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + name = "node_releases___node_releases_1.1.52.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz"; + sha1 = "bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"; }; } { @@ -7786,30 +7786,6 @@ }; } { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - path = fetchurl { - name = "npm_bundled___npm_bundled_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b"; - }; - } - { - name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; - path = fetchurl { - name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; - sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2"; - }; - } - { - name = "npm_packlist___npm_packlist_1.4.8.tgz"; - path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz"; - sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"; - }; - } - { name = "npm_run_path___npm_run_path_2.0.2.tgz"; path = fetchurl { name = "npm_run_path___npm_run_path_2.0.2.tgz"; @@ -7818,14 +7794,6 @@ }; } { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; - }; - } - { name = "nth_check___nth_check_1.0.2.tgz"; path = fetchurl { name = "nth_check___nth_check_1.0.2.tgz"; @@ -8018,11 +7986,11 @@ }; } { - name = "open___open_7.0.2.tgz"; + name = "open___open_7.0.3.tgz"; path = fetchurl { - name = "open___open_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.0.2.tgz"; - sha1 = "fb3681f11f157f2361d2392307548ca1792960e8"; + name = "open___open_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; + sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; }; } { @@ -8066,14 +8034,6 @@ }; } { - name = "os_homedir___os_homedir_1.0.2.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - } - { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { name = "os_locale___os_locale_3.1.0.tgz"; @@ -8090,14 +8050,6 @@ }; } { - name = "osenv___osenv_0.1.5.tgz"; - path = fetchurl { - name = "osenv___osenv_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; - sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; - }; - } - { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { name = "p_defer___p_defer_1.0.0.tgz"; @@ -8466,11 +8418,11 @@ }; } { - name = "picomatch___picomatch_2.2.1.tgz"; + name = "picomatch___picomatch_2.2.2.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz"; - sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a"; + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; }; } { @@ -8922,11 +8874,11 @@ }; } { - name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz"; - sha1 = "33d4fc946602eb5e9355c4165d68a10727689dba"; + name = "postcss_modules_scope___postcss_modules_scope_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha1 = "385cae013cc7743f5a7d7602d1073a89eaae62ee"; }; } { @@ -9306,19 +9258,19 @@ }; } { - name = "promise___promise_8.0.3.tgz"; + name = "promise___promise_8.1.0.tgz"; path = fetchurl { - name = "promise___promise_8.0.3.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-8.0.3.tgz"; - sha1 = "f592e099c6cddc000d538ee7283bb190452b0bf6"; + name = "promise___promise_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz"; + sha1 = "697c25c3dfe7435dd79fcd58c38a135888eaf05e"; }; } { - name = "prompts___prompts_2.3.1.tgz"; + name = "prompts___prompts_2.3.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz"; - sha1 = "b63a9ce2809f106fa9ae1277c275b167af46ea05"; + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; }; } { @@ -9338,11 +9290,11 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz"; - sha1 = "34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"; + name = "proxy_addr___proxy_addr_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; }; } { @@ -9538,14 +9490,6 @@ }; } { - name = "rc___rc_1.2.8.tgz"; - path = fetchurl { - name = "rc___rc_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; - }; - } - { name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; path = fetchurl { name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; @@ -9562,35 +9506,35 @@ }; } { - name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; path = fetchurl { - name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.0.tgz"; - sha1 = "b11cc48aa2be2502fb3c27a50d1dfa95cfa9dfe0"; + name = "react_dev_utils___react_dev_utils_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; + sha1 = "f6de325ae25fa4d546d09df4bb1befdc6dd19c19"; }; } { - name = "react_dom___react_dom_16.12.0.tgz"; + name = "react_dom___react_dom_16.13.1.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz"; - sha1 = "0da4b714b8d13c2038c9396b54a92baea633fe11"; + name = "react_dom___react_dom_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.13.1.tgz"; + sha1 = "c1bd37331a0486c078ee54c4740720993b2e0e7f"; }; } { - name = "react_error_overlay___react_error_overlay_6.0.6.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.6.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz"; - sha1 = "ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2"; + name = "react_error_overlay___react_error_overlay_6.0.7.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz"; + sha1 = "1dcfb459ab671d53f660a991513cb2f0a0553108"; }; } { - name = "react_is___react_is_16.12.0.tgz"; + name = "react_is___react_is_16.13.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz"; - sha1 = "2cc0fe0fba742d97fd527c42a13bec4eeb06241c"; + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; }; } { @@ -9626,11 +9570,11 @@ }; } { - name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz"; - sha1 = "11417ffda579306d4e841a794d32140f3da1b43f"; + name = "react_test_renderer___react_test_renderer_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz"; + sha1 = "de25ea358d9012606de51e012d9742e7f0deabc1"; }; } { @@ -9642,11 +9586,11 @@ }; } { - name = "react___react_16.12.0.tgz"; + name = "react___react_16.13.1.tgz"; path = fetchurl { - name = "react___react_16.12.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz"; - sha1 = "0c0a9c6a142429e3614834d5a778e18aa78a0b83"; + name = "react___react_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz"; + sha1 = "2e818822f1a9743122c063d6410d85c1e3afe48e"; }; } { @@ -9746,11 +9690,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; }; } { @@ -9770,19 +9714,19 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; }; } { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; - sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; }; } { @@ -9826,11 +9770,11 @@ }; } { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; - sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; }; } { @@ -9842,11 +9786,11 @@ }; } { - name = "regjsparser___regjsparser_0.6.3.tgz"; + name = "regjsparser___regjsparser_0.6.4.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; - sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; }; } { @@ -10114,11 +10058,11 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "run_async___run_async_2.4.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_async___run_async_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; + sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8"; }; } { @@ -10178,11 +10122,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.21.1.tgz"; + name = "sanitize_html___sanitize_html_1.22.1.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.21.1.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.21.1.tgz"; - sha1 = "1647d15c0c672901aa41eac1b86d0c38146d30ce"; + name = "sanitize_html___sanitize_html_1.22.1.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz"; + sha1 = "5b36c92ab27917ddd2775396815c2bc1a6268310"; }; } { @@ -10218,11 +10162,11 @@ }; } { - name = "scheduler___scheduler_0.18.0.tgz"; + name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz"; - sha1 = "5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"; + name = "scheduler___scheduler_0.19.1.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; + sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; }; } { @@ -10234,11 +10178,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.4.tgz"; + name = "schema_utils___schema_utils_2.6.5.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; - sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; + name = "schema_utils___schema_utils_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz"; + sha1 = "c758f0a7e624263073d396e29cd40aa101152d8a"; }; } { @@ -10458,11 +10402,11 @@ }; } { - name = "sisteransi___sisteransi_1.0.4.tgz"; + name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz"; - sha1 = "386713f1ef688c7c0304dc4c0632898941cad2e3"; + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; }; } { @@ -10658,11 +10602,11 @@ }; } { - name = "srcset___srcset_1.0.0.tgz"; + name = "srcset___srcset_2.0.1.tgz"; path = fetchurl { - name = "srcset___srcset_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz"; - sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; + name = "srcset___srcset_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz"; + sha1 = "8f842d357487eb797f413d9c309de7a5149df5ac"; }; } { @@ -10938,14 +10882,6 @@ }; } { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; - }; - } - { name = "style_loader___style_loader_0.23.1.tgz"; path = fetchurl { name = "style_loader___style_loader_0.23.1.tgz"; @@ -10994,11 +10930,11 @@ }; } { - name = "svg_parser___svg_parser_2.0.3.tgz"; + name = "svg_parser___svg_parser_2.0.4.tgz"; path = fetchurl { - name = "svg_parser___svg_parser_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.3.tgz"; - sha1 = "a38f2e4e5442986f7ecb554c11f1411cfcf8c2b9"; + name = "svg_parser___svg_parser_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz"; + sha1 = "fdc2e29e13951736140b76cb122c8ee6630eb6b5"; }; } { @@ -11034,14 +10970,6 @@ }; } { - name = "tar___tar_4.4.13.tgz"; - path = fetchurl { - name = "tar___tar_4.4.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; - sha1 = "43b364bc52888d555298637b10d60790254ab525"; - }; - } - { name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; path = fetchurl { name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; @@ -11074,11 +11002,11 @@ }; } { - name = "terser___terser_4.6.3.tgz"; + name = "terser___terser_4.6.7.tgz"; path = fetchurl { - name = "terser___terser_4.6.3.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz"; - sha1 = "e33aa42461ced5238d352d2df2a67f21921f8d87"; + name = "terser___terser_4.6.7.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz"; + sha1 = "478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"; }; } { @@ -11258,19 +11186,19 @@ }; } { - name = "ts_pnp___ts_pnp_1.1.6.tgz"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; - sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; + name = "ts_pnp___ts_pnp_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz"; + sha1 = "a500ad084b0798f1c3071af391e65912c86bca92"; }; } { - name = "tslib___tslib_1.11.0.tgz"; + name = "tslib___tslib_1.11.1.tgz"; path = fetchurl { - name = "tslib___tslib_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz"; - sha1 = "f1f3528301621a53220d58373ae510ff747a66bc"; + name = "tslib___tslib_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; + sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; }; } { @@ -11322,6 +11250,14 @@ }; } { + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + }; + } + { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { name = "type_fest___type_fest_0.8.1.tgz"; @@ -11370,11 +11306,11 @@ }; } { - name = "typescript___typescript_3.8.2.tgz"; + name = "typescript___typescript_3.8.3.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz"; - sha1 = "91d6868aaead7da74f493c553aeff76c0c0b1d5a"; + name = "typescript___typescript_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; + sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; }; } { @@ -11394,19 +11330,19 @@ }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; }; } { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha1 = "a9cc6cc7ce63a0a3023fc99e341b94431d405a57"; + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; }; } { @@ -11650,11 +11586,11 @@ }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; - sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } { @@ -11842,14 +11778,6 @@ }; } { - name = "wide_align___wide_align_1.1.3.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; - }; - } - { name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { name = "word_wrap___word_wrap_1.2.3.tgz"; @@ -12058,11 +11986,11 @@ }; } { - name = "ws___ws_7.2.1.tgz"; + name = "ws___ws_7.2.3.tgz"; path = fetchurl { - name = "ws___ws_7.2.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz"; - sha1 = "03ed52423cd744084b2cf42ed197c8b65a936b8e"; + name = "ws___ws_7.2.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz"; + sha1 = "a5411e1fb04d5ed0efee76d26d5c46d830c39b46"; }; } { @@ -12082,6 +12010,14 @@ }; } { + name = "xregexp___xregexp_4.3.0.tgz"; + path = fetchurl { + name = "xregexp___xregexp_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; + sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; + }; + } + { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { name = "xtend___xtend_4.0.2.tgz"; @@ -12114,11 +12050,11 @@ }; } { - name = "yaml___yaml_1.7.2.tgz"; + name = "yaml___yaml_1.8.3.tgz"; path = fetchurl { - name = "yaml___yaml_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; - sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2"; + name = "yaml___yaml_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.8.3.tgz"; + sha1 = "2f420fca58b68ce3a332d0ca64be1d191dd3f87a"; }; } { @@ -12130,11 +12066,11 @@ }; } { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { @@ -12146,11 +12082,11 @@ }; } { - name = "yargs___yargs_13.3.0.tgz"; + name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { - name = "yargs___yargs_13.3.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz"; - sha1 = "4c657a55e07e5f2cf947f8a366567c04a0dedc83"; + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; }; } ]; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index f307032f414..a6122b31753 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "152ic9pga0wjg4r7b66hdnbsj9wrzfzbbps7wjas3rcbcv1f2i90"; + sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; }; - modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c"; + modSha256 = "0c8gc4qzdazxxnabfms63df8vlf2iy6iy0jrm710x76m4vm6mrbj"; subPackages = "cmd/thanos"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 065af0079b0..9f0be68e168 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -16,7 +16,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' - mkdir $out + mkdir -p $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; @@ -37,7 +37,7 @@ in stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin $out/public - makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \ + makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \ --add-flags "-p $out/public" ln -s ${backend.out}/index.html $out/public/index.html ln -s ${frontend.out}/bower_components $out/public/bower_components diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 09f43c755f1..f112598da6a 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 697492d9627..b8f8ca33b0e 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 4046cc7d8bb..25b7325bba2 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2b7fb972c90..c75df46cf04 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,16 +1,16 @@ generic: { v44 = generic { - version = "4.4.7"; - sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9"; + version = "4.4.8"; + sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; }; v40 = generic { - version = "4.0.19"; - sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr"; + version = "4.0.20"; + sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; }; v30 = generic { - version = "3.0.30"; - sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07"; + version = "3.0.31"; + sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm"; }; } diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index c4cf5d044da..ca48a72d9fe 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d5a3b9de3c0..8d862373b99 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -103,13 +103,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.21"; + version = "0.21.23"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng"; + sha256 = "0jnhjhm1ilpcwb4f58b8pgyzjq3dlr0j2xyk0zck0afwkdxyj9cb"; }; buildInputs = [ glib boost ] diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index e9bd705ffa9..769a8605f03 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -15,8 +15,8 @@ buildGoPackage rec { }; postInstall = '' - mkdir -p $bin/share - cp -R $src/frontend $bin/share + mkdir -p $out/share + cp -R $src/frontend $out/share ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 9c99faca484..46416c98276 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; + sha256 = "1qbaibmbiw3pffi0cm6d06k1gra4acgxr97gj7f1ckvql5rni4h0"; }; - cargoSha256 = "1chf1l9jlnhi9cyqpmcz8yfzwzmkn4lfxqhdhclvl8j4b2zvbcgc"; + cargoSha256 = "138h99l3vv34higbqj59fa88w7c63c80g3rw07n9j2f834cvr901"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 44c9676fc77..300d341cf88 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -42,11 +42,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.1"; + version = "4.12.2"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "0xbdf9651lm4b5g60ly40nc7r8gssvnvq7m3pdma99mdcs5vcz01"; + sha256 = "0l514s2xhsy1lspzgvibbzs80zi84zxr2wx4d40hq85yb2lg5434"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 40d59611da2..b53a207a6c5 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr"; + sha256 = "0851sdzgg5krf05b1pg29gmwzvzxvawfp37ny3lrb5xcdqbr379c"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 0da61861207..73aa349a517 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.5.0"; + version = "8.5.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y"; + sha256 = "02sa0sldsfajryyfndv587qw69q8y8igfpimg98w1g3vndrq1dj7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index cd98af51e08..3bf72043ec5 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.21.22"; + version = "0.21.30"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "16jwvg9mcv0yr94ldncfs6bczyv4n3q9v7g7v0ssrkrnkxh722zx"; + sha256 = "19j0hm2d2q279kzmdjbjgfhjwcp7071a2mmvsnb0167wdyaq4bcf"; }; dontBuild = true; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 04ad685403b..46ef6bcfac5 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -8,6 +8,7 @@ , SystemConfiguration , modules ? null +, nixosTests }: let @@ -89,12 +90,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "1fmrm51zgrasjbmhs0pzb1lyca3ddx0wd35shvxnkjnifi8qd1h7"; + sha256 = "0rp4sxqxd2wsb5iyv0mh11l16zxvh7rbgfg0vcgns823gvh8lqai"; }; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl @@ -129,6 +130,8 @@ stdenv.mkDerivation rec { cp -r conf $out/share/freeswitch/ ''; + passthru.tests.freeswitch = nixosTests.freeswitch; + meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = "https://freeswitch.org/"; diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index fb62ee58474..2ce8e901e86 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D cockroachoss $bin/bin/cockroach + install -D cockroachoss $out/bin/cockroach installShellCompletion cockroach.bash mkdir -p $man/share/man @@ -51,11 +51,7 @@ buildGoPackage rec { runHook postInstall ''; - # Unfortunately we have to keep an empty reference to $out, because it seems - # buildGoPackages only nukes references to the go compiler under $bin, effectively - # making all binary output under $bin mandatory. Ideally, we would just use - # $out and $man and remove $bin since there's no point in an empty path. :( - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; meta = with stdenv.lib; { homepage = "https://www.cockroachlabs.com"; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 6f7f81f2378..4015e2097ee 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.15.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0av21czfxpwy4y7n9x6hy6m2fliqcazjx7ww0rwm6kdwxipq1xsz"; + sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "0c120gkkswg0cqvvhjkxvalr4fsjv81khwg0x0fm8fr6lipkfksn"; + modSha256 = "1fx830dif9cq2rvigdbqbc3vmmq01ywj9b095adbrwddvay8m8si"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ea11faf1efc..9b5118eacc3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -101,6 +101,15 @@ common = rec { # attributes common to both builds passthru.mysqlVersion = "5.7"; + passthru.tests = { + mariadb-galera-mariabackup = nixosTests.mariadb-galera-mariabackup; + mariadb-galera-rsync = nixosTests.mariadb-galera-rsync; + mysql = nixosTests.mysql; + mysql-autobackup = nixosTests.mysql-autobackup; + mysql-backup = nixosTests.mysql-backup; + mysql-replication = nixosTests.mysql-replication; + }; + meta = { description = "An enhanced, drop-in replacement for MySQL"; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index a9fc3fd1a17..1634b0b5b74 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "0w0mz4a1cyxdsqmv7jrkw163jll8ir5zmf93zcidlqx13knrk80g"; + sha256 = "0iw0ra9fya4bf1vkjq3w5kij4x46yinb90v015pi9c6qfpancfdj"; }; # cdiff renamed to ydiff; remove when patroni source reflects this. diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index f71afc2b674..0a6d1a8cf61 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v"; + sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 257af21cec9..168cee9711b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "128bfxy7aabyvlcrzdi20f51k9xxgynd76f01v6w1314wrjg2r8f"; + sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index ee59e683ce8..314e9275c8c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.3.0"; + version = "4.3.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1zkjz4hkjqzg0j7i7bjxgdcv2kfcgqwahirh06yag6hvm4qf9y9w"; + sha256 = "12mfydlva05dczjhrw14xq9zr0hqqyszlwivvq2zj9h1p9agm7fn"; }; installPhase = '' diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index a5274c855f7..3e292d8740c 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "squid-4.10"; + pname = "squid"; + version = "4.11"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q"; + url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; + sha256 = "0z986kykx539wjqd7mr8y0abf3z6hz8byf8fmmbky9hh4ihlgnaf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 0487ed177d0..40b85fc949e 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1dcazssabqxr9wv3dds3z7ks3y628qa07vgnn3hpdwxzm2b2ma92"; + sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; }; - modSha256 = "0w3ssxvsmq8i6hbfmn4ig2x13i2nlqy5q1khcblf9pq5vhk202qx"; + modSha256 = "17imp24abfgh75g8161daknzqzk2m19q9d1mij6487046lk75hqz"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 503ff16caee..3e58edba42f 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -4,13 +4,18 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "9.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz"; - sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s"; - name = "${pname}-${version}.tgz"; - }; + version = "9.4.2"; + + src = { + i686-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz"; + sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; + }; + x86_64-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; + sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ makeWrapper ]; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` # script will correctly fall back to the JRE specified by JAVA_HOME - rm -rf $out/linux/jre-x64 $out/linux/jre-x86 + rm -rf $out/jre makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ @@ -32,6 +37,6 @@ stdenv.mkDerivation rec { description = "Universal Media Server: a DLNA-compliant UPnP Media Server"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thall ]; + maintainers = with stdenv.lib.maintainers; [ thall snicket2100 ]; }; } diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 372bda4061b..76d1a5f0b75 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.4"; - sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; + version = "3.13.5"; + sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; }; matomo-beta = { - version = "3.13.4"; + version = "3.13.5"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; + sha256 = "1b9a9jj86bb3f0093k6sz235iivvvqbcvkjqxwn7c9z7qsmpvbxr"; }; }; common = pname: { version, sha256, beta ? null }: diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 9cab8c4a9ba..ca4b5d832a6 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.4"; + version = "5.4.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "10zjgbr96ri87r5v7860vg5ndbnjfhjhily4m9nyl60f1lbjdhrr"; + sha256 = "0i9ndfhm9iwilqwbqs3dngmzzjmazw4vwbyccjabs3zmzliis6vv"; }; installPhase = '' diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 8463b1750d1..e5ef70e43a9 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { python3Packages.pexpect python3Packages.pytest bashInteractive + + # use xdist to speed up the test run, just like upstream: + # https://github.com/scop/bash-completion/blob/009bf2228c68894629eb6fd17b3dc0f1f6d67615/test/requirements.txt#L4 + python3Packages.pytest_xdist ]; # - ignore test_gcc on ARM because it assumes -march=native @@ -40,7 +44,7 @@ stdenv.mkDerivation rec { # - ignore test_ls because impure logic # - ignore test_screen because it assumes vt terminals exist checkPhase = '' - pytest . \ + pytest -n $NIX_BUILD_CORES . \ ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0f18eb79d2d..11d9e48008f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -16,6 +16,7 @@ , python3 , cmake +, runCommand , writeText , nixosTests , useOperatingSystemEtc ? true @@ -202,38 +203,41 @@ let passthru = { shellPath = "/bin/fish"; - tests.nixos = nixosTests.fish; + tests = { + nixos = nixosTests.fish; + + # Test the fish_config tool by checking the generated splash page. + # Since the webserver requires a port to run, it is not started. + fishConfig = + let fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + + # if we don't set `delete=False`, the file will get cleaned up + # automatically (leading the test to fail because there's no + # tempfile to check) + sed -e "s@, mode='w'@, mode='w', delete=False@" -i webconfig.py + + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/build/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' + + # cannot test the http server because it needs a localhost port + ''; + in + runCommand "test-web-config" { } '' + HOME=$(mktemp -d) + ${fish}/bin/fish ${fishScript} && touch $out + ''; + }; }; }; - - tests = { - - # Test the fish_config tool by checking the generated splash page. - # Since the webserver requires a port to run, it is not started. - fishConfig = - let - fishScript = writeText "test.fish" '' - set -x __fish_bin_dir ${fish}/bin - echo $__fish_bin_dir - cp -r ${fish}/share/fish/tools/web_config/* . - chmod -R +w * - # we delete everything after the fileurl is assigned - sed -e '/fileurl =/q' -i webconfig.py - echo "print(fileurl)" >> webconfig.py - # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' - - # cannot test the http server because it needs a localhost port - ''; - in '' - HOME=$(mktemp -d) - ${fish}/bin/fish ${fishScript} - ''; - }; - - # FIXME(Profpatsch) replace withTests stub - withTests = with lib; flip const; in -withTests tests fish +fish diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index b2f50c62dc4..682d88dbfbd 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "58"; + version = "59"; 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" ]; - sha256 = "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0"; + sha256 = "1flhsdfksvv9gmfkgjwgdia1irv53g9abmq3y22s5a5ycyx2hajr"; }; dontConfigure = true; diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index d4c18f9f581..a5c22d125af 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,21 +1,21 @@ -{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl -, darwin, makeWrapper, less, openssl_1_0_2, pam, lttng-ust }: +{ stdenv, lib, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl +, darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0jb2xm79m3m14zk7v730ai1zvxcb5a13jbkkya0qy7332k6gn6bl" - else if stdenv.isLinux then "0s0jvc9ha6fw8qy7f5n0v6zf043rawsjdlm5wvqxq1q2idz7xcw1" + platformSha = if stdenv.isDarwin then "0c71w6z6sc86si07i6vy4w3069jal7476wyiizyr7qjm9m22963f" + else if stdenv.isLinux then "0m13y66a6w64s31qbi3j5x8jll6dfrin890jah8kyncsvlyisqg3" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" else throw "unsupported platform"; - libraries = [ libunwind libuuid icu curl openssl_1_0_2 ] ++ + libraries = [ libunwind libuuid icu curl openssl_1_1 ] ++ (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); in stdenv.mkDerivation rec { pname = "powershell"; - version = "6.2.3"; + version = "7.0.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; @@ -26,21 +26,42 @@ stdenv.mkDerivation rec { buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' + installPhase = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + pslibs=$out/share/powershell + mkdir -p $pslibs + + cp -r * $pslibs + + rm -f $pslibs/libcrypto${ext}.1.0.0 + rm -f $pslibs/libssl${ext}.1.0.0 + + ls $pslibs + '' + lib.optionalString (!stdenv.isDarwin) '' + patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so + patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so + '' + '' + mkdir -p $out/bin - mkdir -p $out/share/powershell - cp -r * $out/share/powershell - makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \ + + makeWrapper $pslibs/pwsh $out/bin/pwsh \ --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; dontStrip = true; - meta = with stdenv.lib; { - description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework"; + doInstallCheck = true; + installCheck = '' + $out/bin/pwsh --help > /dev/null + ''; + + meta = with lib; { + description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; - maintainers = [ maintainers.yrashk ]; + maintainers = with maintainers; [ yrashk srgom ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; license = with licenses; [ mit ]; }; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index dc0a45c3e52..192e38b963d 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.17"; + version = "0.9.18"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "0ynfnphbp69am390m5zfzk5rzj1749vs7rzyq310f6mk7xdq6j4v"; + sha256 = "1zg5dl9qdysbaw2djy9f7f1ydp7vzjv840cjwqxlmg9615lgg7xa"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6e679f16e30..87ef5ecbde5 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-04-30"; + version = "2020-05-07"; pname = "oh-my-zsh"; - rev = "06b0276675e978d80535259915fbb44011e10101"; + rev = "b876198575cbf23d589ddc8da6b22254d3d5358b"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1y1c8v2akxwffrmcq8lmxvdnirqkxbxbrhcws76dlcgp2m3drvgq"; + sha256 = "0vx3pi9wk9crmwgkpd3nwp88ci6ly0savj6v2md7qazmimgffsfi"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index a11b280b047..09879451d8e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -49,6 +49,7 @@ in rec { # Configure Phase , configureFlags ? [] , cmakeFlags ? [] + , mesonFlags ? [] , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. # @@ -252,6 +253,32 @@ in rec { ++ 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}"; + + mesonFlags = if mesonFlags == null then null else let + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamily = platform: with platform; + /**/ if isAarch32 then "arm" + else if isAarch64 then "aarch64" + else if isx86_32 then "x86" + else if isx86_64 then "x86_64" + else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; + crossFile = builtins.toFile "cross-file.conf" ('' + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + '' + # TODO should have target prefix too, issue #86077 + + '' + + [binaries] + pkgconfig = 'pkg-config' + ''); + in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 8d4863757ad..2254f2e22d9 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.5"; + version = "2.8.6"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs"; + sha256 = "0zbs8vzbh89wxf36h9mvhin2p85n3jrsq6l5i40q1zkzgwi3648n"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 4af03111869..d0cb07197cd 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,21 +7,21 @@ rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.7"; + version = "2.8.11"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2"; + sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; }; })); ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.15"; + version = "2.7.17"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1kjqr35c11njyi3f2rjab6821bhqcrdykv4285q76gwv0qynigwr"; + sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; }; })); diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index 1f4315afc40..38762b6fd29 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -32,11 +32,11 @@ buildGoPackage rec { installPhase = if stdenv.isDarwin then '' - install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain + install -Dm755 -t $out/bin bin/docker-credential-osxkeychain '' else '' - install -Dm755 -t $bin/bin bin/docker-credential-pass - install -Dm755 -t $bin/bin bin/docker-credential-secretservice + install -Dm755 -t $out/bin bin/docker-credential-pass + install -Dm755 -t $out/bin bin/docker-credential-secretservice ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix new file mode 100644 index 00000000000..a408746c7fd --- /dev/null +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGo114Package, fetchFromGitHub }: + +buildGo114Package rec { + pname = "exoscale-cli"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "exoscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "04ym7mfv565icj3lmd2nrvq9asawwmmzg09681pj9py61ws56bxr"; + }; + + goPackagePath = "github.com/exoscale/cli"; + goDeps = ./deps.nix; + + # ensures only the cli binary is built and we don't clutter bin/ with submodules + subPackages = [ "." ]; + + # we need to rename the resulting binary but can't use buildFlags with -o here + # because these are passed to "go install" which does not recognize -o + postBuild = '' + mv go/bin/cli go/bin/exo + ''; + + meta = { + description = "Command-line tool for everything at Exoscale: compute, storage, dns"; + homepage = "https://github.com/exoscale/cli"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ dramaturg ]; + }; +} diff --git a/pkgs/tools/admin/exoscale-cli/deps.nix b/pkgs/tools/admin/exoscale-cli/deps.nix new file mode 100644 index 00000000000..a67ee93a851 --- /dev/null +++ b/pkgs/tools/admin/exoscale-cli/deps.nix @@ -0,0 +1,876 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "v1.1.1"; + sha256 = "14v2dy5gqchjn7k0sd6cx59ms42v681r6xz7cb1kspp4b28a74rw"; + }; + } + { + goPackagePath = "github.com/alecthomas/assert"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/assert"; + rev = "405dbfeb8e38"; + sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; + }; + } + { + goPackagePath = "github.com/alecthomas/chroma"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/chroma"; + rev = "v0.6.2"; + sha256 = "1bcppy1s148iikr78qjm0akahn01ywh83a8pw544prr9yc16jvmz"; + }; + } + { + goPackagePath = "github.com/alecthomas/colour"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/colour"; + rev = "60882d9e2721"; + sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; + }; + } + { + goPackagePath = "github.com/alecthomas/gometalinter"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/gometalinter"; + rev = "v2.0.11"; + sha256 = "08p7bwvhpgizif8qi59m8mm3mcny70x9msbk8m8vjpphsq55wha4"; + }; + } + { + goPackagePath = "github.com/alecthomas/kong"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kong"; + rev = "v0.1.15"; + sha256 = "1llxabcdzlb2hard0h931knqkdnyjyz8dp3k0nli0m0mags7l31b"; + }; + } + { + goPackagePath = "github.com/alecthomas/repr"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/repr"; + rev = "117648cd9897"; + sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "v3.5.1"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.0.0"; + sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.8"; + sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; + }; + } + { + goPackagePath = "github.com/cyberdelia/templates"; + fetch = { + type = "git"; + url = "https://github.com/cyberdelia/templates"; + rev = "ca7fffd4298c"; + sha256 = "1miakwci9pz95p0jps4i3pyv5ws713ks1wwir5bzrl0yg8klrgw1"; + }; + } + { + goPackagePath = "github.com/danwakefield/fnmatch"; + fetch = { + type = "git"; + url = "https://github.com/danwakefield/fnmatch"; + rev = "cbb64ac3d964"; + sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/deepmap/oapi-codegen"; + fetch = { + type = "git"; + url = "https://github.com/deepmap/oapi-codegen"; + rev = "ee90a3f9f1ae"; + sha256 = "199nb6aqhllkk891x24h1jffin1x9fx8jdsav9pbc2ki0z8mlji3"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "v1.1.6"; + sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/exoscale/egoscale"; + fetch = { + type = "git"; + url = "https://github.com/exoscale/egoscale"; + rev = "v0.24.0"; + sha256 = "1ls7blpmhwqxz9cfjc5799q4047pawfda1v1mhyicjdlp3b1z1zi"; + }; + } + { + goPackagePath = "github.com/fatih/camelcase"; + fetch = { + type = "git"; + url = "https://github.com/fatih/camelcase"; + rev = "v1.0.0"; + sha256 = "0z7rw6f5j97dkzqya257dqlxf3cm8zl508081gmnr4bsjhkwpz2l"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/getkin/kin-openapi"; + fetch = { + type = "git"; + url = "https://github.com/getkin/kin-openapi"; + rev = "v0.2.0"; + sha256 = "0slv4k55yiqgv5cv51mvfdcckl95wsbvhvrrpmh4wf7q9rk0jkf6"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-chi/chi"; + fetch = { + type = "git"; + url = "https://github.com/go-chi/chi"; + rev = "v4.0.2"; + sha256 = "1ay9yxzj60l21h4wayrq9sv5ajaqaryy5yyf27z7v2k4a83b5qr6"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.42.0"; + sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + }; + } + { + goPackagePath = "github.com/golangci/lint-1"; + fetch = { + type = "git"; + url = "https://github.com/golangci/lint-1"; + rev = "d2cdd8c08219"; + sha256 = "0viib12a61338411ng4nnd4na4fscsknghk397jdfn00sigyy4ls"; + }; + } + { + goPackagePath = "github.com/google/shlex"; + fetch = { + type = "git"; + url = "https://github.com/google/shlex"; + rev = "c34317bd91bf"; + sha256 = "00qivza4hkllfkar2vpqmyxybi0fwqipgijv61dgapq4xddxdq0r"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "d547d1d9531e"; + sha256 = "0rhgxfh8b3qq4imkw6dmv0hxsmflm9pkax8i7a9z8q464z1ixrz7"; + }; + } + { + goPackagePath = "github.com/gordonklaus/ineffassign"; + fetch = { + type = "git"; + url = "https://github.com/gordonklaus/ineffassign"; + rev = "1003c8bd00dc"; + sha256 = "1rkzqvd3z03vq8q8qi9cghvgggsf02ammj9wq8jvpnx6b2sd16nd"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/juju/ansiterm"; + fetch = { + type = "git"; + url = "https://github.com/juju/ansiterm"; + rev = "720a0952cc2a"; + sha256 = "0n6j0y7xhashp8gdkdl0r7vlbkdrkymrzxn9hxrx522k2isggs7h"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/labstack/echo"; + fetch = { + type = "git"; + url = "https://github.com/labstack/echo"; + rev = "v4.1.11"; + sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405"; + }; + } + { + goPackagePath = "github.com/labstack/gommon"; + fetch = { + type = "git"; + url = "https://github.com/labstack/gommon"; + rev = "v0.3.0"; + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; + }; + } + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/manifoldco/promptui"; + fetch = { + type = "git"; + url = "https://github.com/manifoldco/promptui"; + rev = "v0.3.2"; + sha256 = "185h0lqm14l9j0yvdsn9njq7jw3j6x3l21jvvczzbcbbrj44q0pl"; + }; + } + { + goPackagePath = "github.com/matryer/moq"; + fetch = { + type = "git"; + url = "https://github.com/matryer/moq"; + rev = "6cfb0558e1bd"; + sha256 = "0x7ss68cvq2aljyw4765iy7divmp8rghpyzlas3nb95qzsfmmpzl"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.4"; + sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.10"; + sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.3"; + sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + }; + } + { + goPackagePath = "github.com/minio/minio-go"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio-go"; + rev = "v6.0.44"; + sha256 = "0sfmd2lf24f7ds16imk63mas6izhjnmprbxad0sil9abvk8r23mk"; + }; + } + { + goPackagePath = "github.com/minio/sha256-simd"; + fetch = { + type = "git"; + url = "https://github.com/minio/sha256-simd"; + rev = "v0.1.1"; + sha256 = "1j0iqsckm97g4l79vd4mc7apbmkdar23jpzqpnpdhwpfd834j8lp"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/nicksnyder/go-i18n"; + fetch = { + type = "git"; + url = "https://github.com/nicksnyder/go-i18n"; + rev = "v1.10.0"; + sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "be2c049b30cc"; + sha256 = "1fr996vpmh6v5q13kfgf0fbi0hksxqg0fnbvj2nqhlsyfp5s8f4w"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.2"; + sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "68dc04aab96a"; + sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.1"; + sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/tsenart/deadcode"; + fetch = { + type = "git"; + url = "https://github.com/tsenart/deadcode"; + rev = "210d2dc333e9"; + sha256 = "05kif593f4wygnrq2fdjhn7kkcpdmgjnykcila85d0gqlb1f36g0"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "v1.0.0"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/fasttemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasttemplate"; + rev = "v1.1.0"; + sha256 = "089wm839lqmw9knr3ifbi82iykaybk0zxzp3c02lsh31wax4f8a2"; + }; + } + { + goPackagePath = "github.com/vbauerster/mpb"; + fetch = { + type = "git"; + url = "https://github.com/vbauerster/mpb"; + rev = "v4.8.4"; + sha256 = "0ifz1hp1a5xjxx7x9km5pb0x6p60lcpzwmhnxlg5x4ls6hrs8wd9"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "e1110fd1c708"; + sha256 = "0n5n7dzlr87mvk3mbcx400al4pa1i85jbbdhbx4s1rhr0rs3kh9a"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "c67002cb31c3"; + sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2180aed22343"; + sha256 = "0hl3pgi8rzij5m6alq4xqfvyvidy7jnf5y85031jv4y1bj85r6pl"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "52ab43148777"; + sha256 = "1kakxbqrb1w2vwg7r1896z68qcx2lfvimsl8cs2niiipbgpi6imx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "a911d9008d1f"; + sha256 = "118vsliq2a9xfp6rckc310mf9lydfgah6hgiggd88cm3zch4626m"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v3-unstable"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v3-unstable"; + rev = "df19058c872c"; + sha256 = "0nb6925fixs6brdwpmwi32b38acn1s8dv4g0syjy3kpq0wasljy9"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "v1.42.0"; + sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.5"; + sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg"; + }; + } +] diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index ce250d33e94..05cab814ecf 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "3.5.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw"; + hash = "sha256-hjH1TBw6GHYNI9JSBOzdyEtJmp8NhlwNYydGZwsjAg0="; }; - modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; + modSha256 = "sha256-+PJRaDdZqVO6D9SXojlr8JXn++pL18HOHFdaiUEalw8="; subPackages = [ "cmd/lego" ]; buildFlagsArray = [ diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 31705d1e79c..de967578d5c 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "lexicon"; - version = "3.3.17"; + version = "3.3.22"; propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "1wrsw759am6yp2m9b34iv82m371df3ssp2vhdjr18ys3xk7dvj89"; + sha256 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a"; }; meta = with lib; { diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 6051c16e91e..f270576e684 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite , raft-canonical, sqlite-replication, udev @@ -10,15 +10,20 @@ buildGoPackage rec { pname = "lxd"; - version = "4.0.1"; + version = "4.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; + sha256 = "0svzj57wwm43d2gnx0myr2p9pzjmkivwhgg0dww6zl169bx32liz"; }; + postPatch = '' + substituteInPlace shared/usbid/load.go \ + --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" + ''; + preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd @@ -31,9 +36,9 @@ buildGoPackage rec { postInstall = '' # test binaries, code generation - rm $bin/bin/{deps,macaroon-identity,generate} + rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index a4998d8546b..5bfbb6d8c64 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0waqkb1l66yk2gbqzybrh3yzf72gvyjsrvv3zyxpxzsgawrcx85g"; + sha256 = "0lg4v32jx0fxcjz6cj6cxxlg7rhj75k4p75izpkk4l11xpxqhgjm"; }; - cargoSha256 = "0z4m7aslgwvbfm6af03d8ql6c4w83h0kwgbgy6sfsx1gf7kv6q6z"; + cargoSha256 = "05qqy6l28ihn7hykkkh1x7z3q58cdrwv76fc22xjcg20985ac2nx"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index b648cdb2512..b378f082865 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,21 +1,38 @@ -{ - stdenv, pythonPackages, openssl, - +{ lib +, python3 +, openssl # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. - extraInputs ? [] +, extraInputs ? [] }: +let + + py = python3.override { + packageOverrides = self: super: { + # Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved + msgpack = super.msgpack.overridePythonAttrs ( + oldAttrs: rec { + version = "0.6.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a"; + }; + } + ); + }; + }; -pythonPackages.buildPythonApplication rec { +in +py.pkgs.buildPythonApplication rec { pname = "salt"; - version = "2019.2.0"; + version = "3000.2"; - src = pythonPackages.fetchPypi { + src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; + sha256 = "1n90qqhsvbf4pc4pcbya3rjfkblbccf4np4mxpghjqaa16fl4cqf"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with py.pkgs; [ jinja2 markupsafe msgpack @@ -24,8 +41,6 @@ pythonPackages.buildPythonApplication rec { pyzmq requests tornado_4 - ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [ - futures ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; @@ -40,7 +55,7 @@ pythonPackages.buildPythonApplication rec { # as is it rather long. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://saltstack.com/"; description = "Portable, distributed, remote execution and configuration management system"; maintainers = with maintainers; [ aneeshusa ]; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index c1ae07c0fda..b082f61f875 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "simple-evcorr"; repo = "sec"; rev = meta.version; - sha256 = "025cz3mr5yrdgs0i3h8v2znhvjkyh78kba1rzvl03ns2b1c49168"; + sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; }; buildInputs = [ perl ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; - version = "2.8.2"; + version = "2.8.3"; }; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index b7a97b3766b..d6ad699eaa8 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { ./12-CVE-2016-9296.patch ./13-CVE-2017-17969.patch (fetchpatch { + name = "3-CVE-2018-5996.patch"; url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; }) (fetchpatch { + name = "4-CVE-2018-10115.patch"; url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; }) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ca043692788..0c528bcea1e 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://digint.ch/btrbk"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ asymmetric the-kenny ]; + maintainers = with maintainers; [ asymmetric ]; inherit version; }; } diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 81209444455..b96d6d75725 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preFixup = '' - wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin + wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index 1d754e4324d..b261289f0bf 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - install -D duplicacy_main $bin/bin/duplicacy + install -D duplicacy_main $out/bin/duplicacy ''; meta = with lib; { diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 6e2b92e8128..9a77153e2ff 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { description = "Easy-to-use offline browser / website mirroring utility"; homepage = "http://www.httrack.com"; license = licenses.gpl3; - maintainers = with maintainers; [ the-kenny ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index a23be69f4cf..707ba8a9885 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -19,6 +19,5 @@ python2Packages.buildPythonApplication { homepage = "http://rdiff-backup.nongnu.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index df9d613ee44..f366533f9bf 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { passthru.tests.restic = nixosTests.restic; postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - $bin/bin/restic generate \ + $out/bin/restic generate \ --bash-completion restic.bash \ --zsh-completion restic.zsh \ --man . diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index c7f12cb751b..45a4df74b15 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dt $bin/bin rest-server + install -Dt $out/bin rest-server ''; meta = with lib; { diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index 90ed1068ca6..5ca460beb3b 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }: let - # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES - Mojolicious-6-46 = perlPackages.buildPerlPackage rec { + # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile + # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.26.1.snapshot + Mojolicious-8-35 = perlPackages.buildPerlPackage rec { pname = "Mojolicious"; - version = "6.46"; + version = "8.35"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz"; - sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr"; + sha256 = "1bll0ahh5v1y3x0ql29klwsa68cj46wzqc385srsnn2m8kh2ak8h"; }; }; - MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec { + MojoIOLoopForkCall-0-20 = perlPackages.buildPerlModule rec { pname = "Mojo-IOLoop-ForkCall"; - version = "0.17"; + version = "0.20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz"; - sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8"; + sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b"; }; - propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ]; + propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ]; }; - version = "0.18.0"; - checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; + version = "0.20.0"; + checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3"; in stdenv.mkDerivation { pname = "znapzend"; @@ -34,9 +35,9 @@ stdenv.mkDerivation { sha256 = checksum; }; - buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; + buildInputs = [ wget perl MojoIOLoopForkCall-0-20 perlPackages.TAPParserSourceHandlerpgTAP ]; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake autoreconfHook ]; preConfigure = '' sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am @@ -55,23 +56,23 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " ''; diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 81fdc95d88d..13e1d836938 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm444 -t $out/share/doc/zopfli ../README* + cp $src/src/zopfli/*.h $dev/include/ ''; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 2df5043867a..eaf9ac634a1 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; + sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/tools/filesystems/bees/bees-service-wrapper index 8ef46afc18f..67c95e8f803 100755 --- a/pkgs/tools/filesystems/bees/bees-service-wrapper +++ b/pkgs/tools/filesystems/bees/bees-service-wrapper @@ -140,7 +140,11 @@ _setup() { [[ $bees_uuid ]] || { # if bees_uuid is not in our .conf file, look it up with findmnt - read -r bees_uuid fstype < <(findmnt -n -o uuid,fstype "$bees_fsSpec") && [[ $fstype ]] || exit + for findmnt_mode in --kernel --mtab --fstab; do + read -r bees_uuid fstype < <(findmnt "$findmnt_mode" -n -o uuid,fstype "$bees_fsSpec") ||: + [[ $bees_uuid && $fstype ]] && break + done + [[ $bees_uuid ]] || die "Unable to identify a device matching $bees_fsSpec with findmnt" [[ $fstype = btrfs ]] || die "Device type is $fstype, not btrfs" } diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 065a673eb03..bf6c68072aa 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.4"; + version = "1.14.5"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7"; + sha256 = "173c5fcnfbnlw5a437r2x899ax77j3wp8gg8gffhryahcgyn1abq"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index ea610dfcc7f..c2234404d34 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -93,7 +93,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.8"; + version = "14.2.9"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,7 +101,7 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki"; + sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; }; patches = [ diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index dafe4c85176..b8f63a379b1 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,18 +1,20 @@ {stdenv, fetchurl, help2man}: stdenv.mkDerivation rec { - version = "1.5.0.456"; + version = "1.6.2.605"; pname = "fatsort"; src = fetchurl { url = "mirror://sourceforge/fatsort/${pname}-${version}.tar.xz"; - sha256 = "15fy2m4p9s8cfvnzdcd5ynkc2js0zklkkf34sjxdac7x2iwb8dd8"; + sha256 = "1dzzsl3a1ampari424vxkma0i87qkbgkgm2169x9xf3az0vgmjh8"; }; patches = [ ./fatsort-Makefiles.patch ]; buildInputs = [ help2man ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + meta = with stdenv.lib; { homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch index 9c9f58e97ab..51775edfb41 100644 --- a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch +++ b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch @@ -1,31 +1,34 @@ -diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile ---- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 -+++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile +--- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100 ++++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200 @@ -1,4 +1,5 @@ -MANDIR=/usr/local/share/man/man1 -+PREFIX=$(out) ++PREFIX?=/usr/local +MANDIR=$(PREFIX)/share/man/man1 INSTALL_FLAGS=-m 0755 -p -D -diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile ---- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 -+++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 -@@ -1,3 +1,5 @@ -+PREFIX=$(out) -+ - CC=gcc - LD=gcc - -@@ -33,9 +35,9 @@ - - # Mac OS X does not have a "/usr/local/sbin" - ifeq ($(UNAME),Darwin) --SBINDIR=/usr/local/bin -+SBINDIR=$(PREFIX)/bin +diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile +--- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100 ++++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200 +@@ -30,7 +30,7 @@ + override CFLAGS += -D __CYGWIN__ + override CFLAGS += -D __LINUX__ + override LDFLAGS += -liconv +- SBINDIR=/usr/local/sbin ++ SBINDIR=$(PREFIX)/sbin + endif else --SBINDIR=/usr/local/sbin -+SBINDIR=$(PREFIX)/sbin + ifdef MINGW +@@ -60,9 +60,9 @@ + # OS X's install does not support the '-D' flag. + INSTALL_FLAGS=-m 0755 -p + # Mac OS X does not have a "/usr/local/sbin" +- SBINDIR=/usr/local/bin ++ SBINDIR=$(PREFIX)/bin + else +- SBINDIR=/usr/local/sbin ++ SBINDIR=$(PREFIX)/sbin + endif + endif endif - - OBJ=fatsort.o FAT_fs.o fileio.o endianness.o signal.o entrylist.o errors.o options.o clusterchain.o sort.o misc.o natstrcmp.o stringlist.o diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 2d24cb71bbe..0a4472d7123 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,40 +1,55 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: -stdenv.mkDerivation { - name = "fuseiso-20070708"; +stdenv.mkDerivation rec { + pname = "fuseiso"; + version = "20070708"; src = fetchurl { - url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2"; + url = "mirror://sourceforge/project/fuseiso/fuseiso/${version}/fuseiso-${version}.tar.bz2"; sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse zlib glib ]; - - patches = let fetchPatchFromDebian = { patch, sha256 }: - fetchpatch { - inherit sha256; - url = "https://sources.debian.net/data/main/f/fuseiso/20070708-3.2/debian/patches/${patch}"; - }; - in [ - (fetchPatchFromDebian { - patch = "00-support_large_iso.patch"; + patches = [ + (fetchpatch { + name = "00-support_large_iso.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/00-support_large_iso.patch"; sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw"; }) - (fetchPatchFromDebian { # CVE-2015-8837 - patch = "02-prevent-buffer-overflow.patch"; + (fetchpatch { + name = "01-fix_typo.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/01-fix_typo.patch"; + sha256 = "14rpxp0yylzsgqv0r19l4wx1h5hvqp617gpv1yg0w48amr9drasa"; + }) + (fetchpatch { + name = "02-prevent-buffer-overflow_CVE-2015-8837.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/02-prevent-buffer-overflow.patch"; sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig"; }) - (fetchPatchFromDebian { # CVE-2015-8836 - patch = "03-prevent-integer-overflow.patch"; + (fetchpatch { + name = "03-prevent-integer-overflow_CVE-2015-8836.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/03-prevent-integer-overflow.patch"; sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv"; }) ]; - meta = { - homepage = "https://sourceforge.net/projects/fuseiso"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ fuse glib zlib ]; + + # after autoreconfHook, glib and zlib are not found, so force link against + # them + NIX_LDFLAGS = "-lglib-2.0 -lz"; + + enableParallelBuilding = true; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} NEWS README + ''; + + meta = with stdenv.lib; { description = "FUSE module to mount ISO filesystem images"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + homepage = "https://sourceforge.net/projects/fuseiso"; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index f8d955dbfc1..3f0e261b18d 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,8 +16,8 @@ buildGoPackage rec { subPackages = [ "." "tools/mount_gcsfuse" ]; postInstall = '' - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.gcsfuse - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.fuse.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; meta = with lib;{ diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5cc6e5c156b..f02fec85a5b 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.4"; + version = "7.5"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "1f7z1dacnx7pd3ri4nka6851fzhdfandbf94blds8bqfqc1263h6"; + sha256 = "1zahld2v1y920i0p25zcn15a593g3bl5sgnmhkdmn7kvk7mx4p93"; }; buildInputs = [ @@ -73,19 +73,25 @@ stdenv.mkDerivation postPatch = '' sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am + substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ + --replace '/sbin/' '${lvm2}/bin/' + substituteInPlace libglusterfs/src/glusterfs/compat.h \ + --replace '/bin/umount' '${utillinux}/bin/umount' + substituteInPlace contrib/fuse-lib/mount-gluster-compat.h \ + --replace '/bin/mount' '${utillinux}/bin/mount' ''; - # Note that the VERSION file is something that is present in release tarballs - # but not in git tags (at least not as of writing in v3.10.1). - # That's why we have to create it. - # Without this, gluster (at least 3.10.1) will fail very late and cryptically, - # for example when setting up geo-replication, with a message like - # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. - # What happens here is that the gverify.sh script tries to compare the versions, - # but fails when the version is empty. - # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 - preConfigure = '' - echo "v${s.version}" > VERSION + # Note that the VERSION file is something that is present in release tarballs + # but not in git tags (at least not as of writing in v3.10.1). + # That's why we have to create it. + # Without this, gluster (at least 3.10.1) will fail very late and cryptically, + # for example when setting up geo-replication, with a message like + # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume. + # What happens here is that the gverify.sh script tries to compare the versions, + # but fails when the version is empty. + # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 + preConfigure = '' + echo "v${s.version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python ''; diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index fa498263baa..fb90c3b0aeb 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -1,4 +1,4 @@ -{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp, boost, jansson, zeromq, openssl, pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: # Common attributes of irods packages @@ -7,7 +7,7 @@ with stdenv; { enableParallelBuilding = true; - buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which ]; + buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which catch2 ]; cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" @@ -18,6 +18,7 @@ with stdenv; "-DIRODS_EXTERNALS_FULLPATH_JANSSON=${jansson}" "-DIRODS_EXTERNALS_FULLPATH_ZMQ=${zeromq}" "-DIRODS_EXTERNALS_FULLPATH_CPPZMQ=${cppzmq}" + "-DIRODS_EXTERNALS_FULLPATH_CATCH2=${catch2}" "-DIRODS_LINUX_DISTRIBUTION_NAME=nix" "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=${builtins.nixVersion}" "-DCPACK_GENERATOR=TGZ" diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index b6099c099f3..8dfdd96dbeb 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which }: +{ stdenv, fetchFromGitHub, bzip2, zlib, autoconf, automake, cmake, gnumake, help2man , texinfo, libtool , cppzmq , libarchive, avro-cpp_llvm, boost, jansson, zeromq, openssl , pam, libiodbc, kerberos, gcc, libcxx, which, catch2 }: with stdenv; @@ -10,19 +10,21 @@ let inherit stdenv bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive jansson zeromq openssl pam libiodbc kerberos gcc libcxx - boost avro-cpp which; + boost avro-cpp which catch2; }; in rec { # irods: libs and server package irods = stdenv.mkDerivation (common // rec { - version = "4.2.2"; - prefix = "irods"; - name = "${prefix}-${version}"; - - src = fetchurl { - url = "https://github.com/irods/irods/releases/download/${version}/irods-${version}.tar.gz"; - sha256 = "0b89hs7sizwrs2ja7jl521byiwb58g297p0p7zg5frxmv4ig8dw7"; + version = "4.2.7"; + pname = "irods"; + + src = fetchFromGitHub { + owner = "irods"; + repo = "irods"; + rev = version; + sha256 = "1pd4l42z4igzf0l8xbp7yz0nhzsv47ziv5qj8q1hh6pfhmwlzp9s"; + fetchSubmodules = true; }; # Patches: @@ -41,6 +43,10 @@ in rec { substituteInPlace cmake/runtime_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/lib" "DESTINATION lib" substituteInPlace cmake/development_library.cmake --replace "DESTINATION usr/include" "DESTINATION include" + for file in unit_tests/cmake/test_config/*.cmake + do + substituteInPlace $file --replace "CATCH2}/include" "CATCH2}/include/catch2" + done export cmakeFlags="$cmakeFlags -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib @@ -59,13 +65,18 @@ in rec { # icommands (CLI) package, depends on the irods package irods-icommands = stdenv.mkDerivation (common // rec { - version = "4.2.2"; - name = "irods-icommands-${version}"; - src = fetchurl { - url = "https://github.com/irods/irods_client_icommands/archive/${version}.tar.gz"; - sha256 = "15zcxrx0q5c3rli3snd0b2q4i0hs3zzcrbpnibbhsip855qvs77h"; + version = "4.2.7"; + pname = "irods-icommands"; + + src = fetchFromGitHub { + owner = "irods"; + repo = "irods_client_icommands"; + rev = version; + sha256 = "08hqrc9iaw0y9rrrcknnl5mzbcrsvqc39pwvm62fipl3vnfqryli"; }; + patches = [ ./zmqcpp-deprecated-send_recv.patch ]; + buildInputs = common.buildInputs ++ [ irods ]; preConfigure = common.preConfigure + '' @@ -84,7 +95,6 @@ in rec { description = common.meta.description + " CLI clients"; longDescription = common.meta.longDescription + '' This package provides the CLI clients, called 'icommands'.''; - broken = true; }; }); } diff --git a/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch b/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch new file mode 100644 index 00000000000..8c249dc4745 --- /dev/null +++ b/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch @@ -0,0 +1,21 @@ +diff -r -u source/src/irods-grid.cpp source.new/src/irods-grid.cpp +--- source/src/irods-grid.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ source.new/src/irods-grid.cpp 2020-05-05 16:34:35.566464346 +0200 +@@ -412,7 +412,7 @@ + data_to_send.data(), + data_to_send.size() ); + try { +- if (!zmq_skt.send(req)) { ++ if (!zmq_skt.send( req, zmq::send_flags::dontwait )) { + std::cerr << "ZeroMQ encountered an error sending a message.\n"; + return errno; + } +@@ -426,7 +426,7 @@ + zmq::message_t rep; + // wait for the server reponse + try { +- if (!zmq_skt.recv( &rep )) { ++ if (!zmq_skt.recv( rep, zmq::recv_flags::dontwait )) { + std::cerr << "ZeroMQ encountered an error receiving a message.\n"; + return errno; + } diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 767c5168ff2..72b95641d00 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.9"; + version = "0.9.1"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1jx6bga0k07cckpv0yk77kwql7rjiicf9wkbadc8yqhp463xn90q"; + sha256 = "1ilxkrqbpb5whv7xfwfvph76jwyjzf988njjpyyr99h6jv2r77q1"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index c7d11d415a5..5efa218ed08 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,55 +1,33 @@ -{ stdenv, fetchgit, fetchFromGitHub, go, fuse }: +{ stdenv, buildGoPackage, fetchFromGitHub, fuse, installShellFiles }: -stdenv.mkDerivation rec { +buildGoPackage rec { pname = "tmsu"; - version = "0.7.4"; - - go-sqlite3 = fetchgit { - url = "git://github.com/mattn/go-sqlite3"; - rev = "c9a0db5d8951646743317f0756da0339fe144dd5"; - sha256 = "1m0q9869fis0dhg34g5wc5xi6pby491spfxi23w461h29higbrqh"; - }; - - go-fuse = fetchgit { - url = "git://github.com/hanwen/go-fuse"; - rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd"; - sha256 = "1iph2hpvby2mfwqg9pp39xjqdl9a09h4442yfdn5l67pznljh2bi"; - }; + version = "0.7.5"; + goPackagePath = "github.com/oniony/TMSU"; src = fetchFromGitHub { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "1g9gxlll2g4qkqbrshq3888sy1lgw6p5dvcrl5qyh6w73yimi1cq"; + sha256 = "0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq"; }; - buildInputs = [ go fuse ]; + goDeps = ./deps.nix; - preBuild = '' - mkdir -p src/github.com/mattn/go-sqlite3/ - ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3 + buildInputs = [ fuse ]; + nativeBuildInputs = [ installShellFiles ]; - mkdir -p src/github.com/hanwen/go-fuse - ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse - - mkdir -p src/github.com/oniony/tmsu - ln -s ${src}/* src/github.com/oniony/tmsu - - patchShebangs tests/. - - export GOPATH=$PWD - export GOCACHE=$TMPDIR/go-cache + preBuild = '' + mv go/src/${goPackagePath} src + mv src/src/${goPackagePath} go/src/${goPackagePath} + export GOPATH=$PWD:$GOPATH ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/sbin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/zsh/site-functions - make install INSTALL_DIR=$out/bin \ - MOUNT_INSTALL_DIR=$out/sbin \ - MAN_INSTALL_DIR=$out/share/man/man1 \ - ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions + postInstall = '' + mv $out/bin/{TMSU,tmsu} + cp src/misc/bin/* $out/bin/ + installManPage src/misc/man/tmsu.1 + installShellCompletion --zsh src/misc/zsh/_tmsu ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/filesystems/tmsu/deps.nix b/pkgs/tools/filesystems/tmsu/deps.nix new file mode 100644 index 00000000000..90e64b434c4 --- /dev/null +++ b/pkgs/tools/filesystems/tmsu/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "730713460d4fc41afdc2533bd37ff60c94c0c586"; + sha256 = "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "98a44bcf5949f178c8116fa30e62c9ac2ef65927"; + sha256 = "108rk74ringkkyx05zlq5khh32fsfi0przyzrpsr1r5j57xrhxj0"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3c4aac89819a5fdc28d906456729d3423fd46969"; + sha256 = "16q9ay6bl28zrnb377p8lvrs2nd98h7i6y3yi8ccjwzg1czbfdsi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1957bb5e6d1f523308b49060df02171d06ddfc77"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + }; + } +] diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 695e071effc..359d8b7abbe 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "unionfs-fuse"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; rev = "v${version}"; - sha256 = "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6"; + sha256 = "0bwx70x834qgqh53vqp18bhbxbsny80hz922rbgj8k9wj7cbfilm"; }; patches = diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 051adb0742f..1c437a3f05c 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qt5, netpbm }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qt5.qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 085b6ae4a95..ba5082ac304 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Verifies the integrity of PNG, JNG and MNG files"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 67d3eb15ba1..5bc52b92f0d 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 56df615e575..f9042645be0 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w"; + sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 8546c4e8182..1bfb2f88020 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -12,9 +12,10 @@ , libjpeg , libgsf , libexif +, libheif , ApplicationServices , python27 -, libpng ? null +, libpng , fetchFromGitHub , fetchpatch , autoreconfHook @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.9.1"; + version = "8.9.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "01vgvzlygg3fzpinb0x1rdm2sqvnqxmvxbnlbg73ygdadv3l2s0v"; + sha256 = "0pgvcp5yjk96izh7kjfprjd9kddx7zqrwwhm8dyalhrwbmj6c2q5"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -41,15 +42,6 @@ stdenv.mkDerivation rec { ''; }; - patches = [ - # autogen.sh should not run configure - # https://github.com/libvips/libvips/pull/1566 - (fetchpatch { - url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch"; - sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp"; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook @@ -69,6 +61,8 @@ stdenv.mkDerivation rec { libjpeg libgsf libexif + libheif + libpng python27 libpng expat diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 60e6b56b2e4..0993a39983e 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, gtk3, epoxy, wayland }: -stdenv.mkDerivation { - pname = "wdisplays-unstable"; - version = "2020-03-15"; + +stdenv.mkDerivation rec { + pname = "wdisplays"; + version = "1.0"; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -10,8 +11,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cyclopsian"; repo = "wdisplays"; - rev = "0faafdc04d7dd47d3a4e385f348cb9d267f2e60d"; - sha256 = "1y3bzh4mi6d67n6v0i8j5snpaikpbyr89acayr4m6bx85qnrq4g2"; + rev = version; + sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; }; meta = let inherit (stdenv) lib; in { diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 792b12688aa..3c97c168429 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -33,7 +33,7 @@ buildGoPackage { postInstall = '' installShellCompletion --bash ${aptlyCompletionSrc}/aptly - wrapProgram "$bin/bin/aptly" \ + wrapProgram "$out/bin/aptly" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index c6f664a1008..9588d0ae948 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.9"; + version = "1.10"; in stdenv.mkDerivation { pname = "autorandr"; @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n"; + sha256 = "0rcgs1n09p0p16lr5y239s0yrw7bch0x2cqwgc2dyh7rz7d9qmwn"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index d08a609735f..95bc44dcce0 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,22 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "07yng5bwhin7yqj1hihmxgi8w0n45nks05a8795zwsw92k373ib4"; + sha256 = "10cs94ja1dmn0f24gqkcy8rf68b3b43k6qpbb5njbg0hcx3x6cyj"; fetchSubmodules = true; }; - cargoSha256 = "1xqbpij6lr0bqyi0cfwgp3d4hcjhibpdc4dfm9gb39mmbgradrzf"; + cargoSha256 = "13cphi08bp6lg054acgliir8dx2jajll4m3c4xxy04skmx555zr8"; + + # Disable test that's broken on macOS. + # This should probably be removed on the next release. + # https://github.com/sharkdp/bat/issues/983 + patches = [ ./macos.patch ]; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/bat/macos.patch b/pkgs/tools/misc/bat/macos.patch new file mode 100644 index 00000000000..549782f0c91 --- /dev/null +++ b/pkgs/tools/misc/bat/macos.patch @@ -0,0 +1,13 @@ +diff --git a/src/assets.rs b/src/assets.rs +index 4f8556f..222abc2 100644 +--- a/src/assets.rs ++++ b/src/assets.rs +@@ -336,7 +336,7 @@ mod tests { + assert_eq!(test.syntax_for_file("Makefile"), "Makefile"); + } + +- #[cfg(unix)] ++ #[cfg(all(unix,not(target_os = "macos")))] + #[test] + fn syntax_detection_invalid_utf8() { + use std::os::unix::ffi::OsStrExt; diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix deleted file mode 100644 index 6e6a9b7c5ab..00000000000 --- a/pkgs/tools/misc/blsd/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: - -buildGoPackage { - pname = "blsd"; - version = "2017-07-27"; - - goPackagePath = "github.com/junegunn/blsd"; - - src = fetchFromGitHub { - owner = "junegunn"; - repo = "blsd"; - rev = "a2ac619821e502452abdeae9ebab45026893b9e8"; - sha256 = "0b0q6i4i28cjqgxqmwxbps22gp9rcd3jz562q5wvxrwlpbzlls2h"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgit2 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/junegunn/blsd"; - description = "List directories in breadth-first order"; - license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; - broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead. - }; -} diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix deleted file mode 100644 index d212f213a60..00000000000 --- a/pkgs/tools/misc/blsd/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8"; - sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi"; - }; - } -] diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix index 7e827f007eb..854958dc8a3 100644 --- a/pkgs/tools/misc/brotab/default.nix +++ b/pkgs/tools/misc/brotab/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, glibcLocales, python }: python.pkgs.buildPythonApplication rec { - version = "1.2.1"; + version = "1.2.2"; pname = "brotab"; src = fetchFromGitHub { owner = "balta2ar"; repo = pname; rev = version; - sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3"; + sha256 = "1c6npyws705qf9rv70mmh7d0almmpxz87a0n65lhw08lms1h3dl2"; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index e63ad0e42af..9e1671aec9d 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.4.0"; + version = "1.4.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x"; + sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4"; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index c42e8cacc73..96e33e0de24 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.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1ww8xcf57csazj3q2569irxg5il29jrx43mq5cif8dvn8xjm00nn"; + sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw"; }; - modSha256 = "1zmvav19nyqv6yp71mk3lx6szc5vwyf81m8kvcjj9rlzlygmcl8g"; + modSha256 = "147bbhbcf81i6vyiv9q8abx5qw44fx3qw5v5f6zjnkfajdqlvbsx"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index e75ddaa5bab..581cb6cb783 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clipman"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "15s7np57pvh7mqmq016mvhz34f189wd1vrfiamzmps37mdz2nq9i"; + sha256 = "09qvd7p63y7kh2i22pc89kr5wdnsbkraj5az9ds3bp3yj4q2mfyn"; }; modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index f66f2b97d14..8e9782506fb 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr"; + sha256 = "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 3c7e72f6d73..e261b95fde5 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "direnv"; - version = "2.21.2"; + version = "2.21.3"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "0afpxx8pwa1zb66l79af57drzjaazn2rp6306w4pxvqfh0zi2bri"; + sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; }; postConfigure = '' @@ -23,9 +23,9 @@ buildGoPackage rec { installPhase = '' mkdir -p $out - make install DESTDIR=$bin - mkdir -p $bin/share/fish/vendor_conf.d - echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish + make install DESTDIR=$out + mkdir -p $out/share/fish/vendor_conf.d + echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 2dea0f179a1..cb000b29472 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c"; + sha256 = "1697z9j0xd4il01bcvz1xwzkcg5mbkpp207mshb9csdhwi9a50wg"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6"; + cargoSha256 = "1rczq41jpds7kfyf31nxj4v8rk9rccijjixpznhlriam6xhgm90b"; doCheck = false; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index aeb88d0c68b..be8134a92a3 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "1x2hyc8vc5dz6k7b3291vxz36wllhinvqrb0d8zx9bv0ydj6qmjl"; + sha256 = "08gsd99w20fdi0apppmzsh06z29ga8y89nfcizidil2hkl8b7jyn"; }; postPatch = '' diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 4944600108a..0d2029fa314 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -1,25 +1,19 @@ -{ lib -, stdenv +{ stdenv , fetchurl , gcc-unwrapped , dpkg , polkit +, utillinux , bash , nodePackages -, electron_3 -, gtk3 -, wrapGAppsHook +, makeWrapper +, electron_7 }: let - libPath = lib.makeLibraryPath [ - # for libstdc++.so.6 - gcc-unwrapped.lib - ]; - sha256 = { - "x86_64-linux" = "0zb9j34dz7ybjix018bm8g0b6kilw9300q4ahcm22p0ggg528dh7"; - "i686-linux" = "0wsv4mvwrvsaz1pwiqs94b3854h5l8ff2dbb1ybxmvwjbfrkdcqc"; + "x86_64-linux" = "1yvqi86bw0kym401zwknhwq9041fxg047sbj3aydnfcqf11vrrmk"; + "i686-linux" = "12lghzhsl16h3jvzm3vw4hrly32fz99z6rdmybl8viralrxy8mb8"; }."${stdenv.system}"; arch = { @@ -27,26 +21,22 @@ let "i686-linux" = "i386"; }."${stdenv.system}"; -in stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.60"; + version = "1.5.86"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; inherit sha256; }; - buildInputs = [ - gtk3 - ]; - - nativeBuildInputs = [ - wrapGAppsHook - ]; - dontBuild = true; dontConfigure = true; + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x $src . ''; @@ -55,33 +45,33 @@ in stdenv.mkDerivation rec { # along with some other paths patchPhase = '' ${nodePackages.asar}/bin/asar extract opt/balenaEtcher/resources/app.asar tmp - # Use Nix(OS) paths + # use Nix(OS) paths sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js - sed -i "s|process.resourcesPath|'$out/opt/balenaEtcher/resources/'|" tmp/generated/gui.js + sed -i "s|'lsblk'|'${utillinux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js + sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js ${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar rm -rf tmp - # Fix up .desktop file - substituteInPlace usr/share/applications/balena-etcher-electron.desktop \ - --replace "/opt/balenaEtcher/balena-etcher-electron" "$out/bin/balena-etcher-electron" ''; installPhase = '' - mkdir -p $out/bin - cp -r opt $out/ - cp -r usr/share $out/ + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + + cp -a usr/share/* $out/share + cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} - # We'll use our Nixpkgs electron_3 instead - rm $out/opt/balenaEtcher/balena-etcher-electron + substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ + --replace 'Exec=/opt/balenaEtcher/balena-etcher-electron' 'Exec=${pname}' - ln -s ${electron_3}/bin/electron $out/bin/balena-etcher-electron + runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --add-flags $out/opt/balenaEtcher/resources/app.asar - --prefix LD_LIBRARY_PATH : ${libPath} - ) + postFixup = '' + makeWrapper ${electron_7}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 62c2aa36dc1..fc4c44e01cd 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.59"; + version = "0.2.61"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "14a7mb1a1s74hi124v4jscc72m09zq2bd8xrhq5agz9z27plqm2c"; + sha256 = "1d0rx5gcp9z06kxjknqa1r2b4m5c4vrhp4a9spkawvgiky5a9x07"; }; - cargoSha256 = "1945s3ajpy55fzh5wbl7fchqck0fh69shl18lxni9hvg04smq39i"; + cargoSha256 = "1bmyhg1y4gz719nsfdfjf4y73f9l6aag17dx9iazfzwnwwaq46m9"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 3048b4c9396..2f63eaf4380 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "ul"; repo = pname; rev = "v${version}"; - sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad"; + sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m"; }; - cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3"; + cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 9969148e223..afbe811e7f2 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; }; - patches = [ ./format-string.patch ./overflow.patch ./segv.patch ./sprintf.patch ]; + patches = [ + ./format-string_CVE-2012-4426.patch + ./overflow_CVE-2012-4409.patch + ./segv.patch + ./sprintf_CVE-2012-4527.patch + ]; buildInputs = [ libmcrypt libmhash ]; diff --git a/pkgs/tools/misc/mcrypt/format-string.patch b/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch index 322ab473811..322ab473811 100644 --- a/pkgs/tools/misc/mcrypt/format-string.patch +++ b/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch diff --git a/pkgs/tools/misc/mcrypt/overflow.patch b/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch index bf747a58266..bf747a58266 100644 --- a/pkgs/tools/misc/mcrypt/overflow.patch +++ b/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch diff --git a/pkgs/tools/misc/mcrypt/sprintf.patch b/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch index 1c9ade80777..1c9ade80777 100644 --- a/pkgs/tools/misc/mcrypt/sprintf.patch +++ b/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index f2adadc0840..c33aa074404 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -1,4 +1,10 @@ -{ fetchzip, lib, stdenv, mtools }: +{ stdenv +, lib +, fetchzip +, utillinux +, jq +, mtools +}: stdenv.mkDerivation rec { pname = "memtest86-efi"; @@ -22,19 +28,28 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ mtools ]; + nativeBuildInputs = [ + utillinux + jq + mtools + ]; installPhase = '' - mkdir -p $out $TEMP/memtest86-files - # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # - # The following uses dd and mcopy to extract the actual EFI app from the - # usb image so that it can be installed directly on the hard drive. - dd if=$src/memtest86-usb.img of=$TEMP/ESP.img skip=2048 - mcopy -i $TEMP/ESP.img ::/EFI/BOOT/ $TEMP/memtest86-files/ - mv $TEMP/memtest86-files/BOOT/* $out/ + # The following uses sfdisk to calculate the offset of the FAT EFI System + # Partition in the disk image, and mcopy to extract the actual EFI app from + # the filesystem so that it can be installed directly on the hard drive. + IMG=$src/memtest86-usb.img + ESP_OFFSET=$(sfdisk --json $IMG | jq -r ' + # Partition type GUID identifying EFI System Partitions + def ESP_GUID: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"; + .partitiontable | + .sectorsize * (.partitions[] | select(.type == ESP_GUID) | .start) + ') + mkdir $out + mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/ ''; meta = with lib; { diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index f216e358d8a..c3e9a0dc2ff 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -45,7 +45,7 @@ in buildGoPackage { runHook preBuild ${stdenv.lib.concatMapStrings (t: '' - go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main + go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} runHook postBuild diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix new file mode 100644 index 00000000000..cff7df1801f --- /dev/null +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, gnugrep, nix }: + +stdenv.mkDerivation rec { + pname = "nix-direnv"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-direnv"; + rev = "${version}"; + sha256 = "1lwmg6mn3lf7s0345v53zadxn9v0x8z6pcbj90v5dx3pgrq41gs8"; + }; + + # Substitute instead of wrapping because the resulting file is + # getting sourced, not executed: + postPatch = '' + substituteInPlace direnvrc \ + --replace "grep" "${gnugrep}/bin/grep" \ + --replace "nix-shell" "${nix}/bin/nix-shell" \ + --replace "nix-instantiate" "${nix}/bin/nix-instantiate" + ''; + + installPhase = '' + runHook preInstall + install -m500 -D direnvrc $out/share/nix-direnv/direnvrc + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A fast, persistent use_nix implementation for direnv"; + homepage = "https://github.com/nix-community/nix-direnv"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d55b2cd6f24..0720ca76f25 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200322"; + name = "parallel-20200422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10"; + sha256 = "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 617d6675c68..0abbcd5c3a2 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 = "9.4.1"; + version = "9.6.0"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "1c33c8aihsfdxaqkwy4isrvmjam5j5rdz98vv2apy73638vx3q04"; + sha256 = "1wgw5lwpm3ylby2llnjiq356cdb3v1jghj7xq659c722wj617i88"; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index a66a6688ad4..35bd84005b5 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; postInstall = '' - ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp + ln -s $out/bin/phraseapp-client $out/bin/phraseapp ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 17e9dcbc33a..1a244cd4103 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,17 @@ buildGoModule rec { pname = "pistol"; - version = "0.0.5"; + version = "0.1.1"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "1zxvpmy6c26dhg5wpk5cgaqipw5372crkhm1vaghm8jkiw7sjwvw"; + sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d"; }; - modSha256 = "13yxcfd29ziprjsjl2ji7w5i2506hwwl3y0ycaphj2wlcd75rdxs"; + modSha256 = "0r062nka72ah2nb2gf8dfrrj4sxadkykcqjzkp4c9vwk93mhw41k"; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; subPackages = [ "cmd/pistol" ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index fec1bee160f..df76ddf2662 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.5"; + version = "1.2020.8"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd"; + sha256 = "0xkv8d31dc0dchr40zzgmjw2wyh4i5vxwdk3fhqpw0pk2frxwc1w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index fd17de60f20..790bf73a44d 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { - version = "6.36"; + version = "6.38"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047"; + sha256 = "0mhjgd2b3grdaad64b72m8i5rm9k58yx7kpiqmhmd3kl5qlgxagy"; }; installPhase = '' diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1bd2fc259ee..1bb7f9582c4 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 = "2.7.1"; + version = "3.0.7"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm"; + sha256 = "10w47hbi6y92imzh1rlwkh5bfj1pnlkfxhbi8lhmy6ggxa62xmf7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 7fc1a63c5ab..a59a14d4b90 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.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy"; + sha256 = "1avdzs3v6k4jhkadm8i8dlwg0iffqd99xqpi53smd0zgwks744l5"; }; - cargoSha256 = "1i0y3x5rmg27gxrr2lv04sqq7qyiv1bnazfy24l5zgb4akvdg3r5"; + cargoSha256 = "0bdb4nadrms5jq3s8pby2qfky7112ynd7vd6mw720mshqklk5zyb"; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index d5cd4ef32ef..80741f0543c 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -31,8 +31,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; homepage = "https://www.gnu.org/software/stow/"; - - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index d2a8a1d0e87..b4f834bdd1a 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -18,12 +18,12 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow + install -D -t $out/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow ''; preFixup = '' - wrapProgram $bin/bin/tewisay \ - --prefix COWPATH : $bin/share/tewisay/cows + wrapProgram $out/bin/tewisay \ + --prefix COWPATH : $out/share/tewisay/cows ''; meta = { diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 4d17768b8dc..12ea456b9f7 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.1a"; + version = "3.1b"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "1j85d5mj7zf3k17wsrm45m79ygc6dljc4as3crvp12r45k8xg9k6"; + sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index ae8e7926eb9..e631aa9d342 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.0"; - source.sha256 = "1q5z6f548138792mc7aksxdgngfgdsyf8s117b4flyb2hqgmv24b"; + version = "2.0.1"; + source.sha256 = "03q1q6majci0l6kzw6kv7r395jycrl862mlqmyydxcd29y8wm3m2"; erubis = buildRubyGem rec { inherit ruby; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 39882b4e6e6..20979a467c0 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "0r42hrhd33kkkvii9h4896cmr319q728pdnhhamkhzgilvzxrwrz"; + sha256 = "1n9zcz6arbp3gmn360gv0gs703ii59pfgw5gvvwvbm492g2csj3h"; }; - cargoSha256 = "041djz3w7qmr19xq4cxgpw0m4qz2368q2wijw5aidvrxqlcz7xg2"; + cargoSha256 = "08xswkwy6npmx9z8d27l83flq0haj0rnmwkcsz68mlrndz8yymlh"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix index 2fbd4360698..5a14dade01b 100644 --- a/pkgs/tools/misc/ttygif/default.nix +++ b/pkgs/tools/misc/ttygif/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "ttygif"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "icholy"; repo = pname; rev = version; - sha256 = "18l26iacpfn4xqqv1ai6ncabn83mqv98c48gl265gfld66y7zbzn"; + sha256 = "1w9c3h6hik2gglwsw8ww63piy66i4zqr3273wh5rc9r2awiwh643"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "CC:=$(CC)" "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { homepage = "https://github.com/icholy/ttygif"; description = "Convert terminal recordings to animated gifs"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ moaxcp ]; }; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0a45c27a7a8..4b399abb61e 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.05.03"; + version = "2020.05.08"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal"; + sha256 = "16zxa8ss2rka7cvkqyi67s8i1h9f4nxx88w9vjbxchbga6w0scc6"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index be6d05ef426..116b0b25306 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.5.5"; + version = "3.6.0"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1w93ia9jr2afgkbaklx2rj0ccd0ghg1qbdg363aqqvyw40ccya1r"; + sha256 = "05rh61dx4f9kv5p8sahhwwiyivwq438fl30j9d97i4sagvb5jvvm"; }; - modSha256 = "051fxfh7lwrj3hzsgr2c2ga6hksz56673lg35y36sz4d93yldj6f"; + modSha256 = "1k7yd2lh6hwz3qm6ywrlr1qw0asqwdgrpj594v1gvav426yqyr6s"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 9d4230524be..7b796a52e3a 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -10,7 +10,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/assh" \ + wrapProgram "$out/bin/assh" \ --prefix PATH : ${openssh}/bin ''; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 7522b1629cc..1a52a7f8987 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p"; + sha256 = "09lyl9cpb5li7kyh0y78lhgvvb24ssfjmkz65xzbgm5jyrz8rmr4"; }; - cargoSha256 = "16nkmmkla3dlz40qhy04sknm3p2f5qik0ijczcw5ibg5w1jsydfr"; + cargoSha256 = "0m57cdbghzzjyxr6c0diyrfsjqip1dnqsh0zlapv8myizxy4rrzy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 12bfad0c8df..f9c1ee4bc31 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "clash"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "08zwrnpiihlir83fryani8pr972lmj1sjvhjc5pzlw1hks88i9m2"; + sha256 = "1nb4hl9x2lj0hy8byz14c2xn6yhrb6pqmhzl002k83qd3zrc6s3p"; }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "05i8mzhxzkgcmaa4gazfl8pq3n8mc4prww0ghl6m28cy7a0vsh7f"; + modSha256 = "113ynl1f01ihmbc376rb421rrjlxxbc8p9fhxrvpxcsm10rjky8w"; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 7be61d0e853..2fb2cb79ff4 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "corerad"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "1594qrwrz4bc3iipm4aqb8l1zyi04pwmiz0vdlfn12qn1p7lad5p"; + sha256 = "1r9kvz1ylrnfc7y5c4knqhx6xngh1p8j1axb8bd7h7p51c4i7jz2"; }; - modSha256 = "1cfhxkvwzf7sn227y6h5h19f27a9ngmpnyqdlfba5km8axqn29vm"; + modSha256 = "00xisa4l90f0digb1jfd2w616r080m7yp01y1rb83r8k147z5d2v"; buildFlagsArray = '' -ldflags= - -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1586881022 + -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1589133047 -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 9f1eff220c3..797791e1c0b 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.6"; pname = "davix"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.5 release did carry a broken CMake file, + # using the url below since the 0.7.6 release did carry a broken CMake file, # supposedly fixed in the next release # https://github.com/cern-fts/davix/issues/40 src = fetchurl { url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; - sha256 = "1j3gzsjhzrsk6irxalc3rwgp9cqb52chriadmy1mv1s6d2bwl86r"; + sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 57d7244148d..dc29a95d92b 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -47,8 +47,8 @@ in buildGoPackage rec { # DataDog use paths relative to the agent binary, so fix these. postPatch = '' - sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ - -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ + sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \ + -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \ -i cmd/agent/common/common_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ -i pkg/util/hostname_nix.go @@ -57,14 +57,14 @@ in buildGoPackage rec { # Install the config files and python modules from the "dist" dir # into standard paths. postInstall = '' - mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/conf.d $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages} + mkdir -p $out/${python.sitePackages} $out/share/datadog-agent + cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent + cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages} - cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent + cp -R $src/pkg/status/dist/templates $out/share/datadog-agent - wrapProgram "$bin/bin/agent" \ - --set PYTHONPATH "$bin/${python.sitePackages}" \ + wrapProgram "$out/bin/agent" \ + --set PYTHONPATH "$out/${python.sitePackages}" \ --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib ''; diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix new file mode 100644 index 00000000000..572dc0d8384 --- /dev/null +++ b/pkgs/tools/networking/drill/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "drill"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fcsonline"; + repo = pname; + rev = version; + sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw"; + }; + + cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m"; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "HTTP load testing application inspired by Ansible syntax"; + homepage = "https://github.com/fcsonline/drill"; + license = licenses.gpl3; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 6d74cd2c78c..6a63a2047b2 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; - maintainers = with maintainers; [ the-kenny ]; license = licenses.bsd0; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix index a5e8dc10d34..262234ca67b 100644 --- a/pkgs/tools/networking/guardian-agent/default.nix +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -23,14 +23,14 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - mkdir -p $bin/bin $out/share/doc/${pname} - cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/ + mkdir -p $out/bin $out/share/doc/${pname} + cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $out/bin/ cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent ''; postFixup = '' - wrapProgram $bin/bin/sga-guard \ - --prefix PATH : "$bin/bin" \ + wrapProgram $out/bin/sga-guard \ + --prefix PATH : "$out/bin" \ --prefix PATH : "${autossh}/bin" ''; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 0373b05ede0..49efeac02a9 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,22 +1,31 @@ -{ fetchurl, stdenv, openssl, pkgconfig, db, zlib, cyrus_sasl, perl }: +{ stdenv, fetchurl, pkg-config, perl +, openssl, db, zlib, cyrus_sasl +}: stdenv.mkDerivation rec { - name = "isync-1.3.1"; + pname = "isync"; + version = "1.3.1"; src = fetchurl { - url = "mirror://sourceforge/isync/${name}.tar.gz"; + url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; sha256 = "1sphd30jplii58y2zmw365bckm6pszmapcy905zhjll1sm1ldjv8"; }; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ openssl db cyrus_sasl zlib ]; meta = with stdenv.lib; { homepage = "http://isync.sourceforge.net/"; + # https://sourceforge.net/projects/isync/ + changelog = "https://sourceforge.net/p/isync/isync/ci/v${version}/tree/NEWS"; description = "Free IMAP and MailDir mailbox synchronizer"; + longDescription = '' + mbsync (formerly isync) is a command line application which synchronizes + mailboxes. Currently Maildir and IMAP4 mailboxes are supported. New + messages, message deletions and flag changes can be propagated both ways. + ''; license = licenses.gpl2Plus; - - maintainers = with maintainers; [ the-kenny ]; platforms = platforms.unix; + maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 3bd03f38564..0649eb02172 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,22 +2,20 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-04-04T05-28-55Z"; + version = "2020-04-25T00-43-23Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "09z28fq492d4l0089d1knq4zah9p2b212pkz777vznw9lzfqqip8"; + sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770"; }; - modSha256 = "0cv824ar5ifsg93sylrfjmax6zqm5073y95hqqfcc1dfp0mv2ki3"; + modSha256 = "1bcz7jchfnglypr2md9hhqbvcbghic2yp6njdrx3m5nqhylypzfx"; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") - ''; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/minio/mc/cmd.Version=${version}" ]; meta = with stdenv.lib; { homepage = "https://github.com/minio/mc"; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index c103637c685..611e848b9af 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe , xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk, libsoup, icu -, withMug ? false }: +, withMug ? false +, batchSize ? null }: stdenv.mkDerivation rec { pname = "mu"; @@ -14,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; }; + postPatch = stdenv.lib.optionalString (batchSize != null) '' + sed -i lib/mu-store.cc --regexp-extended \ + -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' + ''; + buildInputs = [ sqlite xapian glib gmime3 texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; @@ -41,7 +47,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - maintainers = with maintainers; [ antono the-kenny peterhoeg ]; + maintainers = with maintainers; [ antono peterhoeg ]; platforms = platforms.mesaPlatforms; }; } diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index c0c7b6782df..9eb9afcb0e7 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.6"; + version = "0.6.7"; # Upstream recommends and supports git src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; - sha256 = "0spp8dl4i5xcqfbqxxcpdf3gwcmyf4ywl1dd79w6gzbr07p894p5"; + sha256 = "1jvihq30cwlpjqwny0lcrciysn40wscq6xik3s9b81nw2s7wiyqr"; }; nativeBuildInputs = [ pkgconfig makeWrapper bison flex ]; diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 4f0a516b420..a1c6962d3f9 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; + sha256 = "1x6hivr1v76fxy1dn82xrj9rj8k3r097kf4yiblqq16y631hxzy4"; }; buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6e6e8fbf23c..b0be2ab5e6d 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.13.1"; + version = "1.13.3"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1sfqi169xf0wmlpzri9frkgsh99fgjvcpbdkd42vsm10qa1dnpk5"; + sha256 = "1y3b3zwzig520nyky7xnr0l0zf68i4w698bysyngpkada14d8dv3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 2bf907380e0..90b16e37ed7 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.32.10"; + version = "0.32.11"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "0rf00fqbf8xvxbxnhki93knwdp4bqjvv548ia8c0w6cryj07plyg"; + sha256 = "17p7khfiv5aflpl4imbqp8v7gignd6v6a7g80xlnzgix5ismh84l"; }; - modSha256 = "08f03haxzpi57gaxymsbzs0nbbgnf6z4gmpal476xy3gvc0dyi3r"; + modSha256 = "1sdjzj52gkqk51ml29hijzv64clmi38km5z7j7paf28dla2brfxq"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 5efca2cb7fd..bca0fcb81c7 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.17.1"; + version = "1.18.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g"; + sha256 = "0f4agsh0gqpyhl3nysv4x9f74hlnch27gp3l8bpl645kbbfkg0di"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 1fa8bac33e2..41946b88471 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "wireguard-go"; - version = "0.0.20200121"; + version = "0.0.20200320"; goPackagePath = "golang.zx2c4.com/wireguard"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz"; - sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9"; + sha256 = "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"; }; patches = [ ./0001-Fix-darwin-build.patch ]; diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix index b1a92582b7c..859b8572f82 100644 --- a/pkgs/tools/networking/wireguard-go/deps.nix +++ b/pkgs/tools/networking/wireguard-go/deps.nix @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "c178f38b412c"; - sha256 = "1r6v8xnvb4z5vdckbj6vd08kn6h4ivr9hvdpgq4drj6l1mp79rf7"; + rev = "5c8b2ff67527"; + sha256 = "0r5s7f4w7crrbcf5ydpr2xzsq0svjm332vsds41yp58kwi2lvh2v"; }; } { diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 4fac72f7d03..4b6e2aa9f18 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200319"; + version = "1.0.20200510"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "0g9vlngg9dnh7qqfhaycw35fq8ij5hfz6p1cykh4ncjgr93i7rbx"; + sha256 = "0xqchidfn1j3jq5w7ck570aib12q9z0mfvwhmnyzqxx7d3qh76j6"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index dc69d3f030d..03f6bc2b117 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -34,7 +34,7 @@ in rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty - cp target/release/build/cached-nix-shell-*/out/trace-nix.so $out/lib + cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh cp cached-nix-shell.1 $out/share/man/man1 ''; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index 4e51b9b46dd..c1e84494609 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "10xncifdfhilxclxyf72h7dcfn8yn1h34qbkvdq9l76ghv5qjniq"; + sha256 = "04cfhj42c2m7lafir9ksh36n3nhx3x20lhamyk4zc5p3pm1xdbs6"; }; nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index b55ac647b35..53e70ad7bd7 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,25 +1,16 @@ { lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr"; + sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad"; }; - - patches = [ - # Fixes debug output on stdout mangling some files. Fixed in next release. - # https://github.com/nix-community/nixpkgs-fmt/issues/201 - (fetchpatch { - url = "https://github.com/nix-community/nixpkgs-fmt/commit/648f46e1d5507592b246311618f467da282bf1b5.patch"; - sha256 = "18n4criyl0lydxmjqfkcmwx0pniyqzfgfxcjwz6czqwmx5y7b4rb"; - }) - ]; - - cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9"; + + cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x"; meta = with lib; { description = "Nix code formatter for nixpkgs"; diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index fba2b82ff32..01acc2ed6ed 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4"; + sha256 = "0zby9bd64bmrkb229ic7ckn2ycf9bpwsisx2a7z0id0j4mjaca4k"; }; - cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l"; + cargoSha256 = "1w4618w5yj1205d7s2hq273fb35qfcd7cnxdwxn4pq8x3ahgy4kx"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 41b6d26d02d..1a20c6b9ab6 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "01yvkfclrynv7gpvdckzbcv03xr28yb4v6333a6nv6gy05p26g3a"; + sha256 = "1aj76wwpnvniv5xdygfv17kj74rxxkvngkvw2019qinm2nv81c3p"; }; - cargoSha256 = "152f2f16d5vlww51aldvh1r2r4kx8ad5d48dc30xsfj669zzw24h"; + cargoSha256 = "0nzxx31nlmrcrcs67z1wci0d4n6kdq83z2ld4bq8xgp6p916f4sl"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 5fdf6d66362..c7e3c0fb665 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.11.2"; + version = "1.11.3"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "03q5l873zc1dm478f35ibqandypakf47hzqb5gjpnpbcyb2m2jxz"; + sha256 = "0qwds9w9y2dy39bwh2523wra5dj820cjl11ynkshh7k94fk7qgpm"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 389d1feb346..4c591777691 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 = "0.2.19"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0vw0axnb7gil6lr72rixp4v3pspi0jq99x8h954mdcff2jr031x5"; + sha256 = "0wg8wavbs063dnpjia7wd60nf97v7pl4lm6s9xndpai1r1c99c2d"; }; - cargoSha256 = "118rxiwvi9k6jq5y0k7yn4w9zlb0fd6xdcyrv38ipr8qrj16cjrq"; + cargoSha256 = "0igq8aml22c26w43zgk2gii8yl8mhs8ikfh0bn32ajwigqfk4vaq"; 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 8c70a5a4724..e569d5a3de9 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A user environment configurator"; - maintainers = with maintainers; [ rycee ]; + homepage = "https://rycee.gitlab.io/home-manager/"; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index a1d2f15ad13..130bf2bb2e5 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -29,10 +29,10 @@ buildGoPackage rec { postInstall = '' mkdir -p $lib cp -v $src/data/*.nix $lib - wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; + wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; - outputs = [ "out" "bin" "lib" ]; + outputs = [ "out" "lib" ]; meta = with lib; { description = "Morph is a NixOS host manager written in Golang."; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 96fd1bebdd4..c44c7d4c96d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -14,6 +14,8 @@ common = , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive, rustc, cargo + # Used by tests + , gmock , busybox-sandbox-shell , storeDir , stateDir @@ -39,7 +41,8 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; + ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt + docbook5 docbook_xsl_ns jq gmock ]; buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json @@ -177,7 +180,7 @@ in rec { nixStable = callPackage common (rec { name = "nix-2.3.4"; src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; }; @@ -188,18 +191,18 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre7346_5e7ccdc9"; + suffix = "pre7534_b92f58f6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5e7ccdc9e3ddd61dc85e20c898001345bfb497a5"; - sha256 = "10jg0rq92xbigbbri7harn4b75blqaf6rjgq4hhvlnggf2w9iprg"; + rev = "b92f58f6d9e44f97002d1722bd77bad939824c1c"; + sha256 = "1p791961y5v04kpz37g6hm98f1ig7i34inxl9dcj3pbqhf5kicxg"; }; crates = fetchurl { - url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118797694/download/1/nix-vendored-crates-2.4pre7534_b92f58f6.tar.xz"; + sha256 = "a4c2612bbd81732bbb899bc0c230e07b16f6b6150ffbb19c4907dedbbc2bf9fc"; }; inherit storeDir stateDir confDir boehmgc; @@ -207,18 +210,18 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200403_3473b19"; + suffix = "pre20200501_941f952"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0"; - sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr"; + rev = "941f95284ab57e9baa317791327cf1715d8564b5"; + sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs"; }; crates = fetchurl { - url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz"; + sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix index e6e30b26240..dc0c733ca7b 100644 --- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix @@ -3,7 +3,7 @@ callPackage ./generic.nix (rec { version = "1.6.1"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; }; nixopsAzurePackages = with python2Packages; [ diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index a52ea88950c..f99be6d7575 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper -, clang, llvm, gcc, which, libcgroup, python, perl, gmp -, wine ? null +{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper +, clang_9, llvm_9, gcc, which, libcgroup, python, perl, gmp +, file, cmocka, wine ? null, fetchpatch }: # wine fuzzing is only known to work for win32 binaries, and using a mixture of @@ -15,24 +15,52 @@ let else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; }; libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; - aflplusplus = stdenv.mkDerivation rec { + aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "2.59c"; + version = "2.64c"; src = fetchFromGitHub { - owner = "vanhauser-thc"; + owner = "AFLplusplus"; repo = "AFLplusplus"; rev = version; - sha256 = "1ik33ifk4n96762iv1h4kl4jf9yvsq2hgs097wkiy589siw44g5r"; + sha256 = "0n618pk6nlmkcbv1qm05fny4mnhcprrw0ppmra1phvk1y22iildj"; }; enableParallelBuilding = true; + # build of unsigaction32 broken in 2.64c: + # https://github.com/AFLplusplus/AFLplusplus/commit/079fdbf9bc5be1adba19e4bd08be965bd4dd79dc#commitcomment-38428357 + # The applied patch fixes it. + patches = [ + (fetchpatch { + url = "https://github.com/AFLplusplus/AFLplusplus/commit/5b9928f1a9d4b017ea04365ca8b522fde71236eb.patch"; + sha256 = "1m4w9w4jaxb2mjkwvr6r4qa2j5cdzzpchjphpwd95861h0zvb6hh"; + }) + ]; + # Note: libcgroup isn't needed for building, just for the afl-cgroup # script. - nativeBuildInputs = [ makeWrapper which ]; - buildInputs = [ llvm python gmp ] + nativeBuildInputs = [ makeWrapper which clang_9 gcc ]; + buildInputs = [ llvm_9 python gmp ] ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + + postPatch = '' + # Replace the CLANG_BIN variables with the correct path + substituteInPlace llvm_mode/afl-clang-fast.c \ + --replace "CLANGPP_BIN" '"${clang_9}/bin/clang++"' \ + --replace "CLANG_BIN" '"${clang_9}/bin/clang"' \ + --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" + + # Replace "gcc" and friends with full paths in afl-gcc + # Prevents afl-gcc picking up any (possibly incorrect) gcc from the path + substituteInPlace src/afl-gcc.c \ + --replace '"gcc"' '"${gcc}/bin/gcc"' \ + --replace '"g++"' '"${gcc}/bin/g++"' \ + --replace '"gcj"' '"gcj-UNSUPPORTED"' \ + --replace '"clang"' '"clang-UNSUPPORTED"' \ + --replace '"clang++"' '"clang++-UNSUPPORTED"' + ''; + makeFlags = [ "PREFIX=$(out)" ]; buildPhase = '' common="$makeFlags -j$NIX_BUILD_CORES" @@ -45,6 +73,9 @@ let ''; postInstall = '' + # remove afl-clang(++) which are just symlinks to afl-clang-fast + rm $out/bin/afl-clang $out/bin/afl-clang++ + # the makefile neglects to install unsigaction cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ @@ -61,36 +92,15 @@ let cp ${libtokencap}/bin/get-libtokencap-so $out/bin/ # Install the cgroups wrapper for asan-based fuzzing. - cp experimental/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup + cp examples/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup chmod +x $out/bin/afl-cgroup substituteInPlace $out/bin/afl-cgroup \ --replace "cgcreate" "${libcgroup}/bin/cgcreate" \ --replace "cgexec" "${libcgroup}/bin/cgexec" \ --replace "cgdelete" "${libcgroup}/bin/cgdelete" - # Patch shebangs before wrapping patchShebangs $out/bin - # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it - # has totally different semantics in that case(?) - and also set a - # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out - # of $PATH. - # first though we need to replace the afl-clang-fast++ symlink with - # a real copy to prevent wrapProgram skipping the symlink and confusing - # nix's cc wrapper - rm $out/bin/afl-clang-fast++ - cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++ - for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do - wrapProgram $x \ - --set-default AFL_PATH "$out/lib/afl" \ - --run 'export AFL_CC=''${AFL_CC:-${clang}/bin/clang} AFL_CXX=''${AFL_CXX:-${clang}/bin/clang++}' - done - # do similar for afl-gcc and afl-gcc-fast - for x in $out/bin/afl-gcc $out/bin/afl-gcc-fast; do - wrapProgram $x \ - --set-default AFL_PATH "$out/lib/afl" \ - --run 'export AFL_CC=''${AFL_CC:-${gcc}/bin/gcc} AFL_CXX=''${AFL_CXX:-${gcc}/bin/g++}' - done '' + stdenv.lib.optionalString (wine != null) '' substitute afl-wine-trace $out/bin/afl-wine-trace \ --replace "qemu_mode/unsigaction" "$out/lib/afl" @@ -105,17 +115,15 @@ let wrapPythonProgramsIn $out/bin ${python.pkgs.pefile} ''; - installCheckInputs = [ perl ]; + installCheckInputs = [ perl file cmocka ]; doInstallCheck = true; installCheckPhase = '' # replace references to tools in build directory with references to installed locations substituteInPlace test/test.sh \ - --replace '`which gcc`' "" \ --replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ --replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ --replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`' - perl -pi -e 's|(?<=\s)gcc(?=\s)|${gcc}/bin/gcc|g' test/test.sh - perl -pi -e 's|(\.\./)(\S+?)(?<!\.c)(?<!\.s?o)(?=\s)|\$out/bin/\2|g' test/test.sh + perl -pi -e 's|(?<!\.)(\.\./)([^\s\/]+?)(?<!\.c)(?<!\.s?o)(?=\s)|\$out/bin/\2|g' test/test.sh cd test && ./test.sh ''; @@ -129,10 +137,10 @@ let AFL++ is a heavily enhanced version of AFL, incorporating many features and improvements from the community. ''; - homepage = "https://github.com/vanhauser-thc/AFLplusplus"; + homepage = "https://aflplus.plus"; license = stdenv.lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with stdenv.lib.maintainers; [ ris ]; + maintainers = with stdenv.lib.maintainers; [ ris mindavi ]; }; }; in aflplusplus diff --git a/pkgs/tools/security/aflplusplus/libdislocator.nix b/pkgs/tools/security/aflplusplus/libdislocator.nix index d1d9dad6c5b..6f947a7280a 100644 --- a/pkgs/tools/security/aflplusplus/libdislocator.nix +++ b/pkgs/tools/security/aflplusplus/libdislocator.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { preInstall = '' mkdir -p $out/lib/afl + # issue is fixed upstream: https://github.com/AFLplusplus/AFLplusplus/commit/2a60ceb6944a7ca273057ddf64dcf837bf7f9521 + sed -i 's/README\.dislocator\.md/README\.md/g' Makefile ''; postInstall = '' mkdir $out/bin diff --git a/pkgs/tools/security/aflplusplus/libtokencap.nix b/pkgs/tools/security/aflplusplus/libtokencap.nix index 830708227e3..9421ee0d1e2 100644 --- a/pkgs/tools/security/aflplusplus/libtokencap.nix +++ b/pkgs/tools/security/aflplusplus/libtokencap.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { preInstall = '' mkdir -p $out/lib/afl + mkdir -p $out/share/doc/afl ''; postInstall = '' mkdir $out/bin diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 202657dac9a..c51c839afe8 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -28,11 +28,17 @@ stdenv.mkDerivation { for f in ${aflplusplus.src.name}/qemu_mode/patches/* ; do sed -E -i 's|(\.\./)+patches/([a-z-]+\.h)|\2|g' $f sed -E -i 's|\.\./\.\./config\.h|afl-config.h|g' $f + sed -E -i 's|\.\./\.\./include/cmplog\.h|afl-cmplog.h|g' $f done cp ${aflplusplus.src.name}/qemu_mode/patches/*.h $sourceRoot/ cp ${aflplusplus.src.name}/types.h $sourceRoot/afl-types.h substitute ${aflplusplus.src.name}/config.h $sourceRoot/afl-config.h \ --replace "types.h" "afl-types.h" + substitute ${aflplusplus.src.name}/include/cmplog.h $sourceRoot/afl-cmplog.h \ + --replace "config.h" "afl-config.h" \ + --replace "forkserver.h" "afl-forkserver.h" + substitute ${aflplusplus.src.name}/include/forkserver.h $sourceRoot/afl-forkserver.h \ + --replace "types.h" "afl-types.h" cat ${aflplusplus.src.name}/qemu_mode/patches/*.diff > all.patch ''; @@ -68,7 +74,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://www.qemu.org/; + homepage = "https://www.qemu.org/"; description = "Fork of QEMU with AFL++ instrumentation support"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 6accefa58a4..6d3c4bccef9 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw"; + sha256 = "0413yjbnj4k917x48h1gnj64kygbr6c1n55f23qkvj0hgbxpgssz"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr"; + cargoSha256 = "09747f9g7yyq9c8wbfdb3hwxii5xq23ynhba0vc01nhjpjyn0ksd"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 43d8d3a9b11..0c60ab62106 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.13.2"; + version = "2.13.2b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r"; + sha256 = "1pba3d04gfnviv8r98anpv7m8r9r417s352r5fz8qzg8lr070540"; }; buildCommand = '' diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index b9cffc7f769..e74e1b61438 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.31"; + version = "1.4.32"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; + sha256 = "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl"; }; postPatch = '' diff --git a/pkgs/tools/security/genpass/default.nix b/pkgs/tools/security/genpass/default.nix new file mode 100644 index 00000000000..ee3eebac991 --- /dev/null +++ b/pkgs/tools/security/genpass/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "genpass"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "cyplo"; + repo = pname; + rev = "v${version}"; + sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini"; + }; + + cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m"; + + meta = with stdenv.lib; { + description = "A simple yet robust commandline random password generator."; + homepage = "https://github.com/cyplo/genpass"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ cyplo ]; + }; +} diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 410b63ec7d7..a16701f48ea 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,8 +1,15 @@ -{ stdenv, buildGoModule, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }: +{ stdenv, makeWrapper +, buildGoModule, fetchFromGitHub, installShellFiles +, git +, gnupg +, xclip +, wl-clipboard +, passAlias ? false +}: buildGoModule rec { pname = "gopass"; - version = "1.9.0"; + version = "1.9.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -10,10 +17,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "1cssiglhxnrk1wl8phqkhmljqig5ms5a23sdzf8lywk5f6w2gayh"; + sha256 = "19xhyyd76r17rwn6s8xgfjnyi7kywagy0i4anqws40w79j3qb1p0"; }; - modSha256 = "01p3zv6dq1l68in1qqvlsh7i3ydhhanf54dyf7288x35js8wnmqa"; + modSha256 = "0zr4ihpcclw5pfhcdrd4n4qb3i3djcwyvwr4m2kpn99icp55bml8"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; @@ -28,6 +35,8 @@ buildGoModule rec { $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done + '' + stdenv.lib.optionalString passAlias '' + ln -s $out/bin/gopass $out/bin/pass ''; postFixup = '' @@ -39,7 +48,7 @@ buildGoModule rec { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; homepage = "https://www.gopass.pw/"; license = licenses.mit; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ andir rvolosatovs ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix new file mode 100644 index 00000000000..961f1e6954a --- /dev/null +++ b/pkgs/tools/security/jadx/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, gradle, jdk, makeWrapper, perl }: + +let + pname = "jadx"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "skylot"; + repo = pname; + rev = "v${version}"; + sha256 = "1dx3g0sm46qy57gggpg8bpmin5glzbxdbf0qzvha9r2dwh4mrwlg"; + }; + + deps = stdenv.mkDerivation { + name = "${pname}-deps"; + inherit src; + + nativeBuildInputs = [ gradle jdk perl ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --no-daemon jar + ''; + + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/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 = "083r4hg6m9cxzm2m8nckf10awq8kh901v5i39r60x47xk5yw84ps"; + }; +in stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ gradle jdk makeWrapper ]; + + buildPhase = '' + # The installDist Gradle build phase tries to copy some dependency .jar + # files multiple times into the build directory. This ends up failing when + # the dependencies are read directly from the Nix store since they are not + # marked as chmod +w. To work around this, get a local copy of the + # dependency store, and give write permissions. + depsDir=$(mktemp -d) + cp -R ${deps}/* $depsDir + chmod -R u+w $depsDir + + gradleInit=$(mktemp) + cat >$gradleInit <<EOF + gradle.projectsLoaded { + rootProject.allprojects { + buildscript { + repositories { + clear() + maven { url '$depsDir' } + } + } + repositories { + clear() + maven { url '$depsDir' } + } + } + } + + settingsEvaluated { settings -> + settings.pluginManagement { + repositories { + maven { url '$depsDir' } + } + } + } + EOF + + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --offline --no-daemon --info --init-script $gradleInit pack + ''; + + installPhase = '' + mkdir $out $out/bin + cp -R build/jadx/lib $out + for prog in jadx jadx-gui; do + cp build/jadx/bin/$prog $out/bin + wrapProgram $out/bin/$prog --set JAVA_HOME ${jdk.home} + done + ''; + + meta = with stdenv.lib; { + description = "Dex to Java decompiler"; + longDescription = '' + Command line and GUI tools for produce Java source code from Android Dex + and Apk files. + ''; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index f56bd59cd9a..09916f85f9e 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4"; pname = "kpcli"; src = fetchurl { url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; - sha256 = "1z6dy70d3ag16vgzzafcnxb8gap3wahfmy4vd22fpgbrdd6riph4"; + sha256 = "0s46cni16ph93havmkrlai3k13mdppyca1s2bqm751a6rirmsgj0"; }; buildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 4f0b5f2c954..15797fc8665 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D bin/notary $bin/bin/notary + install -D bin/notary $out/bin/notary runHook postInstall ''; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 46dfafa8151..76b90d5b885 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://www.passwordstore.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher globin ma27 ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index c2fc2cff881..cc5f0c94e11 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { description = "Pass extension for importing data from existing password managers"; homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index f5b61207de6..43c74a9029b 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Pass extension that keeps the password store encrypted inside a tomb"; homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index 5bc88d394e7..b2f331f1375 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Pass extension that provides an easy flow for updating passwords"; homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; + maintainers = with maintainers; [ lovek323 fpletz tadfisher ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 7daf42ab6c7..b3c08648862 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = "https://github.com/carnager/rofi-pass"; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix index 9d05304cf2f..afef0d4c472 100644 --- a/pkgs/tools/security/pdfcrack/default.nix +++ b/pkgs/tools/security/pdfcrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfcrack"; - version = "0.18"; + version = "0.19"; src = fetchurl { url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz"; - sha256 = "035s3jzrs3ci0i53x04dzpqp9225c4s52cd722d6zqra5b2sw8w2"; + sha256 = "1vf0l83xk627fg0a3b10wabgqxy08q4vbm0xjw9xzkdpk1lj059i"; }; installPhase = '' diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 73321fd618e..07051731069 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { ''; patches = [ - (fetchpatch { url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; - sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; - }) + (fetchpatch { + name = "CVE-2014-0470.patch"; + url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; + sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; + }) ]; NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 215ab63328f..e6cd74eda4b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; + # cross compiles correctly but needs the following + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--disable-tool-name-check"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index a0205970366..353590ed87c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -1,22 +1,22 @@ -{ lib, pythonPackages }: +{ lib, python3Packages }: let - truffleHogRegexes = pythonPackages.buildPythonPackage rec { + truffleHogRegexes = python3Packages.buildPythonPackage rec { pname = "truffleHogRegexes"; - version = "0.0.4"; - src = pythonPackages.fetchPypi { + version = "0.0.7"; + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z"; + sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405"; }; }; in - pythonPackages.buildPythonApplication rec { + python3Packages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.97"; + version = "2.1.11"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; + sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e"; }; # Relax overly restricted version constraint @@ -24,7 +24,7 @@ in substituteInPlace setup.py --replace "GitPython ==" "GitPython >= " ''; - propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ]; + propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ]; # Test cases run git clone and require network access doCheck = false; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 0520db1ff8c..515b5884999 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { ]; postInstall = '' - echo "complete -C $bin/bin/vault vault" > vault.bash + echo "complete -C $out/bin/vault vault" > vault.bash installShellCompletion vault.bash ''; diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index 95afb580d4e..e1e5e100bd1 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -28,8 +28,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/ + mkdir -p $out/bin + cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/ ''; meta = { diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 583bbd2ebd9..62b1be61965 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20200326"; + version = "20200430"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1zr2sziiy5jvwgmxpgy2imzsmmb6hlncfd816i7qxrixg2ag7ycr"; + sha256 = "0z19bniqsa8y0n1qrxmb6gz7m63jpwx22zgk5ablyriixhfpz07v"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index d6f7a782824..0d2d704ea6c 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.9"; + version = "3.14.10"; src = fetchFromGitHub { - sha256 = "1c8g4fg8c9x816xx3m33njfn9h6ksl8g4rmc20y39v1y9jn72vxk"; + sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index b8bbe09fcb7..6b6aa40a0f7 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.69"; + version = "21.70"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx"; + sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z"; }; patchPhase = '' diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 1a4cdb9acdf..afb59b25059 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0lpwp5fzlf037bn03x1dldw8nfa5pyqi4qsqbscwn42idvs94mhx"; + sha256 = "1l2zdp5f9spkfx1dhxyj32791kgvc8hqjr1kk75vds4c1wgwq8gk"; }; - cargoSha256 = "1g5k6dkv0zznh8q359n7sg9wf0gcix6m36pg9ql8wi5hnlsvg1s1"; + cargoSha256 = "08a7gr70a3rh7a52gglck16qlwngb6ap723lg3b3mxmkyigdf6i6"; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 4dcb6afb00f..805a70c74e9 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "BINDIR=${placeholder "bin"}/bin" + "BINDIR=${placeholder "out"}/bin" ]; buildPhase = '' diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a5ced1e325d..1739e0ad784 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2002.0"; + version = "8.2004.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "1y414g61j93dgm5xg0ni985a99cyag0flvv1fqn2188dhr6w31py"; + sha256 = "1n97kx6cyyzd4zh6q01fyqi2wq1ah68h95kdc109m1zhfnvxghsz"; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 6645639bcf0..883305b1d54 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.07"; + version = "0.11.08"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1kyxkwn18y4161yyvxw3hd9xlzwlp270sn4gpnzvmr6rwxhr0nvh"; + sha256 = "1xy5m5r4icc10h957ank0amnh46v2v47z4n1z43d9s7lmvahw287"; }; postPatch = '' diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index cced17e6ddd..470c8a0ca4d 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -3,13 +3,13 @@ let common = opts: libsForQt5.callPackage (import ./common.nix opts) {}; in rec { new-engine = common rec { - version = "A56"; - sha256 = "0sxmjkrwcchxg2qmcjsw2vr42s7cdcg2fxkwb8axq2r2z23465gp"; + version = "A57"; + sha256 = "0algfdlxfjs582hsqmagbcmw06p8qlh0k5xczfkscs3prdn2vm7n"; installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; }; old-engine = common rec { - version = "0.27.0"; - sha256 = "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h"; + version = "0.28.0"; + sha256 = "1n2hd2dysi5bv2iyq40phh1jxc48gdwzs414vfbxvcharcwapnja"; installFiles = [ "UEFITool" "UEFIReplace/UEFIReplace" "UEFIPatch/UEFIPatch" ]; }; } diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 562886ad57e..08e227d2454 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -4,18 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1zajgzhhxigga5wc94bmbk8iwx7yc2jq3f0hqadfsa4f0wmpi0nf"; + sha256 = "1p746v9xrfm6avc6v9dvcnpckhvdizzf53pcg9bpcp0lw5sh85da"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "1ka9d81ddzz52w75xdiwd2xkv1rlamyvvdax09wanb61zxxwm0i7"; + cargoSha256 = "15cpi0b5yqjwi1liry2q17sn9hpc4xf9gn33ri3rs6ls5qs7j7pa"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 39f1b7e5bc2..c29060cb82f 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s"; }) (fetchpatch { + name = "CVE-2015-8107.patch"; url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff"; sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv"; }) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 1ba1db1f7cb..c3da9a60555 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation rec { - name = "colordiff-1.0.18"; + name = "colordiff-1.0.19"; src = fetchurl { urls = [ "https://www.colordiff.org/${name}.tar.gz" "http://www.colordiff.org/archive/${name}.tar.gz" ]; - sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"; + sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"; }; buildInputs = [ perl /* xmlto */ ]; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ac90b4d7792..6fc27bdf00c 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.17.0"; + version = "3.19.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj"; + sha256 = "01cr4941sg6is6k6sajlbr6hs5s47aq9xhp7gadhq4h3x6dilj40"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 58dea610c39..73e2b8a6de4 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-5.0.1"; + name = "gawk-5.1.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + sha256 = "1gc2cccqy1x1bf6rhwlmd8q7dz7gnam6nwgl38bxapv6qm5flpyg"; }; # When we do build separate interactive version, it makes sense to always include man. diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 154e099d3dd..fccd2174a6d 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "4.9"; + version = "4.9.1"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17"; + sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index 57f036a47f0..aafce117ee4 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchurl, yacc }: +{ stdenv, fetchFromGitHub, yacc }: stdenv.mkDerivation rec { - name = "nawk-20121220"; + pname = "nawk"; + version = "20180827"; - src = fetchurl { - url = "https://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"; - sha256 = "10wvdn7xwc5bbp5h7l0b9fxby3bds21n8a34z54i8kjsbhb95h4d"; + src = fetchFromGitHub { + owner = "onetrueawk"; + repo = "awk"; + rev = version; + sha256 = "0qcsxhcwg6g3c0zxmbipqa8d8d5n8zxrq0hymb8yavsaz103fcl6"; }; nativeBuildInputs = [ yacc ]; - unpackPhase = '' - mkdir build - cd build - tar xvf ${src} - ''; - patchPhase = '' substituteInPlace ./makefile \ --replace "YACC = yacc -d -S" "" diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 83d0bdd92c7..19690e270af 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.6.1"; + version = "9.8.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj"; + sha256 = "1l4bwnbd3g0wmdx8yv8hi5wm2z2q67y9mwrvrc4xxmkdrb5y8jcd"; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 9eba451c54a..ab589eb87fc 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -1,9 +1,7 @@ { stdenv , fetchFromGitHub , rustPlatform -, asciidoc -, docbook_xsl -, libxslt +, asciidoctor , installShellFiles , Security , withPCRE2 ? true @@ -12,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.0.1"; + version = "12.1.0"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0"; + sha256 = "1vgkk78c25ia9y4q5psrh7xrlbfdn7dz7bc20kci40n8zr0vjwww"; }; - cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y"; + cargoSha256 = "143lnf4yah9ik7v8rphv7gbvr2ckhjpmy8zfgqml1n3fqxiqvxnb"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; - nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ]; + nativeBuildInputs = [ asciidoctor installShellFiles ]; buildInputs = (stdenv.lib.optional withPCRE2 pcre2) ++ (stdenv.lib.optional stdenv.isDarwin Security); diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 0e905be01f2..a540918e56d 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "0y1mabnp0sbvayn695x1yfw04d2bky0r69wyidld6hllq3kqn9y2"; + sha256 = "04jsni80jzhbb106283df34cdyp5p362l6m29kp30hnc6x49853q"; }; - cargoSha256 = "1ra6argxs5dmpxhrr3az21myp27fl3nkdjfqn8cam2xhld1y270l"; + cargoSha256 = "1gwb76zys7gky42clzjs5g4hhgpfvzcw63chw9mnj703c7h0cgfh"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/chmln/sd"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.amar1729 ]; + maintainers = with maintainers; [ amar1729 filalex77 ]; }; } diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 71f79724b9c..cad59507903 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh"; + sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; }; modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 80b99284e49..ba46d36814a 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.2.0"; + version = "2.3.0"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "0akxzfibfa8msnardvyy9hkj2z6sqn7pnwphz6avixdcclg6yxa5"; + sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 52a10711875..bb6432fc3e6 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,6 +1,6 @@ /* TeX Live user docs - source: ../../../../../doc/languages-frameworks/texlive.xml - - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive + - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index dced8672ee6..7254b3d63d9 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,8 +1,13 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib +, buildGoPackage +, fetchFromGitHub +, installShellFiles +}: buildGoPackage rec { pname = "cri-tools"; version = "1.18.0"; + src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; @@ -12,15 +17,26 @@ buildGoPackage rec { goPackagePath = "github.com/kubernetes-sigs/cri-tools"; + nativeBuildInputs = [ installShellFiles ]; + buildPhase = '' pushd go/src/${goPackagePath} - make all install BINDIR=$bin/bin + make binaries VERSION=${version} + ''; + + installPhase = '' + make install BINDIR=$out/bin + + for shell in bash fish zsh; do + $out/bin/crictl completion $shell > crictl.$shell + installShellCompletion crictl.$shell + done ''; meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = "https://github.com/kubernetes-sigs/cri-tools"; - license = lib.licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a781f3a4424..6ad8c355ee2 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${binPath} + wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index bcb0c545d45..c16eb003d8d 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let spec = fetchurl { - url = "https://developers.linode.com/api/docs/v4/openapi.yaml"; - sha256 = "1l2fahdcmv7sp1qkwr5nv2vls8fypvlybwylqfzhyjmn7jqkw4hq"; + url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml"; + sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0"; }; in diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 66a2e36fa15..5767878dc65 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -100,6 +100,7 @@ mapAliases ({ devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 dmtx = dmtx-utils; # added 2018-04-25 + dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 @@ -274,6 +275,7 @@ mapAliases ({ man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 + matcha = throw "matcha was renamed to matcha-gtk-theme"; # added 2020-05-09 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 mess = mame; # added 2019-10-30 @@ -576,6 +578,7 @@ mapAliases ({ transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; + trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 uberwriter = apostrophe; # added 2020-04-23 @@ -605,6 +608,7 @@ mapAliases ({ winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xp-pen-g430 = pentablet-driver; # added 2020-05-03 xfceUnstable = xfce4-14; # added 2019-09-17 xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d128be80c81..a22878b284e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,6 +185,8 @@ in protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; + ptags = callPackage ../development/tools/misc/ptags { }; + demoit = callPackage ../servers/demoit { }; deviceTree = callPackage ../os-specific/linux/device-tree {}; @@ -776,6 +778,8 @@ in ec2-utils = callPackage ../tools/virtualization/ec2-utils { }; + exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; + altermime = callPackage ../tools/networking/altermime {}; alttab = callPackage ../tools/X11/alttab { }; @@ -879,6 +883,8 @@ in crc32c = callPackage ../development/libraries/crc32c { }; + cudd = callPackage ../development/libraries/cudd { }; + cue = callPackage ../development/tools/cue { }; deltachat-electron = callPackage @@ -928,6 +934,8 @@ in fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; + genpass = callPackage ../tools/security/genpass { }; + genymotion = callPackage ../development/mobile/genymotion { }; gaia = callPackage ../development/libraries/gaia { }; @@ -1270,8 +1278,6 @@ in blockdiag = with python3Packages; toPythonApplication blockdiag; - blsd = callPackage ../tools/misc/blsd { }; - bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; @@ -2056,6 +2062,8 @@ in nfstrace = callPackage ../tools/networking/nfstrace { }; + nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2974,6 +2982,10 @@ in driftnet = callPackage ../tools/networking/driftnet {}; + drill = callPackage ../tools/networking/drill { + inherit (darwin.apple_sdk.frameworks) Security; + }; + drone = callPackage ../development/tools/continuous-integration/drone { }; drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; @@ -4367,6 +4379,8 @@ in jade = callPackage ../tools/text/sgml/jade { }; + jadx = callPackage ../tools/security/jadx { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; @@ -4551,6 +4565,8 @@ in kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kytea = callPackage ../tools/text/kytea { }; k6 = callPackage ../development/tools/k6 { }; @@ -5671,6 +5687,8 @@ in stdenv = clangStdenv; }; + oq = callPackage ../development/tools/oq { }; + out-of-tree = callPackage ../development/tools/out-of-tree { }; oppai-ng = callPackage ../tools/misc/oppai-ng { }; @@ -5747,10 +5765,7 @@ in pal = callPackage ../tools/misc/pal { }; - pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { - configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - }); + pandoc = callPackage ../development/tools/pandoc { }; pamtester = callPackage ../tools/security/pamtester { }; @@ -6413,6 +6428,8 @@ in safe = callPackage ../tools/security/safe { }; + safety-cli = with python3.pkgs; toPythonApplication safety; + safe-rm = callPackage ../tools/system/safe-rm { }; safeeyes = callPackage ../applications/misc/safeeyes { }; @@ -6657,6 +6674,8 @@ in python = python3; }; + sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { }; + softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security; @@ -6706,6 +6725,11 @@ in sourceHighlight = callPackage ../tools/text/source-highlight { }; + spacebar = callPackage ../os-specific/darwin/spacebar { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + spaceFM = callPackage ../applications/misc/spacefm { }; speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; @@ -7091,7 +7115,6 @@ in trilium-desktop trilium-server ; - trilium = trilium-desktop; trousers = callPackage ../tools/security/trousers { }; @@ -7593,6 +7616,8 @@ in which = callPackage ../tools/system/which { }; + whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; @@ -8111,8 +8136,7 @@ in cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - inherit (llvmPackages) clang llvm; + inherit (llvmPackages_10) stdenv clang llvm; }) crystal_0_31 crystal_0_32 @@ -8183,6 +8207,7 @@ in gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; gcc9Stdenv = overrideCC gccStdenv buildPackages.gcc9; + gcc10Stdenv = overrideCC gccStdenv buildPackages.gcc10; wrapCCMulti = cc: if stdenv.targetPlatform.system == "x86_64-linux" then let @@ -8350,6 +8375,20 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { + inherit noSysDirs; + + # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion + profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + + enableLTO = !stdenv.isi686; + + libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; + + isl = if !stdenv.isDarwin then isl_0_17 else null; + })); + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { @@ -8400,6 +8439,14 @@ in profiledCompiler = false; }); + gfortran10 = wrapCC (gcc10.cc.override { + name = "gfortran"; + langFortran = true; + langCC = false; + langC = false; + profiledCompiler = false; + }); + gcj = gcj6; gcj6 = wrapCC (gcc6.cc.override { name = "gcj"; @@ -8432,6 +8479,15 @@ in gnatboot = gnat6; }); + gnat10 = wrapCC (gcc10.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; @@ -8616,7 +8672,7 @@ in openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { }; + openjfx14 = callPackage ../development/compilers/openjdk/openjfx/14.nix { }; openjdk8-bootstrap = if adoptopenjdk-hotspot-bin-8.meta.available then @@ -8661,33 +8717,39 @@ in else openjdk11.override { headless = true; }; - openjdk13-bootstrap = + openjdk14-bootstrap = if adoptopenjdk-hotspot-bin-13.meta.available then adoptopenjdk-hotspot-bin-13 else - /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */ - callPackage ../development/compilers/openjdk/12.nix { + /* adoptopenjdk not available for i686, so fall back to our old builds of 12 & 13 for bootstrapping */ + callPackage ../development/compilers/openjdk/13.nix { openjfx = openjfx11; /* need this despite next line :-( */ enableJavaFX = false; headless = true; inherit (gnome2) GConf gnome_vfs; + openjdk13-bootstrap = callPackage ../development/compilers/openjdk/12.nix { + openjfx = openjfx11; /* need this despite next line :-( */ + enableJavaFX = false; + headless = true; + inherit (gnome2) GConf gnome_vfs; + }; }; /* current JDK */ - openjdk13 = + openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } else callPackage ../development/compilers/openjdk { - openjfx = openjfx13; + openjfx = openjfx14; inherit (gnome2) GConf gnome_vfs; }; - openjdk13_headless = + openjdk14_headless = if stdenv.isDarwin then - openjdk13 + openjdk14 else - openjdk13.override { headless = true; }; + openjdk14.override { headless = true; }; openjdk = openjdk8; openjdk_headless = openjdk8_headless; @@ -8699,8 +8761,8 @@ in jdk11 = openjdk11; jdk11_headless = openjdk11_headless; - jdk13 = openjdk13; - jdk13_headless = openjdk13_headless; + jdk14 = openjdk14; + jdk14_headless = openjdk14_headless; jdk = jdk8; jre = jre8; @@ -9354,6 +9416,8 @@ in janet = callPackage ../development/interpreters/janet {}; + jelly = callPackage ../development/interpreters/jelly {}; + jimtcl = callPackage ../development/interpreters/jimtcl {}; jmeter = callPackage ../applications/networking/jmeter {}; @@ -9675,6 +9739,7 @@ in spidermonkey = spidermonkey_38; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; + ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; @@ -10538,6 +10603,10 @@ in mdl = callPackage ../development/tools/misc/mdl { }; + python-language-server = callPackage ../development/dotnet-modules/python-language-server { + inherit (dotnetPackages) Nuget; + }; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; @@ -11404,8 +11473,6 @@ in dhex = callPackage ../applications/editors/dhex { }; - dnnl = callPackage ../development/libraries/dnnl { }; - double-conversion = callPackage ../development/libraries/double-conversion { }; dclib = callPackage ../development/libraries/dclib { }; @@ -12279,7 +12346,7 @@ in itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; itk = callPackage ../development/libraries/itk { - stdenv = gcc8Stdenv; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; jasper = callPackage ../development/libraries/jasper { }; @@ -12404,6 +12471,8 @@ in libacr38u = callPackage ../tools/security/libacr38u { }; + libaec = callPackage ../development/libraries/libaec { }; + libagar = callPackage ../development/libraries/libagar { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; @@ -13765,6 +13834,8 @@ in one_gadget = callPackage ../development/tools/misc/one_gadget { }; + oneDNN = callPackage ../development/libraries/oneDNN { }; + onedrive = callPackage ../applications/networking/sync/onedrive { }; oneko = callPackage ../applications/misc/oneko { }; @@ -13798,7 +13869,7 @@ in openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { + opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; @@ -13814,6 +13885,8 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; + opencv = opencv4; + openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; @@ -13979,7 +14052,7 @@ in python = python37; }; - protobuf = protobuf3_7; + protobuf = protobuf3_8; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; @@ -14407,7 +14480,10 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + simpleitk = callPackage ../development/libraries/simpleitk { + lua = lua51Packages.lua; + stdenv = gcc8Stdenv; + }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; @@ -14838,7 +14914,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { - stdenv = gcc8Stdenv; + stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -15519,6 +15595,10 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; + inherit (callPackage ../servers/hasura { }) + hasura-cli + hasura-graphql-engine; + heapster = callPackage ../servers/monitoring/heapster { }; hbase = callPackage ../servers/hbase {}; @@ -16991,7 +17071,7 @@ in # Hardened linux hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened-config.nix { + structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { inherit stdenv; inherit (kernel) version; }; @@ -17899,7 +17979,7 @@ in ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; - inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) + inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 ; @@ -17957,7 +18037,7 @@ in manrope = callPackage ../data/fonts/manrope { }; - matcha = callPackage ../data/themes/matcha { }; + matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; @@ -19313,6 +19393,8 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; + genxword = callPackage ../applications/misc/genxword { }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -20149,7 +20231,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { }; + josm = callPackage ../applications/misc/josm { jre = jdk11; }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -20740,7 +20822,7 @@ in mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; - mpvScripts = { + mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; }; @@ -20813,6 +20895,8 @@ in node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; + ninjas2 = callPackage ../applications/audio/ninjas2 {}; + notion = callPackage ../applications/window-managers/notion { }; nootka = qt5.callPackage ../applications/audio/nootka { }; @@ -21074,6 +21158,8 @@ in omxplayer = callPackage ../applications/video/omxplayer { }; + inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { @@ -21106,6 +21192,8 @@ in inherit (pkgs) pkgconfig; }; + orca-c = callPackage ../applications/audio/orca-c {}; + osm2xmap = callPackage ../applications/misc/osm2xmap { libyamlcpp = libyamlcpp_0_3; }; @@ -22057,7 +22145,7 @@ in tendermint = callPackage ../tools/networking/tendermint { }; - termdown = (newScope pythonPackages) ../applications/misc/termdown { }; + termdown = python3Packages.callPackage ../applications/misc/termdown { }; terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; @@ -22190,6 +22278,8 @@ in trayer = callPackage ../applications/window-managers/trayer { }; + tinywm = callPackage ../applications/window-managers/tinywm { }; + tree-from-tags = callPackage ../applications/audio/tree-from-tags { }; tdrop = callPackage ../applications/misc/tdrop { }; @@ -22496,7 +22586,7 @@ in weechat = wrapWeechat weechat-unwrapped { }; - weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); + weechatScripts = recurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { pango = null; @@ -23550,6 +23640,8 @@ in gtk = gtk2; }; + mari0 = callPackage ../games/mari0 { }; + mars = callPackage ../games/mars { }; megaglest = callPackage ../games/megaglest {}; @@ -23588,7 +23680,7 @@ in lua = lua5_1; }; - n2048 = callPackage ../games/n2048 {}; + n2048 = callPackage ../games/n2048 { }; naev = callPackage ../games/naev { }; @@ -23601,6 +23693,8 @@ in nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; + netris = callPackage ../games/netris { }; + neverball = callPackage ../games/neverball { }; nexuiz = callPackage ../games/nexuiz { }; @@ -23882,7 +23976,7 @@ in lua = lua5_1; }; - tbe = callPackage ../games/the-butterfly-effect { }; + tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; teetertorture = callPackage ../games/teetertorture { }; @@ -24309,7 +24403,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { }; + ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; exonerate = callPackage ../applications/science/biology/exonerate { }; @@ -24872,9 +24966,16 @@ in fped = callPackage ../applications/science/electronics/fped { }; + # this is a wrapper for kicad.base and kicad.libraries kicad = callPackage ../applications/science/electronics/kicad { }; kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; - kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; }; + kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; }; + # mostly here so the kicad-unstable components (except packages3d) get built + kicad-unstable-small = kicad.override { + pname = "kicad-unstable-small"; + stable = false; + with3d = false; + }; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; @@ -25944,7 +26045,7 @@ in texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; - # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive + # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = recurseIntoAttrs (callPackage ../tools/typesetting/tex/texlive { }); @@ -26384,7 +26485,7 @@ in bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; - xp-pen-g430 = libsForQt5.callPackage ../misc/drivers/xp-pen-g430 {}; + pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; qmk_firmware = callPackage ../development/misc/qmk_firmware { avrgcc = pkgsCross.avr.buildPackages.gcc; @@ -26444,6 +26545,10 @@ in kcli = callPackage ../development/tools/kcli {}; + pxlib = callPackage ../development/libraries/pxlib {}; + + pxview = callPackage ../development/tools/pxview {}; + unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; @@ -26464,4 +26569,5 @@ in vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 7d1bcc5bd99..0621f2ed17e 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -39,43 +39,17 @@ let ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; inherit (callPackage ../development/coq-modules/mathcomp {}) - mathcompGen mathcompGenSingle ssreflect - - mathcompCorePkgs mathcomp + mathcomp_ mathcomp-config + mathcomp ssreflect mathcomp-ssreflect mathcomp-fingroup mathcomp-algebra mathcomp-solvable mathcomp-field mathcomp-character - - mathcompCorePkgs_1_7 mathcomp_1_7 - mathcomp-ssreflect_1_7 mathcomp-fingroup_1_7 mathcomp-algebra_1_7 - mathcomp-solvable_1_7 mathcomp-field_1_7 mathcomp-character_1_7 - - mathcompCorePkgs_1_8 mathcomp_1_8 - mathcomp-ssreflect_1_8 mathcomp-fingroup_1_8 mathcomp-algebra_1_8 - mathcomp-solvable_1_8 mathcomp-field_1_8 mathcomp-character_1_8 - - mathcompCorePkgs_1_9 mathcomp_1_9 - mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9 - mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9 - - mathcompCorePkgs_1_10 mathcomp_1_10 - mathcomp-ssreflect_1_10 mathcomp-fingroup_1_10 mathcomp-algebra_1_10 - mathcomp-solvable_1_10 mathcomp-field_1_10 mathcomp-character_1_10 - ; + ; inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { }) - mathcompExtraGen multinomials coqeal - - mathcomp-finmap mathcomp-bigenough mathcomp-analysis - mathcomp-multinomials mathcomp-real-closed mathcomp-coqeal - - mathcomp_1_7-finmap mathcomp_1_7-bigenough mathcomp_1_7-analysis - mathcomp_1_7-multinomials mathcomp_1_7-real-closed - mathcomp_1_7-finmap_1_0 - - mathcomp_1_8-finmap mathcomp_1_8-bigenough mathcomp_1_8-analysis - mathcomp_1_8-multinomials mathcomp_1_8-real-closed mathcomp_1_8-coqeal - - mathcomp_1_9-finmap mathcomp_1_9-bigenough mathcomp_1_9-analysis - mathcomp_1_9-multinomials mathcomp_1_9-real-closed; + mathcomp-extra-override mathcomp-extra-config mathcomp-extra + current-mathcomp-extra mathcomp-extra-fast mathcomp-extra-all + mathcomp-finmap mathcomp-bigenough mathcomp-real-closed + mathcomp-analysis multinomials coqeal + ; metalib = callPackage ../development/coq-modules/metalib { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; @@ -86,6 +60,8 @@ let tlc = callPackage ../development/coq-modules/tlc {}; Velisarios = callPackage ../development/coq-modules/Velisarios {}; Verdi = callPackage ../development/coq-modules/Verdi {}; + + filterPackages = filterCoqPackages; }; filterCoqPackages = coq: set: @@ -113,8 +89,7 @@ in rec { */ mkCoqPackages = coq: let self = lib.makeScope newScope (lib.flip mkCoqPackages' coq); in - if coq.dontFilter or false then self - else filterCoqPackages coq self; + if coq.dontFilter or false then self else filterCoqPackages coq self; coq_8_5 = callPackage ../applications/science/logic/coq { ocamlPackages = ocamlPackages_4_05; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ae985f8b75d..13c5b721301 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -77,8 +77,8 @@ in { ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc883; # no binary yet inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; + buildLlvmPackages = buildPackages.llvmPackages_10; + llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; }; ghcjs = compiler.ghcjs86; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9517769f7b3..071d1612b6c 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -38,20 +38,10 @@ let async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - async_find = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_find - else callPackage ../development/ocaml-modules/async_find { }; - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; - async_p4 = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/async { } - else null; - atd = callPackage ../development/ocaml-modules/atd { }; atdgen = callPackage ../development/ocaml-modules/atdgen { }; @@ -277,6 +267,8 @@ let farfadet = callPackage ../development/ocaml-modules/farfadet { }; + fiat-p256 = callPackage ../development/ocaml-modules/fiat-p256 { }; + fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; fileutils = callPackage ../development/ocaml-modules/fileutils { }; @@ -305,10 +297,14 @@ let inherit (pkgs) gnuplot; }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; + herelib = callPackage ../development/ocaml-modules/herelib { }; higlo = callPackage ../development/ocaml-modules/higlo { }; + hkdf = callPackage ../development/ocaml-modules/hkdf { }; + hmap = callPackage ../development/ocaml-modules/hmap { }; imagelib = callPackage ../development/ocaml-modules/imagelib { }; @@ -742,8 +738,6 @@ let ptime = callPackage ../development/ocaml-modules/ptime { }; - re2_p4 = callPackage ../development/ocaml-modules/re2 { }; - resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; result = callPackage ../development/ocaml-modules/ocaml-result { }; @@ -1178,13 +1172,6 @@ let then callPackage ../development/ocaml-modules/janestreet/core.nix {} else core_p4; - re2 = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.re2 - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/re2.nix {} - else re2_p4; - textutils = if lib.versionOlder "4.03" ocaml.version then janeStreet.textutils @@ -1218,13 +1205,6 @@ let then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} else async_extra_p4; - async = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async.nix {} - else async_p4; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f933eeff1f..b27d41b6494 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3224,6 +3224,19 @@ let }; }; + ConvertBencode = buildPerlPackage rec { + pname = "Convert-Bencode"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OR/ORCLEV/${pname}-${version}.tar.gz"; + sha256 = "0v2ywj18px67mg97xnrdq9mnlzgqvj92pr2g47g9c9b9cpw3v7r6"; + }; + meta = { + description = "Functions for converting to/from bencoded strings"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConvertColor = buildPerlModule { pname = "Convert-Color"; version = "0.11"; @@ -16996,6 +17009,20 @@ let }; }; + StringInterpolate = buildPerlPackage { + pname = "String-Interpolate"; + version = "0.32"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NE/NEILB/String-Interpolate-0.32.tar.gz; + sha256 = "15fwbpz3jdpdgmz794iw9hz2caxrnrw9pdwprxxkanpm92cdhaf7"; + }; + meta = with stdenv.lib; { + # https://metacpan.org/pod/String::Interpolate + description = "String::Interpolate - Wrapper for builtin the Perl interpolation engine."; + license = licenses.gpl1Plus; + }; + }; + StringMkPasswd = buildPerlPackage { pname = "String-MkPasswd"; version = "0.05"; @@ -17042,6 +17069,20 @@ let }; }; + StringSimilarity = buildPerlPackage { + pname = "String-Similarity"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/String-Similarity-1.04.tar.gz"; + sha256 = "0i9j3hljxw7j6yiii9nsscfj009vw6zv1q8cxwd75jxvj0idm3hz"; + }; + doCheck = true; + meta = { + license = with stdenv.lib.licenses; [ gpl2 ]; + description = "Calculate the similarity of two strings"; + }; + }; + ShellCommand = buildPerlPackage { pname = "Shell-Command"; version = "0.06"; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9532f113ae3..0fecf30e736 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -202,7 +202,35 @@ in maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; + + phpmd = mkDerivation rec { + version = "2.8.2"; + pname = "phpmd"; + src = pkgs.fetchurl { + url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; + sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb"; + }; + + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpmd/phpmd.phar + makeWrapper ${php}/bin/php $out/bin/phpmd \ + --add-flags "$out/libexec/phpmd/phpmd.phar" + ''; + + meta = with pkgs.lib; { + description = "PHP code quality analyzer"; + license = licenses.bsd3; + homepage = "https://phpmd.org/"; + maintainers = teams.php.members; + broken = !isPhp74; + }; + }; + phpstan = mkDerivation rec { version = "0.12.19"; pname = "phpstan"; @@ -320,11 +348,16 @@ in sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; + peclDeps = [ php.extensions.apcu ]; + buildInputs = [ - php.extensions.apcu pcre' ]; + postInstall = '' + mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so + ''; + meta.maintainers = lib.teams.php.members; }; @@ -341,13 +374,6 @@ in version = "2.6.1"; pname = "couchbase"; - buildInputs = [ - pkgs.libcouchbase - pkgs.zlib - php.extensions.igbinary - php.extensions.pcs - ]; - src = pkgs.fetchFromGitHub { owner = "couchbase"; repo = "php-couchbase"; @@ -356,7 +382,14 @@ in }; configureFlags = [ "--with-couchbase" ]; + + buildInputs = [ + pkgs.libcouchbase + pkgs.zlib + ]; internalDeps = [ php.extensions.json ]; + peclDeps = [ php.extensions.igbinary ]; + patches = [ (pkgs.writeText "php-couchbase.patch" '' --- a/config.m4 @@ -383,7 +416,6 @@ in ]; meta.maintainers = lib.teams.php.members; - meta.broken = isPhp74; # Build error }; event = buildPecl { @@ -557,8 +589,10 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; + internalDeps = [ php.extensions.tokenizer ]; + meta.maintainers = lib.teams.php.members; - meta.broken = isPhp74; # Build error + meta.broken = isPhp73; # Runtime failure on 7.3, build error on 7.4 }; pdo_oci = buildPecl rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5548f8c75a7..c356700167e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let packages = ( self: let - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -100,7 +100,7 @@ let in { - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; @@ -676,6 +676,8 @@ in { dftfit = callPackage ../development/python-modules/dftfit { }; + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + discid = callPackage ../development/python-modules/discid { }; discordpy = callPackage ../development/python-modules/discordpy { }; @@ -941,6 +943,8 @@ in { python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + mortgage = callPackage ../development/python-modules/mortgage { }; + msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; @@ -967,6 +971,8 @@ in { ndtypes = callPackage ../development/python-modules/ndtypes { }; + neo = callPackage ../development/python-modules/neo { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; neuron = pkgs.neuron.override { @@ -1473,6 +1479,8 @@ in { transforms3d = callPackage ../development/python-modules/transforms3d { }; + trimesh = callPackage ../development/python-modules/trimesh {}; + sentinel = callPackage ../development/python-modules/sentinel { }; sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; @@ -2694,6 +2702,8 @@ in { dpath = callPackage ../development/python-modules/dpath { }; + dparse = callPackage ../development/python-modules/dparse { }; + dpkt = callPackage ../development/python-modules/dpkt {}; urllib3 = callPackage ../development/python-modules/urllib3 {}; @@ -2915,6 +2925,8 @@ in { helpdev = callPackage ../development/python-modules/helpdev { }; + heudiconv = callPackage ../development/python-modules/heudiconv { }; + hickle = callPackage ../development/python-modules/hickle { }; hiro = callPackage ../development/python-modules/hiro {}; @@ -4096,6 +4108,8 @@ in { ipy = callPackage ../development/python-modules/IPy { }; + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + ipykernel = if pythonOlder "3.4" then callPackage ../development/python-modules/ipykernel/4.nix { } else @@ -4172,7 +4186,10 @@ in { inherit (pkgs.jsonnet) name src; }; - jupyter_client = callPackage ../development/python-modules/jupyter_client { }; + jupyter_client = if isPy3k then + callPackage ../development/python-modules/jupyter_client { } + else + callPackage ../development/python-modules/jupyter_client/5.nix { }; jupyter_core = callPackage ../development/python-modules/jupyter_core { }; @@ -5655,6 +5672,8 @@ in { safe = callPackage ../development/python-modules/safe { }; + safety = callPackage ../development/python-modules/safety { }; + sampledata = callPackage ../development/python-modules/sampledata { }; sasmodels = callPackage ../development/python-modules/sasmodels { }; @@ -5865,6 +5884,8 @@ in { traitlets = callPackage ../development/python-modules/traitlets { }; + traittypes = callPackage ../development/python-modules/traittypes { }; + transitions = callPackage ../development/python-modules/transitions { }; extras = callPackage ../development/python-modules/extras { }; @@ -7266,7 +7287,7 @@ in { scour = callPackage ../development/python-modules/scour { }; - pymssql = callPackage ../development/python-modules/pymssql { }; + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 nanoleaf = callPackage ../development/python-modules/nanoleaf { }; |