diff --git a/third_party/nixpkgs/README.md b/third_party/nixpkgs/README.md index 16cfeabfa7..8f52d91500 100644 --- a/third_party/nixpkgs/README.md +++ b/third_party/nixpkgs/README.md @@ -60,7 +60,7 @@ channels](https://nixos.org/nix/manual/#sec-channels). Nixpkgs is among the most active projects on GitHub. While thousands of open issues and pull requests might seem a lot at first, it helps consider it in the context of the scope of the project. Nixpkgs -describes how to build over 40,000 pieces of software and implements a +describes how to build tens of thousands of pieces of software and implements a Linux distribution. The [GitHub Insights](https://github.com/NixOS/nixpkgs/pulse) page gives a sense of the project activity. diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml index e20b0c689a..3c9a56a81b 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.xml +++ b/third_party/nixpkgs/doc/builders/packages/index.xml @@ -11,7 +11,7 @@ - + diff --git a/third_party/nixpkgs/doc/builders/packages/kakoune.section.md b/third_party/nixpkgs/doc/builders/packages/kakoune.section.md new file mode 100644 index 0000000000..8e054777a7 --- /dev/null +++ b/third_party/nixpkgs/doc/builders/packages/kakoune.section.md @@ -0,0 +1,9 @@ +# Kakoune {#sec-kakoune} + +Kakoune can be built to autoload plugins: + +```nix +(kakoune.override { + plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; +}) +``` diff --git a/third_party/nixpkgs/doc/builders/packages/kakoune.xml b/third_party/nixpkgs/doc/builders/packages/kakoune.xml deleted file mode 100644 index 045dbd0a65..0000000000 --- a/third_party/nixpkgs/doc/builders/packages/kakoune.xml +++ /dev/null @@ -1,12 +0,0 @@ -
- Kakoune - - - Kakoune can be built to autoload plugins: -(kakoune.override { - plugins = with pkgs.kakounePlugins; [ parinfer-rust ]; -}) - -
diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md new file mode 100644 index 0000000000..ad3b94880b --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -0,0 +1,84 @@ +# BEAM Languages (Erlang, Elixir & LFE) {#sec-beam} + +## Introduction {#beam-introduction} + +In this document and related Nix expressions, we use the term, *BEAM*, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction. + +## Structure {#beam-structure} + +All BEAM-related expressions are available via the top-level `beam` attribute, which includes: + + - `interpreters`: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (`beam.interpreters.erlangR19`, etc), Elixir (`beam.interpreters.elixir`) and LFE (`beam.interpreters.lfe`). + + - `packages`: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. `beam.packages.erlangR19`. + +The default Erlang compiler, defined by `beam.interpreters.erlang`, is aliased as `erlang`. The default BEAM package set is defined by `beam.packages.erlang` and aliased at the top level as `beamPackages`. + +To create a package builder built with a custom Erlang version, use the lambda, `beam.packagesWith`, which accepts an Erlang/OTP derivation and produces a package builder similar to `beam.packages.erlang`. + +Many Erlang/OTP distributions available in `beam.interpreters` have versions with ODBC and/or Java enabled or without wx (no observer support). For example, there's `beam.interpreters.erlangR22_odbc_javac`, which corresponds to `beam.interpreters.erlangR22` and `beam.interpreters.erlangR22_nox`, which corresponds to `beam.interpreters.erlangR22`. + +## Build Tools {#build-tools} + +### Rebar3 {#build-tools-rebar3} + +We provide a version of Rebar3, under `rebar3`. We also provide a helper to fetch Rebar3 dependencies from a lockfile under `fetchRebar3Deps`. + +### Mix & Erlang.mk {#build-tools-other} + +Both Mix and Erlang.mk work exactly as expected. There is a bootstrap process that needs to be run for both, however, which is supported by the `buildMix` and `buildErlangMk` derivations, respectively. + +## How to Install BEAM Packages {#how-to-install-beam-packages} + +BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. To install any of those builders into your profile, refer to them by their attribute path `beamPackages.rebar3`: + +```ShellSession +$ nix-env -f "" -iA beamPackages.rebar3 +``` + +## Packaging BEAM Applications {#packaging-beam-applications} + +### Erlang Applications {#packaging-erlang-applications} + +#### Rebar3 Packages {#rebar3-packages} + +The Nix function, `buildRebar3`, defined in `beam.packages.erlang.buildRebar3` and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project. + +If a package needs to compile native code via Rebar3's port compilation mechanism, add `compilePort = true;` to the derivation. + +#### Erlang.mk Packages {#erlang-mk-packages} + +Erlang.mk functions similarly to Rebar3, except we use `buildErlangMk` instead of `buildRebar3`. + +#### Mix Packages {#mix-packages} + +Mix functions similarly to Rebar3, except we use `buildMix` instead of `buildRebar3`. + +Alternatively, we can use `buildHex` as a shortcut: + +## How to Develop {#how-to-develop} + +### Creating a Shell {#creating-a-shell} + +Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of erlang and other interpreter, and then user your normal build tools. As an example with elixir: + +```nix +{ pkgs ? import " {} }: + +with pkgs; + +let + + elixir = beam.packages.erlangR22.elixir_1_9; + +in +mkShell { + buildInputs = [ elixir ]; + + ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include"; +} +``` + +#### Building in a Shell (for Mix Projects) {#building-in-a-shell} + +Using a `shell.nix` as described (see ) should just work. diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.xml b/third_party/nixpkgs/doc/languages-frameworks/beam.xml deleted file mode 100644 index addab24f7f..0000000000 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.xml +++ /dev/null @@ -1,159 +0,0 @@ -
- BEAM Languages (Erlang, Elixir & LFE) - -
- Introduction - - - In this document and related Nix expressions, we use the term, BEAM, to describe the environment. BEAM is the name of the Erlang Virtual Machine and, as far as we're concerned, from a packaging perspective, all languages that run on the BEAM are interchangeable. That which varies, like the build system, is transparent to users of any given BEAM package, so we make no distinction. - -
- -
- Structure - - - All BEAM-related expressions are available via the top-level beam attribute, which includes: - - - - - - interpreters: a set of compilers running on the BEAM, including multiple Erlang/OTP versions (beam.interpreters.erlangR19, etc), Elixir (beam.interpreters.elixir) and LFE (beam.interpreters.lfe). - - - - - packages: a set of package builders (Mix and rebar3), each compiled with a specific Erlang/OTP version, e.g. beam.packages.erlangR19. - - - - - - The default Erlang compiler, defined by beam.interpreters.erlang, is aliased as erlang. The default BEAM package set is defined by beam.packages.erlang and aliased at the top level as beamPackages. - - - - To create a package builder built with a custom Erlang version, use the lambda, beam.packagesWith, which accepts an Erlang/OTP derivation and produces a package builder similar to beam.packages.erlang. - - - - Many Erlang/OTP distributions available in beam.interpreters have versions with ODBC and/or Java enabled or without wx (no observer support). For example, there's beam.interpreters.erlangR22_odbc_javac, which corresponds to beam.interpreters.erlangR22 and beam.interpreters.erlangR22_nox, which corresponds to beam.interpreters.erlangR22. - -
- -
- Build Tools - -
- Rebar3 - - - We provide a version of Rebar3, under rebar3. We also provide a helper to fetch Rebar3 dependencies from a lockfile under fetchRebar3Deps. - -
- -
- Mix & Erlang.mk - - - Both Mix and Erlang.mk work exactly as expected. There is a bootstrap process that needs to be run for both, however, which is supported by the buildMix and buildErlangMk derivations, respectively. - -
-
- -
- How to Install BEAM Packages - - - BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. - To install any of those builders into your profile, refer to them by their attribute path beamPackages.rebar3: - - - -$ nix-env -f "<nixpkgs>" -iA beamPackages.rebar3 - -
- -
- Packaging BEAM Applications - -
- Erlang Applications - -
- Rebar3 Packages - - - The Nix function, buildRebar3, defined in beam.packages.erlang.buildRebar3 and aliased at the top level, can be used to build a derivation that understands how to build a Rebar3 project. - - - - If a package needs to compile native code via Rebar3's port compilation mechanism, add compilePort = true; to the derivation. - -
- -
- Erlang.mk Packages - - - Erlang.mk functions similarly to Rebar3, except we use buildErlangMk instead of buildRebar3. - - -
- -
- Mix Packages - - - Mix functions similarly to Rebar3, except we use buildMix instead of buildRebar3. - - - - Alternatively, we can use buildHex as a shortcut: - -
-
-
- -
- How to Develop - -
- Creating a Shell - - - Usually, we need to create a shell.nix file and do our development inside of the environment specified therein. Just install your version of erlang and other interpreter, and then user your normal build tools. - As an example with elixir: - - - -{ pkgs ? import "<nixpkgs"> {} }: - -with pkgs; - -let - - elixir = beam.packages.erlangR22.elixir_1_9; - -in -mkShell { - buildInputs = [ elixir ]; - - ERL_INCLUDE_PATH="${erlang}/lib/erlang/usr/include"; -} - - -
- Building in a Shell (for Mix Projects) - - - Using a shell.nix as described (see ) should just work. - -
-
-
-
diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md new file mode 100644 index 0000000000..b4228d9d31 --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md @@ -0,0 +1,140 @@ +# Go {#sec-language-go} + +## Go modules {#ssec-language-go} + +The function `buildGoModule` builds Go programs managed with Go modules. It builds a [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build: + +- An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module. +- A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. + +### Example for `buildGoModule` {#ex-buildGoModule} + +In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function: + +- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;` +- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. + +```nix +pet = buildGoModule rec { + pname = "pet"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "knqyf263"; + repo = "pet"; + rev = "v${version}"; + sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; + }; + + vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; + + runVend = true; + + meta = with lib; { + description = "Simple command-line snippet manager, written in Go"; + homepage = "https://github.com/knqyf263/pet"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} +``` + +## `buildGoPackage` (legacy) {#ssec-go-legacy} + +The function `buildGoPackage` builds legacy Go programs, not supporting Go modules. + +### Example for `buildGoPackage` + +In the following is an example expression using buildGoPackage, the following arguments are of special significance to the function: + +- `goPackagePath` specifies the package's canonical Go import path. +- `goDeps` is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate `deps.nix` file for readability. The dependency data structure is described below. + +```nix +deis = buildGoPackage rec { + pname = "deis"; + version = "1.13.0"; + + goPackagePath = "github.com/deis/deis"; + + src = fetchFromGitHub { + owner = "deis"; + repo = "deis"; + rev = "v${version}"; + sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; + }; + + goDeps = ./deps.nix; +} +``` + +The `goDeps` attribute can be imported from a separate `nix` file that defines which Go libraries are needed and should be included in `GOPATH` for `buildPhase`: + +```nix +# deps.nix +[ # goDeps is a list of Go dependencies. + { + # goPackagePath specifies Go package import path. + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + # `fetch type` that needs to be used to get package source. + # If `git` is used there should be `url`, `rev` and `sha256` defined next to it. + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } +] +``` + +To extract dependency information from a Go package in automated way use [go2nix](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs. + +You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: + +```bash +for p in $NIX_PROFILES; do + GOPATH="$p/share/go:$GOPATH" +done +``` + +## Attributes used by the builders {#ssec-go-common-attributes} + +Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used: + +### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray} + +These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`. The most common use case of these attributes is to make the resulting executable aware of its own version. For example: + +```nix + buildFlagsArray = [ + # Note: single quotes are not needed. + "-ldflags=-X main.Version=${version} -X main.Commit=${version}" + ]; +``` + +```nix + buildFlagsArray = '' + -ldflags= + -X main.Version=${version} + -X main.Commit=${version} + ''; +``` + +### `deleteVendor` {#var-go-deleteVendor} + +Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. + +### `subPackages` {#var-go-subPackages} + +Limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.xml b/third_party/nixpkgs/doc/languages-frameworks/go.xml deleted file mode 100644 index ebdcf61605..0000000000 --- a/third_party/nixpkgs/doc/languages-frameworks/go.xml +++ /dev/null @@ -1,248 +0,0 @@ -
- Go - -
- Go modules - - - The function buildGoModule builds Go programs managed with Go modules. It builds a Go modules through a two phase build: - - - - An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module. - - - - - A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. - - - - - - - buildGoModule - -pet = buildGoModule rec { - pname = "pet"; - version = "0.3.4"; - - src = fetchFromGitHub { - owner = "knqyf263"; - repo = "pet"; - rev = "v${version}"; - sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; - }; - - vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; - - runVend = true; - - meta = with lib; { - description = "Simple command-line snippet manager, written in Go"; - homepage = "https://github.com/knqyf263/pet"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} - - - - - is an example expression using buildGoModule, the following arguments are of special significance to the function: - - - - vendorSha256 is the hash of the output of the intermediate fetcher derivation. - - - - - runVend runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. - - - - - - - vendorSha256 can also take null as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set 'vendorSha256 = null;' - -
- -
- Go legacy - - - The function buildGoPackage builds legacy Go programs, not supporting Go modules. - - - - buildGoPackage - -deis = buildGoPackage rec { - pname = "deis"; - version = "1.13.0"; - - goPackagePath = "github.com/deis/deis"; - - src = fetchFromGitHub { - owner = "deis"; - repo = "deis"; - rev = "v${version}"; - sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; - }; - - goDeps = ./deps.nix; -} - - - - - is an example expression using buildGoPackage, the following arguments are of special significance to the function: - - - - goPackagePath specifies the package's canonical Go import path. - - - - - goDeps is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate deps.nix file for readability. The dependency data structure is described below. - - - - - - - The goDeps attribute can be imported from a separate nix file that defines which Go libraries are needed and should be included in GOPATH for buildPhase. - - - - deps.nix - -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "github.com/docopt/docopt-go"; - fetch = { - type = "git"; - url = "https://github.com/docopt/docopt-go"; - rev = "784ddc588536785e7299f7272f39101f7faccc3f"; - sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; - }; - } -] - - - - - - - - goDeps is a list of Go dependencies. - - - - - goPackagePath specifies Go package import path. - - - - - fetch type that needs to be used to get package source. If git is used there should be url, rev and sha256 defined next to it. - - - - - - - To extract dependency information from a Go package in automated way use go2nix. It can produce complete derivation and goDeps file for Go programs. - - - - You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: - -for p in $NIX_PROFILES; do - GOPATH="$p/share/go:$GOPATH" -done - - -
- -
- Attributes used by the builders - - - Both buildGoModule and buildGoPackage can be tweaked to behave slightly differently, if the following attributes are used: - - - - - - buildFlagsArray and buildFlags - - - - These attributes set build flags supported by go build. We recommend using buildFlagsArray. The most common use case of these attributes is to make the resulting executable aware of its own version. For example: - - - buildFlagsArray - - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Commit=${version}" - ]; - - - - - - Note: single quotes are not needed. - - - - - buildFlagsArray - - buildFlagsArray = '' - -ldflags= - -X main.Version=${version} - -X main.Commit=${version} - ''; - - - - - - - deleteVendor - - - - Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. - - - - - - subPackages - - - - Limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. - - - - -
-
diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index 3366108cd9..22bc6e1baa 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -7,13 +7,13 @@ - + - + @@ -25,9 +25,9 @@ - + - + diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 59f7389b9a..8a2fe2711c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -153,7 +153,7 @@ The dot product of [1 2] and [3 4] is: 11 But if we maintain the script ourselves, and if there are more dependencies, it may be nice to encode those dependencies in source to make the script re-usable without that bit of knowledge. That can be done by using `nix-shell` as a -[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix), like so: +[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)), like so: ```python #!/usr/bin/env nix-shell diff --git a/third_party/nixpkgs/doc/languages-frameworks/qt.section.md b/third_party/nixpkgs/doc/languages-frameworks/qt.section.md new file mode 100644 index 0000000000..4a37eb4ef7 --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/qt.section.md @@ -0,0 +1,124 @@ +# Qt {#sec-language-qt} + +This section describes the differences between Nix expressions for Qt libraries and applications and Nix expressions for other C++ software. Some knowledge of the latter is assumed. + +There are primarily two problems which the Qt infrastructure is designed to address: ensuring consistent versioning of all dependencies and finding dependencies at runtime. + +## Nix expression for a Qt package (default.nix) {#qt-default-nix} + +```{=docbook} + +{ mkDerivation, lib, qtbase }: + +mkDerivation { + pname = "myapp"; + version = "1.0"; + + buildInputs = [ qtbase ]; +} + + + + + + Import mkDerivation and Qt (such as qtbase modules directly. Do not import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures. + + + + + Use mkDerivation instead of stdenv.mkDerivation. mkDerivation is a wrapper around stdenv.mkDerivation which applies some Qt-specific settings. This deriver accepts the same arguments as stdenv.mkDerivation; refer to for details. + + + To use another deriver instead of stdenv.mkDerivation, use mkDerivationWith: + +mkDerivationWith myDeriver { + # ... +} + + If you cannot use mkDerivationWith, please refer to . + + + + + mkDerivation accepts the same arguments as stdenv.mkDerivation, such as buildInputs. + + + +``` + +## Locating runtime dependencies {#qt-runtime-dependencies} +Qt applications need to be wrapped to find runtime dependencies. If you cannot use `mkDerivation` or `mkDerivationWith` above, include `wrapQtAppsHook` in `nativeBuildInputs`: + +```nix +stdenv.mkDerivation { + # ... + + nativeBuildInputs = [ wrapQtAppsHook ]; +} +``` +Entries added to `qtWrapperArgs` are used to modify the wrappers created by `wrapQtAppsHook`. The entries are passed as arguments to [wrapProgram executable makeWrapperArgs](#fun-wrapProgram). + +```nix +mkDerivation { + # ... + + qtWrapperArgs = [ ''--prefix PATH : /path/to/bin'' ]; +} +``` + +Set `dontWrapQtApps` to stop applications from being wrapped automatically. It is required to wrap applications manually with `wrapQtApp`, using the syntax of [wrapProgram executable makeWrapperArgs](#fun-wrapProgram): + +```nix +mkDerivation { + # ... + + dontWrapQtApps = true; + preFixup = '' + wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin + ''; +} +``` + +> Note: `wrapQtAppsHook` ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQT. + +Libraries are built with every available version of Qt. Use the `meta.broken` attribute to disable the package for unsupported Qt versions: + +```nix +mkDerivation { + # ... + + # Disable this library with Qt < 5.9.0 + meta.broken = builtins.compareVersions qtbase.version "5.9.0" < 0; +} +``` +## Adding a library to Nixpkgs + Add a Qt library to all-packages.nix by adding it to the collection inside `mkLibsForQt5`. This ensures that the library is built with every available version of Qt as needed. + +### Example Adding a Qt library to all-packages.nix {#qt-library-all-packages-nix} + +``` +{ + # ... + + mkLibsForQt5 = self: with self; { + # ... + + mylib = callPackage ../path/to/mylib {}; + }; + + # ... +} +``` +## Adding an application to Nixpkgs +Add a Qt application to *all-packages.nix* using `libsForQt5.callPackage` instead of the usual `callPackage`. The former ensures that all dependencies are built with the same version of Qt. + +### Example Adding a QT application to all-packages.nix {#qt-application-all-packages-nix} +```nix +{ + # ... + + myapp = libsForQt5.callPackage ../path/to/myapp/ {}; + + # ... +} +``` diff --git a/third_party/nixpkgs/doc/languages-frameworks/qt.xml b/third_party/nixpkgs/doc/languages-frameworks/qt.xml deleted file mode 100644 index ec95621d8f..0000000000 --- a/third_party/nixpkgs/doc/languages-frameworks/qt.xml +++ /dev/null @@ -1,149 +0,0 @@ -
- Qt - - - This section describes the differences between Nix expressions for Qt libraries and applications and Nix expressions for other C++ software. Some knowledge of the latter is assumed. There are primarily two problems which the Qt infrastructure is designed to address: ensuring consistent versioning of all dependencies and finding dependencies at runtime. - - - - Nix expression for a Qt package (<filename>default.nix</filename>) - -{ mkDerivation, lib, qtbase }: - -mkDerivation { - pname = "myapp"; - version = "1.0"; - - buildInputs = [ qtbase ]; -} - - - - - - - Import mkDerivation and Qt (such as qtbase modules directly. Do not import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures. - - - - - Use mkDerivation instead of stdenv.mkDerivation. mkDerivation is a wrapper around stdenv.mkDerivation which applies some Qt-specific settings. This deriver accepts the same arguments as stdenv.mkDerivation; refer to for details. - - - To use another deriver instead of stdenv.mkDerivation, use mkDerivationWith: - -mkDerivationWith myDeriver { - # ... -} - - If you cannot use mkDerivationWith, please refer to . - - - - - mkDerivation accepts the same arguments as stdenv.mkDerivation, such as buildInputs. - - - - - - Locating runtime dependencies - - Qt applications need to be wrapped to find runtime dependencies. If you cannot use mkDerivation or mkDerivationWith above, include wrapQtAppsHook in nativeBuildInputs: - -stdenv.mkDerivation { - # ... - - nativeBuildInputs = [ wrapQtAppsHook ]; -} - - - - - - Entries added to qtWrapperArgs are used to modify the wrappers created by wrapQtAppsHook. The entries are passed as arguments to . - -mkDerivation { - # ... - - qtWrapperArgs = [ ''--prefix PATH : /path/to/bin'' ]; -} - - - - - Set dontWrapQtApps to stop applications from being wrapped automatically. It is required to wrap applications manually with wrapQtApp, using the syntax of : - -mkDerivation { - # ... - - dontWrapQtApps = true; - preFixup = '' - wrapQtApp "$out/bin/myapp" --prefix PATH : /path/to/bin - ''; -} - - - - - - wrapQtAppsHook ignores files that are non-ELF executables. This means that scripts won't be automatically wrapped so you'll need to manually wrap them as previously mentioned. An example of when you'd always need to do this is with Python applications that use PyQT. - - - - - Libraries are built with every available version of Qt. Use the meta.broken attribute to disable the package for unsupported Qt versions: - -mkDerivation { - # ... - - # Disable this library with Qt < 5.9.0 - meta.broken = builtins.compareVersions qtbase.version "5.9.0" < 0; -} - - - - - Adding a library to Nixpkgs - - Add a Qt library to all-packages.nix by adding it to the collection inside mkLibsForQt5. This ensures that the library is built with every available version of Qt as needed. - - Adding a Qt library to <filename>all-packages.nix</filename> - -{ - # ... - - mkLibsForQt5 = self: with self; { - # ... - - mylib = callPackage ../path/to/mylib {}; - }; - - # ... -} - - - - - - - Adding an application to Nixpkgs - - Add a Qt application to all-packages.nix using libsForQt5.callPackage instead of the usual callPackage. The former ensures that all dependencies are built with the same version of Qt. - - Adding a Qt application to <filename>all-packages.nix</filename> - -{ - # ... - - myapp = libsForQt5.callPackage ../path/to/myapp/ {}; - - # ... -} - - - - -
diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md index e4c4ffce04..e292b3110f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -1,74 +1,38 @@ ---- -title: Ruby -author: Michael Fellinger -date: 2019-05-23 ---- +# Ruby {#sec-language-ruby} -# Ruby +## Using Ruby -## User Guide +Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 2.6. It's also possible to refer to specific versions, e.g. `ruby_2_y`, `jruby`, or `mruby`. -### Using Ruby +In the Nixpkgs tree, Ruby packages can be found throughout, depending on what they do, and are called from the main package set. Ruby gems, however are separate sets, and there's one default set for each interpreter (currently MRI only). -#### Overview +There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly. -Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. -The attribute `ruby` refers to the default Ruby interpreter, which is currently -MRI 2.5. It's also possible to refer to specific versions, e.g. `ruby_2_6`, `jruby`, or `mruby`. +The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_6.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use. -In the nixpkgs tree, Ruby packages can be found throughout, depending on what -they do, and are called from the main package set. Ruby gems, however are -separate sets, and there's one default set for each interpreter (currently MRI -only). +Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual. -There are two main approaches for using Ruby with gems. -One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. -The other is to depend on the common gems, which we'll explain further down, and -rely on them being updated regularly. +### Temporary Ruby environment with `nix-shell` -The interpreters have common attributes, namely `gems`, and `withPackages`. So -you can refer to `ruby.gems.nokogiri`, or `ruby_2_5.gems.nokogiri` to get the -Nokogiri gem already compiled and ready to use. +Rather than having a single Ruby environment shared by all Ruby development projects on a system, Nix allows you to create separate environments per project. `nix-shell` gives you the possibility to temporarily load another environment akin to a combined `chruby` or `rvm` and `bundle exec`. -Since not all gems have executables like `nokogiri`, it's usually more -convenient to use the `withPackages` function like this: -`ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the -Ruby in your environment will be able to find the gem and it can be used in your -Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` -as usual. +There are two methods for loading a shell with Ruby packages. The first and recommended method is to create an environment with `ruby.withPackages` and load that. -#### Temporary Ruby environment with `nix-shell` - -Rather than having a single Ruby environment shared by all Ruby -development projects on a system, Nix allows you to create separate -environments per project. `nix-shell` gives you the possibility to -temporarily load another environment akin to a combined `chruby` or -`rvm` and `bundle exec`. - -There are two methods for loading a shell with Ruby packages. The first and -recommended method is to create an environment with `ruby.withPackages` and load -that. - -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" ``` -The other method, which is not recommended, is to create an environment and list -all the packages directly. +The other method, which is not recommended, is to create an environment and list all the packages directly. -```shell -nix-shell -p ruby.gems.nokogiri ruby.gems.pry +```ShellSession +$ nix-shell -p ruby.gems.nokogiri ruby.gems.pry ``` -Again, it's possible to launch the interpreter from the shell. The Ruby -interpreter has the attribute `gems` which contains all Ruby gems for that -specific interpreter. +Again, it's possible to launch the interpreter from the shell. The Ruby interpreter has the attribute `gems` which contains all Ruby gems for that specific interpreter. -##### Load environment from `.nix` expression +#### Load Ruby 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 Ruby 2.5, `nokogori`, and `pry`. Consider a -`shell.nix` file with: +As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with: ```nix with import {}; @@ -77,43 +41,33 @@ ruby.withPackages (ps: with ps; [ nokogiri pry ]) What's happening here? -1. We begin with importing the Nix Packages collections. `import ` - imports the `` function, `{}` calls it and the `with` statement - brings all attributes of `nixpkgs` in the local scope. These attributes form - the main package set. +1. We begin with importing the Nix Packages collections. `import ` imports the `` 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 Ruby environment with the `withPackages` function. -3. The `withPackages` function expects us to provide a function as an argument - that takes the set of all ruby gems and returns a list of packages to include - in the environment. Here, we select the packages `nokogiri` and `pry` from - the package set. +3. The `withPackages` function expects us to provide a function as an argument that takes the set of all ruby gems and returns a list of packages to include in the environment. Here, we select the packages `nokogiri` and `pry` from the package set. -##### Execute command with `--run` +#### Execute command with `--run` -A convenient flag for `nix-shell` is `--run`. It executes a command in the -`nix-shell`. We can e.g. directly open a `pry` REPL: +A convenient flag for `nix-shell` is `--run`. It executes a command in the `nix-shell`. We can e.g. directly open a `pry` REPL: -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry" ``` Or immediately require `nokogiri` in pry: -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri" ``` Or run a script using this environment: -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb" ``` -##### Using `nix-shell` as shebang +#### Using `nix-shell` as shebang -In fact, for the last case, there is a more convenient method. You can add a -[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script -specifying which dependencies `nix-shell` needs. With the following shebang, you -can just execute `./example.rb`, and it will run with all dependencies. +In fact, for the last case, there is a more convenient method. You can add a [shebang]() to your script specifying which dependencies `nix-shell` needs. With the following shebang, you can just execute `./example.rb`, and it will run with all dependencies. ```ruby #! /usr/bin/env nix-shell @@ -126,35 +80,24 @@ body = RestClient.get('http://example.com').body puts Nokogiri::HTML(body).at('h1').text ``` -### Developing with Ruby +## Developing with Ruby -#### Using an existing Gemfile +### Using an existing Gemfile -In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. -This can be used to generate a `gemset.nix` which is used to fetch the gems and -combine them into a single environment. -The reason why you need to have a separate file for this, is that Nix requires -you to have a checksum for each input to your build. -Since the `Gemfile.lock` that `bundler` generates doesn't provide us with -checksums, we have to first download each gem, calculate its SHA256, and store -it in this separate file. +In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. This can be used to generate a `gemset.nix` which is used to fetch the gems and combine them into a single environment. The reason why you need to have a separate file for this, is that Nix requires you to have a checksum for each input to your build. Since the `Gemfile.lock` that `bundler` generates doesn't provide us with checksums, we have to first download each gem, calculate its SHA256, and store it in this separate file. So the steps from having just a `Gemfile` to a `gemset.nix` are: -```shell -bundle lock -bundix +```ShellSession +$ bundle lock +$ bundix ``` -If you already have a `Gemfile.lock`, you can simply run `bundix` and it will -work the same. +If you already have a `Gemfile.lock`, you can simply run `bundix` and it will work the same. -To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, -which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent -time of modification. +To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent time of modification. -Once the `gemset.nix` is generated, it can be used in a -`bundlerEnv` derivation. Here is an example you could use for your `shell.nix`: +Once the `gemset.nix` is generated, it can be used in a `bundlerEnv` derivation. Here is an example you could use for your `shell.nix`: ```nix # ... @@ -166,41 +109,26 @@ let in mkShell { buildInputs = [ gems gems.wrappedRuby ]; } ``` -With this file in your directory, you can run `nix-shell` to build and use the gems. -The important parts here are `bundlerEnv` and `wrappedRuby`. +With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`. -The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that -all the `/lib` and `/bin` directories will be available, and the executables of -all gems (even of indirect dependencies) will end up in your `$PATH`. -The `wrappedRuby` provides you with all executables that come with Ruby itself, -but wrapped so they can easily find the gems in your gemset. +The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that all the `/lib` and `/bin` directories will be available, and the executables of all gems (even of indirect dependencies) will end up in your `$PATH`. The `wrappedRuby` provides you with all executables that come with Ruby itself, but wrapped so they can easily find the gems in your gemset. -One common issue that you might have is that you have Ruby 2.6, but also -`bundler` in your gemset. That leads to a conflict for `/bin/bundle` and -`/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems -in a `lowPrio` call. So in order to give the `bundler` from your gemset -priority, it would be used like this: +One common issue that you might have is that you have Ruby 2.6, but also `bundler` in your gemset. That leads to a conflict for `/bin/bundle` and `/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems in a `lowPrio` call. So in order to give the `bundler` from your gemset priority, it would be used like this: ```nix # ... mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; } ``` +### Gem-specific configurations and workarounds -#### Gem-specific configurations and workarounds +In some cases, especially if the gem has native extensions, you might need to modify the way the gem is built. -In some cases, especially if the gem has native extensions, you might need to -modify the way the gem is built. +This is done via a common configuration file that includes all of the workarounds for each gem. -This is done via a common configuration file that includes all of the -workarounds for each gem. +This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`, since it already contains a lot of entries, it should be pretty easy to add the modifications you need for your needs. -This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`, -since it already contains a lot of entries, it should be pretty easy to add the -modifications you need for your needs. - -In the meanwhile, or if the modification is for a private gem, you can also add -the configuration to only your own environment. +In the meanwhile, or if the modification is for a private gem, you can also add the configuration to only your own environment. Two places that allow this modification are the `ruby` derivation, or `bundlerEnv`. @@ -261,10 +189,9 @@ let in pkgs.ruby.withPackages (ps: with ps; [ pg ]) ``` -Then we can get whichever postgresql version we desire and the `pg` gem will -always reference it correctly: +Then we can get whichever postgresql version we desire and the `pg` gem will always reference it correctly: -```shell +```ShellSession $ nix-shell --argstr pg_version 9_4 --run 'ruby -rpg -e "puts PG.library_version"' 90421 @@ -272,24 +199,15 @@ $ nix-shell --run 'ruby -rpg -e "puts PG.library_version"' 100007 ``` -Of course for this use-case one could also use overlays since the configuration -for `pg` depends on the `postgresql` alias, but for demonstration purposes this -has to suffice. +Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice. -#### Adding a gem to the default gemset +### Adding a gem to the default gemset -Now that you know how to get a working Ruby environment with Nix, it's time to -go forward and start actually developing with Ruby. -We will first have a look at how Ruby gems are packaged on Nix. Then, we will -look at how you can use development mode with your code. +Now that you know how to get a working Ruby environment with Nix, it's time to go forward and start actually developing with Ruby. We will first have a look at how Ruby gems are packaged on Nix. Then, we will look at how you can use development mode with your code. -All gems in the standard set are automatically generated from a single -`Gemfile`. The dependency resolution is done with `bundler` and makes it more -likely that all gems are compatible to each other. +All gems in the standard set are automatically generated from a single `Gemfile`. The dependency resolution is done with `bundler` and makes it more likely that all gems are compatible to each other. -In order to add a new gem to nixpkgs, you can put it into the -`/pkgs/development/ruby-modules/with-packages/Gemfile` and run -`./maintainers/scripts/update-ruby-packages`. +In order to add a new gem to nixpkgs, you can put it into the `/pkgs/development/ruby-modules/with-packages/Gemfile` and run `./maintainers/scripts/update-ruby-packages`. To test that it works, you can then try using the gem with: @@ -297,16 +215,11 @@ To test that it works, you can then try using the gem with: NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])" ``` -#### Packaging applications +### Packaging applications -A common task is to add a ruby executable to nixpkgs, popular examples would be -`chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` -function, that allows you to make a package that only exposes the listed -executables, otherwise the package may cause conflicts through common paths like -`bin/rake` or `bin/bundler` that aren't meant to be used. +A common task is to add a ruby executable to nixpkgs, popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` function, that allows you to make a package that only exposes the listed executables, otherwise the package may cause conflicts through common paths like `bin/rake` or `bin/bundler` that aren't meant to be used. -The absolute easiest way to do that is to write a -`Gemfile` along these lines: +The absolute easiest way to do that is to write a `Gemfile` along these lines: ```ruby source 'https://rubygems.org' do @@ -314,10 +227,7 @@ source 'https://rubygems.org' do end ``` -If you want to package a specific version, you can use the standard Gemfile -syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable -version anyway, it's easier to update by simply running the `bundle lock` and -`bundix` steps again. +If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again. Now you can also also make a `default.nix` that looks like this: @@ -331,20 +241,15 @@ bundlerApp { } ``` -All that's left to do is to generate the corresponding `Gemfile.lock` and -`gemset.nix` as described above in the `Using an existing Gemfile` section. +All that's left to do is to generate the corresponding `Gemfile.lock` and `gemset.nix` as described above in the `Using an existing Gemfile` section. -##### Packaging executables that require wrapping +#### Packaging executables that require wrapping -Sometimes your app will depend on other executables at runtime, and tries to -find it through the `PATH` environment variable. +Sometimes your app will depend on other executables at runtime, and tries to find it through the `PATH` environment variable. -In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the -gem in another script that prefixes the `PATH`. +In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the gem in another script that prefixes the `PATH`. -Of course you could also make a custom `gemConfig` if you know exactly how to -patch it, but it's usually much easier to maintain with a simple wrapper so the -patch doesn't have to be adjusted for each version. +Of course you could also make a custom `gemConfig` if you know exactly how to patch it, but it's usually much easier to maintain with a simple wrapper so the patch doesn't have to be adjusted for each version. Here's another example: diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.xml b/third_party/nixpkgs/doc/languages-frameworks/ruby.xml deleted file mode 100644 index 9b579d6804..0000000000 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.xml +++ /dev/null @@ -1,107 +0,0 @@ -
- Ruby - - - There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert this into a nix expression that contains all Gem dependencies automatically. - - - - For example, to package sensu, we did: - - - -$ cd pkgs/servers/monitoring -$ mkdir sensu -$ cd sensu -$ cat > Gemfile -source 'https://rubygems.org' -gem 'sensu' -$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic -$ cat > default.nix -{ lib, bundlerEnv, ruby }: - -bundlerEnv rec { - name = "sensu-${version}"; - - version = (import gemset).sensu.version; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemdir = ./.; - - meta = with lib; { - description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = "http://sensuapp.org/"; - license = with licenses; mit; - maintainers = with maintainers; [ theuni ]; - platforms = platforms.unix; - }; -} - - - - Please check in the Gemfile, Gemfile.lock and the gemset.nix so future updates can be run easily. - - - - Updating Ruby packages can then be done like this: - - - -$ cd pkgs/servers/monitoring/sensu -$ nix-shell -p bundler --run 'bundle lock --update' -$ nix-shell -p bundix --run 'bundix' - - - - For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. rake at the command line, there is an alternative builder called bundlerApp. Set up the gemset.nix the same way, and then, for example: - - - - - - - - The chief advantage of bundlerApp over bundlerEnv is the executables introduced in the environment are precisely those selected in the exes list, as opposed to bundlerEnv which adds all the executables made available by gems in the gemset, which can mean e.g. rspec or rake in unpredictable versions available from various packages. - - - - Resulting derivations for both builders also have two helpful attributes, env and wrappedRuby. The first one allows one to quickly drop into nix-shell with the specified environment present. E.g. nix-shell -A sensu.env would give you an environment with Ruby preset so it has all the libraries necessary for sensu in its paths. The second one can be used to make derivations from custom Ruby scripts which have Gemfiles with their dependencies specified. It is a derivation with ruby wrapped so it can find all the needed dependencies. For example, to make a derivation my-script for a my-script.rb (which should be placed in bin) you should run bundix as specified above and then use bundlerEnv like this: - - - - - -
diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 400f39c345..0230993d3f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -63,9 +63,52 @@ The fetcher will verify that the `Cargo.lock` file is in sync with the `src` attribute, and fail the build if not. It will also will compress the vendor directory into a tar.gz archive. -### Building a crate for a different target +### Cross compilation -To build your crate with a different cargo `--target` simply specify the `target` attribute: +By default, Rust packages are compiled for the host platform, just like any +other package is. The `--target` passed to rust tools is computed from this. +By default, it takes the `stdenv.hostPlatform.config` and replaces components +where they are known to differ. But there are ways to customize the argument: + + - To choose a different target by name, define + `stdenv.hostPlatform.rustc.config` as that name (a string), and that + name will be used instead. + + For example: + ```nix + import { + crossSystem = (import ).systems.examples.armhf-embedded // { + rustc.config = "thumbv7em-none-eabi"; + }; + } + ``` + will result in: + ```shell + --target thumbv7em-none-eabi + ``` + + - To pass a completely custom target, define + `stdenv.hostPlatform.rustc.config` with its name, and + `stdenv.hostPlatform.rustc.platform` with the value. The value will be + serialized to JSON in a file called + `${stdenv.hostPlatform.rustc.config}.json`, and the path of that file + will be used instead. + + For example: + ```nix + import { + crossSystem = (import ).systems.examples.armhf-embedded // { + rustc.config = "thumb-crazy"; + rustc.platform = { foo = ""; bar = ""; }; + }; + } + will result in: + ```shell + --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""} + ``` + +Finally, as an ad-hoc escape hatch, a computed target (string or JSON file +path) can be passed directly to `buildRustPackage`: ```nix pkgs.rustPlatform.buildRustPackage { @@ -74,6 +117,15 @@ pkgs.rustPlatform.buildRustPackage { } ``` +This is useful to avoid rebuilding Rust tools, since they are actually target +agnostic and don't need to be rebuilt. But in the future, we should always +build the Rust tools and standard library crates separately so there is no +reason not to take the `stdenv.hostPlatform.rustc`-modifying approach, and the +ad-hoc escape hatch to `buildRustPackage` can be removed. + +Note that currently custom targets aren't compiled with `std`, so `cargo test` +will fail. This can be ignored by adding `doCheck = false;` to your derivation. + ### Running package tests When using `buildRustPackage`, the `checkPhase` is enabled by default and runs @@ -524,12 +576,13 @@ For example, you might want to add `latest.rustChannels.stable.rust` to the list Imperatively, the latest stable version can be installed with the following command: - $ nix-env -Ai nixos.latest.rustChannels.stable.rust + $ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust Or using the attribute with nix-shell: - $ nix-shell -p nixos.latest.rustChannels.stable.rust + $ nix-shell -p nixpkgs.latest.rustChannels.stable.rust +Substitute the `nixpkgs` prefix with `nixos` on NixOS. To install the beta or nightly channel, "stable" should be substituted by "nightly" or "beta", or use the function provided by this overlay to pull a version based on a diff --git a/third_party/nixpkgs/doc/using/configuration.xml b/third_party/nixpkgs/doc/using/configuration.xml index 3e21b0e228..336bdf5b26 100644 --- a/third_party/nixpkgs/doc/using/configuration.xml +++ b/third_party/nixpkgs/doc/using/configuration.xml @@ -169,6 +169,9 @@ } + + Note that whitelistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic whitelist for all types of licenses. blacklistedLicenses applies to all licenses. + diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index a704a6884c..850de29e7d 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -392,6 +392,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "Historic Permission Notice and Disclaimer"; }; + hpndSellVariant = spdx { + fullName = "Historical Permission Notice and Disclaimer - sell variant"; + spdxId = "HPND-sell-variant"; + }; + # Intel's license, seems free iasl = { fullName = "iASL"; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index a26605ad8f..1967e7bee8 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -1152,9 +1152,9 @@ githubId = 50839; name = "Brian Jones"; }; - boothead = { + commandodev = { email = "ben@perurbis.com"; - github = "boothead"; + github = "commandodev"; githubId = 87764; name = "Ben Ford"; }; @@ -1755,6 +1755,12 @@ githubId = 1740337; name = "Chris Ostrouchov"; }; + confus = { + email = "con-f-use@gmx.net"; + github = "con-f-use"; + githubId = 11145016; + name = "J.C."; + }; contrun = { email = "uuuuuu@protonmail.com"; github = "contrun"; @@ -2895,6 +2901,12 @@ githubId = 541748; name = "Felipe Espinoza"; }; + fehnomenal = { + email = "fehnomenal@fehn.systems"; + github = "fehnomenal"; + githubId = 9959940; + name = "Andreas Fehn"; + }; felschr = { email = "dev@felschr.com"; github = "felschr"; @@ -4137,6 +4149,12 @@ githubId = 60272884; name = "Jonathan Jeppener-Haltenhoff"; }; + joelancaster = { + email = "joe.a.lancas@gmail.com"; + github = "joelancaster"; + githubId = 16760945; + name = "Joe Lancaster"; + }; joelburget = { email = "joelburget@gmail.com"; github = "joelburget"; @@ -4801,12 +4819,6 @@ fingerprint = "5A9A 1C9B 2369 8049 3B48 CF5B 81A1 5409 4816 2372"; }]; }; - kylewlacy = { - email = "kylelacy+nix@pm.me"; - github = "kylewlacy"; - githubId = 1362179; - name = "Kyle Lacy"; - }; laikq = { email = "gwen@quasebarth.de"; github = "laikq"; @@ -5509,7 +5521,7 @@ name = "Marius Bakke"; }; mbaillie = { - email = "martin@baillie.email"; + email = "martin@baillie.id"; github = "martinbaillie"; githubId = 613740; name = "Martin Baillie"; @@ -6135,6 +6147,12 @@ githubId = 5139265; name = "James Wood"; }; + mudrii = { + email = "mudreac@gmail.com"; + github = "mudrii"; + githubId = 220262; + name = "Ion Mudreac"; + }; muflax = { email = "mail@muflax.com"; github = "muflax"; @@ -6959,6 +6977,18 @@ githubId = 138074; name = "Pedro Pombeiro"; }; + poscat = { + email = "poscat@mail.poscat.moe"; + github = "poscat0x04"; + githubId = 53291983; + name = "Poscat Tarski"; + keys = [ + { + longkeyid = "rsa4096/2D2595A00D08ACE0"; + fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; + } + ]; + }; pradeepchhetri = { email = "pradeep.chhetri89@gmail.com"; github = "pradeepchhetri"; @@ -6975,6 +7005,12 @@ fingerprint = "240B 57DE 4271 2480 7CE3 EAC8 4F74 D536 1C4C A31E"; }]; }; + preisschild = { + email = "florian@florianstroeger.com"; + github = "Preisschild"; + githubId = 11898437; + name = "Florian Ströger"; + }; priegger = { email = "philipp@riegger.name"; github = "priegger"; @@ -9041,6 +9077,12 @@ githubId = 619015; name = "Svintsov Dmitry"; }; + urbas = { + email = "matej.urbas@gmail.com"; + github = "urbas"; + githubId = 771193; + name = "Matej Urbas"; + }; uri-canva = { email = "uri@canva.com"; github = "uri-canva"; diff --git a/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.pl b/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.pl index 638d1b2aaa..43fb394136 100755 --- a/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.pl +++ b/third_party/nixpkgs/maintainers/scripts/nixpkgs-lint.pl @@ -35,7 +35,7 @@ GetOptions("package|p=s" => \$filter, ) or exit 1; # Evaluate Nixpkgs into an XML representation. -my $xml = `nix-env -f '$path' -qa '$filter' --xml --meta --drv-path`; +my $xml = `nix-env -f '$path' --arg overlays '[]' -qa '$filter' --xml --meta --drv-path`; die "$0: evaluation of ‘$path’ failed\n" if $? != 0; my $info = XMLin($xml, KeyAttr => { 'item' => '+attrPath', 'meta' => 'name' }, ForceArray => 1, SuppressEmpty => '' ) or die "cannot parse XML output"; diff --git a/third_party/nixpkgs/maintainers/scripts/update_redirected_urls.sh b/third_party/nixpkgs/maintainers/scripts/update-redirected-urls.sh similarity index 97% rename from third_party/nixpkgs/maintainers/scripts/update_redirected_urls.sh rename to third_party/nixpkgs/maintainers/scripts/update-redirected-urls.sh index b802756559..5ffa9aca5f 100755 --- a/third_party/nixpkgs/maintainers/scripts/update_redirected_urls.sh +++ b/third_party/nixpkgs/maintainers/scripts/update-redirected-urls.sh @@ -9,3 +9,4 @@ curl https://repology.org/api/v1/repository/nix_unstable/problems \ | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \ | sort | uniq | tee script.sed find -name '*.nix' | xargs -P4 -- sed -f script.sed -i +rm script.sed diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 214d9356aa..f5e6c5f4d6 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -147,6 +147,7 @@ ./programs/npm.nix ./programs/oblogout.nix ./programs/plotinus.nix + ./programs/proxychains.nix ./programs/qt5ct.nix ./programs/screen.nix ./programs/sedutil.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix new file mode 100644 index 0000000000..7743f79c1c --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix @@ -0,0 +1,165 @@ +{ config, lib, pkgs, ... }: +with lib; +let + + cfg = config.programs.proxychains; + + configFile = '' + ${cfg.chain.type}_chain + ${optionalString (cfg.chain.type == "random") + "chain_len = ${builtins.toString cfg.chain.length}"} + ${optionalString cfg.proxyDNS "proxy_dns"} + ${optionalString cfg.quietMode "quiet_mode"} + remote_dns_subnet ${builtins.toString cfg.remoteDNSSubnet} + tcp_read_time_out ${builtins.toString cfg.tcpReadTimeOut} + tcp_connect_time_out ${builtins.toString cfg.tcpConnectTimeOut} + localnet ${cfg.localnet} + [ProxyList] + ${builtins.concatStringsSep "\n" + (lib.mapAttrsToList (k: v: "${v.type} ${v.host} ${builtins.toString v.port}") + (lib.filterAttrs (k: v: v.enable) cfg.proxies))} + ''; + + proxyOptions = { + options = { + enable = mkEnableOption "this proxy"; + + type = mkOption { + type = types.enum [ "http" "socks4" "socks5" ]; + description = "Proxy type."; + }; + + host = mkOption { + type = types.str; + description = "Proxy host or IP address."; + }; + + port = mkOption { + type = types.port; + description = "Proxy port"; + }; + }; + }; + +in { + + ###### interface + + options = { + + programs.proxychains = { + + enable = mkEnableOption "installing proxychains configuration"; + + chain = { + type = mkOption { + type = types.enum [ "dynamic" "strict" "random" ]; + default = "strict"; + description = '' + dynamic - Each connection will be done via chained proxies + all proxies chained in the order as they appear in the list + at least one proxy must be online to play in chain + (dead proxies are skipped) + otherwise EINTR is returned to the app. + + strict - Each connection will be done via chained proxies + all proxies chained in the order as they appear in the list + all proxies must be online to play in chain + otherwise EINTR is returned to the app. + + random - Each connection will be done via random proxy + (or proxy chain, see ) from the list. + ''; + }; + length = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Chain length for random chain. + ''; + }; + }; + + proxyDNS = mkOption { + type = types.bool; + default = true; + description = "Proxy DNS requests - no leak for DNS data."; + }; + + quietMode = mkEnableOption "Quiet mode (no output from the library)."; + + remoteDNSSubnet = mkOption { + type = types.enum [ 10 127 224 ]; + default = 224; + description = '' + Set the class A subnet number to use for the internal remote DNS mapping, uses the reserved 224.x.x.x range by default. + ''; + }; + + tcpReadTimeOut = mkOption { + type = types.int; + default = 15000; + description = "Connection read time-out in milliseconds."; + }; + + tcpConnectTimeOut = mkOption { + type = types.int; + default = 8000; + description = "Connection time-out in milliseconds."; + }; + + localnet = mkOption { + type = types.str; + default = "127.0.0.0/255.0.0.0"; + description = "By default enable localnet for loopback address ranges."; + }; + + proxies = mkOption { + type = types.attrsOf (types.submodule proxyOptions); + description = '' + Proxies to be used by proxychains. + ''; + + example = literalExample '' + { myproxy = + { type = "socks4"; + host = "127.0.0.1"; + port = 1337; + }; + } + ''; + }; + + }; + + }; + + ###### implementation + + meta.maintainers = with maintainers; [ sorki ]; + + config = mkIf cfg.enable { + + assertions = singleton { + assertion = cfg.chain.type != "random" && cfg.chain.length == null; + message = '' + Option `programs.proxychains.chain.length` + only makes sense with `programs.proxychains.chain.type` = "random". + ''; + }; + + programs.proxychains.proxies = mkIf config.services.tor.client.enable + { + torproxy = mkDefault { + enable = true; + type = "socks4"; + host = "127.0.0.1"; + port = 9050; + }; + }; + + environment.etc."proxychains.conf".text = configFile; + environment.systemPackages = [ pkgs.proxychains ]; + }; + +} diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix index 5179cbaf6b..c4923cfd3f 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire.nix @@ -17,10 +17,6 @@ let mkdir -p "$out/lib" ln -s "${pkgs.pipewire.jack}/lib" "$out/lib/pipewire" ''; - pulse-libs = pkgs.runCommand "pulse-libs" {} '' - mkdir -p "$out/lib" - ln -s "${pkgs.pipewire.pulse}/lib" "$out/lib/pipewire" - ''; in { meta = { @@ -50,7 +46,7 @@ in { }; pulse = { - enable = mkEnableOption "PulseAudio emulation"; + enable = mkEnableOption "PulseAudio server emulation"; }; }; }; @@ -61,23 +57,24 @@ in { assertions = [ { assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; - message = "PipeWire based PulseAudio emulation doesn't use the PulseAudio service"; + message = "PipeWire based PulseAudio server emulation replaces PulseAudio"; } { assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; - message = "PIpeWire based JACK emulation doesn't use the JACK service"; + message = "PipeWire based JACK emulation doesn't use the JACK service"; } ]; environment.systemPackages = [ pkgs.pipewire ] - ++ lib.optional cfg.jack.enable jack-libs - ++ lib.optional cfg.pulse.enable pulse-libs; + ++ lib.optional cfg.jack.enable jack-libs; - systemd.packages = [ pkgs.pipewire ]; + systemd.packages = [ pkgs.pipewire ] + ++ lib.optional cfg.pulse.enable pkgs.pipewire.pulse; # PipeWire depends on DBUS but doesn't list it. Without this booting # into a terminal results in the service crashing with an error. systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; + systemd.user.sockets.pipewire-pulse.wantedBy = lib.mkIf (cfg.socketActivation && cfg.pulse.enable) ["sockets.target"]; systemd.user.services.pipewire.bindsTo = [ "dbus.service" ]; services.udev.packages = [ pkgs.pipewire ]; @@ -100,6 +97,6 @@ in { source = "${pkgs.pipewire}/share/alsa/alsa.conf.d/50-pipewire.conf"; }; environment.sessionVariables.LD_LIBRARY_PATH = - lib.optional (cfg.jack.enable || cfg.pulse.enable) "/run/current-system/sw/lib/pipewire"; + lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire"; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix index 4b2e1a3c07..73099ae336 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix @@ -49,8 +49,13 @@ in default = 34197; description = '' The port to which the service should bind. - - This option will also open up the UDP port in the firewall configuration. + ''; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to automatically open the specified UDP port in the firewall. ''; }; saveName = mkOption { @@ -237,6 +242,6 @@ in }; }; - networking.firewall.allowedUDPPorts = [ cfg.port ]; + networking.firewall.allowedUDPPorts = if cfg.openFirewall then [ cfg.port ] else []; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix index 69386cdbb3..41483d80a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix @@ -34,6 +34,14 @@ in defaultText = "pkgs.disnix"; }; + enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; + + profiles = mkOption { + type = types.listOf types.string; + default = [ "default" ]; + example = [ "default" ]; + description = "Names of the Disnix profiles to expose in the system's PATH"; + }; }; }; @@ -44,6 +52,7 @@ in dysnomia.enable = true; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; + environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); services.dbus.enable = true; services.dbus.packages = [ pkgs.disnix ]; @@ -68,7 +77,8 @@ in ++ optional config.services.postgresql.enable "postgresql.service" ++ optional config.services.tomcat.enable "tomcat.service" ++ optional config.services.svnserve.enable "svnserve.service" - ++ optional config.services.mongodb.enable "mongodb.service"; + ++ optional config.services.mongodb.enable "mongodb.service" + ++ optional config.services.influxdb.enable "influxdb.service"; restartIfChanged = false; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix index 4b52963500..eb94791fbb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix @@ -66,6 +66,19 @@ let ) (builtins.attrNames cfg.components)} ''; }; + + dysnomiaFlags = { + enableApacheWebApplication = config.services.httpd.enable; + enableAxis2WebService = config.services.tomcat.axis2.enable; + enableDockerContainer = config.virtualisation.docker.enable; + enableEjabberdDump = config.services.ejabberd.enable; + enableMySQLDatabase = config.services.mysql.enable; + enablePostgreSQLDatabase = config.services.postgresql.enable; + enableTomcatWebApplication = config.services.tomcat.enable; + enableMongoDatabase = config.services.mongodb.enable; + enableSubversionRepository = config.services.svnserve.enable; + enableInfluxDatabase = config.services.influxdb.enable; + }; in { options = { @@ -117,6 +130,12 @@ in description = "A list of paths containing additional modules that are added to the search folders"; default = []; }; + + enableLegacyModules = mkOption { + type = types.bool; + default = true; + description = "Whether to enable Dysnomia legacy process and wrapper modules"; + }; }; }; @@ -142,34 +161,48 @@ in environment.systemPackages = [ cfg.package ]; - dysnomia.package = pkgs.dysnomia.override (origArgs: { - enableApacheWebApplication = config.services.httpd.enable; - enableAxis2WebService = config.services.tomcat.axis2.enable; - enableEjabberdDump = config.services.ejabberd.enable; - enableMySQLDatabase = config.services.mysql.enable; - enablePostgreSQLDatabase = config.services.postgresql.enable; - enableSubversionRepository = config.services.svnserve.enable; - enableTomcatWebApplication = config.services.tomcat.enable; - enableMongoDatabase = config.services.mongodb.enable; - enableInfluxDatabase = config.services.influxdb.enable; + dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) { + enableLegacy = builtins.trace '' + WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper' + modules for compatibility reasons! If you rely on these modules, consider + migrating to better alternatives. + + More information: https://raw.githubusercontent.com/svanderburg/dysnomia/f65a9a84827bcc4024d6b16527098b33b02e4054/README-legacy.md + + If you have migrated already or don't rely on these Dysnomia modules, you can + disable legacy mode with the following NixOS configuration option: + + dysnomia.enableLegacyModules = false; + + In a future version of Dysnomia (and NixOS) the legacy option will go away! + '' true; }); dysnomia.properties = { hostname = config.networking.hostName; inherit (config.nixpkgs.localSystem) system; - supportedTypes = (import "${pkgs.stdenv.mkDerivation { - name = "supportedtypes"; - buildCommand = '' - ( echo -n "[ " - cd ${cfg.package}/libexec/dysnomia - for i in * - do - echo -n "\"$i\" " - done - echo -n " ]") > $out - ''; - }}"); + supportedTypes = [ + "echo" + "fileset" + "process" + "wrapper" + + # These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS + "systemd-unit" + "sysvinit-script" + "nixos-configuration" + ] + ++ optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication" + ++ optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice" + ++ optional (dysnomiaFlags.enableDockerContainer) "docker-container" + ++ optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump" + ++ optional (dysnomiaFlags.enableInfluxDatabase) "influx-database" + ++ optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database" + ++ optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database" + ++ optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication" + ++ optional (dysnomiaFlags.enableMongoDatabase) "mongo-database" + ++ optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository"; }; dysnomia.containers = lib.recursiveUpdate ({ @@ -185,9 +218,9 @@ in }; } // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = { mysqlPort = config.services.mysql.port; + mysqlSocket = "/run/mysqld/mysqld.sock"; } // lib.optionalAttrs cfg.enableAuthentication { mysqlUsername = "root"; - mysqlPassword = builtins.readFile (config.services.mysql.rootPassword); }; } // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = { @@ -199,6 +232,13 @@ in tomcatPort = 8080; }; } // lib.optionalAttrs (config.services.mongodb.enable) { mongo-database = {}; } + // lib.optionalAttrs (config.services.influxdb.enable) { + influx-database = { + influxdbUsername = config.services.influxdb.user; + influxdbDataDir = "${config.services.influxdb.dataDir}/data"; + influxdbMetaDir = "${config.services.influxdb.dataDir}/meta"; + }; + } // lib.optionalAttrs (config.services.svnserve.enable) { subversion-repository = { svnBaseDir = config.services.svnserve.svnBaseDir; }; }) cfg.extraContainerProperties; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index 9342039927..3ee7a81dc3 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -757,7 +757,7 @@ in { systemd.services.gitaly = { after = [ "network.target" "gitlab.service" ]; - requires = [ "gitlab.service" ]; + bindsTo = [ "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ openssh diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix index c5070aaa35..d7233f10c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix @@ -25,7 +25,6 @@ let HTTP_ADDR = ${cfg.httpAddress} HTTP_PORT = ${toString cfg.httpPort} ROOT_URL = ${cfg.rootUrl} - STATIC_ROOT_PATH = ${cfg.staticRootPath} [session] COOKIE_NAME = session @@ -179,13 +178,6 @@ in ''; }; - staticRootPath = mkOption { - type = types.str; - default = "${pkgs.gogs.data}"; - example = "/var/lib/gogs/data"; - description = "Upper level of template and static files path."; - }; - extraConfig = mkOption { type = types.str; default = ""; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix index 0477254e7c..1f2e13f373 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/home-assistant.nix @@ -245,7 +245,11 @@ in { Group = "hass"; Restart = "on-failure"; ProtectSystem = "strict"; - ReadWritePaths = "${cfg.configDir}"; + ReadWritePaths = let + cfgPath = [ "config" "homeassistant" "allowlist_external_dirs" ]; + value = attrByPath cfgPath [] cfg; + allowPaths = if isList value then value else singleton value; + in [ "${cfg.configDir}" ] ++ allowPaths; KillSignal = "SIGINT"; PrivateTmp = true; RemoveIPC = true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix b/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix index c5e8a5b85e..caeb4b0416 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mautrix-telegram.nix @@ -21,6 +21,7 @@ in { default = { appservice = rec { database = "sqlite:///${dataDir}/mautrix-telegram.db"; + database_opts = {}; hostname = "0.0.0.0"; port = 8080; address = "http://localhost:${toString port}"; @@ -29,6 +30,8 @@ in { bridge = { permissions."*" = "relaybot"; relaybot.whitelist = [ ]; + double_puppet_server_map = {}; + login_shared_secret_map = {}; }; logging = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix index 4a85b3956d..10b49d9b22 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix @@ -232,6 +232,16 @@ in Restart = "on-failure"; ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateDevices = true; + PrivateTmp = true; + ReadWritePaths = "${cfg.dataDir}"; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + NoNewPrivileges = true; }; preStart = '' rm -f ${cfg.dataDir}/passwd diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix index dc1d957c17..88e13f4dbf 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.exwm; loadScript = pkgs.writeText "emacs-exwm-load" '' - (require 'exwm) + ${cfg.loadScript} ${optionalString cfg.enableDefaultConfig '' (require 'exwm-config) (exwm-config-default) @@ -19,6 +19,18 @@ in options = { services.xserver.windowManager.exwm = { enable = mkEnableOption "exwm"; + loadScript = mkOption { + default = "(require 'exwm)"; + example = literalExample '' + (require 'exwm) + (exwm-enable) + ''; + description = '' + Emacs lisp code to be run after loading the user's init + file. If enableDefaultConfig is true, this will be run + before loading the default config. + ''; + }; enableDefaultConfig = mkOption { default = true; type = lib.types.bool; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix index f7ef261037..00ac83a189 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix @@ -159,9 +159,14 @@ in boot.initrd.extraUtilsCommandsTest = '' # sshd requires a host key to check config, so we pass in the test's + tmpkey="$(mktemp initrd-ssh-testkey.XXXXXXXXXX)" + cp "${../../../tests/initrd-network-ssh/ssh_host_ed25519_key}" "$tmpkey" + # keys from Nix store are world-readable, which sshd doesn't like + chmod 600 "$tmpkey" echo -n ${escapeShellArg sshdConfig} | $out/bin/sshd -t -f /dev/stdin \ - -h ${../../../tests/initrd-network-ssh/ssh_host_ed25519_key} + -h "$tmpkey" + rm "$tmpkey" ''; boot.initrd.network.postCommands = '' diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh index e5cafe237c..abc1a0af48 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh @@ -219,6 +219,9 @@ done @preDeviceCommands@ echo "running udev..." ln -sfn /proc/self/fd /dev/fd +ln -sfn /proc/self/fd/0 /dev/stdin +ln -sfn /proc/self/fd/1 /dev/stdout +ln -sfn /proc/self/fd/2 /dev/stderr mkdir -p /etc/systemd ln -sfn @linkUnits@ /etc/systemd/network mkdir -p /etc/udev diff --git a/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix b/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix index 69385e5f2f..b19b688a1f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix @@ -109,9 +109,8 @@ in { ''; }]; - system.autoUpgrade.flags = [ "--no-build-output" ] - ++ (if cfg.flake == null then - (if cfg.channel == null then + system.autoUpgrade.flags = (if cfg.flake == null then + [ "--no-build-output" ] ++ (if cfg.channel == null then [ "--upgrade" ] else [ "-I" diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 899509696e..d746105ea6 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -28,7 +28,9 @@ in atd = handleTest ./atd.nix {}; avahi = handleTest ./avahi.nix {}; avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; + awscli = handleTest ./awscli.nix { }; babeld = handleTest ./babeld.nix {}; + bat = handleTest ./bat.nix {}; bazarr = handleTest ./bazarr.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 beanstalkd = handleTest ./beanstalkd.nix {}; @@ -170,6 +172,7 @@ in jenkins = handleTest ./jenkins.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; + jq = handleTest ./jq.nix {}; k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; keepalived = handleTest ./keepalived.nix {}; @@ -193,6 +196,7 @@ in limesurvey = handleTest ./limesurvey.nix {}; login = handleTest ./login.nix {}; loki = handleTest ./loki.nix {}; + lsd = handleTest ./lsd.nix {}; lxd = handleTest ./lxd.nix {}; lxd-nftables = handleTest ./lxd-nftables.nix {}; #logstash = handleTest ./logstash.nix {}; @@ -207,6 +211,8 @@ in mediawiki = handleTest ./mediawiki.nix {}; memcached = handleTest ./memcached.nix {}; metabase = handleTest ./metabase.nix {}; + minecraft = handleTest ./minecraft.nix {}; + minecraft-server = handleTest ./minecraft-server.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; minidlna = handleTest ./minidlna.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/awscli.nix b/third_party/nixpkgs/nixos/tests/awscli.nix new file mode 100644 index 0000000000..35bdd6d99b --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/awscli.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "awscli"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + machine = { pkgs, ... }: + { + environment.systemPackages = [ pkgs.awscli ]; + }; + + testScript = + '' + assert "${pkgs.python3Packages.botocore.version}" in machine.succeed("aws --version") + assert "${pkgs.awscli.version}" in machine.succeed("aws --version") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/bat.nix b/third_party/nixpkgs/nixos/tests/bat.nix new file mode 100644 index 0000000000..8e65e235d9 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/bat.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "bat"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; }; + + testScript = '' + machine.succeed("echo 'Foobar\n\n\n42' > /tmp/foo") + assert "Foobar" in machine.succeed("bat -p /tmp/foo") + assert "42" in machine.succeed("bat -p /tmp/foo -r 4:4") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/jq.nix b/third_party/nixpkgs/nixos/tests/jq.nix new file mode 100644 index 0000000000..20b67522ee --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/jq.nix @@ -0,0 +1,10 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "jq"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; }; + + testScript = '' + assert "world" in jq.succeed('echo \'{"values":["hello","world"]}\'| jq \'.values[1]\''') + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/lsd.nix b/third_party/nixpkgs/nixos/tests/lsd.nix new file mode 100644 index 0000000000..fee8e95e14 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/lsd.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "lsd"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.lsd = { pkgs, ... }: { environment.systemPackages = [ pkgs.lsd ]; }; + + testScript = '' + lsd.succeed('echo "abc" > /tmp/foo') + assert "4 B /tmp/foo" in lsd.succeed('lsd --classic --blocks "size,name" /tmp/foo') + assert "lsd ${pkgs.lsd.version}" in lsd.succeed("lsd --version") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/minecraft-server.nix b/third_party/nixpkgs/nixos/tests/minecraft-server.nix new file mode 100644 index 0000000000..53780e4636 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/minecraft-server.nix @@ -0,0 +1,37 @@ +let + seed = "2151901553968352745"; + rcon-pass = "foobar"; + rcon-port = 43000; +in import ./make-test-python.nix ({ pkgs, ... }: { + name = "minecraft-server"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.server = { ... }: { + environment.systemPackages = [ pkgs.mcrcon ]; + + nixpkgs.config.allowUnfree = true; + + services.minecraft-server = { + declarative = true; + enable = true; + eula = true; + serverProperties = { + enable-rcon = true; + level-seed = seed; + online-mode = false; + "rcon.password" = rcon-pass; + "rcon.port" = rcon-port; + }; + }; + + virtualisation.memorySize = 2048; + }; + + testScript = '' + server.wait_for_unit("minecraft-server") + server.wait_for_open_port(${toString rcon-port}) + assert "${seed}" in server.succeed( + "mcrcon -H localhost -P ${toString rcon-port} -p '${rcon-pass}' -c 'seed'" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/minecraft.nix b/third_party/nixpkgs/nixos/tests/minecraft.nix new file mode 100644 index 0000000000..e0c35f2d27 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/minecraft.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "minecraft"; + meta = with lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.client = { nodes, ... }: + let user = nodes.client.config.users.users.alice; + in { + imports = [ ./common/user-account.nix ./common/x11.nix ]; + + environment.systemPackages = [ pkgs.minecraft ]; + + nixpkgs.config.allowUnfree = true; + + test-support.displayManager.auto.user = user.name; + }; + + enableOCR = true; + + testScript = { nodes, ... }: + let user = nodes.client.config.users.users.alice; + in '' + client.wait_for_x() + client.execute("su - alice -c minecraft-launcher &") + client.wait_for_text("CONTINUE WITHOUT LOGIN") + client.sleep(10) + client.screenshot("launcher") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 83d4f6465b..4fc5d48e0e 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -499,8 +499,8 @@ let list, targetList ) with subtest("Test MTU and MAC Address are configured"): - assert "mtu 1342" in machine.succeed("ip link show dev tap0") - assert "mtu 1343" in machine.succeed("ip link show dev tun0") + machine.wait_until_succeeds("ip link show dev tap0 | grep 'mtu 1342'") + machine.wait_until_succeeds("ip link show dev tun0 | grep 'mtu 1343'") assert "02:de:ad:be:ef:01" in machine.succeed("ip link show dev tap0") '' # network-addresses-* only exist in scripted networking + optionalString (!networkd) '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix index 6695b9a723..3e8360e1ea 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmusfm/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }: stdenv.mkDerivation { - version = "2018-10-11"; + version = "2020-07-23"; pname = "cmusfm-unstable"; src = fetchFromGitHub { owner = "Arkq"; repo = "cmusfm"; - rev = "ad2fd0aad3f4f1a25add1b8c2f179e8859885873"; - sha256 = "0wpwdwgyrp64nvwc6shy0n387p31j6aw6cnmfi9x2y1jhl5hbv6b"; + rev = "73df3e64d8aa3b5053b639615b8f81d512420e52"; + sha256 = "1p9i65v8hda9bsps4hm9m2b7aw9ivk4ncllg8svyp455gn5v8xx6"; }; # building configureFlags = [ "--enable-libnotify" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix new file mode 100644 index 0000000000..031203dda7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/dsf2flac/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, boost, flac, id3lib, pkg-config +, taglib, zlib }: + +stdenv.mkDerivation rec { + pname = "dsf2flac"; + version = "unstable-2018-01-02"; + + src = fetchFromGitHub { + owner = "hank"; + repo = pname; + rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16"; + sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc"; + }; + + buildInputs = [ boost flac id3lib taglib zlib ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + preConfigure = '' + export LIBS="$LIBS -lz" + ''; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + + meta = with stdenv.lib; { + description = "A DSD to FLAC transcoding tool"; + homepage = "https://github.com/hank/dsf2flac"; + license = licenses.gpl2; + maintainers = with maintainers; [ dmrauh ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix index 64b8e72443..1695643365 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust1.nix @@ -17,7 +17,7 @@ let }; meta = with stdenv.lib; { - homepage = "http://faust.grame.fr/"; + homepage = "https://faust.grame.fr/"; downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix index 515f8a6f9a..1c096374a4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faust2.nix @@ -31,7 +31,7 @@ let }; meta = with stdenv.lib; { - homepage = "http://faust.grame.fr/"; + homepage = "https://faust.grame.fr/"; downloadPage = "https://github.com/grame-cncm/faust/"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix b/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix index 03ca4ce8eb..00682b13be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/faust/faustlive.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { together the convenience of a standalone interpreted language with the efficiency of a compiled language. It's ideal for fast prototyping. ''; - homepage = "http://faust.grame.fr/"; + homepage = "https://faust.grame.fr/"; license = licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 24bc340898..7045d6811d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation rec { homepage = "https://16-bits.org/ft2.php"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + # From HOW-TO-COMPILE.txt: + # > This code is NOT big-endian compatible + platforms = platforms.littleEndian; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix index 77a04221b8..76b5617d23 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl , unzip +, copyDesktopItems , makeDesktopItem , imagemagick , SDL @@ -37,7 +38,7 @@ in stdenv.mkDerivation rec { }; sourceRoot = (if isStereo then "gt2stereo/trunk" else "goattrk2") + "/src"; - nativeBuildInputs = [ unzip imagemagick ]; + nativeBuildInputs = [ copyDesktopItems unzip imagemagick ]; buildInputs = [ SDL ]; # PREFIX gets treated as BINDIR. @@ -51,11 +52,16 @@ in stdenv.mkDerivation rec { # Other files get installed during the build phase. installPhase = '' + runHook preInstall + convert goattrk2.bmp goattracker.png install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png - ${desktopItem.buildCommand} + + runHook postInstall ''; + desktopItems = [ desktopItem ]; + meta = { description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" + optionalString isStereo " - Stereo version"; @@ -66,4 +72,3 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/audio/greg/default.nix b/third_party/nixpkgs/pkgs/applications/audio/greg/default.nix index e027680f5f..c243a81ac2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/greg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/greg/default.nix @@ -13,8 +13,7 @@ with pythonPackages; buildPythonApplication rec { sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v"; }; - buildInputs = with pythonPackages; [ feedparser ]; - propagatedBuildInputs = buildInputs; + propagatedBuildInputs = [ setuptools feedparser ]; meta = with stdenv.lib; { homepage = "https://github.com/manolomartinez/greg"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/iannix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/iannix/default.nix index fa779a7f0f..3765d2ca67 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/iannix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/iannix/default.nix @@ -1,14 +1,15 @@ -{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -mkDerivation { +mkDerivation rec { pname = "iannix"; - version = "2016-01-31"; + version = "0.9.20-b"; + src = fetchFromGitHub { owner = "iannix"; repo = "IanniX"; - rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755"; - sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; + rev = "v${version}"; + sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q="; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -20,11 +21,11 @@ mkDerivation { enableParallelBuilding = true; - meta = { - description = "Graphical open-source sequencer,"; + meta = with lib; { + description = "Graphical open-source sequencer"; homepage = "https://www.iannix.org/"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix index 1839aa9c7a..4cc48b89f9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "06x9b2kjsgk8kddhif0x59nwzhnwjmq40x3w5nrphqaimqlrhlcf"; + sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15"; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch deleted file mode 100644 index 3e1c822be2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c3865405ca707e3284a81709577d85ce2b3db72c Mon Sep 17 00:00:00 2001 -From: Francesco Gazzetta -Date: Wed, 19 Aug 2020 15:06:58 +0200 -Subject: [PATCH 2/2] Set the initial directory to the current directory - -otherwise the user has to navigate from the nix store, which makes the program -crash due to its size ---- - sources/Adapters/DEB/System/DEBSystem.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sources/Adapters/DEB/System/DEBSystem.cpp b/sources/Adapters/DEB/System/DEBSystem.cpp -index 6e86693..65d2cdd 100644 ---- a/sources/Adapters/DEB/System/DEBSystem.cpp -+++ b/sources/Adapters/DEB/System/DEBSystem.cpp -@@ -54,7 +54,7 @@ void DEBSystem::Boot(int argc,char **argv) { - } - Path::SetAlias("bin",dirname(buff)) ; - -- Path::SetAlias("root","bin:..") ; -+ Path::SetAlias("root",".") ; - - #ifdef _DEBUG - Trace::GetInstance()->SetLogger(*(new StdOutLogger())); --- -2.25.4 - diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix index 91d7096879..9b1a1869c2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "littlegptracker"; - version = "unstable-2019-04-14"; + version = "unstable-2020-11-26"; src = fetchFromGitHub { owner = "Mdashdotdashn"; repo = "littlegptracker"; - rev = "0ed729b46739e3df5e111c6fa4d548fde2d3b891"; - sha256 = "1pc6lg2qp6xh7ahs5d5pb63ms4h2dz7ryp3c7mci4g37gbwbsj5b"; + rev = "4aca8cd765e1ad586da62decd019e66cb64b45b8"; + sha256 = "0f2ip8z5wxk8fvlw47mczsbcrzh4nh1hgw1fwf5gjrqnzm8v111x"; }; buildInputs = [ @@ -26,9 +26,6 @@ stdenv.mkDerivation rec { # Remove outdated (pre-64bit) checks that would fail on modern platforms # (see description in patch file) ./0001-Remove-coherency-checks.patch - # Set starting directory to cwd, default is in /nix/store and causes a crash - # (see description in patch file) - ./0002-Set-the-initial-directory-to-the-current-directory.patch ]; preBuild = "cd projects"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix index d628e5894a..b10accedc6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-musicbox-webclient"; - version = "2.4.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "pimusicbox"; repo = "mopidy-musicbox-webclient"; rev = "v${version}"; - sha256 = "0784s32pap9rbki3f0f7swaf6946sdv4xzidns13jmw9ilifk5z4"; + sha256 = "1lzarazq67gciyn6r8cdms0f7j0ayyfwhpf28z93ydb280mfrrb9"; }; propagatedBuildInputs = [ mopidy ]; @@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mopidy extension for playing music from SoundCloud"; license = licenses.mit; + broken = stdenv.isDarwin; maintainers = [ maintainers.spwhitt ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix index 6ba29226b5..e7332aa187 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/muse/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "https://www.muse-sequencer.org/"; + homepage = "https://muse-sequencer.github.io/"; description = "MIDI/Audio sequencer with recording and editing capabilities"; longDescription = '' MusE is a MIDI/Audio sequencer with recording and editing capabilities diff --git a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix index 0de043d35d..83b1ef3b04 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.9.5"; + version = "3.9.6"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd"; + sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg"; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 8a0cd99ff2..4b931813be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.24"; + version = "1.25_fix"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0lw18943dqgydgl4byk440j016m486s82k6hhqjn3w75108b7w1r"; + sha256 = "1slv8qjxsj67z6984nl67g53mq0sdls2cbikvfjmgmad1wkh98ma"; }; nativeBuildInputs = [ cmake ]; @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { homepage = "https://16-bits.org/pt2.php"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + # From HOW-TO-COMPILE.txt: + # > This code is NOT big-endian compatible + platforms = platforms.littleEndian; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix index 2467d30992..b17876325d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "4923e2fa001cfc2403d1bed368710499d5def322e6384b8eea2bd39d3351a417"; + sha256 = "022fw6rbn0chg0432h9q05w8qnys0hd9hf1qm2qlnnmamxw4dyfy"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index ec5727a05b..13543114d6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.11.10"; + version = "20.11.21"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1a7qrh5mdkqpz5cpk5jdq0s2cfrvn7ja76r5cmhs70ba1xnzd8rq"; + sha256 = "1q6sh2jhngvihkxjprkcd1php6r7m6qkxsijx8d3azzlgj9nbf2n"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4c4f3f2b29..2e6e2e592b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.16.0"; + version = "2.17.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "16z2cy41vxbrvjblj09in6669pks1p9y3rgx8b7afjwf102ba9yi"; + sha256 = "1r0cl4jfgg0b3zr46bh9dhhg2qgsh3xj99w3ryyjdxydfvychvz8"; }; appimageContents = appimageTools.extractType2 { @@ -30,8 +30,7 @@ in appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood ]; + maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood th0rgal ]; platforms = [ "x86_64-linux" ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix index 59fd1e936d..3ca62722f9 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/turbo-geth.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2020.11.03"; + version = "2020.11.04"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0fhfrk0k8w1mx4kf81kyirdpa91fm4g5pnvhr9cybrvygc4yx1f7"; + sha256 = "1iidj7cvpazk2v419l6k7h67rkx0mni3fcxfjpwrp0815fy1c2ri"; }; vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index cdf36bc3c2..43ab2a796e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -355,9 +355,6 @@ rec { url = "https://download.jboss.org/drools/release/${version}/droolsjbpm-tools-distribution-${version}.zip"; sha512 = "2qzc1iszqfrfnw8xip78n3kp6hlwrvrr708vlmdk7nv525xhs0ssjaxriqdhcr0s6jripmmazxivv3763rnk2bfkh31hmbnckpx4r3m"; extraPostFetch = '' - # work around https://github.com/NixOS/nixpkgs/issues/38649 - chmod go-w $out; - # update site is a couple levels deep, alongside some other irrelevant stuff cd $out; find . -type f -not -path ./binaries/org.drools.updatesite/\* -exec rm {} \; diff --git a/third_party/nixpkgs/pkgs/applications/editors/elvis/default.nix b/third_party/nixpkgs/pkgs/applications/editors/elvis/default.nix index 3a6c8c97b2..df8f255de5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/elvis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/elvis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { configureFlags = [ "--ioctl=termios" ]; meta = { - homepage = "http://elvis.vi-editor.org/"; + homepage = "http://elvis.the-little-red-haired-girl.org/"; description = "A vi clone for Unix and other operating systems"; license = stdenv.lib.licenses.free; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix index 7f5a097daa..66ab983023 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "prolog-mode-1.25"; + pname = "prolog-mode"; + version = "1.28"; src = fetchurl { url = "http://bruda.ca/_media/emacs/prolog.el"; - sha256 = "0hfd2dr3xc5qxgvc08nkb2l5a05hfldahdc6ymi9vd8798cc46yh"; + sha256 = "oCMzks4xuor8Il8Ll8PXh1zIvMl5qN0RCFJ9yKiHOHU="; }; buildCommand = '' @@ -17,8 +18,5 @@ stdenv.mkDerivation { homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; license = stdenv.lib.licenses.gpl2Plus; - - # Has wrong sha256 - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix index b9ec218b93..a54ce7345d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glow"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "0gwzf2p67s0nsb7my5njcz4znlfl62s9gg7x9ywbk9jzsr9avkhv"; + sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh"; }; vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 9fbab34690..136b0c2686 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -90,7 +90,7 @@ let It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. ''; - maintainers = with maintainers; [ loskutov ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }); @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.2.5"; /* 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 = "0xkra8l3ga8qsmzbvfisn99lxm5wxa8c4d4jzljjwn8855bs20a3"; /* updated by script */ + sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.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 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */ + sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* 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 = "092swkz7l1p3asrna6fxj6j324sh7pdbgzrlapdwka8kq9y40ajz"; /* updated by script */ + sha256 = "1rlw01aq6ci46xv4d4877k30309jjws29kwhriy98xf804msyzyb"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* 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 = "1416ikna169d2hx77yd0bb8hpxkpnf27jgyq5yrgla1w6h1fp1p0"; /* updated by script */ + sha256 = "05qr8jiasqxmkgi9v52g7hgpdf7pkkjcp42bbkh1f4zgvq81p5py"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* 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 = "0bdxmxml6337cdpb2amhdqlvxicng50cgzlnmiw0wqnmwj5ihpih"; /* updated by script */ + sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0wqhcag32fxqxg6aml2a3d0rpds0d48rgbcl7cp0ah8xj6x72047"; /* updated by script */ + sha256 = "196hhb4n52a50w50awx01ksyl5dkrbdmnz8sb9di5ihni7043p97"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0g7bki4bzi3a1w3rlwik2w0ma10xb4g450qxm4fr4fp8dy2xaysc"; /* updated by script */ + sha256 = "0dwd9gvi8n3igza95pil3mf7azxn131830rvfzdvnvrzj9yb2q8l"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* 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 = "03f1z7xhz90j9l8xp3il115yvb15kda0i6ba5ndhby7nf52vnphk"; /* updated by script */ + sha256 = "0bpkl8phc16yjm7qjfbg42rm7sbfwbrjva7w0qiwiw9ibwvs90id"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* 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 = "1c60k38ai63s4779fs55vaiswfc6bi7ki6p96hrmmkrnpzgsipg5"; /* updated by script */ + sha256 = "0l97nk9psb8g0sxm148fcz0x2v9mwqblffigrz2rmac3gd275s7f"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix index 20df287262..6a2ef200e6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/case.kak.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Ease navigation between opened buffers in Kakoune"; + description = "Case convention conversion for Kakoune"; homepage = "https://gitlab.com/FlyingWombat/case.kak"; license = licenses.unlicense; maintainers = with maintainers; [ eraserhd ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix index 512f1f0920..4b67f76097 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kak-auto-pairs.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "kak-auto-pairs"; - version = "2019-07-27"; + version = "2020-07-14"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "886449b1a04d43e5deb2f0ef4b1aead6084c7a5f"; - sha256 = "0knfhdvslzw1f1r1k16733yhkczrg3yijjz6n2qwira84iv3239j"; + rev = "5b4b3b723c34c8b7f40cee60868204974349bf9f"; + sha256 = "1wgrv03f1lkzflbbaz8n23glij5rvfxf8pcqysd668mbx1hcrk9i"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix index a99659c766..fc87e98488 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "1vywybnx2zy75mkx647fhq4xvh5k64b33w69hdjw2v7jz27h4sab"; + sha256 = "1vn444ax5af1gbhkm9lz46jc7zi4grf16cb4wqyb6hvgj2gbl0iw"; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/qmapshack/default.nix b/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix similarity index 85% rename from third_party/nixpkgs/pkgs/applications/misc/qmapshack/default.nix rename to third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix index 1a8758955c..bc7d888e2c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qmapshack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qmapshack"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "Maproom"; repo = pname; rev = "V_${version}"; - sha256 = "157bssrbwcc1w58b0v60jb3wrjf2ig4z6z6crjnpvflkqj5p8vwy"; + sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr"; }; nativeBuildInputs = [ cmake ]; @@ -22,8 +22,6 @@ mkDerivation rec { "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so" ]; - enableParallelBuilding = true; - patches = [ "${src}/FindPROJ4.patch" "${src}/FindQuaZip5.patch" @@ -36,7 +34,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/Maproom/qmapshack"; description = "Consumer grade GIS software"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda sikmir ]; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix b/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix index 0ac19c0d13..61c2bbc542 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, rustPlatform , fetchFromGitHub, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jblindsay"; repo = "whitebox-tools"; - rev = "v${version}"; - sha256 = "0c9jmfjz6ys65y65zlllv9xvaaavr9jpqc1dc217iywhj07j8k2v"; + rev = version; + sha256 = "0s5byn8qyi1bm59j9vhwqaygw5cxipc7wbd3flh7n24nx0s8pr8c"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "05w2jimmygg7dc93i8bpjpjc5yj5xfpfkjnbbgw2sq4kh06r5ii4"; + cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk"; meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; diff --git a/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix b/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix index 4db60e53ad..51740b5ad6 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitLab , qmake -, qtbase , qtcharts , qtsvg , marble @@ -12,18 +11,17 @@ mkDerivation rec { pname = "zombietrackergps"; - version = "1.01"; + version = "1.03"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; rev = "v_${version}"; - sha256 = "0h354ydbahy8rpkmzh5ym5bddbl6irjzklpcg6nbkv6apry84d48"; + sha256 = "1rmdy6kijmcxamm4mqmz8638xqisijlnpv8mimgxywpf90h9rrwq"; }; buildInputs = [ ldutils - qtbase qtcharts qtsvg marble.dev @@ -49,7 +47,8 @@ mkDerivation rec { meta = with lib; { description = "GPS track manager for Qt using KDE Marble maps"; - homepage = "https://gitlab.com/ldutils-projects/zombietrackergps"; + homepage = "https://www.zombietrackergps.net/ztgps/"; + changelog = "https://www.zombietrackergps.net/ztgps/history.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sohalt ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 53779041fc..fd94b4e26c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.7.0"; + version = "4.10.3"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0kn0422k4vi2qifasnkd0cjf5l6z0rmkqv6l46ygxk3qyykjnqcm"; + sha256 = "1ngyd3sfnhf8hpi015pgbms5bspc30lzrpfpw3jp992i4mzcjq0z"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/batik/builder.sh b/third_party/nixpkgs/pkgs/applications/graphics/batik/builder.sh deleted file mode 100755 index c6cf64bf37..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/batik/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -e - -source $stdenv/setup - -unzip $src -mkdir $out -mv batik-* $out/batik diff --git a/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix index 3c78c8b6db..52a2589b40 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix @@ -1,25 +1,23 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "batik"; + version = "1.13"; -stdenv.mkDerivation { - name = "batik-1.6"; - builder = ./builder.sh; src = fetchurl { - url = "http://tarballs.nixos.org/batik-1.6.zip"; - sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6"; + url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; + sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw"; }; - buildInputs = [unzip]; - meta = with stdenv.lib; { description = "Java based toolkit for handling SVG"; homepage = "https://xmlgraphics.apache.org/batik"; license = licenses.asl20; platforms = platforms.unix; - knownVulnerabilities = [ - # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html: - "CVE-2018-8013" - "CVE-2017-5662" - "CVE-2015-0250" - ]; }; + + installPhase = '' + mkdir $out + cp -r * $out/ + ''; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix index e80fbee1b7..edfe5ca2de 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "1gyi80j2c38j62miv8a8nsx1pad169sa4fx0b85m2yv0x7fz492w"; + sha256 = "0yrbcngmwhn5gl5if9w2cx8shh33zk5fd6iqwnapsq8y0lzq6ppr"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 51c066196e..629abb3321 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.4"; + version = "1.5.1"; src = fetchurl { url = "http://geeqie.org/${pname}-${version}.tar.xz"; - sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; + sha256 = "02m1vqaasin249xx792cdj11xyag8lnanwzxd108y7y34g9xam28"; }; patches = [ @@ -19,12 +19,6 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch"; sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn"; }) - # Fixes build with exiv2 0.27.1 - (fetchpatch { - name = "geeqie-exiv2-0.27.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d"; - sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p"; - }) ]; preConfigure = "./autogen.sh"; @@ -32,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool wrapGAppsHook ]; + buildInputs = [ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; @@ -63,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "http://geeqie.sourceforge.net"; - maintainers = with maintainers; [ jfrankenau pSub ]; + maintainers = with maintainers; [ jfrankenau pSub markus1189 ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 6d5e9d9b94..9d2c6c4dd5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.18"; + version = "0.9.19"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "0inl6zmc1726gmj85jbvq3ra4zphd2ikhrnqphgy2b0c72yh4pf7"; + sha256 = "0j3ydivd666fphmgi3ar48xabgi2dcky7p2fyfl7ghxjplflqs9q"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix new file mode 100644 index 0000000000..c9110cbea0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix @@ -0,0 +1,99 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3 +, wrapGAppsHook +, gobject-introspection +, gtk3 +, gdk-pixbuf +# Recommended Dependencies: +, unrarSupport ? false +, unrar +, p7zip +, lhasa +, mupdf +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mcomix3"; + version = "unstable-2020-11-23"; + + # fetch from github because no official release on pypi/github and no build system + src = fetchFromGitHub { + repo = "${pname}"; + owner = "multiSnow"; + rev = "cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"; + sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k"; + }; + + buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); + + format = "other"; + + # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 + # until https://github.com/NixOS/nixpkgs/pull/102613 + strictDeps = false; + + preInstall = '' + libdir=$out/lib/${python3.libPrefix}/site-packages + mkdir -p $out/share/{icons/hicolor,man/man1,applications,metainfo,thumbnailers} + mkdir -p $out/bin $libdir + ''; + + installPhase = '' + runHook preInstall + + ${python3.executable} installer.py --srcdir=mcomix --target=$libdir + mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} + mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb + mv $libdir/mcomix/mcomix/* $libdir/mcomix + + runHook postInstall + ''; + + postInstall = '' + rmdir $libdir/mcomix/mcomix + cp man/* $out/share/man/man1/ + cp -r mime/icons/* $out/share/icons/hicolor/ + cp mime/*.desktop $out/share/applications/ + cp mime/*.appdata.xml $out/share/metainfo/ + cp mime/*.thumbnailer $out/share/thumbnailers/ + for folder in $out/share/icons/hicolor/*; do + mkdir $folder/{apps,mimetypes} + mv $folder/*.png $folder/mimetypes + cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png + cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png + done + ''; + + # to prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}" + ) + ''; + + # real pytests seem to be broken upstream + checkPhase = '' + $out/bin/comicthumb --help > /dev/null + $out/bin/${pname} --help > /dev/null + ''; + + meta = with stdenv.lib; { + description = "Comic book reader and image viewer; python3 fork of mcomix"; + longDescription = '' + User-friendly, customizable image viewer, specifically designed to handle + comic books and manga supporting a variety of container formats + (including CBR, CBZ, CB7, CBT, LHA and PDF) + ''; + homepage = "https://github.com/multiSnow/mcomix3"; + changelog = "https://github.com/multiSnow/mcomix3/blob/gtk3/ChangeLog"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ confus ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch new file mode 100644 index 0000000000..7d3d62b41b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9b48beea..078ba20d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -603,7 +603,7 @@ ENDIF(APPLE) + # + # photoflow executable + # +-add_executable(photoflow main.cc ${RESOURCE_OBJECT}) ++add_executable(photoflow main.cc version.cc ${RESOURCE_OBJECT}) + IF(APPLE) + set_target_properties(photoflow PROPERTIES LINK_FLAGS " -framework ApplicationServices ") + ENDIF(APPLE) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix index 9fec8b99c1..cb8ef65b2e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix @@ -1,42 +1,75 @@ -{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobject-introspection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: +{ automake +, cmake +, exiv2 +, expat +, fetchFromGitHub +, fftw +, fftwFloat +, gettext +, glib +, gobject-introspection +, gtkmm2 +, lcms2 +, lensfun +, libexif +, libiptcdata +, libjpeg +, libraw +, libtiff +, libxml2 +, ninja +, openexr +, pcre +, pkgconfig +, pugixml +, stdenv +, swig +, vips +}: -stdenv.mkDerivation { - name = "photoflow-unstable-2018-08-28"; +stdenv.mkDerivation rec { + pname = "photoflow"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "aferrero2707"; - repo = "PhotoFlow"; - rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38"; - sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9"; + repo = pname; + rev = "8472024fb91175791e0eb23c434c5b58ecd250eb"; + sha256 = "1bq4733hbh15nwpixpyhqfn3bwkg38amdj2xc0my0pii8l9ln793"; }; + patches = [ ./CMakeLists.patch ]; + nativeBuildInputs = [ + automake + cmake gettext glib + gobject-introspection libxml2 + ninja pkgconfig swig - automake - gobject-introspection - cmake - ninja ]; buildInputs = [ - libtiff - libjpeg - fftw exiv2 - lensfun + expat + fftw + fftwFloat gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 - libraw lcms2 + lensfun libexif - vips - expat + libiptcdata + libjpeg + libraw + libtiff + openexr pcre pugixml + vips ]; cmakeFlags = [ @@ -51,6 +84,7 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; platforms = platforms.linux; - broken = true; + # sse3 is not supported on aarch64 + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xlife/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xlife/default.nix new file mode 100644 index 0000000000..cc70137399 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/xlife/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, xorg }: + +stdenv.mkDerivation { + pname = "xlife"; + version = "6.7.5"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/xlife-cal/xlife/trunk"; + rev = "365"; + sha256 = "1gadlcp32s179kd7ypxr8cymd6s060p6z4c2vnx94i8bmiw3nn8h"; + }; + + nativeBuildInputs = with xorg; [ imake gccmakedep ]; + buildInputs = [ xorg.libX11 ]; + + hardeningDisable = [ "format" ]; + installPhase = '' + install -Dm755 xlife -t $out/bin + install -Dm755 lifeconv -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "http://litwr2.atspace.eu/xlife.php"; + description = "Conway's Game of Life and other cellular automata, for X"; + license = licenses.hpndSellVariant; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix index fb74c3d2d1..d7c83704dc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; maintainers = with maintainers; [ abbradar ]; - broken = !("gtk3" ? jre); }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix index 7bb4e92179..6ffe1e2de8 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared-mime-info, + extra-cmake-modules, shared-mime-info, qtbase, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: @@ -10,6 +10,7 @@ mkDerivation { meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13"; }; patches = [ ./0001-akonadi-paths.patch diff --git a/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix b/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix index e9505a72e8..15dfe7f2e4 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kpkpass.nix @@ -8,6 +8,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; + broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase karchive ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch b/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch index c426c0b660..bfbfb5e48e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/darwin.patch @@ -1,24 +1,26 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake -@@ -35,7 +35,6 @@ else() +@@ -80,7 +80,6 @@ else() message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") endif() if(NOT EXISTS "${LIBDIR}/") - message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'") endif() - if(WITH_OPENAL) -@@ -86,7 +85,7 @@ endif() - if(WITH_CODEC_SNDFILE) - set(LIBSNDFILE ${LIBDIR}/sndfile) - set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include) -- set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc) -+ set(LIBSNDFILE_LIBRARIES sndfile) - set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate - endif() + # ------------------------------------------------------------------------- +@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE) + find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) + find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) + list(APPEND LIBSNDFILE_LIBRARIES +- ${_sndfile_FLAC_LIBRARY} +- ${_sndfile_OGG_LIBRARY} +- ${_sndfile_VORBIS_LIBRARY} +- ${_sndfile_VORBISENC_LIBRARY} + ) -@@ -97,7 +96,7 @@ if(WITH_PYTHON) + print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") +@@ -132,7 +127,7 @@ if(WITH_PYTHON) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m") @@ -27,40 +29,18 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() -@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG) - set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) - set(FFMPEG_LIBRARIES +@@ -173,9 +168,7 @@ endif() + if(WITH_CODEC_FFMPEG) + set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil -- mp3lame swscale x264 xvidcore -- theora theoradec theoraenc -- vorbis vorbisenc vorbisfile ogg opus -- vpx swresample) -+ swscale swresample) - set(FFMPEG_LIBPATH ${FFMPEG}/lib) +- mp3lame ogg opus swresample swscale +- theora theoradec theoraenc vorbis vorbisenc +- vorbisfile vpx x264 xvidcore) ++ swresample swscale) + find_package(FFmpeg) endif() -@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA) - set(OPENCOLLADA ${LIBDIR}/opencollada) - - set(OPENCOLLADA_INCLUDE_DIRS -- ${LIBDIR}/opencollada/include/COLLADAStreamWriter -- ${LIBDIR}/opencollada/include/COLLADABaseUtils -- ${LIBDIR}/opencollada/include/COLLADAFramework -- ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader -- ${LIBDIR}/opencollada/include/GeneratedSaxParser -+ ${LIBDIR}/opencollada/include/opencollada/COLLADAStreamWriter -+ ${LIBDIR}/opencollada/include/opencollada/COLLADABaseUtils -+ ${LIBDIR}/opencollada/include/opencollada/COLLADAFramework -+ ${LIBDIR}/opencollada/include/opencollada/COLLADASaxFrameworkLoader -+ ${LIBDIR}/opencollada/include/opencollada/GeneratedSaxParser - ) - -- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) -+ set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada) - set(OPENCOLLADA_LIBRARIES - OpenCOLLADASaxFrameworkLoader - -lOpenCOLLADAFramework -@@ -277,14 +273,13 @@ if(WITH_BOOST) +@@ -266,7 +259,6 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -68,25 +48,8 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf endif() if(WITH_OPENIMAGEIO) - set(OPENIMAGEIO ${LIBDIR}/openimageio) - set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include) - set(OPENIMAGEIO_LIBRARIES -- ${OPENIMAGEIO}/lib/libOpenImageIO.a -+ ${OPENIMAGEIO}/lib/libOpenImageIO.dylib - ${PNG_LIBRARIES} - ${JPEG_LIBRARIES} - ${TIFF_LIBRARY} -@@ -307,7 +302,7 @@ endif() - if(WITH_OPENCOLORIO) - set(OPENCOLORIO ${LIBDIR}/opencolorio) - set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) -- set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp) -+ set(OPENCOLORIO_LIBRARIES OpenColorIO) - set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib) - endif() - -@@ -443,7 +438,7 @@ else() - set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing") +@@ -439,7 +431,7 @@ else() + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic") endif() -if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 17f0ffdb92..9796aef9b7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages @@ -8,8 +8,8 @@ , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada , makeWrapper -, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL -, embree +, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, embree, gmp }: with lib; @@ -18,18 +18,18 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.90.1"; + version = "2.91.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "169xcmm1zkvab14qdxggqc758xdkqs7r7imwi6yx2fl2djacr3g7"; + sha256 = "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost ffmpeg_3 gettext glew ilmbase + [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc alembic @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { tbb makeWrapper embree + gmp ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { openvdb ] else [ - pugixml SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL + pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit @@ -60,7 +61,9 @@ stdenv.mkDerivation rec { : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ - '${python}' + '${python}' \ + --replace '${"$"}{LIBDIR}/openmp' \ + '${llvmPackages.openmp}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ --replace 'set(PYTHON_VERSION 3.7)' \ 'set(PYTHON_VERSION ${python.pythonVersion})' \ @@ -71,15 +74,7 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python3Packages.numpy}/${python.sitePackages}/numpy' \ - --replace 'set(OPENJPEG_INCLUDE_DIRS ' \ - 'set(OPENJPEG_INCLUDE_DIRS "'$(echo ${openjpeg.dev}/include/openjpeg-*)'") #' \ - --replace 'set(OPENJPEG_LIBRARIES ' \ - 'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \ - --replace 'set(OPENIMAGEIO ' \ - 'set(OPENIMAGEIO "${openimageio2.out}") #' \ - --replace 'set(OPENEXR_INCLUDE_DIRS ' \ - 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' + '${python3Packages.numpy}/${python.sitePackages}/numpy' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' ''); diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix index 0799226866..becbbda8ac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "0wsh83kchqakvx7kgs2s31rzsvnfr47jk6pbmqzjv1kqmnlhc3rh"; + sha256 = "0cgl5dpyzc4lciij9q9yghppiclrdnrl1jsbizfgh2an3s18ab8k"; }; - vendorSha256 = "1lg4bbdzgnw50v6m6p7clibwm8m82kdr1jizgbmhfmzy15d5sfll"; + vendorSha256 = "1spzawnk2fslc1m14dp8lx4vpnxwz7xgm1hxbpz4bqlqz1hfd6ax"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix index 472eee6551..208c9c5331 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0mraraby0s213ay2ahqsdvnyg76awbqllrkkx17mrx9z3ykba62d"; + sha256 = "sha256-Q/frWu82gB15LEzwYCbJr7k0yZ+AXBvcPWxoevSpeqU="; }; subPackages = [ "cmd/cheat" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix index 02207fb958..cc6d7d29fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clipit/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchpatch, stdenv , autoreconfHook, intltool, pkgconfig -, gtk3, xdotool, which, wrapGAppsHook }: +, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "clipit"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; - configureFlags = [ "--with-gtk3" ]; - buildInputs = [ gtk3 ]; + configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; + buildInputs = [ gtk3 libayatana-appindicator ]; gappsWrapperArgs = [ "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix index d72aeb629c..7cee0487ea 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/eureka-editor/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2; platforms = platforms.all; + broken = stdenv.isDarwin; maintainers = with maintainers; [ neonfuz ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix index 83d4103bc0..ce6b7c6469 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.13"; + version = "6.4.14"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x"; + sha256 = "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 8135dce4d7..a93ebb12ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -1,27 +1,28 @@ -{ lib, python3Packages }: +{ lib, buildPythonApplication, fetchPypi, requests, pytestCheckHook }: -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "gallery_dl"; - version = "1.15.2"; + version = "1.15.4"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "0f2d1ixg0ir7ispxxggv378dc0m55k9y19075swf893maxf07f35"; + sha256 = "0byn1ggrb9yg9d29205q312v95jy66qp4z384kys8cmrd3mky111"; }; - propagatedBuildInputs = with python3Packages; [ requests ]; + propagatedBuildInputs = [ requests ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # requires network access "--ignore=test/test_results.py" "--ignore=test/test_downloader.py" ]; - meta = { + meta = with lib; { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ dawidsowa ]; + license = licenses.gpl2; + maintainers = with maintainers; [ dawidsowa ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix index 7b0553f7f9..dc84b31262 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -5,7 +5,7 @@ , gettext , fetchFromGitLab , python3 -, libhandy +, libhandy_0 , libpwquality , wrapGAppsHook , gtk3 @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib gdk-pixbuf - libhandy + libhandy_0 ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock index 91096ddc91..7b1b20a1b7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,14 +1,13 @@ GEM remote: https://rubygems.org/ specs: - backports (3.18.1) concurrent-ruby (1.1.7) crass (1.0.6) execjs (2.7.0) ffi (1.13.1) gemojione (4.3.3) json - github-markup (3.0.4) + github-markup (3.0.5) gollum (5.1.1) gemojione (~> 4.1) gollum-lib (~> 5.0) @@ -25,7 +24,7 @@ GEM therubyrhino (~> 2.1.0) uglifier (~> 3.2) useragent (~> 0.16.2) - gollum-lib (5.0.5) + gollum-lib (5.0.6) gemojione (~> 4.1) github-markup (~> 3.0) gollum-rugged_adapter (~> 1.0) @@ -42,12 +41,12 @@ GEM rexml kramdown-parser-gfm (1.0.1) kramdown (~> 2.0) - loofah (2.6.0) + loofah (2.8.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_portile2 (2.4.0) multi_json (1.15.0) mustache (0.99.8) @@ -58,13 +57,13 @@ GEM octicons (8.5.0) nokogiri (>= 1.6.3.1) rack (2.2.3) - rack-protection (2.0.8.1) + rack-protection (2.1.0) rack rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.22.0) + rouge (3.25.0) rss (0.2.9) rexml ruby2_keywords (0.0.2) @@ -74,22 +73,21 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sinatra (2.0.8.1) + sinatra (2.1.0) mustermann (~> 1.0) - rack (~> 2.0) - rack-protection (= 2.0.8.1) + rack (~> 2.2) + rack-protection (= 2.1.0) tilt (~> 2.0) - sinatra-contrib (2.0.8.1) - backports (>= 2.8.2) + sinatra-contrib (2.1.0) multi_json mustermann (~> 1.0) - rack-protection (= 2.0.8.1) - sinatra (= 2.0.8.1) + rack-protection (= 2.1.0) + sinatra (= 2.1.0) tilt (~> 2.0) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-helpers (1.3.0) + sprockets-helpers (1.4.0) sprockets (>= 2.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) diff --git a/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix b/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix index 45bf0e04d0..7d7c0ef3d5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gollum/gemset.nix @@ -1,14 +1,4 @@ { - backports = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qagwshq7zyjgm6k53hbrf4gfrwn6qz5d6rrc83cl59q37v68zsc"; - type = "gem"; - }; - version = "3.18.1"; - }; concurrent-ruby = { groups = ["default"]; platforms = []; @@ -65,10 +55,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14991x92v8s60hfqv7162jfmdqa20fifn2bz0km3k5cgi01pf9rs"; + sha256 = "0rlq9hnvhhndqskl087xwabbvfbfnrvx8ac79iin35wmzpyagl96"; type = "gem"; }; - version = "3.0.4"; + version = "3.0.5"; }; gollum = { dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"]; @@ -87,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18f3g5px9zznyh6ppqlnjdp1ia8awgrix9lhbfh64rpgxg0b9xlr"; + sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4"; type = "gem"; }; - version = "5.0.5"; + version = "5.0.6"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -141,10 +131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s9hq8bpn6g5vqr3nzyirn3agn7x8agan6151zvq5vmkf6rvmyb2"; + sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -162,10 +152,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; mini_portile2 = { groups = ["default"]; @@ -246,10 +236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyj97bfr1shfgwk4ddmdbw0mdkm4qdyh9s1hl0k7accf3kxx1yi"; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; rb-fsevent = { groups = ["default"]; @@ -287,10 +277,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m"; + sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; type = "gem"; }; - version = "3.22.0"; + version = "3.25.0"; }; rss = { dependencies = ["rexml"]; @@ -351,21 +341,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0riy3hwjab1mr73jcqx3brmbmwspnw3d193j06a5f0fy1w35z15q"; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; sinatra-contrib = { - dependencies = ["backports" "multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; + dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mmrfm4pqh98f3irjpkvfpazhcx6q42bnx6bbms9dqvmck3mid28"; + sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja"; type = "gem"; }; - version = "2.0.8.1"; + version = "2.1.0"; }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; @@ -384,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14iq8v16l31bfq7pikfmgcv5x6pkc5lbdmwwg6zlzcy1bibcliar"; + sha256 = "0513ma356g05lsskhsb363263177h6ccmp475il0p69y18his2ij"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; therubyrhino = { dependencies = ["therubyrhino_jar"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index 07918d3d59..42f522175b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 -, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils }: +, libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpscorrelate"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt pkgconfig + wrapGAppsHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 11b373ac13..a081076ac8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.36"; + version = "7.37"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j"; + sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; }; patches = (substituteAll { diff --git a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix index 2a443303e2..444ee7ab52 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "01pgmwq539a0z7xsgx60vz6hmnr0c72xp6apx75qkvjsqbwmzhjh"; + sha256 = "03q3jn0j0cydw2mxfv7236lv4w9fh9slha0mphj33mk2f97b9hl6"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix index 0c2abbd9f5..c97ea3d4b7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which +{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20190228"; + version = "3.20200202.3"; lib = stdenv.lib; in @@ -28,10 +28,10 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz"; - sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"; + sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr"; }; - buildInputs = [ which ] + buildInputs = [ which highlight ] ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase @@ -62,13 +62,14 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ - ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} - ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} - ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''} - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} - ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} - ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''} + ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \ + ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \ + ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \ + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \ + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \ + ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \ + ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ + ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \ ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch index c981857a24..bae63a10bf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch @@ -1,10 +1,28 @@ diff --git a/t/mdwn.t b/t/mdwn.t -index ca3180139..d64750403 100755 +index 966aad2..2756173 100755 --- a/t/mdwn.t +++ b/t/mdwn.t -@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn", - "C. S. Lewis wrote books\n"), - "

C. S. Lewis wrote books

\n", "alphalist off by default"); +@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) { + "

C. S. Lewis wrote books

\n", + "alphalist off by default for multimarkdown = $multimarkdown"); + +- like(IkiWiki::htmlize("foo", "foo", "mdwn", +- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), +- qr{

This works.*fnref:1.*}, +- "footnotes on by default for multimarkdown = $multimarkdown"); +- + $config{mdwn_footnotes} = 0; + unlike(IkiWiki::htmlize("foo", "foo", "mdwn", + "An unusual link label: [^1]\n\n[^1]: http://example.com/\n"), + qr{

An unusual link label: .*fnref:1.*}, + "footnotes can be disabled for multimarkdown = $multimarkdown"); +- +- $config{mdwn_footnotes} = 1; +- like(IkiWiki::htmlize("foo", "foo", "mdwn", +- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), +- qr{

This works.*fnref:1.*}, +- "footnotes can be enabled for multimarkdown = $multimarkdown"); + } -$config{mdwn_alpha_lists} = 1; -like(IkiWiki::htmlize("foo", "foo", "mdwn", @@ -15,23 +33,3 @@ index ca3180139..d64750403 100755 $config{mdwn_alpha_lists} = 0; like(IkiWiki::htmlize("foo", "foo", "mdwn", "A. One\n". - "B. Two\n"), - qr{

A. One\sB. Two

\n}, "alphalist can be disabled"); - --like(IkiWiki::htmlize("foo", "foo", "mdwn", -- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), -- qr{

This works\^1}, "footnotes can be disabled"); - --$config{mdwn_footnotes} = 1; --like(IkiWiki::htmlize("foo", "foo", "mdwn", -- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), -- qr{

This works +Date: Wed, 25 Nov 2020 11:26:49 +0100 +Subject: [PATCH] replace git with normal python package +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + requirements.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index ef25aad..b4246a4 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,2 +1,2 @@ +-git+https://github.com/Yubico/yubikey-manager.git ++yubikey-manager + ./py/qr +-- +2.29.2 + diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix index c6a1022288..460b34416f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-desktop/default.nix @@ -19,6 +19,10 @@ mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; + patches = [ + ./0001-replace-git-with-normal-python-package.patch + ]; + postPatch = '' substituteInPlace deployment.pri \ --replace '/usr/bin' "$out/bin" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix new file mode 100644 index 0000000000..c24f91c4e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchgit, buildGoModule }: + +buildGoModule rec { + pname = "bombadillo"; + version = "2.3.3"; + + src = fetchgit { + url = "https://tildegit.org/sloum/bombadillo.git"; + rev = version; + sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q"; + }; + + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + meta = with lib; { + description = "Non-web client for the terminal, supporting Gopher, Gemini and more"; + homepage = "https://bombadillo.colorfield.space/"; + license = licenses.gpl3; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index ac92473098..4987988eb3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -26,6 +26,7 @@ , libXext , libXfixes , libXi +, libxkbcommon , libXrandr , libXrender , libXScrnSaver @@ -61,6 +62,7 @@ rpath = lib.makeLibraryPath [ libdrm libpulseaudio libX11 + libxkbcommon libXScrnSaver libXcomposite libXcursor @@ -68,6 +70,7 @@ rpath = lib.makeLibraryPath [ libXext libXfixes libXi + libxkbcommon libXrandr libXrender libXtst @@ -86,11 +89,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.16.76"; + version = "1.17.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1nbgiwflmr3ik428yarmnpx10dmqai2m4k910miqd92mwmfb0pib"; + sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md index 5b7c9fe550..8e4eae75f9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/README.md @@ -36,6 +36,9 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). +After updating, please also update pkgs/development/tools/selenium/chromedriver/default.nix +to a matching version. + ## Backports All updates are considered security critical and should be ported to the stable diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index b404ca555b..9e1f0aec59 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -38,6 +38,20 @@ def get_file_revision(revision, file_path): with urlopen(url) as http_response: return http_response.read() +def get_matching_chromedriver(version): + # See https://chromedriver.chromium.org/downloads/version-selection + build = re.sub('.[0-9]+$', '', version) + chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}' + with urlopen(chromedriver_version_url) as http_response: + chromedriver_version = http_response.read().decode() + def get_chromedriver_url(system): + return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip' + return { + 'version': chromedriver_version, + 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), + 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')) + } + def get_channel_dependencies(channel): deps = get_file_revision(channel['version'], 'DEPS') gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" @@ -85,6 +99,8 @@ with urlopen(HISTORY_URL) as resp: continue channel['deps'] = get_channel_dependencies(channel) + if channel_name == 'stable': + channel['chromedriver'] = get_matching_chromedriver(channel['version']) channels[channel_name] = channel diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index eb51135a2c..6281013a68 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -10,6 +10,11 @@ "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" } + }, + "chromedriver": { + "version": "87.0.4280.20", + "sha256_linux": "1cpk7mb32z3a7c7cbaaxskpv91il3i8kgsdp2q8zw9w762kql953", + "sha256_darwin": "06mx2yk6xy46azvkbyvhqm11prxbh67pfi50fcwxb0zqllbq7scr" } }, "beta": { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix index 5500767877..6d8aa3649a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.4.1"; + version = "7.0.4"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1lzcwaczh601kwbx7fzg32nrzlg67asby7p86qy10qz86xf4g608"; + sha256 = "18chvfdmka21zvjgqfpinm3nrj0ba09szxhhm39anpvpbj92ra8j"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 7548eb94fa..98cf28ec3e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "81.0b4"; + version = "84.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ach/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "4b133dd14e8ce1b934e482c4f7f7b5ca4b58751181bed89f6573ba5994ebe644"; + sha256 = "da9290899d245d86b3d2d378072af403106596ae1e02a36d40a93deea9e57000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/af/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "8e50a0845eb058ee853fe40b13c88d764e721f7f8ac2eb54695049ab2a66e3e9"; + sha256 = "28810946bde4c2335714c0f8b0dffad1a1650c167370e38c6eb5e2ee5d2e54be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/an/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3edf8e157cac424b1cbfff019240877e7b7c3bf5ed1b576580569c155c5dd660"; + sha256 = "d32e9e13b2c1f484686d9394f20a87e2c1d833703e0115de1f9c8c552d1e9d8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ar/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b2167ff357963e3295eed2ed423a1c3bcf62d645329b8f4cf817ad3c0e101c97"; + sha256 = "de8348caf98ca0551f3f080eb32ef94c00706676bc8df1723377d98f10221e56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ast/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "805a87a99a417ff4b762c01a9a2b88c7963f53a04fc19b42015db304b15f4bbe"; + sha256 = "104cc96b0e14c030848be4bc07a1b2b836a241e9ddba581b9ca24018c54356ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/az/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "79c61c9515a683731649bcb5d36b26b95dd56165765e5a952339910310c9d259"; + sha256 = "e96087b52f1dc18c8bd29d486faa00ad06a2165d1e14cbd47e37cafb40602a87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/be/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "318fece7d1ad734f6a19faa7003e060b1254b31bf62e59580c70a64c4a167ec6"; + sha256 = "d67c2c1556b6859e0acae5b69b3b7eeac77b3bb1594b48682a97a72742c79d05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bg/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "55616606306dbd0933240d718fef8e83004fd65e4f53dd18f1601f09d0b94e92"; + sha256 = "b3bad1b330a5d4c515b37cddb3e89e538c5cd66ffce68dbf8d1e9adaf4881431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bn/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c38fdef89f6aee7bf03362d2edfe4dcc665d540b1e1dc1dad8c53db20d70087d"; + sha256 = "9c50c4e12061279133177ade4b22b7e2bb7e14dcc1875464f57efb7c7e360bf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/br/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c5ac1c8e9dc2f4c5a1a2b6e33bf699a823a9422bce46922bc36222700a29d2e5"; + sha256 = "79eb76af707b26fa4d46acf11d0be25ccd144abda6c853373c9ec0cc872c2a8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bs/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "a18718ef7f467ed87c76816fb6797165db3e06bc166c5e88b526c9f2ce5c1d19"; + sha256 = "2cbf15a604f90c4a6212f5da251372d09e2247f5ed338193ff93a94695bca308"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca-valencia/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "fcfccd0714c965801ce468f6817bf37eb074064e6e0b616c81be7218a6b632fc"; + sha256 = "a9b6cacf6ee8a6a1f733f3ff3741c1bb12eff823664279205906e8e59b646679"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5f08a2b2d357d5a6828865913b9e28fe90bda7a8ce17a0ea60effb25b8441b7a"; + sha256 = "1ea49a5d59129c820f359fbad2253e051adbb260cedd4b62bb20122562466bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cak/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "db41156b75e1148527c51b915e3d9367d1c36a8d24a52132d1cc9cfe63bd9db6"; + sha256 = "b18651df9ae2e16ea9855c30fa393dd34103cf338a515d41d3c1802e52fb92a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cs/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d3287f28964581e63a3b1a5484e47e8ef33c136b39f13e07d6f3d555c27864cb"; + sha256 = "4dca051e5349372d6caf5a7f6e8e6e12fe42bf96110a1c6e2f7f6e408f365b80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cy/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f41fd34cf1cc72d5fc80113cdc9fae7f03f434e45e990e17a94dd68463464c49"; + sha256 = "3117d47bcec1cf0f5a547a33c62ca5ecfee34435c13a478f23d1d9f0ac187f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/da/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dbbf1611913315ac5294f400c727cd5afbc832efbea56bd839b77cd4d6a5b823"; + sha256 = "34a38c76997bdd41e6b12cebf08345e7cd19838bd92f5a8d082ba3087cb063c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/de/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "1047799de5b42b5cb0827371872b7e85b93a4474bde9288da54a573841e156bd"; + sha256 = "65e417603cf383d92058b8976c1f6499dc5804d02a22bb639e416c4e730b4a62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/dsb/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "602eaa32d32db35d6a6d07f1c0cc53eaa4e432b7ab81d1f23b47d3125ac98d24"; + sha256 = "08dacb91773d7b49eb8f08668627badae2967193c441ff2fb6b9d88063c5ffb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/el/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "8a460f9542e213b1605265c6497742e7d55213ac91b42d00a15b3123b47754ef"; + sha256 = "78e870b673c204e4d9fca2a3fbab06031c724a8b0696a3b6e2dea5ac07a5bb88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-CA/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9bcc44ca3f4192a2a7a001f27db6884dd481551663b6d0c348ed0b9281dabe87"; + sha256 = "4c862eb5c53e65af1ddc212a093eb23e33653341fa7db53d935ed8482637aed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-GB/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9d241d56362ec52619ce02cdd2f11dc90c2e0f7c515c707ea56eca2e8f0eb306"; + sha256 = "f505cf16328603d0164e330fcef60fcfeccdad186d1f91e0b4cee1b8cc7c740d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-US/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "28972b08f8b3f2d19f5d50a2c9275fc459fc3e57df11c884149d1fdb9d99300b"; + sha256 = "f0561469f04ab83dd52ae4e3a8ca451d6569845e37d9e04c5a91085654661f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eo/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "013caa4590462b4bc5dc09cb963cfd85cba4b5419111cdc87316574ca5691e80"; + sha256 = "c64d227d6b21876ea48182795d6fd8ec3ca486e5328629a0bbfb936e8463b0a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-AR/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d6970ccf4d58e2f1219cb0d43a8788084d0863f0f349ab3292e182fb0201e860"; + sha256 = "73b45f6b8d1e53bef003b3e77cc1217b8a85dde49cb0900b4fa2991895e5c184"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-CL/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "76fb3c865b3efa1da1d34c8caa7b56b5b6d0af2cbbaeaef873fa96d2b8c93bb1"; + sha256 = "e7025e4c5fc311aae2798da99ec5e5863bca5ad8b8460981cef86e29ae37d74a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-ES/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7b41a2b297df4f0f6d4f44e1eb0ea0cbf02454382d0994f119a77876c578c4b6"; + sha256 = "e819644eb6337255004fda8286e1f2ed898423c4b97694c8355c28f4d449da61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-MX/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "733b90640a30df66700397ab0cc2045fcbc25af94ef9f36463a191228b511b77"; + sha256 = "07de091ca3b06b94e35b84add7fbc5c8fa6ea84ddfe548e5f55b3bc7980a9bd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/et/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "027286d744b1d9f21157d8242445ccd7610a08d8d541d64635fc16549aac1b4d"; + sha256 = "d6af9ab39f1a13efc772cbb63dd731dcf988c10f13649f348d7ddb3f6ab6ca60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eu/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ff555da3aaf1abb2c384772b309fb4129dad57b9fd523fcabef5b2743d3063ce"; + sha256 = "110e667568429dd2b0c752962e1148884c44aaef9939926c6b0f49ba5bdb1182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fa/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c99f9297568f93eda17058d96dfaf83e587907be9b5005e8f649f693662e4fb6"; + sha256 = "f7a783f12bb08ccb06074f903bb2eaaab13b348c6a2950a9699beee28ad97b5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ff/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "91658b195a622afa3c6fde535391eff1aa6b70f4c0cccc5c55e56e6d66459435"; + sha256 = "b2e47bc8ae8d1e54a1b5799a87b4742d049696edd9913f0cc6beb52a89cc261d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fi/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "cbc70d2051c96813ab081251c339f6cacd29ff26bdd8174b35caf9905a874635"; + sha256 = "f5ee09f1b9d41506ad1023ad05dbdee95ac049eb4bfd38dd99c06cf682e111a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "51890621c8c3c0e40103a10e705adbc860937e5dbbb8a3984eb71a5cae3ed63b"; + sha256 = "f8c33819a6ceab041bed80f1663d94a80ee3bdb6e859eab1eb8ec9d0b67f4222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fy-NL/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5c3a982a51951901732ec7684514be233fe1c44780531fb38f7205724c241387"; + sha256 = "6ed233042e570e9a04ecc1e25f6211deb7685c117db75f32a541076d95d1cebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ga-IE/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "04b5d338c7557f12fc6fb2206d444a8a00be6814b1ca26de4923449a4425b57d"; + sha256 = "b28337429a0c1d26653fda1d93b59ea0383061a253be5b763442166fdb21bbca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gd/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6bc0de0ac627203b1ba035f7a7ba7dd19bd82a7730c526c217150cc5de668fd4"; + sha256 = "546bf2f1a4a8a643b161554bc92e771644ff9ae46c6b10fb2a60b920a2454f44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "37522d032422af770e37a93e33de6c0b8b79b2d22c6e71f32107cc8808de4d35"; + sha256 = "cfc32d3e7e3ba5379895a8b348d9399bd3962a819d0677f14a365f6e0c314676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gn/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "f761db975c72d7e419601988c0674acc7fe17227d5569cac85a1fe2d91f5141c"; + sha256 = "b2b5e826540d3f9b52d67e092fa755b26a34ea9acd0cb1c69eb6f0bc332354d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gu-IN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "8565c1965e09060ddc5b253fa126998f827d17dd58692ec4d17d194d29a464a5"; + sha256 = "497b8a954ed2c9fa13e207462730dd39d2d0de10a38e3762dac3ef1fbd36282c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/he/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c3cc5911103ce955f89c5104ceb1ee50f7c047e4ec761681c8693b643f5d91a8"; + sha256 = "8cdac2e9d2cf10171f2744727ddd80e21a4d46e2082947e49f4a255f174db968"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hi-IN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "95463325675e56e700eaffb6e6690f4b398adb5cb77aaa34b87e16cb142f3533"; + sha256 = "d37c55e60329220de3d792894d7b801adf7dc7ab8ff4ab39bd2e24b59443b973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "6332ae812507f79baaed24e4fb79fc6c383418c4c9d41c0f3dbebc2fb72efef5"; + sha256 = "bebb6709dd3be119be45d9fdb0bac41b81514d78a384a221e2ffbb51b46dbea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hsb/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b18a7d31d3ce7373bcbd6bb7ff56adc023c58097126781d5f915828be8fef92b"; + sha256 = "c43aea7fdd8a57653d6d9af4aa7c0be6e860f5292366ddd91c5860dfde2ee1bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hu/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b1e4c6c9c21b2593f3fa111820a7e6a2e2e72e8b3065738f6a50df6ef4b7f18b"; + sha256 = "71e6b509dd3a6937d9851c262fc7a1bc9e551cbe0515089586fc22098bc51151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hy-AM/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "562f4d9e094b688cb53860834e425997e65b78222724c48ff4ddd71ccca264fe"; + sha256 = "c92eaf9f6bfa97651075d2342e45b988ae89c1a4cb55559dad71bfae5912ee83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ia/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "87299a8aeee6da57666a06cc2d4f479b0c74c220e2b22ddf5254a052f11edacd"; + sha256 = "3c71aafb7dddcd3f9bcc8e169281614ac1087400d1d0ba02afb18c68b1914128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/id/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0cf1bae8def307d08e4c24fb44f7cfbebf150f1edfde2a3c0855a69775f26539"; + sha256 = "8075ef0b1d7eb2fc6141262cbb0d3831c3d8508eb43d3e9e142d96946ed2036d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/is/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "6140d270e99173d995e42d32c0b696a51f72b1c6baa746549bdbbe7e2a08a811"; + sha256 = "5ef96d77bea5c94e7147a5657d76eb5c7f206208a0464245242cca3fc7fb79f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/it/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3583cf0223528929141879c085278354927ced41d71321fe8d832ebd356d4614"; + sha256 = "eb76a1f3bd1ac065772d4ea4a435c53b5f7b1d5b643c7b62b7ccfee205ea4e81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ja/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "4a1bcf87b3cd09d7c3379bd922ede7a3c6c4a19bf11596e858634b408df95cad"; + sha256 = "80b644648b9e40ed592ab9ea2b9d7f1e2abcf8d6b0f925aa57cd6cf28d53dcf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ka/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "320567daf4e4bb12c7209aff34d98efdbb2dead9b34f23d4a2181d2cdddeed71"; + sha256 = "03c34e7b08a8b6140e612739118c35b05dcdef1257b4857d2fda87a1cf8852ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kab/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5b9d60703b494a4eb5956e59bc2d6893bc70e8b890d0c940f25d25b605000c89"; + sha256 = "419a4758cf2e2e24968f4da384dbfb03ef8398713c6070ab29ce379772168f18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "45580e0c3cbb265f718a69ac9de7220d3d89e52e3b8a5cfceb7363c20e63c83e"; + sha256 = "cfe96420e125dd12c9a9e79e45a8d7ee260d1957abddab5ed887afd1a1e3f499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/km/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "24b4879f22829a2a5d72219cba2c5658bf7c7e73ffdc9640f6e897ec613733c7"; + sha256 = "4b3599a9b30132b6105e4bbda7de370e54e21d8e498bb3c4c3d9807282fbf246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kn/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "905ed3fa762c73c5ba677b8ca5b620294cb1ad36dea2ac53fdfca5a739c0c0e6"; + sha256 = "5da3ddc9d9824e3ba59e1cdc89ee3fb8900c661faec1f539c829d0917be5d4d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ko/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a6a63ca4106ee9c710331ea50099e2a50842465095d38ea55a63dcb3ee3d80ad"; + sha256 = "2db9a494693091832e578959144d172d5135b82bbf44c041949da8ffec2de9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lij/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b6fa42dc9bc68d4b71ae93eebfb1a19416f0cdd06d20fb344c0c0347aa2d4862"; + sha256 = "2219d5235f0ed9d2015ead5782976727d2b7103afd987eb445f3f274856e6af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lt/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "c70f6e7c20e252fdef6bf136c99095ebc27672719594df302e58be801a3f06d3"; + sha256 = "a335e0d835bcc7ae9563bb3efe6b926ad71e08f3ccbd164aa2b9f257acd1341d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lv/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c64d561be20fc8f0e7507a0b1dc2e5d79af407531a37cc7da3fd880789899fdb"; + sha256 = "1f89f8f2715254ef335af9b01ca1503caecb1c93b1a900ee1643c3f9e00c6821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "aa38b13c6bc5288ab491f5ccee3a881474b1f42f1bd959435035782d1c39f407"; + sha256 = "86eb9f1e8189ce45c03925337a90f1b204dbdc902c1c4a817a924410a26b0048"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "e56eea60ca1cd447e30cccc82ce7a4797fa23e9bb4871a5e20e05d44ac35f720"; + sha256 = "d5214647403f85c5f7a95871e8d6fb4d4c448af92e6475841fd8474857f21067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ms/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9d8445e2bda6a8cc8714a0eaf82e1b9ec03fbd94042c3557f07d9c8b25bc4b6f"; + sha256 = "23af07562748448a35242a6cd77bce25a5576d2b71177fb682da58adb21671e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/my/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4a7527e5e3e6ea0181cc8b9a2f206bbe162a4e1867faa75b4af261f08e89ae0d"; + sha256 = "bfec2f3ad0853fb36ec4aac9ad97ba14d30a275eff2582c2e9df600b5940c004"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nb-NO/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c2ae9f5fb235541cc69cc3c4307dd4b7de51a9f4b6e038ef3091a773edec6c5a"; + sha256 = "32be6fe8aa661f6098b4600d824846738664f254ecd4ab0d0a1e705b28a94e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ne-NP/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "05acc175b06ab7f5861a3a7e58e9a92c40e0660224426fc8225fba6c25888726"; + sha256 = "dfa3e6b9f31fa716a2c80fda07c24717a526ef96033b5b1861fcdad43c99b29e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "640be4e631343c9f2a55c24a4d5c63908627e9ab2d39a5346d1842d8e4a57799"; + sha256 = "e253d963b66855c44f41c43baba1b5c952b37dd1b83aac8243c60581ca674a49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nn-NO/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "46a898f41e5c3c9853b05fda8f44be01b2fd5a7fe3dad281c21588c2deaaedce"; + sha256 = "5d9b90cdee03a544a78f44d4f0566b5b59ae802af4fa60367a1a4836c01197f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/oc/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "7481c8bad2e905a033f09ec4c20f8d4b184a0f90fce1c10648c4fc57a7a5f301"; + sha256 = "b37f9a283d9dd2ff9e8998d83e0c147bfbb75e4b64b3936cb344243e1277c370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pa-IN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "a460ed0241c569e1ac62727b17f8c8d0d4091e794900e2e2be7d8d8e2b90ada4"; + sha256 = "68f6bae2e6f064e22503145b5fd57d027899f23fcf109010a98397dd8c0d7cf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d82e300cc8be61ddc2aa66bd4d4ec35cd18e47603bd19530cf48728c5fe67a5c"; + sha256 = "789d6925c3b17f96bb92eef54c05fc8787f32ce2c9846931e185dc5a1de9f303"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-BR/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1ee1560d4597adbd230fb0c556a4d8fa6984ee86bb731f7a5a936d660897eb99"; + sha256 = "329eecf74dc8d9d1d8f4578389553d92a368c972fcb2468e0b936f21508bd1bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-PT/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "be7e484f8c3f4d8b7b894a437b70b2f4b448e3a7df518ce6906295df9be7749d"; + sha256 = "b30ba75dbd5f5ff3ff709722acdf36acf4de9993d230eb27996e81406779dd0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/rm/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "819cf6a13d1690dee4e4255aa0c3f551411e2b7076f8ce3447bba47f07c806db"; + sha256 = "ad90ce4fbcd094bebf77b36a63e38326c613bffb580743c9a4c19df845907dfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ro/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "2baa8154f358962983c7e0b26c4a7cc8cf97587b646884527fafe46f5d8d92ae"; + sha256 = "8f7864bc6577724f20829ad79901d92775200860dd8c43bb2443c7bf22d7a435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ru/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "eaaa5338ff8ffbc9bad5321ee3eb7410feb9a26a06d3cc49707c0a048f4412e2"; + sha256 = "8b52d5eaee53805422bb2fd6dd8b2e0c7a5b01feccbc6fb6c77e4fb8678d30a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/si/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ce04721a96cea62eb7011c261f740e9e0ad6288ad9ff231538c3a6df86fb40ae"; + sha256 = "a71df756e97f58271715f3d79a86c0407487dd5820500127cbd9373361bd016f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4b19fef341d64f94ad97a0bb8821693b00e4e7e04454156f92f0c82f4fee0005"; + sha256 = "71eefff1538a2978d9e4e65fdd5a2322ad81ddfee33464c0d70b95eda1649fda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "96192922f2012a3e6be634c7ed09017cebf9498c6fc2862336bfddbc4ea40840"; + sha256 = "91b2938be8230b6301fe3d15c6d9ba3f031c1e5fca886da228f47a2e0a2cd144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/son/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "dfb144edeb3712bc0a3bf7e0675de80315c78bea7d7c6ee5f6047c077acbddf9"; + sha256 = "57e456cd14418c41c2e5f8eb0ec6b0807459f41e15207f6997c7742fd3dc8a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sq/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "54dfab9e843dcde43cf188ae33922371fb90c1bfda53ef629df16576d6a0bac2"; + sha256 = "0f343e2442523f0e422309cc36518484a242db4116f0e6b7dcfe251cdfea76cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f00b5184ccb47223858128aa26481867fb33aa50a914a8c807235c9a2bdf74fa"; + sha256 = "cf8fb723611506fff356cabd91a0ca3fdd9cc5d806167df6dd385438d467eeff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sv-SE/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d3884cf4a9ff23971badfb1a794c9489e0006e6851a0e501e290d8793054cc1e"; + sha256 = "258020bbc7a75139fee340e50d41676d234be19c931f0228485f06fcab2eef81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ta/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "53584d2093feffd36a8a5249ee438b82d21af834a3c2c210944030c127b91cb2"; + sha256 = "7783166c0f9ceed0f7d037c1e92b988818a70522945af2c96db958966eed8b66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/te/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "63b65440720bc492fc95d080b191ba452cc87c8501b195e02df66ea4487fb902"; + sha256 = "02662946b3506da6432c48eb1c7e0f522ffaed2abcfcc474332a799ef3be2b92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/th/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3b01fff09734f2206e4aee227ee7f0c13544fb1635f92a5221ee356117955446"; + sha256 = "1592b372b8e767e5b7369f356fb733a2daf51b4f45c8c4c94041845d63b3c604"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "00f1c65baf63246a9ff44d98171a6ceec6e276488f5d6fbdf6f97760509b3bc7"; + sha256 = "2b831feaae729c674e8a9ee207dea007df100bbbd8cf7553791aee3eede37224"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "064d6c6036fae215fcb50a87863e6808bd1626084d9144a18f7ea1f4c7072093"; + sha256 = "aedf8b7684f204109e42a3797ba00bd7a8c5bd3f827c31ea3fd4eea1679d8af5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/trs/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "73c892e0b0ab0bcdbcf6af88fdc8de335bcd5c56805675ba7b487ed3b620ed22"; + sha256 = "232cae54f6120a47455fdd7e0d88dde1f64d5a1931bcd7d54f6bf8bd376583e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8ac48524702e3f177e78fe97e4fcf528752a3ea0ef08e9212037dbd0febea53e"; + sha256 = "e00de7cbe1f00aa082f9a448857cc19f011bb1d5b579e79457bb0dfc72b7a12d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ur/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "154dd642021769aa67a081080f33d87d736686b9e6e46cdfa2bd2201605bda26"; + sha256 = "7ece4d8af476eef174c0c175b65841da8d826702fb255587c2e1d259bb9ef3ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uz/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "dd36910596d777f49de3dfe8e22f2838b76081cb259107047b9a98c3445c01eb"; + sha256 = "09c7e7d641f703404aa7927860f2924e6be376b2e39b1f0fe012dc87469edb62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/vi/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "3cef9f657f83bbfc68ab4a7c8ab84e1e937553cca98cfc30d3fbbec5c8be7907"; + sha256 = "18121867e6b8c2a52c5324f653f82afbae97481b5ac3df811e881ec39bbb3b0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/xh/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "30a98fa9218cbb07d792629e73a250659b321a3555eedca0a68e6ffb1d5191a7"; + sha256 = "04f5bb96ef9002eeb0869236f70168e7cbd7842b8e12b66dd6d5d67db9acd28a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-CN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "bf15e819d84a3cd3825df2046bd9ffc139008f45fdbbdc64e04cec6a549af3e4"; + sha256 = "142286cf9136bcb9b6af7ea1df3cf77821c0793ab7b9fe533a2963c453f45a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-TW/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b194749cb05fe282f59f2f6621a5d04fba42406d7a3ea71242b667fe94a5a857"; + sha256 = "fef32e5817140bbcb6d1b614a72a29523235606192078eb04420ff7a2453cb9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ach/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "203ca1a13f76935935daf2124c662329df93af0e44b4bcee7334ff60092c8027"; + sha256 = "40e9b7a738e06cec731c69b659b14ca48b119ae20016e0214e1160edf03919b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/af/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "481d233552b0702a8b8092748b4c71da3c14c8df5e971c5b4662273cd8808022"; + sha256 = "9bb05361a51f836b2de5614127f8df768e504f4d5bc136e3f169741098f0bcbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/an/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a128b96a34eea409a8b5fa412e6a1a36bcc28f2fbed40ba9b474b9d86d23dbae"; + sha256 = "ee62418444c76b709204962ed47af8ef3d61b80e628600201b5a12293651c70d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ar/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a2ab8b556b6b477bb1aa287f630e7ae6aa902fd1b75968c01c2e2c76fe9cdf09"; + sha256 = "10b5d4f1616e078bf83ab5ff942dabe89a8eaca63f24e96b53726dfb2bc9e36b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ast/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "193422cbafcaf5ed58f334a9d5b30f9a6181aa1cb649303df18626d9a3484088"; + sha256 = "a4e5ccae125edaa0696b696a5342320707f0c39c8985437b6aed60faede71de0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/az/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c206f5351f0ba474a5277e223514f032c7ff0b66029f570143f2d1d2b8ccf566"; + sha256 = "c13d9ed183c7b9256801708014f38405749cdfcead9f243e80eef78d06a9b78e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/be/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c3d7d04ea43230b6a6e4227b799d47348bc5c2ab6a60e93f4107efa6e7b34ef3"; + sha256 = "57d8eafc3d45784dbad71eb49d5a4c0483d939719b43b0f16e4db1d5a96ff4a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bg/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "08edf0db8aebd41f25366ef4302214b4ef00540be39406fc780eec288b0de324"; + sha256 = "0a65ad71cc9d97277535f07a8dbc7ca248508c24dea8520f92fecbb806f87a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bn/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a6d5dd5918d94e74ee8ffeb10c4caba65697ecdb81598b0bda815fa5d4830a78"; + sha256 = "3cead08f4d746def6cfb909107f4739400498c970f10fbd542259c04b84b5852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/br/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4e7ffbc380b6f8716399ee9d7b9ffc5fcdcae72f48b63ae4bcd2011a85efa0b1"; + sha256 = "40c6e963e8e52ef51cd4d4e63d501f2a6cecec1800541941458b896ad90e5b93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bs/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ef36dae13dc3c943e5981a16d7ca61b4c6daa9a4873d2cd87022fbbcd01c8907"; + sha256 = "1e9df53642c442ead4318b0cc886653fdfcecf5275d6e7218acb390bb13e0021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca-valencia/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "584a0370f79011dd2691461acd573133348a94cc1323d6fb99dea9dd6df1e155"; + sha256 = "3b5699dad93291921979fc6da21d16f94ef471e9a8ef3d877001400ba4abe316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e280fe05f4e9320fd354407811ea8664d50de3810298e5eb4922b2d3e549ad11"; + sha256 = "c52b9cc25dc72eeb6ef3e7c3add4066c005399afdba2cd0964e695a891a1d314"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cak/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "3decca8b5b0d44db169abfa20f07b3c109bbea0a68ae3e44a35f97e3b989324b"; + sha256 = "355df19615fddd85c51b033a413a3de524f19fb2d97a2ba77f3b8001b231338f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cs/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "efccc2a43f961179f61eb7858b1e17ffd069bf7a26027faaad09f1b529ade52c"; + sha256 = "e10f35795f19ea10c4de34687eacad6f9bd863002e9d66b87cbace01b97c8628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cy/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "dc8a1945d0230070e2bdf65b673a9aecc4868c9821f7f1e2f6e0d18bb98c912d"; + sha256 = "f2fd90b19e8c4ac98bd6ee262084ef7842e52a304abe10cfcda2fc14ccb5ce30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/da/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "058b800e2c9fc464f2a75fa48542269056a88916b9474a953f0d29a3e9041257"; + sha256 = "01e468f3a445276aea85425b4b8a58e44a2e4cf8552a02aa3d4d31775bff9575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/de/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "7fbd0b27073b2c46829fc0d631ed11fd9a38a07d0ce474f6837ad1f5c2adff62"; + sha256 = "9dd3d806a4ff60c9cfd5b81cdf212f72c281f75ce554555cfd443f0696f700d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/dsb/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d0b6083098d416366040a877a92b163d469e2764af995c65fced49de23148624"; + sha256 = "eb26cbad496bc1c4f97e6027a1f2cd9166d479a503a3f0ac566a766c86bdf8b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/el/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "104258b0e47b661d7c75c72f5a0d7750399a101a9996a3f8837f0f524e9820db"; + sha256 = "e173622f06f64156d749d0f56d98be72f067077c3e41090aa16a3b0c6d7a5e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-CA/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "be6750a6946b7ef58869d0c9f0412febffcbe4955c823a573d02822f9a14266e"; + sha256 = "c1c6aa503e1565cb0c0239d562f11322265a7bce4005211b8007579f8f56c318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-GB/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e6d2c60c30aa90b6026cb85d6fc3a1d1b7266263980df652c9a1c158528cfc74"; + sha256 = "57b2670f515e2a17c10df602d93a6960e5c4710462098d89568efd446e4480e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-US/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "be534d43126a7fdd297f3431b579495b6f22832a358a0c793a23bea8adce1c9d"; + sha256 = "81cf4a4fe610de3342bdea340d450ff67c594e7e4924a08b6b69de75510da698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eo/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "6ffe84994fe7db178e59ea667495e95e6fba621cd0e4ec812d94dc3d98cf0a3e"; + sha256 = "dd61c4bacfe39f7887c6d21d139df6a2df17f263c4be5689f5f9dd6bb4ee6e63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-AR/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "982874a48791db0bc98559de45bb8884da93ee0a0738664c73ae5a08b3b1a2ef"; + sha256 = "3ae8695c57befa3552033bcb867b48f9ba491a08e31168ba22901fcb3276a3af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-CL/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "c21fcdeacdf570a9f8bba9c34c64a60776aa8a4de56b5f773b1d26eca6d65b70"; + sha256 = "5ae14208cdbf0dd50edecb8a56bfe7dba0e7520f2ef135abb092761acc8630ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-ES/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "bb34dda74d59c862ab24ad9ff0c5ad1e1fb5d73e6029b915f966d0913cf4506a"; + sha256 = "d786cf3b623a05e5156b020a436897525e80117ab7fa9f25ca42fca9fb4c0eba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-MX/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "53686263f77643ad4f769faac81697c7e1eca216ed0a7b051c2318b181318d7b"; + sha256 = "c2ec749bb5befffd81189503d87a57bda462897bba858904924ae999923a4e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/et/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "053d8ad6cf01be9f51cd133090e99230dfe797effc749e14c8a21ba712546776"; + sha256 = "7a2e1078ff1a3bb975baa5488f89e8161e20354d7f55b98c964efa5bfce6f696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eu/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "77774b9126ccbca2b5716b1701f8eb7933ee67ec5437a00b8ab991f423888a80"; + sha256 = "c635006a367f68bfabad7a3874f3333ac3f486f0001ca9641ac8ce12dd9bd01e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fa/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4a0554bff8c11ca39f1de223537d595d298e6f61c2590543151e8ab1d8eca36e"; + sha256 = "f897a5d316c436fc20d8c2737902e29dfd0ece3c9ffdb90fda2fa454ad398257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ff/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "272784bfa53ddc48fa43590b3ebd2fce808786b4649efa1d5b417488efbb8911"; + sha256 = "3a31d43cb5242a0aec516d8fe99dc916144e8b7250b81c7de0b1361b19f067fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fi/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "c389eb80f3cdd215549c7ce55402a7c03544eca2fa3c2074842af32755d14cac"; + sha256 = "50261499bd4725f08684c9042056c9da2029f55b0dee4a856a9de661412c06e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "dc5a79229fbdd3e9fada6b6bbb35183c17a703b9c3f29d9172f2b56cd5c0d289"; + sha256 = "7b793590a975a64b6fcfcccb4e6c07cd5346ec457af1ae31b5fb1032d4217c64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fy-NL/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3eb69867818f0a8448e4f421f0ded4ad1a172bd5c99048065bd4b6cf83e8b25c"; + sha256 = "468c7463503a34de44a74ff6a751e8614abbe6bd23f39f50308f23000614331e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ga-IE/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b09208ca65279e393f512a04712f91b2b170ca6e32777479acb7a03db89e87dd"; + sha256 = "92b49316d122c8c91995766e28387d5587955e022f844c7a85fe491ca602e222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gd/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "011beadfc3e78ff216a13d55a9b54471ebf84bb1be852aa986ab5ba1648836f4"; + sha256 = "4bd2901b705f99bd1889b21f4af9ba7dd022f608960807f96f115a110c96a80a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "c492314ad418a190484fce335d1dc5a28a515f630c59b1cf2d7e812b6d3c3bf4"; + sha256 = "391d62de840d53d531130fef0018c71add0ef7134fbc758eb869da7c1cc3b5f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gn/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "25b03d5251a69631f5d0cbf9dd89d1ce1dd5355e05efcc233bcf62e5311d4d01"; + sha256 = "d51f75a7718e78bfb1e9d0974db0a404294e577e186794d3480778c7facce418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gu-IN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1cc9a3b933b625a26beeb7c31eb062e22ff8dc98c4860bf6ef4aef5567552d63"; + sha256 = "7cbbf4846153f79fc72e217872fd64b92ed8968aaf618eeededa375ac268a12e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/he/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "027cd01f51db3b4d27381870ddf95ca2f7252bf7c6588c3d073d303bebb45311"; + sha256 = "44c0bfad535a4e3c225d948d87935e08e5d77ea22638e971cc833877462edc32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hi-IN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "99d6d2159ae34ce2154678e4913145ccb9c96572ef19a18db6a223647b7ec68e"; + sha256 = "fc64673429972967238b5bb101beb2117cfdb0360e405d4d3b53f013791c0b8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "d9b2fbc6474bac73fe7fb5c4eb818f5dc0d74cbbd52c3aacbed0f17db8bce9eb"; + sha256 = "f256eb4e655a14b1a084af7f72ef4673d33b42d1c23ffc1ff3b4ede42d966246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hsb/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "dcd0c254c542a50807cbf1d0036a4cab5463c237318fb1d1fec9826d052aef62"; + sha256 = "9e1e478e501875ac259e22287aece77f1bbc1f898355ab1c29fa26543b38acbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hu/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5a0a94eeb9c8d219b3e34e92fc51163e190c606f975735215177d521b7ed9656"; + sha256 = "e8605e1b9d2c92c2eafa35cbe647bdda6af22eb030d8656262473b0b17650de9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hy-AM/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2ff26ab884697d226bcfe224ff5c068aed355f6bb00777fa6d9f3bd0b9f9b386"; + sha256 = "be21fea69e27ce54498b6b003c1db20b42d7d52702ac56d1a1fc2c6fc24558f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ia/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7bd9d940f81d76984886463cc10920896247084f91efedf99f787601a47abba6"; + sha256 = "039f50fc10d95bdef4468174a8486f45bbf9313e1b9b6cecb0d094bb3766ca9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/id/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c415b55ec7701219557cc4815ec0975d86f18312a2ef6a8abf3e82876edc5045"; + sha256 = "ecd6f3e031529e1fed8fb7ae77bf6e0497c9ad0e4996e31a86c4b79489ba9811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/is/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3ee6e83bd9c244b123c1a1989fbcc0524c4101fefe697ea0a9ab7c6a05302ac5"; + sha256 = "1f6fbf55f1384141826a4b6a39ec617cc798b0c0a0e1ee02d6cd65a79d6784a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/it/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "de141769375ff5da94ee1030f5af84b309917eeea48cde769419004ca5a015c6"; + sha256 = "73eebb1d351b5d746d3447c7a68d7a906c4db6df8cd257c6a048ea16cf908e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ja/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "69c5c01998a78c17ba55f262493c4e7bfa4fe03bd19a8ca605546f41f0c6f794"; + sha256 = "ff1c630c6c41cd31c8ecab5fc48e8879dbc4aa295492368cae93061de6558b64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ka/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4c37f22f1a20c79c1b391b0f86bde8535c0766980a1b9a42ef912cbf91752392"; + sha256 = "b6976def40cfd05543b70597347ea7c632c591660a2dd08332f81411a6ce6723"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kab/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1c6722e18e1eff26918de17454d8103929115f7f036a1c23247695f7fee13051"; + sha256 = "403bd985ff7ab44324d12c8c7f1386eec9fbae97ac9a0597d12d09d387686db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9ef2e2142d2e6d49adf59e6dd190b4ff816cf566cd35e5d288f66794aa2d73c4"; + sha256 = "3860b0e8d53655669afcb4bece7637e9a1c0daa66d453e9548b2336eb45d94ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/km/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "bf0899cad62f3331d157c557cbf3cf1f7faadaa7f9aeed3c6547b4533689dd7c"; + sha256 = "5753474371c7b8663d45f7f9591958afb9e9e2777df3e89840f6f34894ddf491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kn/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "cfea495b254e1ca8c1be94e95f0c1f126d5f1a1c9d54129562fbec5ded6dec58"; + sha256 = "d0dbeceacf93c3a581cc581e09507e401636350b763c8c9f5342b33a0640bd8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ko/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "ba8c93f8567a4f6bbf7af3c38a2d2ee793b05c0246638ded86538f91e6e9112b"; + sha256 = "095930063eae8e3d6a78a6d9adb3d28cff0bb0c9ccdec977c8c80765a4c60560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lij/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c093b95b291af78460396e87ad39aa142d9925a7253f74aef9640fac0134e397"; + sha256 = "587bced8e4480eba25e8597ab6b838a4f18553dd44b4f0ff48f245406f78e896"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lt/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b035e58bfe373138626d9c5a22e6b6a8c6f35e8ba30ce821f80a1a85fd16c35c"; + sha256 = "e214c23914e05152973428f5ed1df20054df054848d99ff23e5eb09e19b4557c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lv/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6dd5cf66db0207527966532a2728d37438f71d1e79caf9b97916d0e404c9509f"; + sha256 = "67657d4abb394ef76d37c321625d99dcf228ee00cc109e6d1c80cb3659db9879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1308f476d0052e1317b4c7db29d4d2218c60921a9ba7f619dde4455aee7978de"; + sha256 = "bac0e98b7a68dda441195cbebcdbea583f104188112449b14723c1086c3c4f19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "7336012a19cd650dfb8f842de37da8e29e7b0948cc707880667eca87bb31869a"; + sha256 = "125a63c875f4be6e246fa01289386295172d999e0e523c1171578adea24b022e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ms/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "192e12151ed1be4c3f7ea12beedd2c50f6e7fa877ae8c448cc899cd0fa1c6d24"; + sha256 = "6dc44f34449c915e93bf9c012ce7286b16d6418ca8f576d8a008b7ceb90bcb13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/my/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "08db2ff728d5bfcf751e95eb9bba34a94c435e53863790ae06daf803d56c227d"; + sha256 = "af5e2f1f9dcca84f41d3701035a00fc6b581aee2bf00f9f926928b99ab42d06e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nb-NO/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "22cfe518994fff77dc41e6f45550549593564ef2fa2dd34e31af17f5e42d636d"; + sha256 = "d168631cc1518e17cc9cd85f481f1047f6ae7df593d9197de5710fca0d87965b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ne-NP/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "605180e46adcaee8fb813dc41c4e7bbe5f509f181b607554137712405c0cc294"; + sha256 = "4b6065882ddd9e02441eff830808b31e6104d076cefed8386cff4ec7cb12330a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ba8b45685a1d428d5fa1e38e1a3ec024f55db2f3ce4221fd53b96b0e0801a6b4"; + sha256 = "96298283a2dbd9e3242c27551ee29829b21c8b9a32ca33b85da3142c47084dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nn-NO/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "0b76c63f7942576a2deb29cf15b089d2e73aa0b25f07eb1a511ccf033c68234a"; + sha256 = "19475301d3d93a633a1555b4436d63546a71160a992daa760a8c76a808791b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/oc/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "5de508b4039c395b594a0c78d25655113906b95a735d1e94f8e1171ca789da19"; + sha256 = "48af4af195173b541d76bb623acc357c3a2a8d03227406a21de89ab2d6c8c757"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pa-IN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0bf9e4751ef967f4c6f63cb6332fe3940698b3e67d0e4873ea6bf639487159f2"; + sha256 = "582ec12fbe2f8b07f8f4ae11ddf05c62db2d84508ee63ad6bfead9493a1424cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0fcece8a65132810cb297a599cd4b003604854f0af684b33c9de554fbf7b1e86"; + sha256 = "df8fcb5fe32325d45fbc1c9349065cd2d7f283e6a33d944282f3ed948c1174ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-BR/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8363d209d1eb7e8053acb4805df119e230ab31e74b3389ddb01b53b032c12bf4"; + sha256 = "fa48bc301c9b7dac4802b50980c573039648eb41bf0c0fb3ef75d0ba1dce9b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-PT/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cf2ecf2a673f0a4f17cecb10b330bec530fd6e37aff9ed821aa68e202f59f864"; + sha256 = "b0075346738d9a5f61fe4c3265c3a50f639f017551d3bdb2479e622d9561bd33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/rm/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8849e945e79f0f9605e288de967e9f5316c792b150654e23ca65f6c91bba8978"; + sha256 = "c9ad20ff328c8c0693cab58fbfb1d6c1f85bb63fdd20eb8d371e82d4df5c2e50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ro/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "452496612b170e53423009a128f092a3d4a372e0e6fe352e649b3c989f6f254b"; + sha256 = "7816302b6f70c0e24b848d3d396876ee0d870d90561c37e440bb8b7722f54ff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ru/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0e7787bee9fdbb1ca0bd3ef050b1ee5d6c6d8277da941232d6ef10c612003773"; + sha256 = "8f4969a16f4e70b59dd2da78b73532ff39589c984512d16fcd7106d2cf503342"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/si/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bfd6df7b86490aa941f5878ad749d7918bc3c907a177213ab8a60df0270eea69"; + sha256 = "0dfc4c1c797366ac9e65489b07de756a1b03b5498c9e4a6a10ac0d3a60345471"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "87c4827968ac3de5fb7609b9d7685653ef279bafbbb8b15f15f93cc876d6e021"; + sha256 = "5e16b451058d64ea0cb61fa92e17fd72e591009803170b0b220237cac7180167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6b272ee0cc91ba6114dc777f1833ed5201a96fd905a0d68a71cbafafe1a066cb"; + sha256 = "36216a3b474d3fd1d27886495f92eca83d24a465690efe7356ca9e7e4c08163d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/son/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "342f9eedcb359409fb324c13120ed25421435b614e9b5e15585ccf1551c263c4"; + sha256 = "1116bbb70b7ff8538d3ce4e7df190bd152c98889d1612fa8485cb0197a83868c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sq/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ad11f5878139c46a2344d0bcf6b02ad2c19e59f9861e7ac74668801e14742b73"; + sha256 = "006948f771f4964f5f4f078615cbb85aee23051e371ff7b871caee7c4659fe64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5e555aafe353036537609b9ba997374d106bb5ecaaa386b5395b7d156ff89901"; + sha256 = "20b0b9d605603e525d046424d290e6b2a0c963c0eae2a9a6c6ccdb72a9803e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sv-SE/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cbd33b4fd20d8a7401e384196c28adf9fda6ee2bf24895d75e75f8b727d33e53"; + sha256 = "a132b97019c75aa8929830f873974e1ab36b69ca7e3c9ab44dd2a5b11bbe4f7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ta/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8e4e9919ec79c1847449cc75539f24801d972b67d6895727aafddf7485d95ed3"; + sha256 = "3f24d965ee5c89edd447e8a52a0241a5d1cedb0aae6ed1ad1c212ba4dbed210a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/te/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "cb756aa758e69f26eb50d2e81bcb922c2a15a2304ef99debe67a57c44b2c3c52"; + sha256 = "2b65c7bb7df93b2bdffa687bd4309352f0d73ecdd66767db0db860f33f17c6a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/th/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8c2be1458aa4077264ec946181d7ab3160086d12c821dc3d5fa3bbba46de3574"; + sha256 = "21e2dca4e194a38de97b9b717150441bdd32466ee43e721f41afde004bc8e3e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tl/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e51e4cf97b79b3720129ed9467b57d393a4ffd5698a9a941cd28feffa1d166fa"; + sha256 = "9f4dc351f5244b0837a95d4afbfa0af373fe056e5eb106a2b177a57ba4c85ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tr/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9f0a494434bc3d78c43428bc535517b5d61743326fbdbf1836a84f353408a54e"; + sha256 = "50cabe6fea43e2212d0b0a9a5a382e085fdabc3ff6b6b0694b8f9d3d327c3ffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/trs/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "24cadb7247a254595c29aebe60784d37061465f2c960a8d036096c6df71e4186"; + sha256 = "c4db90a9a0677430fa591cc387bf1255f260208a4907cb760649cd7a6db03808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uk/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "6aa85e7119fd3ca00cd87d898eb93d954b1e58d01edf14106c41df98bdca4d99"; + sha256 = "7c92d619dd827a9f7ef9297f784cff582aba44684dca91c3b9873337b4318fb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ur/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "6b188379acb89178d08e827a60244c2298eae62434991d53378327c36829fa01"; + sha256 = "ef46130577072c6fe6b14aa0710c75344dea46124093f483db47cbc8c9cb4ec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uz/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "782ced50737f68a9fa6db854cde83ef7bbc6f95776a44918248efcedd95230ec"; + sha256 = "34c28440a7772a7fcf7f920be760f92057d813648372fe7cb8ae9f2c3fb3a846"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/vi/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "37b600b306c901080f659955163b1696f5129e71bc3c5f65dc74d280ee6e3024"; + sha256 = "c02c1737b56e1ae4f20ffa9abd392fb69f19d68348341977d0f39bfefab465b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/xh/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ebdfb9a50a5a7cad0508ade647ef3f81e18837d6b84212de6393a854bbfc652f"; + sha256 = "6be6defb443480c536639d99d124d8c636d70f049f126a793d627c131035c9c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-CN/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fbc7b8952fa6d2d73b736abf4e60a10512eb983ea4588f7e746bff9512b953ce"; + sha256 = "454af78f3ea4aa00676c4b97dff278dd404116e1da7993b5a2593167d11db885"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-TW/firefox-81.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5c29c56ef6480703ef9b6a2dc3cae8bc45b2fc01495ba099bd1ee28bbcdce55a"; + sha256 = "7e6b1b0ad56916759b01df06b23bb6a23b0c59815538cb1edb3e95edf7b772d7"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 5b61afe024..5f16fb1914 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "80.0b8"; + version = "84.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f9b686c12733f6be1c96fcc71727f55e9c79f417df64a4b703c7fadaaf3a85e6"; + sha256 = "6b548e6e2753e4a0ad2ad5968c063b6f4c7866c297314ba9e807161f7c757275"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "dc73e323741c3612607812878d24450b0b5d5274a8e58d25a9c3957d457b2431"; + sha256 = "f75bfba14ae1a248918c0e433c343328305eb6372dd80aa343506437f631f2b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "a84e966f8ac0373f63c7fd76148e16c56af645bb9b83cccee91e20065883f92d"; + sha256 = "d2e972f7d345720a89081fce3b9257942c93bdeb2a5c7dcede3c30282407f159"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9949f976617961c3853fc6e4596bac9a7c18d66b72df22b9b217dbccaea6b0c7"; + sha256 = "2731722dbd097875bb797a555e9a0ba3843deb159f7917626d8e97c1a3005e7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "89f277e215e11c7efd270c6f0952292db5c85057a50b48a3753fb16c1322587d"; + sha256 = "4d626c7f293226e9e18e28d069b40f75914f9387553d54588c34e7dd70ce1ae9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "44c84f6e00f5672c4f4b5d26d727da4aa0e8f5bbdcb4ab484be4015b5ea4bb55"; + sha256 = "01a647694a6aa2bbd8ad531197565593783946ad248d34f86550d28b8be5b52b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "cbcb4dbf931214f01167705529ce410935a378ddf76f32c04a16a019a04dcec6"; + sha256 = "49639180573943a4bd4d0672c5dec969850b4bfceca00c37575c6d0f2d589a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6af931944901fc143d9958538aecfcfa5c8604aa928dcad7ff4062e4752b2861"; + sha256 = "c575261553cbc6afcc60650e21605e1298a122b975f6b6b2845a35725fe2ff25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "5f44e1a8abf75708aed3c73c217ac6aa31520c32eae8c6a2c28838d4591fd779"; + sha256 = "5c5ebe2bfaaa7ea16ca4285d9806f3ecef1b29b61e5018920db27e050a4ef521"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7f345832f046770ff20457c902b499a6d2d3650e3cbad696d0a0ce81371b8710"; + sha256 = "29c764eff10d3756f258f0ac5cc9bec14cc46bb66d804eaca5548cebbaa067d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "539e441b74c8897113d8fe36076473f61cd26f9be24d5197dfa8f92a5ce68169"; + sha256 = "7730a4c1e7d4d791fe35f000bba72d3652fe7289eb95f5e77b426995a63ef412"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8f8581a6888dbdce1d357e8a289a0befa20e1679a8cc7bff13ef237bb5498ec9"; + sha256 = "fe90ef596de4262d803fa282cce7b30c1c9bde896b31d7e47d8e862e38ca1037"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5f3b7553a62465e18e103ffce48f75cc58489349c3cf966e3ba0138ce14d7b8c"; + sha256 = "f435a47a36affd5b59c7a6543f1c1c7e0dfead407138967a0f295dcd6093bed6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a1269157c6ec005756c1e0f0bbbf61a524f03b4c69022a2c49661c0375a78839"; + sha256 = "ec4968ccfaea0a975a4f56aaae8290387707570cf899d078438ac2cb98244fe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "15a26b351b40964089c8eed80fd5cadafd66ef39abbf19ce50a8b7ef5bdc661d"; + sha256 = "357c5372b6fade862671db66b90b3382749153c641bcd7c99f7b2a3c68c143fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8400fc3e6192f2095d4a57bf354dbeee1b771a8aa61ab0d865956cdddfafcaf6"; + sha256 = "5ce8f5e451fb2271635a2cada6c7b54a53936a1b912b777d54ce640cecb3d37e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "83c7818e65c32723c2bd0a4f65a33f19941fdcc5d84055cf2532cf8c4592020b"; + sha256 = "ac790fdafd2875d180be2375937b38546dd77d6e9b8428f4d44a2b780b4db14f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "589b9249ffcff23c388716c24cd09baa8b309d771b97f4dfcf9c979ad9a3342a"; + sha256 = "6c5205a4d74da62927648f95a069ed6a68ab012f2cbe0c4cded3de8d40c3d325"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "df57cc439fa74d93921c7c1265b7335e23c0df545e78eccce34e06fa528e75b3"; + sha256 = "516308e19f0373b3ff75e2e114fc7f1d2d370cd4a0f63f8bf74704eced2e0d56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7a2b0380cc8733e7d6eb5adc228fd543d8459d7b7d9ffbcb39b73dffd395e5de"; + sha256 = "d35a67fcfc8c5c334f55d12810bdcbaab6b9cb5fd3aaa75c79977accf7429445"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "6e747524fb05aa987e0c24b21fc9ab27901f1cb205b7cffa100d5bdb7ba130c6"; + sha256 = "e8d36d76d791108a6e514a649eebc9c4814aa8ccd4b21728e56a4e9839eef803"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "4e95f0c08c44e6d4830abaf9c2d25b10e63753f1dd48e192d4464a03b82a68de"; + sha256 = "9bb695670d7ee7a3a35d9adeef579e33f076fc1eca717149a5078134f584bf70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2b75be9a3961e734ae16e591c367e76828e9a3adc458629db69fe5fb32a8b476"; + sha256 = "595b1004380ac96663c2d8889f02a681ad7c5c56e0f12cde4a26a6453d0a0ec5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "2fb71c60605c4c56432c262f62d72509d520787a7e86a45b496a68e55d08823b"; + sha256 = "cb6ac56d074e91e2f5154c275c4c3a46e4392586451fdbba52fb419bbe085c64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3aefd418e20dbb7ae0b8aa87d15be140b4ddd7f6572ae0ca691b98f7f919361b"; + sha256 = "920e2aa05414fb72be7f24240636e7ce7b431776cc919c5a07c1361da3f66289"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "7d650204f7f717cb39b218919b3654db5cced3fffa4d06fdcbd4eba5cea1263b"; + sha256 = "9db297046da02c5c8e1f6d5ba0e4f6b35ec8b8d36335dd2f7933e49d86c207b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "5870182df6c69538ac1eaad0e61f580165e2e916cb76bbdee8b659a5a58dc68b"; + sha256 = "ed94f3ded8f803f956290976cfa41a5c46b42da7f3158b4283445ded15fdd789"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "166dc0e61759c879737a10c3b709e5bc94493bfbf01a7997c2d38b48254d6af6"; + sha256 = "11e2a8b7084ea002c6efd92fc86529e2dd09afbe4fe52285a3165733af95e132"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b8b8ea33ad920876b36abd8d35a61f01548c5a482c7eab0998f83f066bb62e27"; + sha256 = "0baa470895983b2c85f9ecc79f36fa1b6c8578c5bc22be76ef10d6e7f9e11ee9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "255637aa99002ea1f353098b19787077501efc915a74c2bc88a6ed6c05f12079"; + sha256 = "271141d85b5a0338445945208d515ab9ec6452253abddb1860c31cd61458de4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "304144942ac8e71f4c29bf4bbc91f17a05bfd712e621cc0029909e0b65e09a95"; + sha256 = "d467a6e1eff3b2edad56c6b8b58a7fe2d7fa5c07524fc0d567b660b29169ddf9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "7ce1b42078fe98783e2da541cdd69dd2083ada20254ef80fb53454950e77eddd"; + sha256 = "4f117b8bd69c01cb6d38b927ab26cfe79fcd111fc9a4a2e53ae4ef936bc9806d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "af9271da2138c9c0d73fec09c5356a87b91aecc36a1211a9ce35e0ee1bcedda2"; + sha256 = "6eb9d0c0d1ef84abf0af2a873334dea463d728ef5aff398417e2ea3104a4503e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c7f347082b17060c7af21ef12f9fd8b210ee20f877e7e791379c482a63e04ace"; + sha256 = "85d4b90fabcc03d3ac396bdba0749794bc3fe447c9f2ce793962a2acfc35918f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "51d42832b2f58e0d8f011762f9884dd49ab243d45b050258ceeae96bb92daad9"; + sha256 = "462e14991e34122e2275bedcd6776d9f8a75242c2b06d84ef3dadab08428d48d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "33a50b14ff9d965deac611e0dd6a85de9caa9cde9b99a8dd955a28916e026d7e"; + sha256 = "b0b7def94a250ec52fda4e4fe0de931209fe71eb06ce03de13bd7309c7f78d79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bd3469f5c101682a723eb5b261c591fa619b64dc99466ae919658cf44ae8fed4"; + sha256 = "e3bc980f579132b68cdf06b06abe2303430df239444971010ef420f5fe1599f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "eedd3b89b26b6634827e07a5b20b57716f54a604b18d9849a4b2fe30ab7c366e"; + sha256 = "66b9c65dedd1b57cfa2d960a40df72dca473f39f1cc585e1406abc64d68b1ce5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "206a292bdf13d98a502ff89ea57e94b37a528e57b88c1611c5094ed64aae2b0d"; + sha256 = "ad707ad91336de1c0d1f26fddebb95d25a8ff405bc3d576660ad9be0f5643939"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2ec91a2be77abc9b52e4d466cfaef70ef02b7b92e332fe572cdc3f4e53ac5276"; + sha256 = "585c76f373ef5c3f3b86a6cef4dfcdbffe3e314ba737a3f514bcd871140e5aaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5f53772c8a24d4fe1be3cc21673a924a5d65e606168f079b8091f4502d1218b7"; + sha256 = "8f9ed5eb32fe9272f5adc22753997292cd2dab7b1368864b4f001eb0fffd7526"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "15e74fb5124e1547f7eb776bd3b6d4096338731f1d97b6c0944e7f3af1b569c9"; + sha256 = "22d8b3d494f3b0dc5e347c0fedd5ab2ba32690c02993bd2a9066a987bb87aea8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5c4a0c766ed006e0f43856104aa8bd96e8d63ca618fda401370633b707e80374"; + sha256 = "c3a70593633985fcc8974364db75f2998e450359d4a8b621f23e95df24cf8e6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6945e71a060bcbf8a329c65ddcba786beb4f955cc2105806bf5873c07daae988"; + sha256 = "30701d1b25536a45a6a5613cbff8ac83bdec08d6421f1e37d9f0ae9c39ab6856"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5da76038365922aff82c540652132c7763a07f4336ef003a434299240444b036"; + sha256 = "bcb63dc6211b5c24536062ed6f8a424edf0ad553187b298874d97f75d363b1ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4be5260452b39b707d271b5696710038174c397083f626b3fd877aad36c37142"; + sha256 = "0278018d35f7be3e4c8da080bcd86e2bf08a544bfd452136483d2b21f91c582e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "94dac5899d0f2d5afa0dec53472afb329b956347d22581e1b9668a123d200278"; + sha256 = "d5699f8b946bc551fea78389cc6e82a9ca58ca3a8a492cbe3b985ed655fd60d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d4cade715292ed116c2605dd6a8c70854cad373641982283decbc1e2f0417490"; + sha256 = "1e2c580382192e88094738a01bc99b7efda5a1010e1bb180e35b5701f03aef55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5f4bf4e8bb2f5e72872e99f8415b864df457c93ddabbcd4377588895c83b1d7a"; + sha256 = "a541657165e18212f97261b2aba391434246688451cc9f2b643a57891dc0eb1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "5fa9251fd8c8e0d4aebc006ea1f8df15afada7276a1bd0517b89c2a6f8e488b6"; + sha256 = "5ecf7a03bc8e8d6329db2bca4296cf0d07b943ec9c9e0cbb2ffdaa4ecffcdf3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a1557fd84bb39786566b6c11d1efea9464a96b77a690b1b1c3b165283c031185"; + sha256 = "80d6148dbfa8e95e5292699b5326171f6a44eaa30dc4c84b233191a8505a248b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f9359c7eb9c6536ced999c18571babd932a1b1bd22565d6489bb43cb17893eb8"; + sha256 = "9f15ef55fab16e0086466e696f35dc3107451c2b9ccab9452901cf66723bf688"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9b34875edfbf6383b5bbddd110d969e32e448e47eaf48b7f41c215e6b3f8da62"; + sha256 = "762be8a3bee38ea5b939611b4fbc9fd5bfe71e80b685cb0a8937373aa19f94d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "78bdac1a7f0bd82440e43c6079332624b1e7e60defe45d55493857b1f9e2c7ce"; + sha256 = "65196c278a5a70c76315546465915626ed0c5f395af4ed1aed0ab2f27846aac4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "9fc753e4fa4a2a3a911dcfe9d8c7c993416833bedec4e94e85d95ef075209377"; + sha256 = "530010cb0d3393e47324c032d048a377ac5c9da16e73888db026f6cec61c3533"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "1e45e618c6d4db4f870e4d3baf60676d2a76916ce0998ae33d671ab73e8c1bfa"; + sha256 = "5233a8714e24a915404b3139aa3496812a4203b866cf4d870b013b940eba41ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "afe8410a5be470aa016720f411f33aa0b244fa34dacb138ab145b97a7e195db9"; + sha256 = "5dfe6629926804ed0820d472e19e51223565b011dee3feb722a81faa58043744"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "094f4ad0a2b988f0d75938dd6439ad5dacb1eee42584e7d1b424289117512d49"; + sha256 = "4bb4bd94ac7aa845a062c366ea47871293f7b5281a460d3547fc321b6430a3ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "69164a34e2cacc8f68e8e87defe713c4dcd1de278d449e1f9eb7b8cf42aae305"; + sha256 = "162d3705cbb8ef0b8036520d59e17eefd8e94bf27b9c1df027e9c0b26b3ebcca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "10262da2e4d50f2e331b3bd0c4d064002a3a5f10719284b96cced812ca0551bb"; + sha256 = "7498cb5bad8ccde4a82e2acf49e899a652086de5c2e0a63f833d5342e83bfa48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "d310667e306b177191965b40b6cc8556e0fa749a3ebfa6120b0255e701d81ac1"; + sha256 = "88ffd9ffb56000b42d3878654b6be2413189b93881d29809c5cfcbcd740349db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "2130fd9a56e2e4f4c09ea57cf0a566ade53c255c52e867c40316e14a04a59e0f"; + sha256 = "cac6e4ea74b146d07afa79e85746d9678e6407c733a38367ed36e94821cc2f4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ac215f60d098eacfb4d03e857e0229d0368a113e5758f00044790953712cc4bf"; + sha256 = "7e5eaf47c232fd25fb5c1e2de9d81351cfcf33c88c696a193219b0ff86a3c29f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0f89f81cde40821463e9ddbd988616d019d73fc0a27cc3a427dad4c9bd6fc931"; + sha256 = "20b1756847b2cbfc98153ac0d9a646f129b83f5c1383067d7547e9c70409abfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "4d599136e6a8f430f21605895d2ea63aaa3542a2b9dff5fa44d3a618dff1be5b"; + sha256 = "ac71d2e5520acaa352eba1f26576dc101b7b3a64971b36acbbfe7151b47e1344"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "859dc2201e76de7f08b2c29d11382f02bb2eb6f9ec48f65656f578da67cc10d3"; + sha256 = "90ff28f5e3ed56f5472e524f37288bad57045dc5491bc84f5e76f33d1d2cb046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "f9b7784f2c626f6bfe8a39a18a593d9f0d10d0f6407d1015969fd3744a483e88"; + sha256 = "267c1d406006feae8bc350bcb58b4f73cc2403682c5786bb500bcafca4aa1ae9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6c46d8b833423fe0eed0da6c162ae16f6969b569902c41fa21ee7e19ce7515fd"; + sha256 = "815e84bf8acb3cec68dd7fc06d7849240f71e73cd710538b9f8a887df73f98da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c359b9438f6065adb64baca086b7bed295ffccb825a96b4bcc5721ed4346a061"; + sha256 = "14717ad07784d231333584150f04118d22a8616fec76aab800d3208c514904fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "6ae3b82728155e195747176188e30d4ddc3d5e9499ab018902e2e1289b19c171"; + sha256 = "1c1470816615bb292f51cfd1a52002b5f2ed4444be41a3521ef1a40b4e64b2b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "45b97c17dcd1042eb205f6c59f5b679fcd224705cd5009dc2e39c8a22099ecb9"; + sha256 = "872a505769aff03597c71de66121fd007559c3f1cbb22c67661930de6e193634"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "50b2309fc1b083f739b090729096fe82747dc3e889923d271aae500ee5f0c82d"; + sha256 = "d0ef34afb32b0f6d1c266b99ea0f4a9015934112524eee0cadc66faa6898ae27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "aac403c497aa1bb9e37038ea7897f57074278d080e592bf1984f1712a80de632"; + sha256 = "e0b17a97217c799e4e0067e91374e63a6a99df827442d0193fcf47320af8a737"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b8330c7ef733c1d50e320376bdd9c5205fd56f58fc7baf46497f1b0902193dc5"; + sha256 = "0c031b6ae10918e65274f5ce95fd03d68011e36ab626e03ad9484ff40b36bc7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ae7d39f56d162d7b8bfb4d55c6de9b46a40f45c1bf9a4191e65c7a99a36b22ab"; + sha256 = "256b81200a5b92763d368b9c5d6f29e191aa4f11b097de1773bc5557d748c3ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "10e1adf60a23574fd5ccf9ae1be83710c92c902367174f73952d18412228814f"; + sha256 = "734b7d94b896554d5fedfd94a84c827ad6737808cd1f7b5b13be20702d46315b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fe02265dfb0bb12ad9a5739e802937540425789c8e36220f59001ef4fc256f16"; + sha256 = "d2c9fee5e64b8063c834610c2671f9c3fa49a5e02fc7e3482890b534aeb66a7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "73c58bb35f204f875d2c8d293780810be6083d2934fa8d7d7e02a3bc8d41e5a3"; + sha256 = "edcdf2a8a00e0402992862e28efb33614b9f1a4cdfed16316c5d4bbc229b298f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "90243b7a75889617085715d6cbb65c220f1fc5eba5d4a70612277dcb6a6df6b6"; + sha256 = "d097a61adf0908041cb3cce76758f6da274cd7b3a006163b004f70e869947021"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ba8ead8c649116edb7e168b25e6eb3735a85cf5c15a2a78ebe8340cd7071adc1"; + sha256 = "d60731c5976825f0566502f6211d8e22388ec9d02bd122272f70a0830297e1fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6466c44847b3b0370665e996582a2cbed9a8eb56a8b3f683582011cba77e918c"; + sha256 = "5dffa799eec3baf2e55d7b690cf73c2b190e369bff32dd1800020c0fdf912c9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "06869c6fc77aecdf48a991ebd65cc6052c8c3aca976b01cac5e39933c7aa9190"; + sha256 = "abb5779af704c926ca90bd9b9a01eb8de1b1b4feae658d5911bc523739eda0d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e763358e9672fbc8b990bacae8687c7558d9718cc9d1e80798ee9ad220f28b35"; + sha256 = "2a228577a4d6c11a433b8c0340558aa638de175474491428b05509019920f8e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "1669e95f886a7adeac0489c072fb88f1ca09daf3b42027006305857bdbfced4f"; + sha256 = "82f0bec91719e7b2a355c9b0398b924ce4cf429bb11e99d566af9836f5087acb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3d5c9f1596291eba38fa5b5174674fdcfd335e4cff44ecc50ddc7f08ca254b97"; + sha256 = "9e581d2dc107c385142c3bbb5476e3bd94e700cd8f9e36ead46d284d5708e9c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d583744cc4d1099f23960b0ee7c80992233864c94f877623f0c566a65cd944fe"; + sha256 = "096ce747a12c0b773d34517efce6aa4aaaf09385c5cf088046f7217639a7ce9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "cb6b8cdf1747e211cceeb07bda07573bc193574fa3603bfebaa537857953ce13"; + sha256 = "3fc48cd9839ba88f246fb04fe34cc5760aa9e40c8fb782ea57347e32d66030f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "e2561f98607ac5dcc67ef825cfe73d1c2af4ef9c5c01ebf48ee4dc0f80b53d07"; + sha256 = "087c629e5aea8fc698cbc5608c270a7099607b34c5852b3b3f4091af3b7c789f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "de1e1f83c439d17d5489d666f1772ac32e26d70a5b3309176b528de413fae39d"; + sha256 = "4df467d46c5830a3d96f87294c3dfddcc397b73a372ba566900123f7ab86a6ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7632b4734ffe3106e78ddfc9e5ed81dbd219045f4b954421be4629397436763c"; + sha256 = "11090c8aa00533c456ce96cbb09691c816fa2f98ac421cf581c86bd2bef5f296"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8e6c6d36546492ae93128c780c80bcae86ebaded38cc753db1f0401d4b5d31e3"; + sha256 = "8e7a5cc3606dc6cf71de328863a9107c36024001a381baf00daab11bebb857d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "18c7827cc1337e0a2cb3a1e9603aff8e7c3ac8e5631cb791eb0b7a2de35bb487"; + sha256 = "bb1846dd3b7bcf3b657d64bbd215301565dafee00eae96cee15fc71b40f49877"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e78c922c13e0207c9cfb4d492e855543979e77b49a18fc63796c7e74cc4fcdeb"; + sha256 = "375805742481f8f33adccbdc7e10f21ef0b1a0ab383c379e4dc13718c3f8fbf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "bd30e089384bac81aacf68c52ac884712bd0c739f517faa6390090d112d9fcf7"; + sha256 = "a8ce0836980441d1248f8bbd2e4bbc7a8269afe9bf8e3125bd9f4dd3acd06d7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "316ad740bbba808a66b6fa00a9b1391597c949fa217e721563c685ef9fa028f1"; + sha256 = "8f491d8d1f61bf4a7f036efc047462bb04cf953e2a3a39cb5a326e49ed7a880e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-x86_64/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "f92189c808903b314ff4cc30fdfa7d5e2085ce22b9763e95144a7d69e6af719d"; + sha256 = "dc5a8ca6f8a3f40060d0d2abaf694a066960cbfea355678ac583c3977b37cbed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "aaf1bc4cda7e1f1182f701485f5cb186d4b731851aca70611cd478c923b2427b"; + sha256 = "f5b5a500581e52dfe5192135cfa06bf283ff23ca0b1b569db1f1bdcd359ad0b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1be25b19658c15a88031169c57acda5ebd49b63212f584da6f859370b493ad32"; + sha256 = "f96a13006c272edf5f60d6c04011e48729b5078fbde2238a0e5c422eb1293372"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d461a566f7efc35ac323b0e8e963b8332a349e1b317401c2975cf4c75f7ce8cd"; + sha256 = "0bdbd429a512499dcd920ae695b61347196527ab30c601e1645385f3cdaff4ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2051bf3ff16a6ebf15ed4fcd97adc2bef65c04500d09ff1f009785f41c0b02a2"; + sha256 = "e0b6addd1b699c228aa353af879bbd263d1bd0e17aa033754abe864348adfc9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "97951d00f79bed031680ff9676201c9ff0fe79273e4f2697cd19ca9ccdfe95cc"; + sha256 = "3ffbc1b67d9cae58c2b21227e6456d9e6ca8a387cdbe8b5bbae9b1db553a34b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a461aa41658c34bef1bffba2d34619ea402fdda2e51aa1e0200002b2e9321c8d"; + sha256 = "36c9ad3b07b6e032b38486e1d2a7a6b85b85dc84d8d0b9218fbd4c4a71e59e70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ff1d2fa9203fce0aac5d91b38034910bbf7b0822b499fe522ed981f3365db8c3"; + sha256 = "2ac1811463e482205f7dd27e4f98564146f089fb423405a8c3df8d2a10e45147"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "17553a8566afe02d916b18d76a8850295512d9514bc37bbac459bd28a3bf46ec"; + sha256 = "174d0ab72bfb1a8ea811c1b77a9eb65871f68641b1703c3bbf02bad4d298460b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "9863e968594a556a7bd52a43cd3c965687d4116c9fbfb62bed38b1b7ee343728"; + sha256 = "e6d1b74e56690abd5c2f0d2d1dae0b9ac6d16b28daf1964ecd87138a5de9fadf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "762f1f951560f8c85a44cc2a7c318e4f8e5a0b752011cf06f86235e3aedabebf"; + sha256 = "2ad97986bcdcdc2b988f1d50fef1a71d767119e03065ddc3e51ad38efc7dd351"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "24fc8ac01417df1bbcec358c083f7627ed13bc76921bf0efc14e9f7653e9a819"; + sha256 = "71c472c8dce7174ee8139360fd5b8528cba89f73dc186bdd08ed368917b8c41d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b071e20fadfaa2c06baa1579343c18167f6adf88e1c98fc68413287f6a45225f"; + sha256 = "4e5245f658f5bf6f47d40e2437841213b03b9f6d12e83766621f5b59fb258eaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e63fc27b2bd404ae9190035d5537822fe76213545d8dd076566abd12ea213e25"; + sha256 = "4de924505b98c029dbba0762723a3310b3d171f18072a1a51d4f9636aaca8831"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6f4fc3e51819d9d3914ad624593cfc755d9e8f78263700268dab46c38e8fdbcf"; + sha256 = "11fa8468ca6b3c51ed615d0375e63d85443beab66c10cbdc95fca817ada02215"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "ee61413b6544ec56d13bebd08ee2ee69f8d1f16e886ba31d46c2a786c0984f7c"; + sha256 = "c1bc48d54d0ea32731d4400c2b2fd817c5ed222cbe5fea20b3ee26ddeebab9d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8f29a8b77732cb1387371538efdf970d0e93d3de866b103c836990a4f0a30933"; + sha256 = "02cf2dc5bb97e9497655c53ef45dda3495f280a333c94fcc51048852bc993a53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b89854119e139a8e9347b262131ed5da62672f6d728b1017963a11d279861a45"; + sha256 = "6d36d0aa1ce447770c9a149a1df2c27731a31f5784b9f20ef536836e6e42819a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c453a0f5cf528c582a35997a963b944d31666018ffc912ee4e188f795066b925"; + sha256 = "49eb555372658bf827adfc07b08c8ac46a6351f0ecd0fed0ad6d5c4975553c8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "bf1f7ebef2aa4a5e0ed824a2c89a0b86101b5cc754feec482f0c39ef2ef3dea4"; + sha256 = "1c358edc0e6248773103ab92ef0bf6103dfcbfa2945602bbd2f49153ebc7c690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b31ea72af96ecfd2b625d813bf32e08dfbffb9c0acb004e1f279b7937d675a90"; + sha256 = "a445f9806285ef0b036364a618c8d7ca226da899dfa33adbda5b2e327fe63dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "31866007d8bc76202fcec3b9531afe237c9822025a14113051a9389cd9f81ec8"; + sha256 = "6d2590c0cc0aa28a1443185aec54f84973a31e79beccd5ca5700abfd8deebe2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "82b2e6cc268eefb687255fdc5170aa8ab6136d6a07b881d49c044e1700eb9190"; + sha256 = "71c4040c1326133f18ec7a07ea021b061b0994cf92aa113b358c5c0c10ebc59b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "dcd29328d9b464c16bd034f635a16d1593f98e08becc6a278d265b07bdc208a2"; + sha256 = "af3bcd19cd78dea23deaff0c2810282a68428eee4d45e2989c75cbce5ff97098"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cfd6996e81513426d0534ba62e4f2d22fafcef51ed48da4a593b9d3ead2cb2fb"; + sha256 = "641def17e0d004f81cb176ccf70cbaa1df50fb204c3ff45a80800b76c21ed006"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "9d4c24e1153f723a789c1934c15cf8b4d3925fd34e8fee98d7e5ad19c9f7a9d3"; + sha256 = "0475e9de47c64b11470edf16f2819bfc1b1013f75ff6dd83da96bff1174db788"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "91364ba1a2ab6c8bdede117f45a855b5968bee492e054123433c0fc034d66415"; + sha256 = "0f3c14175da4f59b745473df5f0256b582800b3c3dfabaa21e124b9ef100fc72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1cef40ebfb1b12813d85a975ac0620b3ed339acf5de8e4d0ff0aba6aadedcc7d"; + sha256 = "9a33525bcb9d10a10630d4c470877c8698f6da32671cbc47450c7fa4d2cba7de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e41ae370750f65e59470e05b2ed501a308f8743cde3291bae2fb8d17af553789"; + sha256 = "ba397ac159b77c9346b58e5c9e4bdffd21b5ac3fd3d4b67a2b67931916b2f830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "5a279c246cffd27f6c919f451161e87b30ac8743e1a22ac490496b28af7e75de"; + sha256 = "664672b4f5f713bee16024845f16555da16f758d8db674dc5ec7f0022d2b7000"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3530e6f3060fd133dfad72532319c6cdb5be5bdd2dc0395d02e379b203264d20"; + sha256 = "3230da6f19116ccf848855218df3fbace86af2d9085f4109a3006476807f464d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ae1b1fa06440f1038c97fa9d625a2b58ce5ffe11fb53a71afff632a18675f113"; + sha256 = "faf07d08ce391b1043d4081fc650e3ee78ca067a3a11a6e3ff87916f3ac7a557"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "05b47dda3d1fbce0e3dcd79534aef247516e5ded783d1184975ba97b1abb09f8"; + sha256 = "2c763d737cb112b77919594fe34061db5181a725cf518fc3cd9133be9bfd7cf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "689eeeee1a769ec9bb53014044a615f0a5c05d8a15e6dcd408d18ef452c0b441"; + sha256 = "5a631720534e03e211936255012270e04918461112411e787ea02f138087c6b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c64e31adfc24ba1fca84922b33a71bb74150ddc9b4d5e52f3627d2aac3b11516"; + sha256 = "2b86ce004a5c42fd6f5cdda28439263357ce5428b6469440046ce6fe4d6157c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "36765f1c9e1b15b43fd7d70c9f9dd1b977c4171ff920710346493214e08f9dc0"; + sha256 = "e0e81fb1494d86abdcab4cc9feb0f789ab304172c67da013f0a09ab2c2e3e676"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "026c461de7bba74facc421a58028e46efe32e7e3f441a8ca030911e2e883f56a"; + sha256 = "ffcf120a36f7268ab2ae03fb1eb6d458fb63b00d41198bf7997290c28997205b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c2a21914b4f7cc71d6456e9c395fcf2ebbca12408563decc4a400e3d5d43c865"; + sha256 = "a99d3471da7fa2e985fc562a4abe086de9096d2461a50841ad5c8e5d2891bf8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "888aaad1dba8db4d71785fee01c100aa1919d432e8ccaa044e386224abe9494e"; + sha256 = "01412502c872561564e1dac95b12d27295be5c411d2bb1ebbd53cfb4dbadee3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d5b1d103104c2e6e7b8198be649b0628acb4cfe6865422fc9e3db3b6ecc07cc6"; + sha256 = "a73ee3448bb7888acec856e3e3369e28f5fbb9c5d203892e4992f73b319fa394"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "215b9df33e06685f9b264b06b512d325aa8353b3f3975699b77e9fc8d18531f1"; + sha256 = "3b7904059b38eea27b7901de41be029ea8ec23c3d2a8bbe8941d8852c55cfb97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "8a19ef1eb702a0083c7751cbd7f2437c5fa46ba3f61a5f5d07f797b8ca696d22"; + sha256 = "0bf4d3aa4f217e12b1f204bdb189625c6daae24cf5253bf4b1cd6288f2717873"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "17a84efead836ce54c1c0f0f5486595753f97463fbc2031d78b01e33c7a7775d"; + sha256 = "4f95852212b0b08aa420c88e2ec7825913e3e82c1d2891fffdb11a8583bf46b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "41bc47533991b818b26fa149a30825326879cdb3ba92eab0ae5171be595078bd"; + sha256 = "e30d3274103e39241e233aee994b5b8c2b39dbd190ffa1a9da99f8494ae833b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9ee8d0255eaaefe37f00960ed59c83a06b8356a8c6ea05d1f9697edb9880593e"; + sha256 = "f401baba947e64ef4ef02cc5137c8623a99967ec8597e4e5c8987382dbc505a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a9b6dfa44cc8d90a530aeb98ac96a0ac1e63b4a46b9af8ddfd4d6f268fc7eb5a"; + sha256 = "70ac5b24deabcaf0b250575a0454a35e127cf15023a3546ae41c01942c64c59b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e93f74803b536d3b12b6e41d064a7adc5dc16615d045a2e6cf792d25477fbdc6"; + sha256 = "9dfa8b99f67ce66625e0c89c37f4ee36b23421ca89d4445deb5dc82eb0eb05a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "931dbb0817dd797c5af61bc683f3d95ed99ad9834efe2f66a50f9e444e708061"; + sha256 = "4445dc874962b72f7d9096cb46ff98987b56d9c2d3e0acd814fc8c59261363b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1e1afcecc3bcadfbd6989eefc191f8d5cfd0f4d29c1f6814927370aa647af854"; + sha256 = "16c6550910555ddfc395b0c9626dd6e41a4bc9bd4a8ddbfb2867faa991cd4ae4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4907987557a6a560557d417dcc31f9c7dd45dc0d2767ed050770f6fc6f308641"; + sha256 = "1c208c0b99cd008d67e8c9c1d118f7b2c8c354b4dcf740554fc2474ff93b8a7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d895c87359cfb98e236c4b5bac92391528eef07a45dca2d067a7d55fed4ebe7c"; + sha256 = "cac410ba1679d27565d63d3a70920d3ff262b6171dfe732c3ec7ee88d3386b14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "30dc7aee461930bea42c9f2985ff766f4aaf3ec0bd7f09562626b155bf80f202"; + sha256 = "0b8c20ac0a4394c8c4a106e65d83718f639453e10c54906da04f4da536a218e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d452668daf3b5a9f0602417822f7581183dfd5dbcc5d770afa20e1d61d557003"; + sha256 = "978aad2d0855ed8e364faf4a0522d7271bbd134c699da515db7e5c58dca79d49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5e828a4f6abbb80c7b575db2a70ddcff0d734f11eb9bca55c2b8d00f08fa6497"; + sha256 = "f32b2f9cd504a6d4d5b5d2ce47368cad4317cb1249dbd7d925d0c48098fba8be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "994e8ccd626f3e640b8a1b687a22ae6e3943b25995278f3333b6814ce61185c2"; + sha256 = "38e2fef40b71d50b85be7a2d2c44bc0b0bc569410782119fbe07aba00c8193f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "a63ad9f77f01523dfb02eb6c2880a4046a556bae6d329a5e5480aa3eea0aec85"; + sha256 = "c8a617eeaba39e138676c8412594329b00d372c40a0401a77e5bf974a407a3b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "5396452efe004c7cb57105bb7134875e073f822927a98db23e96994e11fc7155"; + sha256 = "d1f19e2edfd1ee97b13b8e42c22f1409174c8fb4b024612d27cbb3ab9586ca1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a0bd2586531902121344b7c70e9ec9ae4e08514d2c467a17664701735f8d74ab"; + sha256 = "8e1f68d6bf97644616e8d8a39443061fe99df088b42e5218beb823d8cd18b8e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "ac4f16381c71e3a4f00c6ac615913cc7d5eda77dd9ca337b9a8ec0e63a2e9176"; + sha256 = "ba22770bc65b0033f424ce30df69a7d21a728245230696b412baf44aa9a111a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "bbeda439051c1ff43ba08b95de57914237e7b9845fef0d92efa02265cdc81961"; + sha256 = "27ab65ac4ee08e2714ca7c493a4575352df4a06532773197a2bb3da86e9a18c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "bb500de9c32241a7e28828e3f9b89427be1a54475d7b05b9c678d489a457c329"; + sha256 = "4a8f6944d9b6134d664e08eb404e130a218497b4957437b56e4487a8bc205ca5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "5689b2805b30cece9f9757a1869906529a7094b4a9de5d5180a5bea7582606de"; + sha256 = "885893b0a9ef75cd623f21c720aee07357ff3b4b21ccfbe456fc11928ef7037f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "fc5ec6938f33c548f52cfb90f8a40b342bc9b4a7b97c3fcc1b3cd2aa5a031270"; + sha256 = "55aa8e1e4b61eb3b9a26fe9abafa804e7b6d34ac1f36efadf10ee13d2cd934a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "374e2a6ea3c59c7f985606f2e631294b57e20d7aff2bd8256ef9c91189e960b3"; + sha256 = "61412fde864addb40fa2d0ab42f30cb9a7e1887cd130ab59880763d675b6f7fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d9058df8893da03a707e549d9f133942fa71bf51e06c1a654f3ac588d79af82b"; + sha256 = "cd7190acda6e20c22edcb99c88c15e87b4676b2dba7de0578d2ab32a22b2bc1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "11019961c5378bb86b45b2c6d4b74ca1e41e86aed500ec0cd73fbe1785ef7742"; + sha256 = "97f16d919eb8321c71864daba7accfcd9bd86d4948bc86df44fa86a52649ad8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "de45c606c961a38c84196cab1827089b1b22e2dd0c23302ce57bf9fcbfcaf82e"; + sha256 = "4ebbdfb4c75621a24b52853c3d94e178decfe3bcaaa1f8f92f42bf91eedd874f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "bc2d98ae8f0fcc608d55b394398c45c1bcfcd02956031ca4762cc98d265916d8"; + sha256 = "4b14585bb554bc346565a69b6a4c10580345923f8e4dbda8b202e6b9e8cf1452"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b7c1d390a8bdf295ad8951959fcb720f977139592ef0f669005dcca0e6cbb19b"; + sha256 = "408f34fb48fe1fa93850857118fc4ed972139e273ed2521cd9f7169f8d4148cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "a61a765b698f48c15cf07ea424e8e69be7630261a94c6514fa739974b51243f0"; + sha256 = "0f7e1e4df86a931152206159a9f4e99b4241377c5545fb343eff86cd21869bec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6721ca2f49b60f5ff1d86e0b1c9a1d6107c5d701b319a2abec7b6fcb9f845d57"; + sha256 = "c7f85ae2c46585cab0aed8c41117ffd686fe0dac6e0ba64eb41bc22d4b8f01c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a77c0c05be64f027d25feaa75a788c630dd7af831c0c2fa334db7c36ac340144"; + sha256 = "2669e61a0d7da09684230c67c6d43091b3b51e12f291259a62c72ce124fa4c3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2baf74be32eec18bb235b57ee3816a3c9df916bbd4458aab1613af864581a072"; + sha256 = "10ac3662c49611f73fb96a13ef464c27b4ce08c25f0f44e253e6e5ce2239a45c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0103da6d53b4a9e9512b8e3b90e583d8592a5bd02f09aedb90f49b1ce73516e6"; + sha256 = "a6e606c6d4ca032653b46966c0b90e001474907424f4fef46669e2363ffb89f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "5dc1ace0d108460d6a57f7b158a1640d822c4e07a2e4d108db9f17e63150e4a1"; + sha256 = "a8a8ee42020f62b38c125002ff6b5ad975d1a24df4e64f354f58fd949517e3c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1e2ee8f338625bf95da2914e54b22e1a052cce955a92102163e67cacc41129b8"; + sha256 = "f405c06f8041e4c90caed14e7d6fac38467976fd71a214f06eab8c2113c386c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c57cda1ba6e8895044fbc55b37eb5e241b02904f69337a6430b3b9fd47a57fea"; + sha256 = "acd2c0812a24b301aafb1278246495b07e346fbd9cd699da406b988dc3d393ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "e31df32be4babb9b1eeb5f6a5a44d1c94b07fd5c4bf70d8cc78d4061e1e790a0"; + sha256 = "d444818f1e76a01a1170209497349331175ab9a761c27b31ddb89ff4d542ab9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0630c3c617d1a646ab0acdc0c18346ac29066a8a31be9995f96e5daecc74bb24"; + sha256 = "f2f3c9c4888f0055c10d1aae6cb1c40cc7f4d2bd1653e846768326e11b6ef2c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "65cc9e3d0e6af8743a768cf23b1dcb281d5ee26cbdf0fb2f0639cfe032f8cc07"; + sha256 = "aeff79d992488895e47d3682d6b3661cfd1a86d39aff8c91313f057838075068"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "7f25deb9d71b23647722745d813e8e115e0d08190811efa4fc0b6456ee5bc634"; + sha256 = "860900ac8f3fde5511a294a4f41e553d4853c4592d4446441399fda78a91898a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "e103461a63337bd7905345091edde08056eb267a522a205d6308e33d477f7d49"; + sha256 = "9122e1837c732b8cf242f211937b3fc445b6a48da3db01cbaa4a0d00117848a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "cfaead5b0913dd265c18e42793a2a845aeb6e421b6c54a0f979bc80cd7a6cb18"; + sha256 = "a3c15061deb11e870d83138bf65beb5a838cc3ba96d067d3e72f816f818da3c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7343ae52dc3f85d35264fb6cc86daea45deed4cc3b7c3dc3078afdfde9a48919"; + sha256 = "cb3d2dcf7d80501a8fa38c50d0301af9562050bc64250cc1c6208467990795d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "389ae6d8db8280f74944c2c5d61dc031ba4ae4db792c1f851ff72ebfb123b17c"; + sha256 = "4ece8a45e79aae6e535d56370f8890c5d3045d0ca78bec67fe848367e518339a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e49d8a521ffc7087c8d75f5ecbb9f6c010966c9f92dd4c105278aeeee1eee865"; + sha256 = "70996e39e5b38f7def90f1eadbdbb294992e4ad27a49d4941b3982a0d3f8421b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "a27ff17d3bd090cf5bf798465dbeb3e369ea03a738729b748a0b03bb2d0418f8"; + sha256 = "36720f87e8b3ee23f15ff48514931747d05638194e9b13b30017e601b8a5c905"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5826bcb2683e74bc5588c7b12099d9d2ac70ecb0026d375bea92d94a3f381f70"; + sha256 = "d433a22f97bcb69570933b1f371c248ebd2eb83a217bcc1989897c08175cbcd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "73d79d2dfc0c7ac86566c1d41a6cbf6367ff57a6c5dcd459e1994d5bb8290fe8"; + sha256 = "0787dd09f287aab492610d2ce23d0be7bc3a2158e84d7e94345358a750ddb752"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "a8b7cab92a7b449ce57a2eaf6a447e4cec99fbd8dd43ffe36dd4b87cd04c19a7"; + sha256 = "4d3bd35ed7c43eb502f482bb60da0dbf14714b35e2996362c835a0a35008308a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "af59707ac1141ed356a9bacfa116d0a65236352f6bbbddd69e8544a551064782"; + sha256 = "8e1c371acd0bd1762c715c8e36dbc8df104351cbb3c37fab64c72b55bc98f006"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "4a6068c0384b69592312bde06631584e612fd1f17d0af4b71dbfe38fe19dd413"; + sha256 = "14b6149229f49406755a5ee308e0e120964595a1f9a7f2f7e9cc2979a5cf561a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a6f01fd45fc403dff8a97be0bcdcd2837eff7880ad039eab2cb31a2eca82c6e9"; + sha256 = "a8adf840548ac5974654234956957b8e53f3e36c83cfad4fa5c840c16e9e4d5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b7cc325a09e7e5a6097c81055eec760452ebff160af5e5f9b7a790a2d3fba53d"; + sha256 = "fc9b023caaabb3a5a18a21a2d65195a7dc7b2655a5d9a1f4c75434cb1f02e4da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "64e6d44ed8b07fefb110463e1003cab01503a52bcb72c76d6030325cd6c796d9"; + sha256 = "940b4e34e92a0efa397d3944fb6b8c5afea57f29355c9f9621accb557efd9860"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "11312a9a212159bb929df04217292481b9aacdebc50ae941729b37f9c7c8312b"; + sha256 = "b1284ea7ec8e42c6139249b1958380e672dd19e7b8c21d95e256e0d3265bd095"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/80.0b8/linux-i686/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0b3f5974dd951fe9ec988c8608b186a2d5ebbc397fb017d587e869cbe4dcc74b"; + sha256 = "ac76d109c7817b9c06356918860216a3e2f4f776a31a8690064593ffc43139d9"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 92434806a1..988f47f3bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -386,4 +386,6 @@ buildStdenv.mkDerivation ({ # on aarch64 this is also required dontUpdateAutotoolsGnuConfigScripts = true; + + requiredSystemFeatures = [ "big-parallel" ]; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index f2e10f3233..73a095b082 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core +, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , kerberos, libdrm, mesa , libxkbcommon, wayland # ozone/wayland @@ -38,7 +38,7 @@ , chromium , gsettings-desktop-schemas -, gnome2, gnome3 +, gnome3 }: with stdenv.lib; @@ -49,8 +49,6 @@ let }; version = chromium.upstream-info.version; - gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; - gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr @@ -65,7 +63,7 @@ let kerberos libdrm mesa coreutils libxkbcommon wayland ] ++ optional pulseSupport libpulseaudio - ++ [ gtk ]; + ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -79,10 +77,10 @@ in stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.adwaita-icon-theme + gnome3.adwaita-icon-theme ]; unpackPhase = '' @@ -150,10 +148,10 @@ in stdenv.mkDerivation { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; - maintainers = with maintainers; [ primeos msteen ]; + maintainers = with maintainers; [ primeos ]; # Note from primeos: By updating Chromium I also update Google Chrome and # will try to merge PRs and respond to issues but I'm not actually using - # Google Chrome. msteen is the actual user/maintainer. + # Google Chrome. platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 8bfbf98b19..542d432948 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -16,13 +16,14 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.14.2"; + version = "28.15.0"; src = fetchFromGitHub { + githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1qz2sqc8rcg5z5kncabgmpl6v4i6wrs9dlgmna69255qrmsshwgm"; + sha256 = "1sbs3gcwfx58mxc0x1g6jklmvpa9dw2bq3i8y9645gfa1s12p8wy"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix index 03571469da..57eb4fad76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/surf/default.nix @@ -1,21 +1,22 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchgit , pkgconfig, wrapGAppsHook -, glib, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk +, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk , xorg, dmenu, findutils, gnused, coreutils , patches ? null }: stdenv.mkDerivation rec { pname = "surf"; - version = "2.0"; + version = "unstable-2019-02-08"; - src = fetchurl { - url = "https://dl.suckless.org/surf/surf-${version}.tar.gz"; - sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"; + src = fetchgit { + url = "git://git.suckless.org/surf"; + rev = "d068a3878b6b9f2841a49cd7948cdf9d62b55585"; + sha256 = "0pjsv2q8c74sdmqsalym8wa2lv55lj4pd36miam5wd12769xw68m"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; + buildInputs = [ glib gcr glib-networking gsettings-desktop-schemas gtk libsoup webkitgtk ]; inherit patches; @@ -32,9 +33,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A simple web browser based on WebKit/GTK"; + description = "A simple web browser based on WebKitGTK"; longDescription = '' - Surf is a simple web browser based on WebKit/GTK. It is able to display + surf is a simple web browser based on WebKitGTK. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index e340e3a052..222b1b5b76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.4"; + version = "10.0.5"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "sha256-2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I=="; + sha256 = "1cxh39x69m4lgqin5k5p67gs9g26w7cnlbdpjqi8dw47y0bpr9xw"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "sha256-B0WGkIt8KDtma/WGyenQ04ctKE7AantUtYnwsjAZZb0="; + sha256 = "1cyg5ic7mrj6x1gxw5w609933d9ripa5b5gxyqnvnxfa23dkh608"; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 7bacb182a5..3e19af619d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.11.10"; + version = "2020.11.11"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "1jajjfbwbqvkr2cc9y4ryn8z1sh19hwydxidfdpgmq794ci8v4np"; + sha256 = "059q0k53n8cc78cg70pw7dnbc1cjzv3kdvw3cfamvkrmscqgczxd"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index d044840637..21a9608db2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.5.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "0vng0ra8bjxmfq6xvdxn72f5bcjrv8i72dams80lf0mq3l7wjl7c"; + sha256 = "0a9f6745f17sws7fyhz0d8wnriv69d6nrci9j5nhysnzg97ky1np"; }; - vendorSha256 = "05vnysr5r3hbayss1pyifgp989kjw81h95iack8ady62k6ys5njl"; + vendorSha256 = "04csmw5zpansb30amr3i6vlwxc3z38q4g69cklh44cr37glm04sm"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 69119673f3..9163347d7b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,28 +1,35 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +let + k3sVersion = "1.19.3-k3s3"; +in buildGoModule rec { pname = "kube3d"; - version = "3.2.1"; - k3sVersion = "1.18.9-k3s1"; + version = "3.3.0"; - excludedPackages = ''tools''; + excludedPackages = "tools"; src = fetchFromGitHub { - owner = "rancher"; - repo = "k3d"; - rev = "v${version}"; - sha256 = "1910vir9yc3xvb23260xljnfpznyhnk4gddy752rrndz7rk1b5c3"; + owner = "rancher"; + repo = "k3d"; + rev = "v${version}"; + sha256 = "1pq5x4fyn98f01mzfjv335gx29c61zd85qc5vhx9rk27hi825ima"; }; - buildFlagsArray = '' - -ldflags= - -w -s - -X github.com/rancher/k3d/v3/version.Version=v${version} - -X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion} - ''; + vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ + "-ldflags=" + "-w" + "-s" + "-X github.com/rancher/k3d/v3/version.Version=v${version}" + "-X github.com/rancher/k3d/v3/version.K3sVersion=v${k3sVersion}" + ]; + + doCheck = false; + postInstall = '' installShellCompletion --cmd k3d \ --bash <($out/bin/k3d completion bash) \ @@ -30,13 +37,15 @@ buildGoModule rec { --zsh <($out/bin/k3d completion zsh) ''; - vendorSha256 = null; - - doCheck = false; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rancher/k3d"; - description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; + description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d"; + longDescription = '' + k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s + + k3d creates containerized k3s clusters. This means, that you can spin up a + multi-node k3s cluster on a single machine using docker. + ''; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix index cd11bcbb43..f9391373b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,10 +4,10 @@ }: let - version = "1.34.2"; + version = "1.34.3"; # Update these on version bumps according to Makefile - centOsIsoVersion = "v1.15.0"; + centOsIsoVersion = "v1.17.0"; openshiftVersion = "v3.11.0"; in buildGoPackage rec { @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "1xzjzmjs2ijg7zzw53v02lgrg1j82jd7ljcn6lprg01hhvfrwgg7"; + sha256 = "0yhln3kyc0098hbnjyxhbd915g6j7s692c0z8yrhh9gdpc5cr2aa"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index df3821744a..1c9f21afdd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0rqlks2f7cwx14xynaq95dxlzh18rsdz1w8a2ia24lvfwf8b95rf"; + sha256 = "1rgfk8l3yz7xwghr06vcgpi6zzjynxxvyg2r78fgp7wpw7bh3rmd"; }; - vendorSha256 = "1fxb97wf69phhqwqg86wcx4dkzh67snzl1xfmj4wvfq16b9xj11j"; + vendorSha256 = "1f6x66zgrmm7x661d0d0qqharrpyb2bsi10swlgx68y5yz285296"; meta = with lib; { description = "Octant plugin for viewing Starboard security information"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 7c948fbcdf..15a3b0ac24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,28 +1,38 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli }: +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: +let + ver = "1.2.7.0"; + source = if stdenv.isDarwin then { + url = + "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; + sha256 = "sha256-HP+opNjS53zR9eUxpNUHGD9rZN1z7lDc6+nONR8fa/s="; + } else { + url = + "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; + sha256 = "sha256-EZ9ncj1YYlod1RLfXOpZFijnKjLYWYVBb+C6yd42l34="; + }; + platformBuildInput = if stdenv.isDarwin then [ unzip ] else [ dpkg ]; + unpackCmd = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src ."; + archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; +in stdenv.mkDerivation rec { pname = "ssm-session-manager-plugin"; - version = "1.1.61.0"; + version = ver; - src = fetchurl { - url = - "https://s3.amazonaws.com/session-manager-downloads/plugin/${version}/ubuntu_64bit/session-manager-plugin.deb"; - sha256 = "0z59irrpwhjjhn379454xyraqs590hij2n6n6k25w5hh8ak7imfl"; - }; + src = fetchurl source; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ autoPatchelfHook ] ++ platformBuildInput; buildInputs = [ awscli ]; - unpackPhase = "dpkg-deb -x $src ."; + unpackPhase = unpackCmd; - installPhase = - "install -m755 -D usr/local/sessionmanagerplugin/bin/session-manager-plugin $out/bin/session-manager-plugin"; + installPhase = "install -m755 -D ${archivePath}/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" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1862a17a84..8386521419 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -339,11 +339,12 @@ "version": "3.1.0" }, "gitlab": { - "owner": "terraform-providers", + "owner": "gitlabhq", + "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v2.9.0", - "sha256": "0l0b69nxxskpsylcgli2sm9qq7p4hw96dsri24w38shhnxmpysbb", - "version": "2.9.0" + "rev": "v3.1.0", + "sha256": "1an34ckz7lz1k25lkjpbmls55zp9pacr46vjnjjpqx6bx5s95f5g", + "version": "3.1.0" }, "google": { "owner": "hashicorp", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index bacf9409bc..a6a9631481 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.26.4"; + version = "0.26.7"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "0q1dzrjfg97bk1prknwpdgcf5vnpdi0f41wb5ni4550zzqsz3rnk"; + sha256 = "1431n6zs2mfkgh281xi0d7m9hxifrrsnd46fnpb54mr6lj9h0sdb"; }; - vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n"; + vendorSha256 = "18ix11g709fvh8h02k3p2bmzrq5fjzaqa50h3g74s3hyl2gc9s9h"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index ae47545ae4..d362500ff5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.17.11"; + version = "0.17.12"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0ggr8l93xpfm4ljjxw0g6kbm0q64hviaamcb5r2vrx9nabz95n95"; + sha256 = "0l70nmxvk30h56bs46cgakddzdf3laj1y88d0jchij0yy7ixa61f"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix index 2e598b1a76..22bf982ec4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.15.5"; + version = "4.15.6"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "1mnw1m3wjkw8rfh6fwwrhfmkna6j19pza9cs7kyp8qj1fzzqi8my"; + sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix index f3f5f54f40..63afa5ce76 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, wrapPython }: +{ stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }: with lib; @@ -13,6 +13,13 @@ stdenv.mkDerivation { sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff"; }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch"; + sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ="; + }) + ]; + nativeBuildInputs = [ wrapPython ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix index b3655888e1..845d0f2779 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "83.4.152"; + version = "111.3.447"; arch = { x86_64-linux = "x86_64"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index 9ed20d7da6..f9abd3fef3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.8.0"; + version = "3.8.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "1fkd5j4ppk36ly6b5pjgng2vksqj6jvpyysg1xz77h2rl4xkzmkw"; + sha256 = "0vy89ih586s89s29dzzggk7bkaz70mzrc9islirk01s1jal1jn0v"; }; buildInputs = [ qtwebengine qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix index 1b475bdee8..d3633e2245 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cordless"; - version = "2020-10-24"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "Bios-Marcel"; repo = pname; rev = version; - sha256 = "18j8yrnipiivc49jwbb0ipgqwdi249fs9zxxz8qx8jfq77imvwbq"; + sha256 = "0avf09b73fs3wpb4fzmm6ka595aanfvp95m6xj1ccxvq8ciwpqcw"; }; subPackages = [ "." ]; - vendorSha256 = "1h47aqf8bmyqvaayfj16br1402qzy7kf8rk96f3vnsyvsnkg5gw5"; + vendorSha256 = "01anbhwgwam70dymcmvkia1xpw48658rq7wv4m7fiavxvnli6z2y"; meta = with stdenv.lib; { homepage = "https://github.com/Bios-Marcel/cordless"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index bb37380a68..9b89634f0b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,20 +17,20 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j"; + sha256 = "0vxz68vldrbmmw1alpwl7blfcy6byd6zg9m0851dm0p0ldyhsp5j"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.115"; + version = "0.0.116"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0w9i3plbiiy2kp4yahsdvz0f4wpszsgqdnlgzbnx7wj0xk4qrkcx"; + sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp"; }; }; }.${branch} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index 7098bba2de..bc6dbc5ce1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -92,6 +92,7 @@ rustPlatform.buildRustPackage rec { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; + broken = stdenv.isDarwin; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix index 52bc60b5af..646a790fed 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.5.0"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "0kgfjai0pz0gpbxsmn3hbha7zr2kax0s1j3ygcsy4kzghla990wm"; + sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p"; }; meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index 3f05e3d7a5..96865374be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -28,7 +28,7 @@ # Helper function for building a derivation for Franz and forks. { pname, name, version, src, meta }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { inherit pname version src meta; # Don't remove runtime deps. @@ -65,7 +65,7 @@ stdenv.mkDerivation { expat stdenv.cc.cc ]; - runtimeDependencies = [ (lib.getLib udev) libnotify ]; + runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; @@ -84,6 +84,7 @@ stdenv.mkDerivation { postFixup = '' wrapProgram $out/opt/${name}/${pname} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \ --prefix PATH : ${xdg_utils}/bin \ "''${gappsWrapperArgs[@]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix index 57b745057d..69a1984806 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,29 +1,61 @@ -{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11 +{ stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl +, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx -, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss +, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss , pango, systemd }: let gitterDirectorySuffix = "opt/gitter"; + libPath = stdenv.lib.makeLibraryPath [ + alsaLib + atk + at-spi2-core + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gnome2.GConf + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libappindicator-gtk3 + libcxx + libdrm + libnotify + libpulseaudio + libxcb + mesa + nspr + nss + pango + stdenv.cc.cc + systemd + ]; doELFPatch = target: '' patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ $out/${gitterDirectorySuffix}/${target} ''; - libPath = stdenv.lib.makeLibraryPath [ - alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage - libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3 - libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd - ]; in stdenv.mkDerivation rec { pname = "gitter"; - version = "4.1.0"; + version = "5.0.1"; src = fetchurl { url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; - sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi"; + sha256 = "1ps9akylqrril4902r8mi0mprm0hb5wra51ry6c1rb5xz5nrzgh1"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 3b1fb255b6..9c99741823 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2"; + sha256 = "0n86cdpw85qzlcr1ynvar0f0zbphmdz1jia9r75lmj07iw4r5hk9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 0df7a5d8e5..952182def2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -7,7 +7,7 @@ , AVFoundation ? null }: let - version = "1.17.2"; + version = "1.17.3"; rev = "v${version}"; in mkDerivation { @@ -17,7 +17,7 @@ in mkDerivation { src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - sha256 = "04pbv1zsxy8dph2v0r9xc8lcm5g6604pwnppi3la5w46ihbwxlb9"; + sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp"; inherit rev; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 995c050d90..93ab78c439 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.11"; + version = "0.6.12"; # 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 = "0gkaxhx87yn8gmkqjdn78m1axfnfkw07sw9qsn7821966fd5l5ax"; + sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 761d7cfcbd..521e60c78f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, autoPatchelfHook, writeScript }: +{ stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.12.1"; + version = "3.13.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "1dxbnk12ry6arn1p38hpv5jfak55pmfmxkkl7aihn3sp1aizpgyg" - else "0nfzx7pbzd95a7v08g29l84sc0lnv9fx8vz3mrmzhs0xqn9gxdkq"; + then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz" + else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g"; }; - buildInputs = [ stdenv.cc.cc ]; + buildInputs = [ stdenv.cc.cc postgresql.lib ]; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix index 8560a8b944..c9dd22f183 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2"; + sha256 = "1y0k9vfb4818b3s313jlxbpjwdxd62cc4kc1vpxdjvs8mx543vrv"; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index e53b8c7391..24ce75dc79 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,15 +1,16 @@ {fetchurl, stdenv, dpkg, makeWrapper, - alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, + harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, + nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: stdenv.mkDerivation { pname = "viber"; - version = "7.0.0.1035"; + version = "13.3.1.22"; src = fetchurl { url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj"; + sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh"; }; buildInputs = [ dpkg makeWrapper ]; @@ -29,10 +30,11 @@ stdenv.mkDerivation { gst_all_1.gstreamer harfbuzz libcap + libGLU libGL libpulseaudio + libxkbcommon libxml2 libxslt - libGLU libGL nspr nss openssl diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index 09ab75aae9..39f4d0d233 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipfs-cluster"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix index 980221afb6..c51d93378c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa"; + sha256 = "11kjndd4rzj83hzhcqvvp9nxjkana63m0h5r51xwp1ww9sn63km9"; }; - cargoSha256 = "1s93zxk85wa7zw8745ba1sgipal75w1y18nc9vca6sig4pzvvj41"; + cargoSha256 = "079ns78acsff2qb59s7q0ck3j2fygcfqy8is6vfa71jyq7a0rjqm"; RUSTC_BOOTSTRAP = 1; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix index 1abaeb6f16..4f3a1ef390 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix @@ -8,6 +8,7 @@ , sqlite , file , gzip +, makeWrapper , notmuch # Build with support for notmuch backend , withNotmuch ? true @@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; - nativeBuildInputs = [ pkgconfig gzip ]; + nativeBuildInputs = [ pkgconfig gzip makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; @@ -39,6 +40,13 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/share/man/man5 gzip < docs/meli.conf.5 > $out/share/man/man5/meli.conf.5.gz gzip < docs/meli-themes.5 > $out/share/man/man5/meli-themes.5.gz + '' + lib.optionalString withNotmuch '' + # Fixes this runtime error when meli is started with notmuch configured: + # $ meli + # libnotmuch5 was not found in your system. Make sure it is installed and + # in the library paths. + # notmuch is not a valid mail backend + wrapProgram $out/bin/meli --set LD_LIBRARY_PATH ${notmuch}/lib ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index c068357a0f..cf78da9a50 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "20201120"; + version = "20201127"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0z6xavgd0zv9pqvfsdyvhhi1q3y7zxhgg24isbnn9r6mldafqwna"; + sha256 = "sha256-BkDGKZmpwahDw1vD67CyWfxD93H83kcpv5JBGVL5F/o="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix index ee5b7c5e17..60dc120548 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -4,6 +4,7 @@ , bzip2 , cargo , common-updater-scripts +, copyDesktopItems , coreutils , curl , dbus @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo + copyDesktopItems gnused llvmPackages.llvm m4 @@ -262,8 +264,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = let - desktopItem = makeDesktopItem { + desktopItems = [ + (makeDesktopItem { categories = lib.concatStringsSep ";" [ "Application" "Network" ]; desktopName = "Thunderbird"; genericName = "Mail Reader"; @@ -283,12 +285,11 @@ stdenv.mkDerivation rec { "x-scheme-handler/snews" "x-scheme-handler/nntp" ]; - }; - in '' + }) + ]; + postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - - ${desktopItem.buildCommand} ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8295e8dbc8..b692fe7d9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -2,6 +2,7 @@ , bzip2 , cargo , common-updater-scripts +, copyDesktopItems , coreutils , curl , dbus @@ -82,6 +83,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo + copyDesktopItems gnused llvmPackages.llvm m4 @@ -257,8 +259,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = let - desktopItem = makeDesktopItem { + desktopItems = [ + (makeDesktopItem { categories = lib.concatStringsSep ";" [ "Application" "Network" ]; desktopName = "Thunderbird"; genericName = "Mail Reader"; @@ -278,12 +280,12 @@ stdenv.mkDerivation rec { "x-scheme-handler/snews" "x-scheme-handler/nntp" ]; - }; - in '' + }) + ]; + + postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl - - ${desktopItem.buildCommand} ''; preFixup = '' @@ -321,6 +323,8 @@ stdenv.mkDerivation rec { gnugrep curl runtimeShell; }; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with stdenv.lib; { description = "A full-featured e-mail client"; homepage = "https://www.thunderbird.net"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index 16f1d7ebd1..dfe816fbf9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.8.8"; + version = "1.9.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "17grlia9vxjly7hnwdgw8xfrynibj9h839kxs3wbdgp86b4lf5xf"; + sha256 = "0bd3nvisdg64wcy5syb1iyrv3vy4c6j8gy68dbf141hn1qiah1bg"; }; vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix index 3bfb252623..0719c137ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix @@ -43,6 +43,7 @@ mkDerivation rec { GenericName[it]=Generatore ed Analizzatore di pacchetti di rete Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole ''; + fileValidation = false; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index b9ee526bbe..364aeac550 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.7"; + version = "6.8.8"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "1m9v4abm8jbyz46hin63vi6irs32n1xzg85bdyb48vpdxh6iwv04"; + sha256 = "0zxk0nv7m1k4n8n82h1rkh239a58s7j643lgqbw3qx45bdy4sf4k"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix new file mode 100644 index 0000000000..7db633737d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -0,0 +1,110 @@ +# Even though pCloud Drive is redistributed as a plug-n-play AppImage, it +# requires a little bit more love because of the way Nix launches those types +# of applications. +# +# What Nix does, simplifying a bit, is that it extracts an AppImage and starts +# it via buildFHSUserEnv - this is totally fine for majority of apps, but makes +# it by-design *impossible* to launch SUID wrappers [^1]; in case of pCloud, +# it's fusermount. +# (so pCloud starts, but silently fails to mount the FUSE drive.) +# +# To overcome this issue, we're manually extracting the AppImage and then treat +# it as if it was a regular, good-ol' application requiring some standard path +# fixes. +# +# ^1 https://github.com/NixOS/nixpkgs/issues/69338 + +{ + # Build dependencies + appimageTools, autoPatchelfHook, fetchzip, stdenv, + + # Runtime dependencies; + # A few additional ones (e.g. Node) are already shipped together with the + # AppImage, so we don't have to duplicate them here. + alsaLib, dbus-glib, fuse, gnome3, libdbusmenu-gtk2, udev, nss +}: + +let + pname = "pcloud"; + version = "1.8.8"; + name = "${pname}-${version}"; + + # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive + src = fetchzip { + url = "https://api.pcloud.com/getpubzip?code=XZpnMpXZPWyhRfdvXUhyY6XpdfmQmJiLRmmV&filename=${name}.zip"; + hash = "sha256-z9OeFkH6EVthg5Dz2mN3jlBTMhiMt/6bUIYFeMO6EXk="; + }; + + appimageContents = appimageTools.extractType2 { + inherit name; + src = "${src}/pcloud"; + }; + +in stdenv.mkDerivation { + inherit pname version; + + src = appimageContents; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + alsaLib + dbus-glib + fuse + gnome3.gtk + libdbusmenu-gtk2 + nss + udev + ]; + + installPhase = '' + mkdir "$out" + cp -ar . "$out/app" + cd "$out" + + # Remove the AppImage runner, since users are not supposed to use it; the + # actual entry point is the `pcloud` binary + rm app/AppRun + + # Adjust directory structure, so that the `.desktop` etc. files are + # properly detected + mkdir bin + mv app/usr/share . + mv app/usr/lib . + + # Adjust the `.desktop` file + mkdir share/applications + + substitute \ + app/pcloud.desktop \ + share/applications/pcloud.desktop \ + --replace "Name=pcloud" "Name=pCloud" \ + --replace "Exec=AppRun" "Exec=$out/bin/pcloud" + + # Build the main executable + cat > bin/pcloud < diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix index cc8412e1ac..9ab7446fe3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix @@ -12,7 +12,7 @@ , cups , dbus , expat -, ffmpeg_3 +, ffmpeg , fontconfig , freetype , gdk-pixbuf @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.9505"; + version = "11.1.0.9615"; src = fetchurl { - url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9505/wps-office_11.1.0.9505.XA_amd64.deb"; - sha256 = "1bvaxwd3npw3kswk7k1p6mcbfg37x0ym4sp6xis6ykz870qivqk5"; + url = "http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/9615/wps-office_11.1.0.9615.XA_amd64.deb"; + sha256 = "0dpd4njpizclllps3qagipycfws935rhj9k5gmdhjfgsk0ns188w"; }; unpackCmd = "dpkg -x $src ."; sourceRoot = "."; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { cairo dbus.lib expat - ffmpeg_3 + ffmpeg fontconfig freetype gdk-pixbuf diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix index 106d2103ec..7aab2b8fd6 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.13.5"; + version = "2.14"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx"; + sha256 = "1iz4lgk99v5bwzk35wi4jg8nn3gbp0vm1p6svs42mxxxf9f99j7i"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix b/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix index a81f2ea8f7..01dc7b5c30 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix @@ -56,7 +56,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "NOAA APT image decoder"; - homepage = "http://noaa-apt.mbernardi.com.ar/"; + homepage = "https://noaa-apt.mbernardi.com.ar/"; license = licenses.gpl3Only; maintainers = with maintainers; [ trepetti ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix index 008697211f..5411571113 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.9"; + version = "2.9.0"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0axzqyljbmpc4c9bnqmdrrz5la5r9qynp49fig645xyxs87vq6b0"; + sha256 = "1pcyj1vzv51j8rgi0hh9chw3vfkfi03bg1rg7gs4nk95ffmwx4pd"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix new file mode 100644 index 0000000000..98afba77c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/phd2/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, + wxGTK30-gtk3, curl, gettext, glib, indilib, libnova }: + +stdenv.mkDerivation rec { + pname = "phd2"; + version = "2.6.9dev1"; + + src = fetchFromGitHub { + owner = "OpenPHDGuiding"; + repo = "phd2"; + rev = "v${version}"; + sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ]; + + cmakeFlags = [ + "-DOPENSOURCE_ONLY=1" + ]; + + meta = with stdenv.lib; { + homepage = "https://openphdguiding.org/"; + description = "Telescope auto-guidance application"; + license = licenses.bsd3; + maintainers = with maintainers; [ hjones2199 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix index efa246a277..2621c5bbf0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/deeptools/default.nix @@ -1,14 +1,14 @@ -{ lib -, python -}: +{ lib, python, fetchFromGitHub }: with python.pkgs; buildPythonApplication rec { pname = "deepTools"; version = "3.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1a14a29e60be13eac11bd204dab9aef73cd72fe56a94c587333f21087584c0d8"; + src = fetchFromGitHub { + owner = "deeptools"; + repo = "deepTools"; + rev = version; + sha256 = "1bz8ln32mfc9k8l9wgp034vw80dxh6f92dfqxhcrpggk4akwj6ml"; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonApplication rec { deeptoolsintervals ]; - checkInputs = [ pytest ]; + checkInputs = [ nose ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix index 86a16c4f04..3f9cb1a288 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.8.12"; + version = "2.8.13"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; - sha256 = "0zxmk417j9s5nms0np1fsip7r0jhwkj1d1x424ljr9krcb2zwcyq"; + sha256 = "0sab478jq96iw3fv0560hrrj8qbh40r8m4ncypdb7991j9haxl09"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index d0f98719fa..d2b05943f7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "mosdepth"; - version = "0.2.9"; + version = "0.3.1"; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849"; + sha256 = "1kcrvamrafz1m0s7mlbhaay8jyg97l1w37p6syl36r2m1plmwxjd"; }; nativeBuildInputs = [ nim ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix index 07669d097a..82c624ba7c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/tebreak/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa -, samtools, findutils }: +, samtools, findutils, python }: python3Packages.buildPythonApplication rec { pname = "tebreak"; @@ -32,6 +32,12 @@ python3Packages.buildPythonApplication rec { done ''; + checkPhase = '' + $out/bin/tebreak -b test/data/example.ins.bam -r test/data/Homo_sapiens_chr4_50000000-60000000_assembly19.fasta -p 4 --pickle test/example.pickle --detail_out test/example.tebreak.detail.out -i lib/teref.human.fa + pushd test + ${python.interpreter} checktest.py + ''; + meta = with stdenv.lib; { description = "Find and characterise transposable element insertions"; homepage = "https://github.com/adamewing/tebreak"; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index 9adb8e3674..e09abccad1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.17"; + version = "14.31.18"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1cg3a56bbvlq5wfjgwclg9vsj61kmj6fnqvgf7fdvklhdvnijla2"; + sha256 = "0hkc7c08azbw3k91ygwz6r5y4yw6k8l7h4gcq5p71knd5k1fa5jd"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix index 4d3acb331d..e61017ea33 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/default.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, -libzip, boost, fftw, qtbase, -libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl +{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake +, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl +, libsigrokdecode4dsl, python3, fetchpatch }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "dsview"; - version = "0.99"; + version = "1.12"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; - rev = version; - sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2"; + rev = "v${version}"; + sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U="; }; - postUnpack = '' - export sourceRoot=$sourceRoot/DSView - ''; + sourceRoot = "source/DSView"; patches = [ # Fix absolute install paths ./install.patch + + # Fix buld with Qt5.15 already merged upstream for future release + # Using local file instead of content of commit #33e3d896a47 because + # sourceRoot make it unappliable + ./qt515.patch ]; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + python3 ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; + maintainers = with maintainers; [ bachp ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch index e30a28d80f..75c3e96286 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/install.patch @@ -2,10 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c1c33e1..208a184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) - install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) - install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) - install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) +@@ -427,8 +427,8 @@ + install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) + install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) + install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/) +install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/qt515.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/qt515.patch new file mode 100644 index 0000000000..552f2062ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dsview/qt515.patch @@ -0,0 +1,13 @@ +diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp +index 921d3db..16cdce9 100755 +--- a/pv/view/viewport.cpp ++++ b/pv/view/viewport.cpp +@@ -37,7 +37,7 @@ + + #include + #include +- ++#include + + #include + diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index 3b6a4c7b73..6b9f07ee68 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "0b1bi99xdhbkb2vdb9y6kyqm0h8y0q168jf2xi8kd0z7kww8li2p"; + sha256 = "13c4p60vrmwmnrv2jcr2gc1cxnimy7j8yp1p6434pbbk2py9k8mx"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix new file mode 100644 index 0000000000..b08c4d84d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/logic/key/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, fetchurl +, unzip +, jdk +, ant +, jre +, makeWrapper +, runCommand +, key +}: + +# get this from the download URL when changing version +let gitRevision = "7d3deab0763c88edee4f7a08e604661e0dbdd450"; + +in stdenv.mkDerivation rec { + pname = "key"; + version = "2.6.3"; + + src = fetchurl { + url = "https://formal.iti.kit.edu/key/releases/${version}/key-src-${version}_${gitRevision}.zip"; + sha256 = "1dr5jmrqs0iy76wdsfiv5hx929i24yzm1xypzqqvx7afc7apyawy"; + }; + + sourceRoot = "key"; + + nativeBuildInputs = [ + unzip + jdk + ant + makeWrapper + ]; + + buildPhase = '' + ant -buildfile scripts/build.xml \ + -Dgit.revision=${gitRevision} \ + compileAll deployAll + ''; + + postCheck = '' + ant -buildfile scripts/build.xml \ + -Dgit.revision=${gitRevision} \ + compileAllTests runAllTests test-deploy-all + ''; + + installPhase = '' + mkdir -p $out/share/java + # Wrong version in the code. On next version change 2.5 to ${version}: + unzip deployment/key-2.5_${gitRevision}.zip -d $out/share/java + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/KeY \ + --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" + ''; + + passthru.tests.check-version = runCommand "key-help" {} '' + ${key}/bin/KeY --help | grep 2.5 # Wrong version in the code. On next version change to ${version} + touch $out + ''; + + meta = with stdenv.lib; { + description = "Java formal verification tool"; + homepage = "https://www.key-project.org"; # also https://formal.iti.kit.edu/key/ + longDescription = '' + The KeY System is a formal software development tool that aims to + integrate design, implementation, formal specification, and formal + verification of object-oriented software as seamlessly as possible. + At the core of the system is a novel theorem prover for the first-order + Dynamic Logic for Java with a user-friendly graphical interface. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix index 6acae2bcb7..4242bb0599 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/proverif/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ./proverif $out/bin cp ./proveriftotex $out/bin + install -D -t $out/share/emacs/site-lisp/ emacs/proverif.el ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix index 5c445459a3..c9e97375b6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -3,7 +3,7 @@ }: let - version = "1.6.0"; + version = "1.7.0"; arch = "x86_64"; desktopItem = makeDesktopItem rec { @@ -25,7 +25,7 @@ in stdenv.mkDerivation { inherit version; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm"; + sha256 = "0v15wscawair5bghr5ixb4i062kmh9by1m0hnz2r1sawlqyafz02"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix index 971eb93e2a..9ce6592d99 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "1xcdf3c8rlvjmhiah3g2j83c889qh9x04kv3kb4nsa2imrpsqaqk"; + sha256 = "0v71x3fph2j3xrnysvkm7zsgnbxisfbdfgxzvzxxfdg59a6l3xid"; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix index 1e3bcea42e..a5388572db 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/4.4.0.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance theorem prover and SMT solver"; - homepage = "http://github.com/Z3Prover/z3"; + homepage = "https://github.com/Z3Prover/z3"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.x86_64; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix index dd71cf2cb1..48512eff53 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.x86_64; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix new file mode 100644 index 0000000000..e1cf5a0f08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, curl, fftw, gmp, gnuplot, gtk3, gtksourceview3, json-glib +, lapack, libxml2, mpfr, openblas, pkg-config, readline }: + +stdenv.mkDerivation rec { + pname = "gretl"; + version = "2020b"; + + src = fetchurl { + url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; + sha256 = "0mpb8gc0mcfql8lzwknpkf1sg7mj9ikzd8r1x5xniabd9mmdhplm"; + }; + + buildInputs = [ + curl + fftw + gmp + gnuplot + gtk3 + gtksourceview3 + json-glib + lapack + libxml2 + mpfr + openblas + readline + ]; + + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A software package for econometric analysis"; + longDescription = '' + gretl is a cross-platform software package for econometric analysis, + written in the C programming language. + ''; + homepage = "http://gretl.sourceforge.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ dmrauh ]; + platforms = with platforms; all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pspp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pspp/default.nix index 95c2c3931b..d6c5b58f0d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pspp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pspp/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl , pkgconfig, gtksourceview, pango, gettext, dconf , makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme -, texinfo, ssw +, texinfo, ssw, python3 }: stdenv.mkDerivation rec { pname = "pspp"; - version = "1.2.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://gnu/pspp/${pname}-${version}.tar.gz"; - sha256 = "07pp27zycrb5x927jwaj9r3q7hy915jh51xs85zxby6gfiwl63m5"; + sha256 = "0lqrash677b09zxdlxp89z6k02y4i23mbqg83956dwl69wc53dan"; }; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkgconfig texinfo python3 ]; buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl gtksourceview pango gettext makeWrapper gsettings-desktop-schemas hicolor-icon-theme ssw diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 48c4b77c2c..09ead07dc0 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1pff3m5xnw9kai6n110j1grxzcf2r7pxi76jin1lxhm8q8gmnnz1"; + sha256 = "1w0r9vv1h3zbfdvk8965g5plfkz5clf81riil5b394ms9vsw0bx5"; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix index e2acef7b8e..a21bffea14 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + broken = true; description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; license = licenses.gpl2; maintainers = teams.sage.members; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index b245ae384a..6fdb7b8fcb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.24"; + version = "1.8.27"; src = fetchPypi { inherit pname version; - sha256 = "768deb3c1d96ed8d734a2fe2eb7cc3877309b17fb5353e9d7036830283806885"; + sha256 = "f3c704e2d67b36e4932896abe00c89e7f3fb7458fc52849b5d7d6d83bd623adf"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 4e87c00434..cd372b79c2 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,17 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - # 0.5.0 is not compatible with gnome 3.38 - version = "0.6.0-rc1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "RuIJvB0J/BQFqemOkEUiqS1uz0gMS49Dd8UQt0nbrQ0="; + sha256 = "vQdNwNiUvoJWRT1foPRadirI2zWjnzU3sGnIxeHKlj8="; }; - cargoSha256 = "+3iZywLvy+8C7j6g9bqij2DSLjBoE2u1GXgfV04cWRY="; + cargoSha256 = "1PQSg6EmwVMZj2ALw6qsbtPMCtALVHx5TR05FjGD/QE="; nativeBuildInputs = [ cmake @@ -75,7 +74,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix index 1535b1a256..e5ea0a67f9 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix @@ -11,11 +11,11 @@ let ]; in stdenv.mkDerivation rec { - version = "2.1.2"; + version = "3.0.2"; pname = "hyper"; src = fetchurl { url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb"; - sha256 = "1n4qlbk7q9zkhhg72mdks95g15xgyrc6ixf882ghvrqghd4zxplm"; + sha256 = "0fv4wv5f8nc739bna83qxmgrvvbyq4w9ch764q2f12wjygrz336p"; }; buildInputs = [ dpkg ]; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index d5113ebf8f..1ec704f5d4 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -75,6 +75,8 @@ stdenv.mkDerivation rec { ''; passthru = { + tests = { inherit (nixosTests) xterm; }; + updateScript = let # Tags that end in letters are unstable suffixes = stdenv.lib.concatStringsSep " " diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix index 1af64f8e6d..5da3aee5d7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/bcompare/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcompare"; - version = "4.3.5.24893"; + version = "4.3.7.25118"; src = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "1gm8d6hgdg8f3hd83wqac28gkvz5nyn62wj7x44vmr60dh4i2jfn"; + sha256 = "165d6d81vy29pr62y4rcvl4abqqhfwdzcsx77p0dqlzgqswj88v8"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index 03e81a91b8..bf6591a8cb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -86,6 +86,8 @@ let git-crypt = callPackage ./git-crypt { }; + git-delete-merged-branches = callPackage ./git-delete-merged-branches { }; + git-dit = callPackage ./git-dit { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -201,6 +203,8 @@ let inherit (darwin.apple_sdk.frameworks) Security AppKit; }; + glab = callPackage ./glab { }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 767e471f8a..d6b976a29f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1lk3lhw598v966c553a3j0bp6vhf03xg7ggv827vzs1s8gnhxshz"; + sha256 = "1d15nrba53yk75n610wnyziq9x5v515i8pqi97iyrsz2gm2lbi3p"; }; - vendorSha256 = "0bkd2ndda6w8pdpvw8hhlb60g8r6gbyymgfb69dvanw5i5shsp5q"; + vendorSha256 = "009dv2brr4h71z78cxikgm0az3hxh28mwm94kn2sgx3pd4r5gir5"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix new file mode 100644 index 0000000000..d5abd0a597 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub, git }: + +python3Packages.buildPythonApplication rec { + pname = "git-delete-merged-branches"; + version = "6.0.5"; + + src = fetchFromGitHub { + owner = "hartwork"; + repo = pname; + rev = version; + sha256 = "1mlmikcpm94nymid35v9rx9dyprhwidgwbdfd5zhsw502d40v0xp"; + }; + + propagatedBuildInputs = with python3Packages; [ + colorama + clintermission + ]; + + checkInputs = [ git ] + ++ (with python3Packages; [ parameterized ]); + + meta = with lib; { + description = "Command-line tool to delete merged Git branches"; + homepage = "https://pypi.org/project/git-delete-merged-branches/"; + license = licenses.gpl3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 47d095b0f1..a99ff3c2e0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.3.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf"; + sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix new file mode 100644 index 0000000000..9c2e4f00ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "glab"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "profclems"; + repo = pname; + rev = "v${version}"; + sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw="; + }; + + vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc="; + runVend = true; + + # Tests are trying to access /homeless-shelter + doCheck = false; + + subPackages = [ "cmd/glab" ]; + + meta = with lib; { + description = "An open-source GitLab command line tool"; + license = licenses.mit; + homepage = "https://glab.readthedocs.io/"; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 2413019ebc..3459f5099c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils }: buildGoModule rec { pname = "lab"; @@ -17,6 +17,8 @@ buildGoModule rec { doCheck = false; + buildInputs = [ makeWrapper ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' @@ -24,9 +26,10 @@ buildGoModule rec { export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c $out/bin/lab completion bash > $out/share/bash-completion/completions/lab $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab + wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ xdg_utils ]}"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 5c4ece7c9e..5914378f5b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -1,17 +1,21 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg }: +{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }: buildPythonApplication rec { pname = "pass-git-helper"; - version = "0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; - rev = version; - sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; + rev = "v${version}"; + sha256 = "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd"; }; propagatedBuildInputs = [ pyxdg ]; + checkInputs = [ pytest ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; meta = with stdenv.lib; { homepage = "https://github.com/languitar/pass-git-helper"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 40e9fc5234..866b7efa42 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "13.6.0", - "repo_hash": "1flri1cgx8drwf46x4sja366aiiif0ww807xrrcxa05pxj0mx8k5", + "version": "13.6.1", + "repo_hash": "0kfh9ngykrnvvjpx4m69pfyfvsvvqfxzlxhm8dgx9ypz4bpmr947", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.6.0-ee", + "rev": "v13.6.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.6.0", + "GITALY_SERVER_VERSION": "13.6.1", "GITLAB_PAGES_VERSION": "1.30.0", "GITLAB_SHELL_VERSION": "13.13.0", "GITLAB_WORKHORSE_VERSION": "8.54.0" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 51818072d3..57465f808d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby, - bundlerEnv, pkgconfig, libgit2_0_27 }: +{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby +, bundlerEnv, pkgconfig +# libgit2 + dependencies +, libgit2, openssl, zlib, pcre, http-parser }: let rubyEnv = bundlerEnv rec { @@ -18,27 +20,27 @@ let }; }; }; -in buildGoPackage rec { - version = "13.6.0"; +in buildGoModule rec { + version = "13.6.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2"; + sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y"; }; - goPackagePath = "gitlab.com/gitlab-org/gitaly"; + vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r"; passthru = { inherit rubyEnv; }; + buildFlags = [ "-tags=static,system_libgit2" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ]; - goDeps = ./deps.nix; - preBuild = "rm -rf go/src/gitlab.com/gitlab-org/labkit/vendor"; + buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + doCheck = false; postInstall = '' mkdir -p $ruby diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/deps.nix deleted file mode 100644 index 532fc9faa8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ /dev/null @@ -1,2298 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "bou.ke/monkey"; - fetch = { - type = "git"; - url = "https://github.com/bouk/monkey"; - rev = "v1.0.1"; - sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.50.0"; - sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl"; - }; - } - { - goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; - fetch = { - type = "git"; - url = "https://dmitri.shuralyov.com/gpu/mtl"; - rev = "666a987793e9"; - sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; - }; - } - { - goPackagePath = "github.com/AndreasBriese/bbloom"; - fetch = { - type = "git"; - url = "https://github.com/AndreasBriese/bbloom"; - rev = "e2d15f34fcf9"; - sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/CloudyKit/fastprinter"; - fetch = { - type = "git"; - url = "https://github.com/CloudyKit/fastprinter"; - rev = "74b38d55f37a"; - sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235"; - }; - } - { - goPackagePath = "github.com/Joker/hpp"; - fetch = { - type = "git"; - url = "https://github.com/Joker/hpp"; - rev = "v1.0.0"; - sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2"; - }; - } - { - goPackagePath = "github.com/Joker/jade"; - fetch = { - type = "git"; - url = "https://github.com/Joker/jade"; - rev = "d475f43051e7"; - sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn"; - }; - } - { - goPackagePath = "github.com/Shopify/goreferrer"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/goreferrer"; - rev = "ec9c9a553398"; - sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn"; - }; - } - { - goPackagePath = "github.com/ajg/form"; - fetch = { - type = "git"; - url = "https://github.com/ajg/form"; - rev = "v1.5.1"; - sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/alexbrainman/sspi"; - fetch = { - type = "git"; - url = "https://github.com/alexbrainman/sspi"; - rev = "4729b3d4d858"; - sha256 = "12xy7gi9v48z8akm6h33qjk3m06f5nw1q15a6y2r61pd404bkdyc"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "7fddfc383310"; - sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; - }; - } - { - goPackagePath = "github.com/avast/retry-go"; - fetch = { - type = "git"; - url = "https://github.com/avast/retry-go"; - rev = "v2.4.2"; - sha256 = "0hb4b1668516a4gv8avmflr565b6c1h93phdb068hcjxxj8767ba"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/certifi/gocertifi"; - fetch = { - type = "git"; - url = "https://github.com/certifi/gocertifi"; - rev = "ee1a9a0726d2"; - sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4"; - }; - } - { - 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/client9/reopen"; - fetch = { - type = "git"; - url = "https://github.com/client9/reopen"; - rev = "v1.0.0"; - sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s"; - }; - } - { - goPackagePath = "github.com/cloudflare/tableflip"; - fetch = { - type = "git"; - url = "https://github.com/cloudflare/tableflip"; - rev = "4baec9811f2b"; - sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q"; - }; - } - { - goPackagePath = "github.com/codahale/hdrhistogram"; - fetch = { - type = "git"; - url = "https://github.com/codahale/hdrhistogram"; - rev = "3a0bb77429bd"; - sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; - }; - } - { - goPackagePath = "github.com/codegangsta/inject"; - fetch = { - type = "git"; - url = "https://github.com/codegangsta/inject"; - rev = "33e0aa1cb7c0"; - sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; - }; - } - { - 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/denisenkom/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/denisenkom/go-mssqldb"; - rev = "cfbb681360f0"; - sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs"; - }; - } - { - goPackagePath = "github.com/dgraph-io/badger"; - fetch = { - type = "git"; - url = "https://github.com/dgraph-io/badger"; - rev = "v1.6.0"; - sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5"; - }; - } - { - 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/dgryski/go-farm"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-farm"; - rev = "6a90982ecee2"; - sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; - }; - } - { - goPackagePath = "github.com/dpotapov/go-spnego"; - fetch = { - type = "git"; - url = "https://github.com/dpotapov/go-spnego"; - rev = "c2c609116ad0"; - sha256 = "1ba14j1y8sjlagx7rfjmvdwlyc90qblpplfb0p3zwsj8chqaijgf"; - }; - } - { - 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/eknkc/amber"; - fetch = { - type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "cdade1c07385"; - sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; - }; - } - { - goPackagePath = "github.com/etcd-io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.3"; - sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc"; - }; - } - { - goPackagePath = "github.com/fasthttp-contrib/websocket"; - fetch = { - type = "git"; - url = "https://github.com/fasthttp-contrib/websocket"; - rev = "1f3b11f56072"; - sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "v1.1.0"; - sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; - }; - } - { - goPackagePath = "github.com/flosch/pongo2"; - fetch = { - type = "git"; - url = "https://github.com/flosch/pongo2"; - rev = "bbf5a6c351f4"; - sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gavv/httpexpect"; - fetch = { - type = "git"; - url = "https://github.com/gavv/httpexpect"; - rev = "v2.0.0"; - sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs"; - }; - } - { - goPackagePath = "github.com/getsentry/raven-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/raven-go"; - rev = "v0.2.0"; - sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf"; - }; - } - { - goPackagePath = "github.com/getsentry/sentry-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/sentry-go"; - rev = "v0.7.0"; - sha256 = "13n9r7845wsq9z61rbvlqjjjg4aifplc74v3kv0i1lys2fw8a5k9"; - }; - } - { - goPackagePath = "github.com/gin-contrib/sse"; - fetch = { - type = "git"; - url = "https://github.com/gin-contrib/sse"; - rev = "5545eab6dad3"; - sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5"; - }; - } - { - goPackagePath = "github.com/gin-gonic/gin"; - fetch = { - type = "git"; - url = "https://github.com/gin-gonic/gin"; - rev = "v1.4.0"; - sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; - }; - } - { - goPackagePath = "github.com/git-lfs/git-lfs"; - fetch = { - type = "git"; - url = "https://github.com/git-lfs/git-lfs"; - rev = "9ea4eed5b112"; - sha256 = "02xx8iw48zyccfxm30kc3r3hgwhc64yfrcy7c2bv4b1hqn09wwnz"; - }; - } - { - goPackagePath = "github.com/git-lfs/gitobj"; - fetch = { - type = "git"; - url = "https://github.com/git-lfs/gitobj"; - rev = "v2.0.0"; - sha256 = "15x3q3ad50jyi6rjjw4siw6gxcp1ppwwhmzq3916vs186b0rqdyv"; - }; - } - { - goPackagePath = "github.com/git-lfs/go-netrc"; - fetch = { - type = "git"; - url = "https://github.com/git-lfs/go-netrc"; - rev = "e0e9ca483a18"; - sha256 = "16djli5hasqm4js2d72msk32ym0y5jmk3a4634nrgbncjksnfihi"; - }; - } - { - goPackagePath = "github.com/git-lfs/go-ntlm"; - fetch = { - type = "git"; - url = "https://github.com/git-lfs/go-ntlm"; - rev = "c5056e7fa066"; - sha256 = "1wrv3aczz0g4wqxjw5pvyy9z1cvj2b33q84h5mprik0f1hwyfwnh"; - }; - } - { - goPackagePath = "github.com/git-lfs/wildmatch"; - fetch = { - type = "git"; - url = "https://github.com/git-lfs/wildmatch"; - rev = "v1.0.4"; - sha256 = "19k8a9j9l0ddlv3asxnn7bblryz674fpm9dg8ds0s74fhix6a5dr"; - }; - } - { - goPackagePath = "github.com/go-check/check"; - fetch = { - type = "git"; - url = "https://github.com/go-check/check"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "v1.0.1"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/go-gl/glfw"; - fetch = { - type = "git"; - url = "https://github.com/go-gl/glfw"; - rev = "12ad95a8df72"; - sha256 = "0ahw4a1lk7wqn6m0sjngsv2zc08kxxj259ai6g4kf11lmidszm9s"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-martini/martini"; - fetch = { - type = "git"; - url = "https://github.com/go-martini/martini"; - rev = "22fa46961aab"; - sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.4.1"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "v1.7.1"; - sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d"; - }; - } - { - goPackagePath = "github.com/gobuffalo/logger"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/logger"; - rev = "v1.0.1"; - sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packd"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packd"; - rev = "v0.3.0"; - sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packr"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packr"; - rev = "v2.7.1"; - sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; - }; - } - { - goPackagePath = "github.com/gobwas/httphead"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/httphead"; - rev = "2c6c146eadee"; - sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss"; - }; - } - { - goPackagePath = "github.com/gobwas/pool"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/pool"; - rev = "v0.2.0"; - sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i"; - }; - } - { - goPackagePath = "github.com/gobwas/ws"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/ws"; - rev = "v1.0.2"; - sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.1"; - sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; - }; - } - { - goPackagePath = "github.com/golang-sql/civil"; - fetch = { - type = "git"; - url = "https://github.com/golang-sql/civil"; - rev = "cb61b32ac6fe"; - sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "215e87163ea7"; - sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j"; - }; - } - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.3.1"; - sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "574c33c3df38"; - sha256 = "1qpw8mq9xqj1hmpag1av941swkx39qikahsajyhn34rc2q54f4z6"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "d4f498aebedc"; - sha256 = "1r4pn70yy5vfl38jx9v8224n7jkhcm5wg28vv48izgznlgv7h024"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.1"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; - rev = "v1.0.0"; - sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "v1.2.0"; - sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "v1.0.2"; - sha256 = "1azjn5a03cv0bdab3clmkfz8g9807nxxjwy9i7dy73p7d4sikhja"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "v1.2.0"; - sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; - }; - } - { - 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/ianlancetaylor/demangle"; - fetch = { - type = "git"; - url = "https://github.com/ianlancetaylor/demangle"; - rev = "5e5cf60278f6"; - sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75"; - }; - } - { - goPackagePath = "github.com/imkira/go-interpol"; - fetch = { - type = "git"; - url = "https://github.com/imkira/go-interpol"; - rev = "v1.1.0"; - sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/iris-contrib/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/blackfriday"; - rev = "v2.0.0"; - sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; - }; - } - { - goPackagePath = "github.com/iris-contrib/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/go.uuid"; - rev = "v2.0.0"; - sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; - }; - } - { - goPackagePath = "github.com/iris-contrib/i18n"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/i18n"; - rev = "987a633949d0"; - sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq"; - }; - } - { - goPackagePath = "github.com/iris-contrib/schema"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/schema"; - rev = "v0.0.1"; - sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; - }; - } - { - goPackagePath = "github.com/jcmturner/gofork"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/gofork"; - rev = "v1.0.0"; - sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "v0.9.1"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "089d3ea4e4d5"; - sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; - }; - } - { - goPackagePath = "github.com/juju/loggo"; - fetch = { - type = "git"; - url = "https://github.com/juju/loggo"; - rev = "584905176618"; - sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4"; - }; - } - { - goPackagePath = "github.com/juju/testing"; - fetch = { - type = "git"; - url = "https://github.com/juju/testing"; - rev = "472a3e8b2073"; - sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/k0kubun/colorstring"; - fetch = { - type = "git"; - url = "https://github.com/k0kubun/colorstring"; - rev = "9440f1994b88"; - sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj"; - }; - } - { - goPackagePath = "github.com/kataras/golog"; - fetch = { - type = "git"; - url = "https://github.com/kataras/golog"; - rev = "v0.0.9"; - sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i"; - }; - } - { - goPackagePath = "github.com/kataras/iris"; - fetch = { - type = "git"; - url = "https://github.com/kataras/iris"; - rev = "v12.0.1"; - sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5"; - }; - } - { - goPackagePath = "github.com/kataras/neffos"; - fetch = { - type = "git"; - url = "https://github.com/kataras/neffos"; - rev = "v0.0.10"; - sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp"; - }; - } - { - goPackagePath = "github.com/kataras/pio"; - fetch = { - type = "git"; - url = "https://github.com/kataras/pio"; - rev = "ea782b38602d"; - sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj"; - }; - } - { - goPackagePath = "github.com/kelseyhightower/envconfig"; - fetch = { - type = "git"; - url = "https://github.com/kelseyhightower/envconfig"; - rev = "v1.3.0"; - sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.1.0"; - sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.9.0"; - sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "v1.2.1"; - sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.3"; - sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - 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/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.2.0"; - sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; - }; - } - { - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "ecaeb7a21d47"; - sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; - }; - } - { - goPackagePath = "github.com/lightstep/lightstep-tracer-go"; - fetch = { - type = "git"; - url = "https://github.com/lightstep/lightstep-tracer-go"; - rev = "v0.15.6"; - sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.2"; - sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.12"; - sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mattn/go-shellwords"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-shellwords"; - rev = "2444a32a19f4"; - sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "v1.12.0"; - sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv"; - }; - } - { - goPackagePath = "github.com/mattn/goveralls"; - fetch = { - type = "git"; - url = "https://github.com/mattn/goveralls"; - rev = "v0.0.2"; - sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mediocregopher/mediocre-go-lib"; - fetch = { - type = "git"; - url = "https://github.com/mediocregopher/mediocre-go-lib"; - rev = "cb65787f37ed"; - sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j"; - }; - } - { - goPackagePath = "github.com/mediocregopher/radix"; - fetch = { - type = "git"; - url = "https://github.com/mediocregopher/radix"; - rev = "v3.3.0"; - sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx"; - }; - } - { - goPackagePath = "github.com/microcosm-cc/bluemonday"; - fetch = { - type = "git"; - url = "https://github.com/microcosm-cc/bluemonday"; - rev = "v1.0.2"; - sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - 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/moul/http2curl"; - fetch = { - type = "git"; - url = "https://github.com/moul/http2curl"; - rev = "v1.0.0"; - sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/nats-io/nats.go"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nats.go"; - rev = "v1.8.1"; - sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj"; - }; - } - { - goPackagePath = "github.com/nats-io/nkeys"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nkeys"; - rev = "v0.0.2"; - sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "v1.0.1"; - sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; - }; - } - { - goPackagePath = "github.com/oklog/ulid"; - fetch = { - type = "git"; - url = "https://github.com/oklog/ulid"; - rev = "v2.0.2"; - sha256 = "1apm4r23kxsm0c9hlxsr7xh6xwrk2cjqylbpxd4ffxbl6bwflja0"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.2"; - sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf"; - }; - } - { - goPackagePath = "github.com/olekukonko/ts"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/ts"; - rev = "78ecb04241c0"; - sha256 = "0k88n5rvs5k5zalbfa7c71jkjb8dhpk83s425z728qn6aq49c978"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.3"; - sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.7.1"; - sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "v1.2.0"; - sha256 = "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"; - }; - } - { - goPackagePath = "github.com/otiai10/copy"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/copy"; - rev = "v1.0.1"; - sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; - }; - } - { - goPackagePath = "github.com/otiai10/curr"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/curr"; - rev = "v1.0.0"; - sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987"; - }; - } - { - goPackagePath = "github.com/otiai10/mint"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/mint"; - rev = "v1.3.0"; - sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca"; - }; - } - { - goPackagePath = "github.com/pborman/getopt"; - fetch = { - type = "git"; - url = "https://github.com/pborman/getopt"; - rev = "7148bc3a4c30"; - sha256 = "0zhvvmv671r1fbdd5hbv3flx8k2rb60giqx115w0553c56qkqfpj"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.8.1"; - sha256 = "1pi1r9ds0vxjza4qrbk52y98wxrzh1ghwzc9c2v1w6i02pdwdcz9"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "v1.0.0"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pingcap/errors"; - fetch = { - type = "git"; - url = "https://github.com/pingcap/errors"; - rev = "v0.11.4"; - sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - 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/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.1"; - sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.3"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.4.0"; - sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n"; - }; - } - { - goPackagePath = "github.com/rubenv/sql-migrate"; - fetch = { - type = "git"; - url = "https://github.com/rubenv/sql-migrate"; - rev = "06338513c237"; - sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz"; - }; - } - { - goPackagePath = "github.com/rubyist/tracerx"; - fetch = { - type = "git"; - url = "https://github.com/rubyist/tracerx"; - rev = "787959303086"; - sha256 = "1xj5213r00zjhb7d2l6wlwv62g6mss50jwjpf7g8fk8djv3l29zz"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "v2.1.0"; - sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; - }; - } - { - goPackagePath = "github.com/sebest/xff"; - fetch = { - type = "git"; - url = "https://github.com/sebest/xff"; - rev = "6c115e0ffa35"; - sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h"; - }; - } - { - 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/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.7.0"; - sha256 = "1a59pw7zimvm8k423iq9l4f4qjj1ia1xc6pkmhwl2mxc46y2n442"; - }; - } - { - 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 = "v1.6.4"; - sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; - }; - } - { - 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.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.3.2"; - sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; - }; - } - { - goPackagePath = "github.com/ssgelm/cookiejarparser"; - fetch = { - type = "git"; - url = "https://github.com/ssgelm/cookiejarparser"; - rev = "v1.0.1"; - sha256 = "0fnm53br0cg3iwzniil0lh9w4xd6xpzfypwfpdiammfqavlqgcw4"; - }; - } - { - 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.6.1"; - sha256 = "1yhiqqzjvi63pf01rgzx68gqkkvjx03fvl5wk30br5l6s81s090l"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "v1.1.0"; - sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; - }; - } - { - goPackagePath = "github.com/uber-go/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "github.com/uber/jaeger-client-go"; - fetch = { - type = "git"; - url = "https://github.com/uber/jaeger-client-go"; - rev = "v2.15.0"; - sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj"; - }; - } - { - goPackagePath = "github.com/uber/jaeger-lib"; - fetch = { - type = "git"; - url = "https://github.com/uber/jaeger-lib"; - rev = "v1.5.0"; - sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "v1.1.7"; - sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "v1.0.0"; - sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "v1.0.0"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; - }; - } - { - goPackagePath = "github.com/valyala/fasthttp"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasthttp"; - rev = "v1.6.0"; - sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b"; - }; - } - { - goPackagePath = "github.com/valyala/fasttemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasttemplate"; - rev = "v1.0.1"; - sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; - }; - } - { - goPackagePath = "github.com/valyala/tcplisten"; - fetch = { - type = "git"; - url = "https://github.com/valyala/tcplisten"; - rev = "ceec8f93295a"; - sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonpointer"; - rev = "4e3ac2762d5f"; - sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonreference"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonreference"; - rev = "bd5ef7bd5415"; - sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonschema"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonschema"; - rev = "v1.2.0"; - sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "github.com/yalp/jsonpath"; - fetch = { - type = "git"; - url = "https://github.com/yalp/jsonpath"; - rev = "5cc68e5049a0"; - sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b"; - }; - } - { - goPackagePath = "github.com/yudai/gojsondiff"; - fetch = { - type = "git"; - url = "https://github.com/yudai/gojsondiff"; - rev = "v1.0.0"; - sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2"; - }; - } - { - goPackagePath = "github.com/yudai/golcs"; - fetch = { - type = "git"; - url = "https://github.com/yudai/golcs"; - rev = "ecda9a501e82"; - sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq"; - }; - } - { - goPackagePath = "github.com/yudai/pp"; - fetch = { - type = "git"; - url = "https://github.com/yudai/pp"; - rev = "v2.0.1"; - sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; - }; - } - { - goPackagePath = "github.com/ziutek/mymysql"; - fetch = { - type = "git"; - url = "https://github.com/ziutek/mymysql"; - rev = "v1.5.4"; - sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; - rev = "3f9890ef73dc"; - sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/labkit"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "40dcf811328c"; - sha256 = "1x22iz53wjg1qps0bnr4lniik09szmy99ny2kb6smjpv9cr6klw7"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.2"; - sha256 = "0lz7fid63pdrcvyzk5kn7vlcva102h61igmw7pz824wvj9k3hy4q"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.4.0"; - sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5c72a883971a"; - sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "da58074b4299"; - sha256 = "1pgvdbjm3n47505diw3mm2hisp9b9q2lyvgl9m6xh2wx83b0cj48"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "cff245a6509b"; - sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "fdd1cda4f05f"; - sha256 = "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d2bd2a29d028"; - sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "c90efee705ee"; - sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62affa334b73"; - sha256 = "0v88xr36220wawwck914f90n9zvvc6lcx33ak3iplkwq0xkgw5fr"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "6e8e738ad208"; - sha256 = "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "e3ed0017c211"; - sha256 = "0nz91nxgfcbcxirscdrxcq5a97z5pyz0g0k2chjxx228dz59aw1i"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.3"; - sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "43d50277825c"; - sha256 = "1168q4da36wq9w2591iqzsfy5ymwfi2g46bv5dnyyspg155ld19k"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.15.0"; - sha256 = "1ljhwv5xsgsbqia70f35q19vwrsm47sh08ljbwdyfa867ff17qdh"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.5"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "ca5a22157cba"; - sha256 = "0ldkh6f0g0wzfkp09ib15a62bmcbpsxj93saikqmc86242bcxij0"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.24.0"; - sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; - }; - } - { - goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/DataDog/dd-trace-go.v1"; - rev = "v1.7.0"; - sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/go-playground/assert.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/go-playground/assert.v1"; - rev = "v1.2.1"; - sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"; - }; - } - { - goPackagePath = "gopkg.in/go-playground/validator.v8"; - fetch = { - type = "git"; - url = "https://gopkg.in/go-playground/validator.v8"; - rev = "v8.18.2"; - sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; - }; - } - { - goPackagePath = "gopkg.in/gorp.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/gorp.v1"; - rev = "v1.7.2"; - sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/aescts.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/jcmturner/aescts.v1"; - rev = "v1.0.1"; - sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/jcmturner/dnsutils.v1"; - rev = "v1.0.1"; - sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/goidentity.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/jcmturner/goidentity.v2"; - rev = "v2.0.0"; - sha256 = "0sfkxrx57dmjlzz4sxfmbsfaxkm32wg6ymjhaga2ggkixlzdd4d7"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/gokrb5.v5"; - fetch = { - type = "git"; - url = "https://gopkg.in/jcmturner/gokrb5.v5"; - rev = "v5.3.0"; - sha256 = "0jynpkncifdd2ib2pc9qhh0r8q7ab7yw0ygzpzgisdzv8ars1diq"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/rpc.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/jcmturner/rpc.v0"; - rev = "v0.0.2"; - sha256 = "0hivgq52gwxsqs5x1my2047k7nqh7wx3yi0llsj3lc3h2mjy4yhd"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "9856a29383ce"; - sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; - }; - } - { - 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.3.0"; - sha256 = "1md0hlyd9s6myv3663i9l59y74n4xjazifmmyxn43g86fgkc5lzj"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v3"; - rev = "9f266ea9e77c"; - sha256 = "1bbai3lzb50m0x2vwsdbagrbhvfylj9k1m32hgbqwldqx4p9ay35"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.1-2019.2.3"; - sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 1e48b569c6..e2dd35ff33 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, buildGoPackage, ruby }: +{ stdenv, fetchFromGitLab, buildGoModule, ruby }: -buildGoPackage rec { +buildGoModule rec { pname = "gitlab-shell"; version = "13.13.0"; src = fetchFromGitLab { @@ -14,17 +14,13 @@ buildGoPackage rec { patches = [ ./remove-hardcoded-locations.patch ]; - goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; - goDeps = ./deps.nix; - - preBuild = '' - rm -rf "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor" - ''; + vendorSha256 = "16fa3bka0008x2yazahc6xxcv4fa6yqg74kk64v8lrp7snbvjf4d"; postInstall = '' - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/ + cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin + cp -r "$NIX_BUILD_TOP/source"/{support,VERSION} $out/ ''; + doCheck = false; meta = with stdenv.lib; { description = "SSH access and repository management app for GitLab"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix deleted file mode 100644 index 4f841c5fff..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ /dev/null @@ -1,2091 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "bou.ke/monkey"; - fetch = { - type = "git"; - url = "https://github.com/bouk/monkey"; - rev = "v1.0.1"; - sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.50.0"; - sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl"; - }; - } - { - goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; - fetch = { - type = "git"; - url = "https://dmitri.shuralyov.com/gpu/mtl"; - rev = "666a987793e9"; - sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; - }; - } - { - goPackagePath = "github.com/AndreasBriese/bbloom"; - fetch = { - type = "git"; - url = "https://github.com/AndreasBriese/bbloom"; - rev = "e2d15f34fcf9"; - sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/CloudyKit/fastprinter"; - fetch = { - type = "git"; - url = "https://github.com/CloudyKit/fastprinter"; - rev = "74b38d55f37a"; - sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235"; - }; - } - { - goPackagePath = "github.com/Joker/hpp"; - fetch = { - type = "git"; - url = "https://github.com/Joker/hpp"; - rev = "v1.0.0"; - sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2"; - }; - } - { - goPackagePath = "github.com/Joker/jade"; - fetch = { - type = "git"; - url = "https://github.com/Joker/jade"; - rev = "d475f43051e7"; - sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn"; - }; - } - { - goPackagePath = "github.com/Shopify/goreferrer"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/goreferrer"; - rev = "ec9c9a553398"; - sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn"; - }; - } - { - goPackagePath = "github.com/ajg/form"; - fetch = { - type = "git"; - url = "https://github.com/ajg/form"; - rev = "v1.5.1"; - sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - 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/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "7fddfc383310"; - sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/certifi/gocertifi"; - fetch = { - type = "git"; - url = "https://github.com/certifi/gocertifi"; - rev = "ee1a9a0726d2"; - sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4"; - }; - } - { - 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/client9/reopen"; - fetch = { - type = "git"; - url = "https://github.com/client9/reopen"; - rev = "v1.0.0"; - sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s"; - }; - } - { - goPackagePath = "github.com/cloudflare/tableflip"; - fetch = { - type = "git"; - url = "https://github.com/cloudflare/tableflip"; - rev = "4baec9811f2b"; - sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q"; - }; - } - { - goPackagePath = "github.com/codahale/hdrhistogram"; - fetch = { - type = "git"; - url = "https://github.com/codahale/hdrhistogram"; - rev = "3a0bb77429bd"; - sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; - }; - } - { - goPackagePath = "github.com/codegangsta/inject"; - fetch = { - type = "git"; - url = "https://github.com/codegangsta/inject"; - rev = "33e0aa1cb7c0"; - sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; - }; - } - { - 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/denisenkom/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/denisenkom/go-mssqldb"; - rev = "cfbb681360f0"; - sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs"; - }; - } - { - goPackagePath = "github.com/dgraph-io/badger"; - fetch = { - type = "git"; - url = "https://github.com/dgraph-io/badger"; - rev = "v1.6.0"; - sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5"; - }; - } - { - 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/dgryski/go-farm"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-farm"; - rev = "6a90982ecee2"; - sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; - }; - } - { - 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/eknkc/amber"; - fetch = { - type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "cdade1c07385"; - sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; - }; - } - { - goPackagePath = "github.com/etcd-io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.3"; - sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc"; - }; - } - { - goPackagePath = "github.com/fasthttp-contrib/websocket"; - fetch = { - type = "git"; - url = "https://github.com/fasthttp-contrib/websocket"; - rev = "1f3b11f56072"; - sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "v1.1.0"; - sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; - }; - } - { - goPackagePath = "github.com/flosch/pongo2"; - fetch = { - type = "git"; - url = "https://github.com/flosch/pongo2"; - rev = "bbf5a6c351f4"; - sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gavv/httpexpect"; - fetch = { - type = "git"; - url = "https://github.com/gavv/httpexpect"; - rev = "v2.0.0"; - sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs"; - }; - } - { - goPackagePath = "github.com/getsentry/raven-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.0"; - sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; - }; - } - { - goPackagePath = "github.com/getsentry/sentry-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/sentry-go"; - rev = "v0.5.1"; - sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89"; - }; - } - { - goPackagePath = "github.com/gin-contrib/sse"; - fetch = { - type = "git"; - url = "https://github.com/gin-contrib/sse"; - rev = "5545eab6dad3"; - sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5"; - }; - } - { - goPackagePath = "github.com/gin-gonic/gin"; - fetch = { - type = "git"; - url = "https://github.com/gin-gonic/gin"; - rev = "v1.4.0"; - sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; - }; - } - { - goPackagePath = "github.com/go-check/check"; - fetch = { - type = "git"; - url = "https://github.com/go-check/check"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "v1.0.1"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/go-gl/glfw"; - fetch = { - type = "git"; - url = "https://github.com/go-gl/glfw"; - rev = "12ad95a8df72"; - sha256 = "0ahw4a1lk7wqn6m0sjngsv2zc08kxxj259ai6g4kf11lmidszm9s"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-martini/martini"; - fetch = { - type = "git"; - url = "https://github.com/go-martini/martini"; - rev = "22fa46961aab"; - sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.4.1"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "v1.7.1"; - sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d"; - }; - } - { - goPackagePath = "github.com/gobuffalo/logger"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/logger"; - rev = "v1.0.1"; - sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packd"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packd"; - rev = "v0.3.0"; - sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packr"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packr"; - rev = "v2.7.1"; - sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; - }; - } - { - goPackagePath = "github.com/gobwas/httphead"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/httphead"; - rev = "2c6c146eadee"; - sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss"; - }; - } - { - goPackagePath = "github.com/gobwas/pool"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/pool"; - rev = "v0.2.0"; - sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i"; - }; - } - { - goPackagePath = "github.com/gobwas/ws"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/ws"; - rev = "v1.0.2"; - sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang-sql/civil"; - fetch = { - type = "git"; - url = "https://github.com/golang-sql/civil"; - rev = "cb61b32ac6fe"; - sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "215e87163ea7"; - sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.3.1"; - sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "574c33c3df38"; - sha256 = "1qpw8mq9xqj1hmpag1av941swkx39qikahsajyhn34rc2q54f4z6"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "d4f498aebedc"; - sha256 = "1r4pn70yy5vfl38jx9v8224n7jkhcm5wg28vv48izgznlgv7h024"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.1"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; - rev = "v1.0.0"; - sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "v1.2.0"; - sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "v1.2.0"; - sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; - }; - } - { - 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/ianlancetaylor/demangle"; - fetch = { - type = "git"; - url = "https://github.com/ianlancetaylor/demangle"; - rev = "5e5cf60278f6"; - sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75"; - }; - } - { - goPackagePath = "github.com/imkira/go-interpol"; - fetch = { - type = "git"; - url = "https://github.com/imkira/go-interpol"; - rev = "v1.1.0"; - sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/iris-contrib/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/blackfriday"; - rev = "v2.0.0"; - sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; - }; - } - { - goPackagePath = "github.com/iris-contrib/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/go.uuid"; - rev = "v2.0.0"; - sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; - }; - } - { - goPackagePath = "github.com/iris-contrib/i18n"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/i18n"; - rev = "987a633949d0"; - sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq"; - }; - } - { - goPackagePath = "github.com/iris-contrib/schema"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/schema"; - rev = "v0.0.1"; - sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "v0.9.1"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "089d3ea4e4d5"; - sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; - }; - } - { - goPackagePath = "github.com/juju/loggo"; - fetch = { - type = "git"; - url = "https://github.com/juju/loggo"; - rev = "584905176618"; - sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4"; - }; - } - { - goPackagePath = "github.com/juju/testing"; - fetch = { - type = "git"; - url = "https://github.com/juju/testing"; - rev = "472a3e8b2073"; - sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/k0kubun/colorstring"; - fetch = { - type = "git"; - url = "https://github.com/k0kubun/colorstring"; - rev = "9440f1994b88"; - sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj"; - }; - } - { - goPackagePath = "github.com/kataras/golog"; - fetch = { - type = "git"; - url = "https://github.com/kataras/golog"; - rev = "v0.0.9"; - sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i"; - }; - } - { - goPackagePath = "github.com/kataras/iris"; - fetch = { - type = "git"; - url = "https://github.com/kataras/iris"; - rev = "v12.0.1"; - sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5"; - }; - } - { - goPackagePath = "github.com/kataras/neffos"; - fetch = { - type = "git"; - url = "https://github.com/kataras/neffos"; - rev = "v0.0.10"; - sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp"; - }; - } - { - goPackagePath = "github.com/kataras/pio"; - fetch = { - type = "git"; - url = "https://github.com/kataras/pio"; - rev = "ea782b38602d"; - sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj"; - }; - } - { - goPackagePath = "github.com/kelseyhightower/envconfig"; - fetch = { - type = "git"; - url = "https://github.com/kelseyhightower/envconfig"; - rev = "v1.3.0"; - sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.9.0"; - sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "v1.2.1"; - sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.3"; - sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - 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/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.2.0"; - sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; - }; - } - { - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "v30.0.5"; - sha256 = "13jk4r8x8rb9lar35dxvh3g7hnzclq95jbpg88y4xklmh48yy3sk"; - }; - } - { - goPackagePath = "github.com/lightstep/lightstep-tracer-go"; - fetch = { - type = "git"; - url = "https://github.com/lightstep/lightstep-tracer-go"; - rev = "v0.15.6"; - sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.2"; - sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.9"; - sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mattn/go-shellwords"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-shellwords"; - rev = "2444a32a19f4"; - sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "v1.12.0"; - sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv"; - }; - } - { - goPackagePath = "github.com/mattn/goveralls"; - fetch = { - type = "git"; - url = "https://github.com/mattn/goveralls"; - rev = "v0.0.2"; - sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mediocregopher/mediocre-go-lib"; - fetch = { - type = "git"; - url = "https://github.com/mediocregopher/mediocre-go-lib"; - rev = "cb65787f37ed"; - sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j"; - }; - } - { - goPackagePath = "github.com/mediocregopher/radix"; - fetch = { - type = "git"; - url = "https://github.com/mediocregopher/radix"; - rev = "v3.3.0"; - sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx"; - }; - } - { - goPackagePath = "github.com/microcosm-cc/bluemonday"; - fetch = { - type = "git"; - url = "https://github.com/microcosm-cc/bluemonday"; - rev = "v1.0.2"; - sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - 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/moul/http2curl"; - fetch = { - type = "git"; - url = "https://github.com/moul/http2curl"; - rev = "v1.0.0"; - sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/nats-io/nats.go"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nats.go"; - rev = "v1.8.1"; - sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj"; - }; - } - { - goPackagePath = "github.com/nats-io/nkeys"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nkeys"; - rev = "v0.0.2"; - sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "v1.0.1"; - sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.2"; - sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.3"; - sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.7.1"; - sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "v1.0.2"; - sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; - }; - } - { - goPackagePath = "github.com/otiai10/copy"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/copy"; - rev = "v1.0.1"; - sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; - }; - } - { - goPackagePath = "github.com/otiai10/curr"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/curr"; - rev = "v1.0.0"; - sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987"; - }; - } - { - goPackagePath = "github.com/otiai10/mint"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/mint"; - rev = "v1.3.0"; - sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca"; - }; - } - { - 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/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "v1.0.0"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pingcap/errors"; - fetch = { - type = "git"; - url = "https://github.com/pingcap/errors"; - rev = "v0.11.4"; - sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - 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/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.1"; - sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.3"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.4.0"; - sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n"; - }; - } - { - goPackagePath = "github.com/rubenv/sql-migrate"; - fetch = { - type = "git"; - url = "https://github.com/rubenv/sql-migrate"; - rev = "06338513c237"; - sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "v2.1.0"; - sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; - }; - } - { - goPackagePath = "github.com/sebest/xff"; - fetch = { - type = "git"; - url = "https://github.com/sebest/xff"; - rev = "6c115e0ffa35"; - sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h"; - }; - } - { - 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/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.6.0"; - sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; - }; - } - { - 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 = "v1.6.4"; - sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; - }; - } - { - 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.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - 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.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/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "v1.0.2"; - sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; - }; - } - { - goPackagePath = "github.com/uber-go/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "github.com/uber/jaeger-client-go"; - fetch = { - type = "git"; - url = "https://github.com/uber/jaeger-client-go"; - rev = "v2.15.0"; - sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj"; - }; - } - { - goPackagePath = "github.com/uber/jaeger-lib"; - fetch = { - type = "git"; - url = "https://github.com/uber/jaeger-lib"; - rev = "v1.5.0"; - sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "v1.1.7"; - sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "v1.0.0"; - sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "v1.0.0"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; - }; - } - { - goPackagePath = "github.com/valyala/fasthttp"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasthttp"; - rev = "v1.6.0"; - sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b"; - }; - } - { - goPackagePath = "github.com/valyala/fasttemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasttemplate"; - rev = "v1.0.1"; - sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; - }; - } - { - goPackagePath = "github.com/valyala/tcplisten"; - fetch = { - type = "git"; - url = "https://github.com/valyala/tcplisten"; - rev = "ceec8f93295a"; - sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonpointer"; - rev = "4e3ac2762d5f"; - sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonreference"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonreference"; - rev = "bd5ef7bd5415"; - sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonschema"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonschema"; - rev = "v1.2.0"; - sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "github.com/yalp/jsonpath"; - fetch = { - type = "git"; - url = "https://github.com/yalp/jsonpath"; - rev = "5cc68e5049a0"; - sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b"; - }; - } - { - goPackagePath = "github.com/yudai/gojsondiff"; - fetch = { - type = "git"; - url = "https://github.com/yudai/gojsondiff"; - rev = "v1.0.0"; - sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2"; - }; - } - { - goPackagePath = "github.com/yudai/golcs"; - fetch = { - type = "git"; - url = "https://github.com/yudai/golcs"; - rev = "ecda9a501e82"; - sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq"; - }; - } - { - goPackagePath = "github.com/yudai/pp"; - fetch = { - type = "git"; - url = "https://github.com/yudai/pp"; - rev = "v2.0.1"; - sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; - }; - } - { - goPackagePath = "github.com/ziutek/mymysql"; - fetch = { - type = "git"; - url = "https://github.com/ziutek/mymysql"; - rev = "v1.5.4"; - sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/gitaly"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/gitaly.git"; - rev = "v1.68.0"; - sha256 = "06w2qx9r7wxhpk6a3icqa0l6hr7x2j2k11kni1ksdx1m1100myjb"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/labkit"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "45895e129029"; - sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.2"; - sha256 = "0lz7fid63pdrcvyzk5kn7vlcva102h61igmw7pz824wvj9k3hy4q"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "da58074b4299"; - sha256 = "1pgvdbjm3n47505diw3mm2hisp9b9q2lyvgl9m6xh2wx83b0cj48"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "cff245a6509b"; - sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "fdd1cda4f05f"; - sha256 = "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d2bd2a29d028"; - sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "c90efee705ee"; - sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6afb5195e5aa"; - sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - 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 = "86b910548bc1"; - sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.3"; - sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "43d50277825c"; - sha256 = "1168q4da36wq9w2591iqzsfy5ymwfi2g46bv5dnyyspg155ld19k"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "v0.15.0"; - sha256 = "1ljhwv5xsgsbqia70f35q19vwrsm47sh08ljbwdyfa867ff17qdh"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.5"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "ca5a22157cba"; - sha256 = "0ldkh6f0g0wzfkp09ib15a62bmcbpsxj93saikqmc86242bcxij0"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.24.0"; - sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; - }; - } - { - goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/DataDog/dd-trace-go.v1"; - rev = "v1.7.0"; - sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/go-playground/assert.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/go-playground/assert.v1"; - rev = "v1.2.1"; - sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"; - }; - } - { - goPackagePath = "gopkg.in/go-playground/validator.v8"; - fetch = { - type = "git"; - url = "https://gopkg.in/go-playground/validator.v8"; - rev = "v8.18.2"; - sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; - }; - } - { - goPackagePath = "gopkg.in/gorp.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/gorp.v1"; - rev = "v1.7.2"; - sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "9856a29383ce"; - sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; - }; - } - { - 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.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.1-2019.2.3"; - sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 0ec96a8f9e..a0f80533ca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, git, buildGoPackage }: +{ stdenv, fetchFromGitLab, git, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "gitlab-workhorse"; version = "8.54.0"; @@ -12,10 +12,10 @@ buildGoPackage rec { sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz"; }; - goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; - goDeps = ./deps.nix; + vendorSha256 = "0wi6vj9phwh0bsdk2lrgq807nb90iivlm0bkdjkim06jq068mizj"; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; + doCheck = false; meta = with stdenv.lib; { homepage = "http://www.gitlab.com/"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix deleted file mode 100644 index 987970917d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix +++ /dev/null @@ -1,2523 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "65cc252bf669"; - sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; - }; - } - { - goPackagePath = "bou.ke/monkey"; - fetch = { - type = "git"; - url = "https://github.com/bouk/monkey"; - rev = "v1.0.1"; - sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.58.0"; - sha256 = "1mcnnvx55yqcj02y4f1hl10ril06q4y9pcsbkb27wgrwimi6fl2n"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/exporter/aws"; - fetch = { - type = "git"; - url = "https://github.com/census-ecosystem/opencensus-go-exporter-aws"; - rev = "2befc13012d0"; - sha256 = "0adnzms874ddcp67mgsgaw43r3fih4pzjn8n424bbi8fhwajsi29"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver"; - fetch = { - type = "git"; - url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver"; - rev = "v0.12.1"; - sha256 = "0y0v3v97qg5yl83vq4kjzgaidnp8iraw1d7llnm9i7s5lkmydiwb"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/integrations/ocsql"; - fetch = { - type = "git"; - url = "https://github.com/opencensus-integrations/ocsql"; - rev = "v0.1.4"; - sha256 = "06w9vm8dq0gg0v7slnv3zij90i8i9qiz2fbg148jih6jdpyakqrq"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/resource"; - fetch = { - type = "git"; - url = "https://github.com/census-ecosystem/opencensus-go-resource"; - rev = "v0.1.1"; - sha256 = "1g9vjrh7w8f2k2kxjcwmmcza2dfp61wmsgaipfk6992hyyccl3sh"; - }; - } - { - goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; - fetch = { - type = "git"; - url = "https://dmitri.shuralyov.com/gpu/mtl"; - rev = "666a987793e9"; - sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; - }; - } - { - goPackagePath = "github.com/AndreasBriese/bbloom"; - fetch = { - type = "git"; - url = "https://github.com/AndreasBriese/bbloom"; - rev = "e2d15f34fcf9"; - sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; - }; - } - { - goPackagePath = "github.com/Azure/azure-amqp-common-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-amqp-common-go"; - rev = "v3.0.0"; - sha256 = "0sxghycqkxaygwi6f85w9pqijm5ms2dk4qkz4d711dmi3b74512j"; - }; - } - { - goPackagePath = "github.com/Azure/azure-pipeline-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-pipeline-go"; - rev = "v0.2.2"; - sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v37.1.0"; - sha256 = "163ryyfg5x227013vyjnjsvww8pvi4kfc80x419d31mx88cs24ic"; - }; - } - { - goPackagePath = "github.com/Azure/azure-service-bus-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-service-bus-go"; - rev = "v0.10.1"; - sha256 = "11d1b5wbv23qzp54qhmkhdwwmrmbfqnc2ddxsg9hg2m258id8hl5"; - }; - } - { - goPackagePath = "github.com/Azure/azure-storage-blob-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-storage-blob-go"; - rev = "v0.10.0"; - sha256 = "1w64h4h1w4nclr115i1haigzy0b8z9dbdjfi8zsf5viqqzhlwqgm"; - }; - } - { - goPackagePath = "github.com/Azure/go-amqp"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-amqp"; - rev = "v0.12.7"; - sha256 = "0gy3kxn5lqpliwfa2ys367hgbsa2n88bsiy04i44ba3aass7m6h4"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/CloudyKit/fastprinter"; - fetch = { - type = "git"; - url = "https://github.com/CloudyKit/fastprinter"; - rev = "74b38d55f37a"; - sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235"; - }; - } - { - goPackagePath = "github.com/FZambia/sentinel"; - fetch = { - type = "git"; - url = "https://github.com/FZambia/sentinel"; - rev = "v1.0.0"; - sha256 = "14cfngdy0n5rg7nrvxg1ydcjd18v0s8h33jx9wkln5ms0d59kfly"; - }; - } - { - goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; - fetch = { - type = "git"; - url = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; - rev = "e802c2cb94ae"; - sha256 = "035z6yk7i53ba91pp0hl20ks1syjaw5f5mdx5c0kbib7k4xcgv96"; - }; - } - { - goPackagePath = "github.com/Joker/hpp"; - fetch = { - type = "git"; - url = "https://github.com/Joker/hpp"; - rev = "v1.0.0"; - sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2"; - }; - } - { - goPackagePath = "github.com/Joker/jade"; - fetch = { - type = "git"; - url = "https://github.com/Joker/jade"; - rev = "d475f43051e7"; - sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn"; - }; - } - { - goPackagePath = "github.com/Shopify/goreferrer"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/goreferrer"; - rev = "ec9c9a553398"; - sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn"; - }; - } - { - goPackagePath = "github.com/ajg/form"; - fetch = { - type = "git"; - url = "https://github.com/ajg/form"; - rev = "v1.5.1"; - sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; - }; - } - { - 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.7.3"; - sha256 = "0wlw1bq7gdyxjm2j5vqbkn42ma28irc5wygkz9bj5z6idah4wl8k"; - }; - } - { - goPackagePath = "github.com/alecthomas/colour"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/colour"; - rev = "60882d9e2721"; - sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; - }; - } - { - goPackagePath = "github.com/alecthomas/kong"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kong"; - rev = "v0.2.4"; - sha256 = "0lv8xk71p5729igwmp6slhmf9x1g5z3zmkfx1mg1y2spn2ck4q7l"; - }; - } - { - goPackagePath = "github.com/alecthomas/repr"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - 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/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "7fddfc383310"; - sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.31.13"; - sha256 = "170yaj7ffrkw56z9kmng06wwnyblqj16zm9x39q76fi4pdnn5rqc"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "v1.3.1"; - sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/certifi/gocertifi"; - fetch = { - type = "git"; - url = "https://github.com/certifi/gocertifi"; - rev = "2c3bb06c6054"; - sha256 = "00g5jy613nkm96k6ylbcwdwpdhm84mvw2gqr3gmj5mhwmsc8x97p"; - }; - } - { - 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/client9/reopen"; - fetch = { - type = "git"; - url = "https://github.com/client9/reopen"; - rev = "v1.0.0"; - sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s"; - }; - } - { - goPackagePath = "github.com/cloudflare/tableflip"; - fetch = { - type = "git"; - url = "https://github.com/cloudflare/tableflip"; - rev = "4baec9811f2b"; - sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q"; - }; - } - { - goPackagePath = "github.com/cncf/udpa"; - fetch = { - type = "git"; - url = "https://github.com/cncf/udpa"; - rev = "269d4d468f6f"; - sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs"; - }; - } - { - goPackagePath = "github.com/codahale/hdrhistogram"; - fetch = { - type = "git"; - url = "https://github.com/codahale/hdrhistogram"; - rev = "3a0bb77429bd"; - sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; - }; - } - { - goPackagePath = "github.com/codegangsta/inject"; - fetch = { - type = "git"; - url = "https://github.com/codegangsta/inject"; - rev = "33e0aa1cb7c0"; - sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; - }; - } - { - 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/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/denisenkom/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/denisenkom/go-mssqldb"; - rev = "cfbb681360f0"; - sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs"; - }; - } - { - goPackagePath = "github.com/devigned/tab"; - fetch = { - type = "git"; - url = "https://github.com/devigned/tab"; - rev = "v0.1.1"; - sha256 = "17r98k3bcyjkq5mz2k9i2sxbzgkq05h5pqg5mn7nyrvsf09x99g5"; - }; - } - { - goPackagePath = "github.com/dgraph-io/badger"; - fetch = { - type = "git"; - url = "https://github.com/dgraph-io/badger"; - rev = "v1.6.0"; - sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5"; - }; - } - { - 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/dgryski/go-farm"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-farm"; - rev = "6a90982ecee2"; - sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; - }; - } - { - goPackagePath = "github.com/dimchansky/utfbom"; - fetch = { - type = "git"; - url = "https://github.com/dimchansky/utfbom"; - rev = "v1.1.0"; - sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; - }; - } - { - goPackagePath = "github.com/disintegration/imaging"; - fetch = { - type = "git"; - url = "https://github.com/disintegration/imaging"; - rev = "v1.6.2"; - sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5"; - }; - } - { - goPackagePath = "github.com/dlclark/regexp2"; - fetch = { - type = "git"; - url = "https://github.com/dlclark/regexp2"; - rev = "v1.2.0"; - sha256 = "011l1prsywvhhi0yc7qmpsca1cwavmawyyld5kjzi0ff9ghvj4ng"; - }; - } - { - 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/eknkc/amber"; - fetch = { - type = "git"; - url = "https://github.com/eknkc/amber"; - rev = "cdade1c07385"; - sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "v0.9.4"; - sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/etcd-io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.3"; - sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc"; - }; - } - { - goPackagePath = "github.com/fasthttp-contrib/websocket"; - fetch = { - type = "git"; - url = "https://github.com/fasthttp-contrib/websocket"; - rev = "1f3b11f56072"; - sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "v1.1.0"; - sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; - }; - } - { - goPackagePath = "github.com/flosch/pongo2"; - fetch = { - type = "git"; - url = "https://github.com/flosch/pongo2"; - rev = "bbf5a6c351f4"; - sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; - }; - } - { - goPackagePath = "github.com/fortytw2/leaktest"; - fetch = { - type = "git"; - url = "https://github.com/fortytw2/leaktest"; - rev = "v1.3.0"; - sha256 = "0487zghyxqzk6zdbhd2j074pcc2l15l4sfg5clrjqwfbql7519wx"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gavv/httpexpect"; - fetch = { - type = "git"; - url = "https://github.com/gavv/httpexpect"; - rev = "v2.0.0"; - sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs"; - }; - } - { - goPackagePath = "github.com/getsentry/raven-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/raven-go"; - rev = "v0.2.0"; - sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf"; - }; - } - { - goPackagePath = "github.com/getsentry/sentry-go"; - fetch = { - type = "git"; - url = "https://github.com/getsentry/sentry-go"; - rev = "v0.5.1"; - sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89"; - }; - } - { - goPackagePath = "github.com/gin-contrib/sse"; - fetch = { - type = "git"; - url = "https://github.com/gin-contrib/sse"; - rev = "5545eab6dad3"; - sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5"; - }; - } - { - goPackagePath = "github.com/gin-gonic/gin"; - fetch = { - type = "git"; - url = "https://github.com/gin-gonic/gin"; - rev = "v1.4.0"; - sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; - }; - } - { - goPackagePath = "github.com/go-check/check"; - fetch = { - type = "git"; - url = "https://github.com/go-check/check"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "v1.0.1"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/go-gl/glfw"; - fetch = { - type = "git"; - url = "https://github.com/go-gl/glfw"; - rev = "e6da0acd62b1"; - sha256 = "0prvx5r7q8yrhqvnwibv4xz3dayjbq36yajzqvh0z4lqsh4hyhch"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "v1.25.4"; - sha256 = "0b6cql5ripbiyrm18d6bfd1rfjnwcbskppw3d0vb80l0wy72d0c6"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-martini/martini"; - fetch = { - type = "git"; - url = "https://github.com/go-martini/martini"; - rev = "22fa46961aab"; - sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "v1.7.1"; - sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d"; - }; - } - { - goPackagePath = "github.com/gobuffalo/logger"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/logger"; - rev = "v1.0.1"; - sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packd"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packd"; - rev = "v0.3.0"; - sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packr"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packr"; - rev = "v2.7.1"; - sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; - }; - } - { - goPackagePath = "github.com/gobwas/httphead"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/httphead"; - rev = "2c6c146eadee"; - sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss"; - }; - } - { - goPackagePath = "github.com/gobwas/pool"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/pool"; - rev = "v0.2.0"; - sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i"; - }; - } - { - goPackagePath = "github.com/gobwas/ws"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/ws"; - rev = "v1.0.2"; - sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang-sql/civil"; - fetch = { - type = "git"; - url = "https://github.com/golang-sql/civil"; - rev = "cb61b32ac6fe"; - sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; - }; - } - { - goPackagePath = "github.com/golang/gddo"; - fetch = { - type = "git"; - url = "https://github.com/golang/gddo"; - rev = "af0f2af80721"; - sha256 = "0ja0xwgg31i2fyqn0b9sf1rjsqkw34kwrr0k0iczzn19mhhc3m7j"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57e"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.4.3"; - sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.2"; - sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "v2.0.0"; - sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.1"; - sha256 = "0l1mi8lw1nlq39hqx52v9lz0369ajfi948521cxwrcb4qwm275p6"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "427632fa3b1c"; - sha256 = "065r8435mr8zzdiifkixzc948c4ivx0hhqjsppy71zcxmm9jhxgx"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/google/subcommands"; - fetch = { - type = "git"; - url = "https://github.com/google/subcommands"; - rev = "v1.0.1"; - sha256 = "0rw5wwjfi0pd1kfbh09mfmyjy6h22ip7cawp0dj7v6rq4cy98ymz"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.1"; - sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; - }; - } - { - goPackagePath = "github.com/google/wire"; - fetch = { - type = "git"; - url = "https://github.com/google/wire"; - rev = "v0.4.0"; - sha256 = "1z3nrccxsrhphpb6yrmc1hn4njy8qbayg3w6m9zsbi77yaiigxni"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; - rev = "v1.0.0"; - sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "v1.2.0"; - sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "v1.2.0"; - sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; - }; - } - { - 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/ianlancetaylor/demangle"; - fetch = { - type = "git"; - url = "https://github.com/ianlancetaylor/demangle"; - rev = "5e5cf60278f6"; - sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75"; - }; - } - { - goPackagePath = "github.com/imkira/go-interpol"; - fetch = { - type = "git"; - url = "https://github.com/imkira/go-interpol"; - rev = "v1.1.0"; - sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/iris-contrib/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/blackfriday"; - rev = "v2.0.0"; - sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; - }; - } - { - goPackagePath = "github.com/iris-contrib/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/go.uuid"; - rev = "v2.0.0"; - sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; - }; - } - { - goPackagePath = "github.com/iris-contrib/i18n"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/i18n"; - rev = "987a633949d0"; - sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq"; - }; - } - { - goPackagePath = "github.com/iris-contrib/schema"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/schema"; - rev = "v0.0.1"; - sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "v0.3.0"; - sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp"; - }; - } - { - goPackagePath = "github.com/johannesboyne/gofakes3"; - fetch = { - type = "git"; - url = "https://github.com/johannesboyne/gofakes3"; - rev = "02d71f533bec"; - sha256 = "0igx9andbkrmwspjbq9sa8pady2hpyvvjj4hfmghnry02kq23fwn"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "v1.3.0"; - sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; - }; - } - { - goPackagePath = "github.com/jpillora/backoff"; - fetch = { - type = "git"; - url = "https://github.com/jpillora/backoff"; - rev = "8eab2debe79d"; - sha256 = "1m5z0703094vhbbmp6s7n6kk7ci5s1pfjq466mz14zp8d1w0yn3x"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.6"; - sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "v0.9.1"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "089d3ea4e4d5"; - sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; - }; - } - { - goPackagePath = "github.com/juju/loggo"; - fetch = { - type = "git"; - url = "https://github.com/juju/loggo"; - rev = "584905176618"; - sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4"; - }; - } - { - goPackagePath = "github.com/juju/testing"; - fetch = { - type = "git"; - url = "https://github.com/juju/testing"; - rev = "472a3e8b2073"; - sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/k0kubun/colorstring"; - fetch = { - type = "git"; - url = "https://github.com/k0kubun/colorstring"; - rev = "9440f1994b88"; - sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj"; - }; - } - { - goPackagePath = "github.com/kataras/golog"; - fetch = { - type = "git"; - url = "https://github.com/kataras/golog"; - rev = "v0.0.9"; - sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i"; - }; - } - { - goPackagePath = "github.com/kataras/iris"; - fetch = { - type = "git"; - url = "https://github.com/kataras/iris"; - rev = "v12.0.1"; - sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5"; - }; - } - { - goPackagePath = "github.com/kataras/neffos"; - fetch = { - type = "git"; - url = "https://github.com/kataras/neffos"; - rev = "v0.0.10"; - sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp"; - }; - } - { - goPackagePath = "github.com/kataras/pio"; - fetch = { - type = "git"; - url = "https://github.com/kataras/pio"; - rev = "ea782b38602d"; - sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj"; - }; - } - { - goPackagePath = "github.com/kelseyhightower/envconfig"; - fetch = { - type = "git"; - url = "https://github.com/kelseyhightower/envconfig"; - rev = "v1.3.0"; - sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.9.0"; - sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "v1.2.1"; - sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.3"; - sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - 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/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.2.0"; - sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; - }; - } - { - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "v30.0.5"; - sha256 = "13jk4r8x8rb9lar35dxvh3g7hnzclq95jbpg88y4xklmh48yy3sk"; - }; - } - { - goPackagePath = "github.com/lightstep/lightstep-tracer-go"; - fetch = { - type = "git"; - url = "https://github.com/lightstep/lightstep-tracer-go"; - rev = "v0.15.6"; - sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.6"; - sha256 = "0zv9ix7g0qf71jdhv7gbab9hjfkgbxl22kwhpz9ck1y6m4g1zxaw"; - }; - } - { - goPackagePath = "github.com/mattn/go-ieproxy"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-ieproxy"; - rev = "v0.0.1"; - sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.12"; - sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mattn/go-shellwords"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-shellwords"; - rev = "2444a32a19f4"; - sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "v1.12.0"; - sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv"; - }; - } - { - goPackagePath = "github.com/mattn/goveralls"; - fetch = { - type = "git"; - url = "https://github.com/mattn/goveralls"; - rev = "v0.0.2"; - sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mediocregopher/mediocre-go-lib"; - fetch = { - type = "git"; - url = "https://github.com/mediocregopher/mediocre-go-lib"; - rev = "cb65787f37ed"; - sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j"; - }; - } - { - goPackagePath = "github.com/mediocregopher/radix"; - fetch = { - type = "git"; - url = "https://github.com/mediocregopher/radix"; - rev = "v3.3.0"; - sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx"; - }; - } - { - goPackagePath = "github.com/microcosm-cc/bluemonday"; - fetch = { - type = "git"; - url = "https://github.com/microcosm-cc/bluemonday"; - rev = "v1.0.2"; - sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - goPackagePath = "github.com/mitchellh/copystructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/copystructure"; - rev = "v1.0.0"; - sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; - }; - } - { - 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/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "v1.0.0"; - sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0"; - }; - } - { - 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/moul/http2curl"; - fetch = { - type = "git"; - url = "https://github.com/moul/http2curl"; - rev = "v1.0.0"; - sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/nats-io/nats.go"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nats.go"; - rev = "v1.8.1"; - sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj"; - }; - } - { - goPackagePath = "github.com/nats-io/nkeys"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nkeys"; - rev = "v0.0.2"; - sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "v1.0.1"; - sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.2"; - sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.3"; - sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.7.1"; - sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "v1.0.2"; - sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; - }; - } - { - goPackagePath = "github.com/otiai10/copy"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/copy"; - rev = "v1.0.1"; - sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; - }; - } - { - goPackagePath = "github.com/otiai10/curr"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/curr"; - rev = "v1.0.0"; - sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987"; - }; - } - { - goPackagePath = "github.com/otiai10/mint"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/mint"; - rev = "v1.3.0"; - sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca"; - }; - } - { - 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/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "v1.0.0"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pingcap/errors"; - fetch = { - type = "git"; - url = "https://github.com/pingcap/errors"; - rev = "v0.11.4"; - sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn"; - }; - } - { - 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/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.1"; - sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.0.0"; - sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.1"; - sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.3"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "github.com/rafaeljusto/redigomock"; - fetch = { - type = "git"; - url = "https://github.com/rafaeljusto/redigomock"; - rev = "257e089e14a1"; - sha256 = "1k572vsda7q5l42s1kn5bjkfb30jshsbc96dz4cnghg43qylyd6h"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.4.0"; - sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n"; - }; - } - { - goPackagePath = "github.com/rubenv/sql-migrate"; - fetch = { - type = "git"; - url = "https://github.com/rubenv/sql-migrate"; - rev = "06338513c237"; - sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v1.5.2"; - sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "v2.1.0"; - sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; - }; - } - { - goPackagePath = "github.com/ryszard/goskiplist"; - fetch = { - type = "git"; - url = "https://github.com/ryszard/goskiplist"; - rev = "2dfbae5fcf46"; - sha256 = "1135gmvcwnmk36zryxq554fmikrmg5c6y5ml00arqpagn5xhnmnl"; - }; - } - { - goPackagePath = "github.com/sebest/xff"; - fetch = { - type = "git"; - url = "https://github.com/sebest/xff"; - rev = "6c115e0ffa35"; - sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h"; - }; - } - { - 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/shabbyrobe/gocovmerge"; - fetch = { - type = "git"; - url = "https://github.com/shabbyrobe/gocovmerge"; - rev = "3e036491d500"; - sha256 = "1wb5xlknnmyamf7ksnd6fwyc73pip90gkjbm6qcc47flbdfdl4xg"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.6.0"; - sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; - }; - } - { - 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 = "v1.6.4"; - sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.2.1"; - sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; - }; - } - { - 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.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - 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.2.0"; - sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "v1.0.2"; - sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; - }; - } - { - goPackagePath = "github.com/uber-go/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "github.com/uber/jaeger-client-go"; - fetch = { - type = "git"; - url = "https://github.com/uber/jaeger-client-go"; - rev = "v2.15.0"; - sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj"; - }; - } - { - goPackagePath = "github.com/uber/jaeger-lib"; - fetch = { - type = "git"; - url = "https://github.com/uber/jaeger-lib"; - rev = "v1.5.0"; - sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "v1.1.7"; - sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "v1.0.0"; - sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; - }; - } - { - goPackagePath = "github.com/valyala/bytebufferpool"; - fetch = { - type = "git"; - url = "https://github.com/valyala/bytebufferpool"; - rev = "v1.0.0"; - sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; - }; - } - { - goPackagePath = "github.com/valyala/fasthttp"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasthttp"; - rev = "v1.6.0"; - sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b"; - }; - } - { - goPackagePath = "github.com/valyala/fasttemplate"; - fetch = { - type = "git"; - url = "https://github.com/valyala/fasttemplate"; - rev = "v1.0.1"; - sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; - }; - } - { - goPackagePath = "github.com/valyala/tcplisten"; - fetch = { - type = "git"; - url = "https://github.com/valyala/tcplisten"; - rev = "ceec8f93295a"; - sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonpointer"; - rev = "4e3ac2762d5f"; - sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonreference"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonreference"; - rev = "bd5ef7bd5415"; - sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; - }; - } - { - goPackagePath = "github.com/xeipuuv/gojsonschema"; - fetch = { - type = "git"; - url = "https://github.com/xeipuuv/gojsonschema"; - rev = "v1.2.0"; - sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "github.com/yalp/jsonpath"; - fetch = { - type = "git"; - url = "https://github.com/yalp/jsonpath"; - rev = "5cc68e5049a0"; - sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b"; - }; - } - { - goPackagePath = "github.com/yudai/gojsondiff"; - fetch = { - type = "git"; - url = "https://github.com/yudai/gojsondiff"; - rev = "v1.0.0"; - sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2"; - }; - } - { - goPackagePath = "github.com/yudai/golcs"; - fetch = { - type = "git"; - url = "https://github.com/yudai/golcs"; - rev = "ecda9a501e82"; - sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq"; - }; - } - { - goPackagePath = "github.com/yudai/pp"; - fetch = { - type = "git"; - url = "https://github.com/yudai/pp"; - rev = "v2.0.1"; - sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; - }; - } - { - goPackagePath = "github.com/yuin/goldmark"; - fetch = { - type = "git"; - url = "https://github.com/yuin/goldmark"; - rev = "v1.1.27"; - sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; - }; - } - { - goPackagePath = "github.com/ziutek/mymysql"; - fetch = { - type = "git"; - url = "https://github.com/ziutek/mymysql"; - rev = "v1.5.4"; - sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/gitaly"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/gitaly.git"; - rev = "v1.74.0"; - sha256 = "1gmrpzm4ijw8g1xj8b3vmvg4cmis7shvwxp5vl2r47a8mh2ql5pd"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; - rev = "1a2bfecd2f0e"; - sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx"; - }; - } - { - goPackagePath = "gitlab.com/gitlab-org/labkit"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "45895e129029"; - sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.3"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; - }; - } - { - goPackagePath = "gocloud.dev"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cloud"; - rev = "v0.20.0"; - sha256 = "0zmqm8k4gxvivhpq3gpdqf9lnm9qj1ryyg9nm0rh3cvman5y07ci"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "e9b2fee46413"; - sha256 = "18sz5426h320l9gdll9n43lzzxg2dmqv0s5fjy6sbvbkkpjs1m28"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "6cc2880d07d6"; - sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "e7c1f5e7dbb8"; - sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "738671d3881b"; - sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d2bd2a29d028"; - sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.3.0"; - sha256 = "0ldgbx2zpprbsfn6p8pfgs4nn87gwbfcv2z0fa7n8alwsq2yw78q"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "627f9648deb9"; - sha256 = "0ziz7i9mhz6dy2f58dsa83flkk165w1cnazm7yksql5i9m7x099z"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "43a5402ce75a"; - sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "6fdc65e7d980"; - sha256 = "0al5gzij4qkrp11i1h8j7288pg6y716zyh2v0886pv2knha7gjvj"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.3"; - sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "555d28b269f0"; - sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "1b747fd94509"; - sha256 = "0r53sxrkkycdpi0l5ljqpd9dzmcgns4csl3zgsaxdy1l0r0bfnyc"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "v0.26.0"; - sha256 = "0niqb2hkpj7sgk8q2xbpgjhbql0s4756nzbjs1msynbc94c9g7hy"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.6"; - sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "7c474a2e3482"; - sha256 = "00337qngl2rr45qpmlysc7wm7q27vbvjr2s36w1lc08fx7ba1wk9"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.29.1"; - sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf"; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.24.0"; - sha256 = "0x3qyn3rizbs671gs7f8v50rmiwf9h7kbaradpivw9718mhbg1gn"; - }; - } - { - goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/DataDog/dd-trace-go.v1"; - rev = "v1.7.0"; - sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/go-playground/assert.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/go-playground/assert.v1"; - rev = "v1.2.1"; - sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"; - }; - } - { - goPackagePath = "gopkg.in/go-playground/validator.v8"; - fetch = { - type = "git"; - url = "https://gopkg.in/go-playground/validator.v8"; - rev = "v8.18.2"; - sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; - }; - } - { - goPackagePath = "gopkg.in/gorp.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/gorp.v1"; - rev = "v1.7.2"; - sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/mgo.v2"; - rev = "9856a29383ce"; - sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; - }; - } - { - 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.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.1-2020.1.5"; - sha256 = "1ry3ywncc9qkmh8ihh67v6k8nmqhq2gvfyrl1ykl4z6s56b7f9za"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } - { - goPackagePath = "rsc.io/quote"; - fetch = { - type = "git"; - url = "https://github.com/rsc/quote"; - rev = "v3.1.0"; - sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; - }; - } - { - goPackagePath = "rsc.io/sampler"; - fetch = { - type = "git"; - url = "https://github.com/rsc/sampler"; - rev = "v1.3.0"; - sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix index 48667ad8be..b574c03248 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper +{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true @@ -6,25 +6,26 @@ with stdenv.lib; -buildGoPackage rec { +buildGoModule rec { pname = "gogs"; - version = "0.11.91"; + version = "0.12.3"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "1yfimgjg9n773kdml17119539w9736mi66bivpv5yp3cj2hj9mlj"; + sha256 = "0ix3mxy8cpqbx24qffbzyf5z88x7605icm7rk5n54r8bdsr7cckd"; }; - patches = [ ./static-root-path.patch ]; + vendorSha256 = "0m0g4dsiq8p2ngsbjxfi3wff7x4xpm67qlhgcgf8b48mqai4d2gc"; + + subPackages = [ "." ]; postPatch = '' patchShebangs . - substituteInPlace pkg/setting/setting.go --subst-var data ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper openssh ]; buildInputs = optional pamSupport pam; @@ -34,18 +35,12 @@ buildGoPackage rec { ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); - outputs = [ "out" "data" ]; - postInstall = '' - mkdir $data - cp -R $src/{public,templates} $data wrapProgram $out/bin/gogs \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; - goPackagePath = "github.com/gogs/gogs"; - meta = { description = "A painless self-hosted Git service"; homepage = "https://gogs.io"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gogs/static-root-path.patch b/third_party/nixpkgs/pkgs/applications/version-management/gogs/static-root-path.patch deleted file mode 100644 index 9eaa72a0c8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gogs/static-root-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go -index f206592d..796da6ef 100644 ---- a/pkg/setting/setting.go -+++ b/pkg/setting/setting.go -@@ -474,7 +474,7 @@ func NewContext() { - LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/") - OfflineMode = sec.Key("OFFLINE_MODE").MustBool() - DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() -- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) -+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") - AppDataPath = sec.Key("APP_DATA_PATH").MustString("data") - EnableGzip = sec.Key("ENABLE_GZIP").MustBool() - diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix index fa7583a1e5..e90f47e51f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.5"; + version = "1.0.0-alpha.8"; src = fetchCrate { inherit version pname; - sha256 = "150hm3kim8cszmycbr4rdpy2g3bfhghsya8hnnfkglzi8sprb5d8"; + sha256 = "01wag3ckqsa7r6zc7cla428w8hr49n2ybp31s42dqmsbak3xbc14"; }; - cargoSha256 = "0398bwjc2ib32nhbg4gjzwq6zwxql7llq8igl51nyr229m917im6"; + cargoSha256 = "1hh4xmkhbbbkag3v25vh6zpn0r4fmipxmkcr8ahgrxf71dvyxj8x"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; LIBCLANG_PATH = "${libclang}/lib"; diff --git a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix index 9bb5518e80..921548b5c0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/devede/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/devede/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ stdenv, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools; - -in buildPythonApplication { - name = "devede-4.8.8"; +in buildPythonApplication rec { + pname = "devede"; + version = "4.16.0"; namePrefix = ""; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "rastersoft"; repo = "devedeng"; - rev = "c518683fbcd793aa92249e4fecafc3c3fea7da68"; - sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q"; + rev = version; + sha256 = "1xb7acjphvn4ya8fgjsvag5gzi9a6c2famfl0ffr8nhb9y8ig9mg"; }; # Temporary fix diff --git a/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix b/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix index 91feb178ca..e1631150b8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/hdhomerun-config-gui/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdhomerun-config-gui"; - version = "20200521"; + version = "20200907"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/hdhomerun_config_gui_${version}.tgz"; - sha256 = "1r1rwfgi714nwblyg8nqjzkpm4n2lg7kqqqas47hvbn5waimz1ja"; + sha256 = "17zf0hzw68b0xdkh1maqhl96jb7171mbhd29y64as29nps9x4fmz"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix index 0e23eac9a8..6863ef9ca6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/plugins.nix @@ -481,12 +481,12 @@ let self = rec { plugin = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.3.12"; + version = "2.4.6"; src = fetchFromGitHub { owner = "peak3d"; repo = "inputstream.adaptive"; - rev = version; + rev = "${version}-${rel}"; sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix index 07b4c79a5b..d9de3eb699 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpc-qt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtx11extras, qttools, mpv }: +{ stdenv, mkDerivation, fetchFromGitLab, fetchpatch, pkg-config, qmake, qtx11extras, qttools, mpv }: mkDerivation rec { pname = "mpc-qt"; @@ -11,7 +11,14 @@ mkDerivation rec { sha256 = "1cis8dl9pm91mpnp696zvwsfp96gkwr8jgs45anbwd7ldw78w4x5"; }; - nativeBuildInputs = [ pkgconfig qmake qttools ]; + patches = [ + (fetchpatch { + url = "https://gitlab.com/mpc-qt/mpc-qt/-/commit/02f2bc7a22e863a89ba322b9acb61cf1aef23ba0.diff"; + sha256 = "0khld55i194zgi18d0wch5459lfzzkbfdbl1im8akvq8ks5xijis"; + }) + ]; + + nativeBuildInputs = [ pkg-config qmake qttools ]; buildInputs = [ mpv qtx11extras ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 22d34fb474..d7dc865c16 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch +{ config, stdenv, fetchFromGitHub , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -31,28 +31,29 @@ , mesa ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null +, archiveSupport ? true, libarchive ? null , bluraySupport ? true, libbluray ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , cmsSupport ? true, lcms2 ? null , dvdnavSupport ? stdenv.isLinux, libdvdnav ? null +, jackaudioSupport ? false, libjack2 ? null , libpngSupport ? true, libpng ? null +, openalSupport ? true, openalSoft ? null , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null , screenSaverSupport ? true, libXScrnSaver ? null , sdl2Support ? true, SDL2 ? null +, sixelSupport ? false, libsixel ? null , speexSupport ? true, speex ? null , swiftSupport ? false, swift ? null , theoraSupport ? true, libtheora ? null , vaapiSupport ? stdenv.isLinux, libva ? null +, vapoursynthSupport ? false, vapoursynth ? null , vdpauSupport ? true, libvdpau ? null , xineramaSupport ? stdenv.isLinux, libXinerama ? null , xvSupport ? stdenv.isLinux, libXv ? null , zimgSupport ? true, zimg ? null -, archiveSupport ? true, libarchive ? null -, jackaudioSupport ? false, libjack2 ? null -, openalSupport ? true, openalSoft ? null -, vapoursynthSupport ? false, vapoursynth ? null }: with stdenv.lib; @@ -76,6 +77,7 @@ assert pulseSupport -> available libpulseaudio; assert rubberbandSupport -> available rubberband; assert screenSaverSupport -> available libXScrnSaver; assert sdl2Support -> available SDL2; +assert sixelSupport -> available libsixel; assert speexSupport -> available speex; assert theoraSupport -> available libtheora; assert vaapiSupport -> available libva; @@ -134,6 +136,7 @@ in stdenv.mkDerivation rec { (enableFeature dvdnavSupport "dvdnav") (enableFeature openalSupport "openal") (enableFeature sdl2Support "sdl2") + (enableFeature sixelSupport "sixel") (enableFeature vaapiSupport "vaapi") (enableFeature waylandSupport "wayland") (enableFeature stdenv.isLinux "dvbin") @@ -161,6 +164,7 @@ in stdenv.mkDerivation rec { ++ optional rubberbandSupport rubberband ++ optional screenSaverSupport libXScrnSaver ++ optional sdl2Support SDL2 + ++ optional sixelSupport libsixel ++ optional speexSupport speex ++ optional theoraSupport libtheora ++ optional vaapiSupport libva @@ -185,14 +189,6 @@ in stdenv.mkDerivation rec { python3 TOOLS/osxbundle.py -s build/mpv ''; - patches = stdenv.lib.optionals stdenv.isDarwin [ - # Fix cocoa backend. Remove with the next release - (fetchpatch { - url = "https://github.com/mpv-player/mpv/commit/188169854313b99d01da8f69fe129f0a487eb7c4.patch"; - sha256 = "062sz4666prb2wg1rn5q8brqkzlq6lxn8sxic78a8lb0125c01f7"; - }) - ]; - postInstall = '' # Use a standard font mkdir -p $out/share/mpv diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix index f19db554d0..5f2a21ea7e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv }: +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib mpv ]; + buildInputs = [ glib mpv-unwrapped ]; installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix index 535913c6f2..7aef0bfd03 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "2020.09.1"; + version = "2020.09.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1by52b56s9c3h23n40iccygkazwlhii2gb28zhnj2xz5805j05y2"; + sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix index 0530af6f22..107fd5f599 100644 --- a/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix @@ -41,7 +41,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; - maintainers = with maintainers; [ kylewlacy ]; + maintainers = with maintainers; [ ]; homepage = "https://plex.tv"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index fee41ed3ef..b1db8cc57d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -1,32 +1,56 @@ -{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt -, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools, genericUpdater +{ stdenv +, fetchFromGitHub +, fetchpatch +, mkDerivation +, SDL2 +, frei0r +, ladspaPlugins +, gettext +, mlt +, jack1 +, pkgconfig +, qtbase +, qtmultimedia +, qtx11extras +, qtwebsockets +, qtquickcontrols2 +, qtgraphicaleffects +, qmake +, qttools +, genericUpdater , common-updater-scripts }: -assert stdenv.lib.versionAtLeast libmlt.version "6.22.1"; assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.10.31"; + version = "20.11.25"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6"; + sha256 = "1nm71gnjd082m7bxlmrkngn079m3fdrb059f7wy23qj7khgpi3iz"; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ - SDL2 frei0r gettext mlt libmlt - qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols + SDL2 + frei0r + ladspaPlugins + gettext + mlt + qtbase + qtmultimedia + qtx11extras + qtwebsockets + qtquickcontrols2 qtgraphicaleffects ]; - NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; + NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt"; qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" @@ -43,9 +67,10 @@ mkDerivation rec { qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}" + "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}" "--prefix PATH : ${mlt}/bin" - ]; + ]; postInstall = '' mkdir -p $out/share/shotcut diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index c01586ce5c..50b9b8f36a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.4.1"; + version = "1.4.2"; # git commit for the above version's tag commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1k6dqaidnldf7kpxdszf0wn6xb8m6vaizm2aza81fri1q0051213"; + sha256 = "17ciyvqz0j1q2vyzwkz6bkvxpz2d7y1kk99fv68ar7l4mr8pyp78"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix index 033fe79368..4cdce2172a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.1.5"; + version = "11.2.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "0i8p28hd5wgiay4lgmd9fid5ickwygy6w3xpfzzy8v9z04xc5bg7"; + sha256 = "125y3zdhj353dmmjmssdaib2zp1jg5aiqmvpgkrzhnh5nx2icfv6"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - ./recognize_nixos.patch - ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438 - ]; - postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch deleted file mode 100644 index 6606c50e77..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/appUtil/Makefile.am b/lib/appUtil/Makefile.am -index a0d8e391..899cd4e9 100644 ---- a/lib/appUtil/Makefile.am -+++ b/lib/appUtil/Makefile.am -@@ -21,4 +21,6 @@ libAppUtil_la_SOURCES = - libAppUtil_la_SOURCES += appUtil.c - libAppUtil_la_SOURCES += appUtilX11.c - --AM_CFLAGS = @GTK_CPPFLAGS@ -+AM_CFLAGS = -+AM_CFLAGS += @GTK_CPPFLAGS@ -+AM_CFLAGS += @GDK_PIXBUF_XLIB2_CPPFLAGS@ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch deleted file mode 100644 index 95b0951b58..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/include/guest_os.h b/lib/include/guest_os.h -index 868dec68..0b9a2ad7 100644 ---- a/lib/include/guest_os.h -+++ b/lib/include/guest_os.h -@@ -278,6 +278,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); - #define STR_OS_MANDRAKE_FULL "Mandrake Linux" - #define STR_OS_MANDRIVA "mandriva" - #define STR_OS_MKLINUX "MkLinux" -+#define STR_OS_NIXOS "NixOS" - #define STR_OS_NOVELL "nld9" - #define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" - #define STR_OS_ORACLE6 "oraclelinux6" -diff --git a/lib/misc/hostinfoPosix.c b/lib/misc/hostinfoPosix.c -index 348a67ec..5f8beb2b 100644 ---- a/lib/misc/hostinfoPosix.c -+++ b/lib/misc/hostinfoPosix.c -@@ -203,6 +203,7 @@ static const DistroInfo distroArray[] = { - { "Mandrake", "/etc/mandrake-release" }, - { "Mandriva", "/etc/mandriva-release" }, - { "MkLinux", "/etc/mklinux-release" }, -+ { "NixOS", "/etc/os-release" }, - { "Novell", "/etc/nld-release" }, - { "OracleLinux", "/etc/oracle-release" }, - { "Photon", "/etc/lsb-release" }, -@@ -865,6 +866,8 @@ HostinfoGetOSShortName(const char *distro, // IN: full distro name - } - } else if (strstr(distroLower, "mandrake")) { - Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize); -+ } else if (strstr(distroLower, "nixos")) { -+ Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize); - } else if (strstr(distroLower, "turbolinux")) { - Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize); - } else if (strstr(distroLower, "sun")) { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix index 1a7935dcf7..c3882ae947 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/runc/default.nix @@ -9,6 +9,8 @@ , apparmor-parser , libseccomp , libselinux +, makeWrapper +, procps , nixosTests }: @@ -26,7 +28,7 @@ buildGoPackage rec { goPackagePath = "github.com/opencontainers/runc"; outputs = [ "out" "man" ]; - nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; + nativeBuildInputs = [ go-md2man installShellFiles makeWrapper pkg-config which ]; buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; @@ -43,6 +45,9 @@ buildGoPackage rec { installPhase = '' install -Dm755 runc $out/bin/runc installManPage man/*/*.[1-9] + wrapProgram $out/bin/runc \ + --prefix PATH : ${lib.makeBinPath [ procps ]} \ + --prefix PATH : /run/current-system/systemd/bin ''; passthru.tests = { inherit (nixosTests) cri-o docker podman; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 21c978e1b0..b11f8d6818 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -17,11 +17,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.6.4"; + version = "3.7.0"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "17z7v7pjq1ibl64ir4h183sp58v2x7iv6dn6imnnhkdvss0kl8vi"; + sha256 = "0y6lm23g6a2ljm78w8iyak7yivxvpj3i55fjbd56m9b2ykssm5pv"; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch new file mode 100644 index 0000000000..a103cb1617 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch @@ -0,0 +1,36 @@ +diff -Naur xen-4.10.4-orig/xen/arch/x86/Makefile xen-4.10.4-patched/xen/arch/x86/Makefile +--- xen-4.10.4-orig/xen/arch/x86/Makefile 2019-07-04 01:28:50.000000000 +1000 ++++ xen-4.10.4-patched/xen/arch/x86/Makefile 2020-03-03 13:32:34.607951507 +1100 +@@ -166,7 +166,7 @@ + # Check if the compiler supports the MS ABI. + export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) + # Check if the linker supports PE. +-XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) ++XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) + CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI + + $(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p') +@@ -188,20 +188,20 @@ + + $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc + $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ +- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ ++ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ + $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) : + $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S + $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ + | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S + $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ +- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ ++ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ + $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) : + $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S + $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ + | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S + $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o +- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ ++ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ + $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@ + if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \ + else $(NM) -pa --format=sysv $(@D)/$(@F) \ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch new file mode 100644 index 0000000000..11989e86c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch @@ -0,0 +1,35 @@ +EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something +like that, and (on my machine) has directories within that called +{Boot, nixos, gummiboot}. + +This patch does two things: + +1) Xen apparently wants to put files in +$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name +because I can't see why we have it + +2) Ensures the said directory exists + + +--- a/xen/Makefile 2016-01-08 01:50:58.028045657 +0000 ++++ b/xen/Makefile 2016-01-08 01:51:33.560268718 +0000 +@@ -49,7 +49,9 @@ + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \ + if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ +- $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ ++ [ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \ ++ $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\ ++ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ + elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \ + echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \ + fi; \ +@@ -69,7 +69,7 @@ + rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi + rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi + rm -f $(D)$(EFI_DIR)/$(T).efi +- rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi ++ rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi + + .PHONY: _debug + _debug: diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix deleted file mode 100644 index 6fa30462df..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/4.8.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit -, ocaml-ng -, withInternalQemu ? true -, withInternalTraditionalQemu ? true -, withInternalSeabios ? true -, withSeabios ? !withInternalSeabios, seabios ? null -, withInternalOVMF ? false # FIXME: tricky to build -, withOVMF ? false, OVMF -, withLibHVM ? true - -# qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsaLib -, ... } @ args: - -assert withInternalSeabios -> !withSeabios; -assert withInternalOVMF -> !withOVMF; - -with stdenv.lib; - -# Patching XEN? Check the XSAs at -# https://xenbits.xen.org/xsa/ -# and try applying all the ones we don't have yet. - -let - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; - - xenlockprofpatch = (fetchpatch { - name = "xenlockprof-gcc7.patch"; - url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222"; - sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70"; - }); - - xenpmdpatch = (fetchpatch { - name = "xenpmd-gcc7.patch"; - url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3"; - sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq"; - }); - - qemuMemfdBuildFix = fetchpatch { - name = "xen-4.8-memfd-build-fix.patch"; - url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; - sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; - }; - - # Ported from - #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=e014dbe74e0484188164c61ff6843f8a04a8cb9d"; - #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2"; - qemuGlusterfs6Fix = ./qemu-gluster-6-compat.diff; - - qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsaLib - ]; -in - -callPackage (import ./generic.nix (rec { - version = "4.8.5"; - - src = fetchurl { - url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "04xcf01jad1lpqnmjblzhnjzp0bss9fjd9awgcycjx679arbaxqz"; - }; - - # Sources needed to build tools and firmwares. - xenfiles = optionalAttrs withInternalQemu { - qemu-xen = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen.git"; - rev = "refs/tags/qemu-xen-${version}"; - sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4"; - }; - patches = [ - qemuMemfdBuildFix - qemuGlusterfs6Fix - ]; - buildInputs = qemuDeps; - meta.description = "Xen's fork of upstream Qemu"; - }; - } // optionalAttrs withInternalTraditionalQemu { - qemu-xen-traditional = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; - rev = "refs/tags/xen-${version}"; - sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk"; - }; - buildInputs = qemuDeps; - patches = [ - ]; - postPatch = '' - substituteInPlace xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - ''; - meta.description = "Xen's fork of upstream Qemu that uses old device model"; - }; - } // optionalAttrs withInternalSeabios { - "firmware/seabios-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/seabios.git"; - rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; - sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - meta.description = "Xen's fork of Seabios"; - }; - } // optionalAttrs withInternalOVMF { - "firmware/ovmf-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/ovmf.git"; - rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; - sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; - }; - meta.description = "Xen's fork of OVMF"; - }; - } // { - # TODO: patch Xen to make this optional? - "firmware/etherboot/ipxe.git" = { - src = fetchgit { - url = "https://git.ipxe.org/ipxe.git"; - rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; - sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; - }; - meta.description = "Xen's fork of iPXE"; - }; - } // optionalAttrs withLibHVM { - xen-libhvm-dir-remote = { - src = fetchgit { - name = "xen-libhvm"; - url = "https://github.com/michalpalka/xen-libhvm"; - rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; - sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; - }; - buildPhase = '' - make - cd biospt - cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm - ''; - installPhase = '' - make install - cp biospt/biospt $out/bin/ - ''; - meta = { - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen''; - license = licenses.bsd2; - }; - }; - }; - - configureFlags = [] - ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH - ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" - ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" - - ++ optional (withSeabios) "--with-system-seabios=${seabios}" - ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" - - ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" - ++ optional (withInternalOVMF) "--enable-ovmf"; - - patches = with xsa; flatten [ - # 253: 4.8 not affected - # 254: no patch supplied by xen project (Meltdown/Spectre) - xenlockprofpatch - xenpmdpatch - ]; - - NIX_CFLAGS_COMPILE = toString [ - # Fix build on Glibc 2.24 - "-Wno-error=deprecated-declarations" - # Fix build with GCC8 - "-Wno-error=maybe-uninitialized" - "-Wno-error=stringop-truncation" - "-Wno-error=format-truncation" - "-Wno-error=array-bounds" - # Fix build with GCC9 - "-Wno-error=address-of-packed-member" - "-Wno-error=format-overflow" - "-Wno-error=absolute-value" - ]; - - postPatch = '' - # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. - sed 1i'#include ' \ - -i tools/blktap2/control/tap-ctl-allocate.c \ - -i tools/libxl/libxl_device.c \ - ${optionalString withInternalQemu "-i tools/qemu-xen/hw/9pfs/9p.c"} - - sed -i -e '/sys\/sysctl\.h/d' tools/blktap2/drivers/block-remus.c - ''; - - passthru.qemu-system-i386 = if withInternalQemu - then "lib/xen/bin/qemu-system-i386" - else throw "this xen has no qemu builtin"; - -})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_05; } // args) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix index 53f556e3f0..7cd02e69c5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/generic.nix @@ -20,6 +20,8 @@ config: # python2Packages.markdown , transfig, ghostscript, texinfo, pandoc +, binutils-unwrapped + , ...} @ args: with stdenv.lib; @@ -42,6 +44,17 @@ let } ( __do ) ''); + + # We don't want to use the wrapped version, because this version of ld is + # only used for linking the Xen EFI binary, and the build process really + # needs control over the LDFLAGS used + efiBinutils = binutils-unwrapped.overrideAttrs (oldAttrs: { + name = "efi-binutils"; + configureFlags = oldAttrs.configureFlags ++ [ + "--enable-targets=x86_64-pep" + ]; + doInstallCheck = false; # We get a spurious failure otherwise, due to host/target mis-match + }); in stdenv.mkDerivation (rec { @@ -119,10 +132,12 @@ stdenv.mkDerivation (rec { '')} ''; - patches = [ ./0000-fix-ipxe-src.patch - ./0000-fix-install-python.patch - ] ++ optional (versionOlder version "4.8.5") ./acpica-utils-20180427.patch - ++ (config.patches or []); + patches = [ + ./0000-fix-ipxe-src.patch + ./0000-fix-install-python.patch + ./0004-makefile-use-efi-ld.patch + ./0005-makefile-fix-efi-mountdir-use.patch + ] ++ (config.patches or []); postPatch = '' ### Hacks @@ -186,6 +201,9 @@ stdenv.mkDerivation (rec { --replace /bin/ls ls ''; + EFI_LD = "${efiBinutils}/bin/ld"; + EFI_VENDOR = "nixos"; + # TODO: Flask needs more testing before enabling it by default. #makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ]; makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix b/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix index e30006fbcc..55e3b12c3b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/xen/packages.nix @@ -1,57 +1,11 @@ { callPackage -, stdenv, overrideCC +, stdenv }: # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim # light] for each ./.nix. rec { - xen_4_8-vanilla = callPackage ./4.8.nix { - meta = { - description = "vanilla"; - longDescription = '' - Vanilla version of Xen. Uses forks of Qemu and Seabios bundled - with Xen. This gives vanilla experince, but wastes space and - build time: typical NixOS setup that runs lots of VMs will - build three different versions of Qemu when using this (two - forks and upstream). - ''; - }; - }; - - xen_4_8-slim = xen_4_8-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = true; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "slim"; - longDescription = '' - Slimmed-down version of Xen that reuses nixpkgs packages as - much as possible. Different parts may get out of sync, but - this builds faster and uses less space than vanilla. Use with - `qemu_xen` from nixpkgs. - ''; - }; - }; - - xen_4_8-light = xen_4_8-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = false; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "light"; - longDescription = '' - Slimmed-down version of Xen without `qemu-traditional` (you - don't need it if you don't know what it is). Use with - `qemu_xen-light` from nixpkgs. - ''; - }; - }; - xen_4_10-vanilla = callPackage ./4.10.nix { meta = { description = "vanilla"; @@ -98,8 +52,8 @@ rec { }; }; - xen-vanilla = xen_4_8-vanilla; - xen-slim = xen_4_8-slim; - xen-light = xen_4_8-light; + xen-vanilla = xen_4_10-vanilla; + xen-slim = xen_4_10-slim; + xen-light = xen_4_10-light; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix index 7464fc1b74..36b3adb08e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "project-repo"; repo = "cagebreak"; rev = version; - hash = "sha256-iMoj++yjGK4hn3C675QntBYcsoBx0lEjjCM8fdvRJYo="; + hash = "sha256-YmUn5H0xNC/4MBGydrEk7dy5v+s2ja4VoA1neWrQ3VY="; }; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix index 89b4fecc20..5bdb04688c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation { - name = "lemonbar-1.3"; + name = "lemonbar-1.4"; src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz"; - sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza"; + url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; + sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; }; buildInputs = [ libxcb perl ]; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchfossil/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchfossil/default.nix index 27933b4717..3a4876bc5d 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchfossil/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchfossil/default.nix @@ -1,11 +1,11 @@ -{stdenv, fossil}: +{stdenv, fossil, cacert}: {name ? null, url, rev, sha256}: stdenv.mkDerivation { name = "fossil-archive" + (if name != null then "-${name}" else ""); builder = ./builder.sh; - nativeBuildInputs = [fossil]; + nativeBuildInputs = [fossil cacert]; # Envvar docs are hard to find. A link for the future: # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md diff --git a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix index c61df8ceb0..44748f231b 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchzip/default.nix @@ -44,8 +44,13 @@ mv "$unpackDir/$fn" "$out" '' else '' mv "$unpackDir" "$out" - '') #*/ - + extraPostFetch; + '') + + extraPostFetch + # Remove write permissions for files unpacked with write bits set + # Fixes https://github.com/NixOS/nixpkgs/issues/38649 + + '' + chmod -R a-w "$out" + ''; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix index 8e51dc1b84..329286bd36 100644 --- a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix @@ -12,16 +12,16 @@ , mimeType ? null , categories ? null , startupNotify ? null -, extraDesktopEntries ? {} # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values +, extraDesktopEntries ? { } # Extra key-value pairs to add to the [Desktop Entry] section. This may override other values , extraEntries ? "" # Extra configuration. Will be appended to the end of the file and may thus contain extra sections , fileValidation ? true # whether to validate resulting desktop file. }: - let # like builtins.toString, but null -> null instead of null -> "" - nullableToString = value: if value == null then null - else if builtins.isBool value then lib.boolToString value - else builtins.toString value; + nullableToString = value: + if value == null then null + else if builtins.isBool value then lib.boolToString value + else builtins.toString value; # The [Desktop entry] section of the desktop file, as attribute set. mainSection = { @@ -39,16 +39,19 @@ let # Map all entries to a list of lines desktopFileStrings = - ["[Desktop Entry]"] + [ "[Desktop Entry]" ] ++ builtins.filter (v: v != null) (lib.mapAttrsToList (name: value: if value != null then "${name}=${value}" else null) mainSection ) - ++ (if extraEntries == "" then [] else ["${extraEntries}"]); + ++ (if extraEntries == "" then [ ] else [ "${extraEntries}" ]); in -runCommandLocal "${name}.desktop" {} +runCommandLocal "${name}.desktop" +{ + nativeBuildInputs = [ desktop-file-utils ]; +} ('' mkdir -p "$out/share/applications" cat > "$out/share/applications/${name}.desktop" < !(args.doCheck or true); + +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optionalAttrs useSysroot { + RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); +} // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; @@ -115,7 +141,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${rustTarget}"] + [target."${shortTarget}"] "linker" = "${ccForHost}" ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' @@ -185,7 +211,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ - --target ${rustTarget} \ + --target ${target} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) @@ -205,7 +231,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { ''; checkPhase = args.checkPhase or (let - argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; + argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} diff --git a/third_party/nixpkgs/pkgs/build-support/rust/sysroot/Cargo.lock b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/Cargo.lock new file mode 100644 index 0000000000..61fcef6174 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/Cargo.lock @@ -0,0 +1,29 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "alloc" +version = "0.0.0" +dependencies = [ + "compiler_builtins", + "core", +] + +[[package]] +name = "compiler_builtins" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369" +dependencies = [ + "rustc-std-workspace-core", +] + +[[package]] +name = "core" +version = "0.0.0" + +[[package]] +name = "rustc-std-workspace-core" +version = "1.99.0" +dependencies = [ + "core", +] diff --git a/third_party/nixpkgs/pkgs/build-support/rust/sysroot/cargo.py b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/cargo.py new file mode 100644 index 0000000000..09f6fba6d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/cargo.py @@ -0,0 +1,45 @@ +import os +import toml + +rust_src = os.environ['RUSTC_SRC'] +orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None + +base = { + 'package': { + 'name': 'alloc', + 'version': '0.0.0', + 'authors': ['The Rust Project Developers'], + 'edition': '2018', + }, + 'dependencies': { + 'compiler_builtins': { + 'version': '0.1.0', + 'features': ['rustc-dep-of-std', 'mem'], + }, + 'core': { + 'path': os.path.join(rust_src, 'libcore'), + }, + }, + 'lib': { + 'name': 'alloc', + 'path': os.path.join(rust_src, 'liballoc/lib.rs'), + }, + 'patch': { + 'crates-io': { + 'rustc-std-workspace-core': { + 'path': os.path.join(rust_src, 'tools/rustc-std-workspace-core'), + }, + }, + }, +} + +if orig_cargo is not None: + with open(orig_cargo, 'r') as f: + src = toml.loads(f.read()) + if 'profile' in src: + base['profile'] = src['profile'] + +out = toml.dumps(base) + +with open('Cargo.toml', 'x') as f: + f.write(out) diff --git a/third_party/nixpkgs/pkgs/build-support/rust/sysroot/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/default.nix new file mode 100644 index 0000000000..4db7cf0dc3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/default.nix @@ -0,0 +1,41 @@ +{ stdenv, rust, rustPlatform, buildPackages }: + +{ shortTarget, originalCargoToml, target, RUSTFLAGS }: + +let + cargoSrc = stdenv.mkDerivation { + name = "cargo-src"; + preferLocalBuild = true; + phases = [ "installPhase" ]; + installPhase = '' + RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} ORIG_CARGO=${originalCargoToml} \ + ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} + mkdir -p $out + cp Cargo.toml $out/Cargo.toml + cp ${./Cargo.lock} $out/Cargo.lock + ''; + }; +in rustPlatform.buildRustPackage { + inherit target RUSTFLAGS; + + name = "custom-sysroot"; + src = cargoSrc; + + RUSTC_BOOTSTRAP = 1; + __internal_dontAddSysroot = true; + cargoSha256 = "0y6dqfhsgk00y3fv5bnjzk0s7i30nwqc1rp0xlrk83hkh80x81mw"; + + doCheck = false; + + installPhase = '' + export LIBS_DIR=$out/lib/rustlib/${shortTarget}/lib + mkdir -p $LIBS_DIR + for f in target/${shortTarget}/release/deps/*.{rlib,rmeta}; do + cp $f $LIBS_DIR + done + + export RUST_SYSROOT=$(rustc --print=sysroot) + host=${rust.toRustTarget stdenv.buildPlatform} + cp -r $RUST_SYSROOT/lib/rustlib/$host $out + ''; +} diff --git a/third_party/nixpkgs/pkgs/build-support/rust/sysroot/update-lockfile.sh b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/update-lockfile.sh new file mode 100755 index 0000000000..83d2983238 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/rust/sysroot/update-lockfile.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p python3 python3.pkgs.toml cargo + +set -e + +HERE=$(dirname "${BASH_SOURCE[0]}") +NIXPKGS_ROOT="$HERE/../../../.." + +# https://unix.stackexchange.com/a/84980/390173 +tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile') + +cd "$tempdir" +nix-build -E "with import (/. + \"${NIXPKGS_ROOT}\") {}; pkgs.rustPlatform.rustcSrc.override { minimalContent = false; }" +RUSTC_SRC="$(pwd)/result" python3 "$HERE/cargo.py" +RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's needed is the lockfile." + +cp Cargo.lock "$HERE" + +rm -rf "$tempdir" + + diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/copy-desktop-items.sh new file mode 100644 index 0000000000..f96a10f33d --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/copy-desktop-items.sh @@ -0,0 +1,42 @@ +# shellcheck shell=bash + +# Setup hook that installs specified desktop items. +# +# Example usage in a derivation: +# +# { …, makeDesktopItem, copyDesktopItems, … }: +# +# let desktopItem = makeDesktopItem { … }; in +# stdenv.mkDerivation { +# … +# nativeBuildInputs = [ copyDesktopItems ]; +# +# desktopItems = [ desktopItem ]; +# … +# } +# +# This hook will copy files which are either given by full path +# or all '*.desktop' files placed inside the 'share/applications' +# folder of each `desktopItems` argument. + +postInstallHooks+=(copyDesktopItems) + +copyDesktopItems() { + if [ "${dontCopyDesktopItems-}" = 1 ]; then return; fi + + if [ -z "$desktopItems" ]; then + return + fi + + for desktopItem in $desktopItems; do + if [[ -f "$desktopItem" ]]; then + echo "Copying '$f' into '$out/share/applications'" + install -D -m 444 -t "$out"/share/applications "$f" + else + for f in "$desktopItem"/share/applications/*.desktop; do + echo "Copying '$f' into '$out/share/applications'" + install -D -m 444 -t "$out"/share/applications "$f" + done + fi + done +} diff --git a/third_party/nixpkgs/pkgs/common-updater/scripts/mark-broken b/third_party/nixpkgs/pkgs/common-updater/scripts/mark-broken index ee80616d0c..f132c86c5e 100755 --- a/third_party/nixpkgs/pkgs/common-updater/scripts/mark-broken +++ b/third_party/nixpkgs/pkgs/common-updater/scripts/mark-broken @@ -3,7 +3,7 @@ # This script is meant to be used to mark failing hydra builds as broken in the meta attrs # To use the script, you should pass the list of failing attrs as arguments to the script. # -# Example: `cat failing-attrs | xargs ./pkgs/common-update/scripts/mark-broken` +# Example: `cat failing-attrs | xargs ./pkgs/common-updater/scripts/mark-broken` # # Generating a list of failing attrs: (this should be improved at a later date) # - Go to the most recent hydra evaluation with all builds completed diff --git a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index 688c606519..a344dbca2f 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j4yfv6b31dwv3aky20bnap6gql1xpl3fz3qzjx1lmr3bngz92jf"; + sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix b/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix index ea64cf3457..39ef6e34aa 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "30"; + version = "35"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7"; + sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix b/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix index 9c7ef62c76..ed8e9eb13a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.11"; + version = "3.15"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1"; + sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0"; meta = with lib; { homepage = "https://rsms.me/inter/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 3d35079610..989c2d39c1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -65,8 +65,8 @@ stdenv.mkDerivation rec { remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml ''} ${lib.optionalString (extraParameters != null) '' - echo -e "\n" >> parameters.toml - cat "$extraParametersPath" >> parameters.toml + echo -e "\n" >> params/parameters.toml + cat "$extraParametersPath" >> params/parameters.toml ''} ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix index aeda5cd695..1115b48b70 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchzip }: - +let + version = "2020-11-14"; +in fetchzip { name = "ttf-tw-moe"; - url = "https://github.com/Jiehong/TW-fonts/archive/b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f.zip"; + url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; postFetch = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile TW-fonts-b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f/\*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0khgxih9z6pqf7pdp21xjp24wb9ygsrdcmzpjb7vr9x8n78i1fbs"; + sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; meta = with stdenv.lib; { homepage = "http://www.moe.gov.tw/"; description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; + version = version; longDescription = '' Installs 2 TTF fonts: MOESongUN and TW-MOE-Std-Kai. Both are provided by the Ministry of Education of Taiwan; each character's shape diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix index 685b5c452f..ce2a92ce48 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "13.0.01"; + version = "13.0.04"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "0y5bd7i5hp9ks6d3qq0bshywba7g90i3074wckpn9m8shh98ngcg"; + sha256 = "sha256-p0wSTyXCXuWIw+hDZ4HZPxgdBJ6oOOqOuX6FzZJmwrE="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "05zgz00n514cijqh9qcvr4iz0bla4hd028cvi1jlh0ic6fkafix8"; + sha256 = "sha256-sKY2qshNV3zXfD2BSbfs0qom1gPt7vD5QmVEkACmx18="; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix index 09491b904e..e57482b191 100644 --- a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { @@ -12,11 +12,23 @@ stdenv.mkDerivation rec { sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9"; }; + patches = [ + # Fixes the build on inscape => 1.0, without this it generates empty cursor files + (fetchpatch { + name = "inkscape-1.0-compat"; + url = "https://github.com/keeferrourke/capitaine-cursors/commit/9da0b53e6098ed023c5c24c6ef6bfb1f68a79924.patch"; + sha256 = "0lx5i60ahy6a2pir4zzlqn5lqsv6claqg8mv17l1a028h9aha3cv"; + }) + ]; + postPatch = '' patchShebangs . ''; - buildInputs =[ + # Complains about not being able to find the fontconfig config file otherwise + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + buildInputs = [ inkscape xcursorgen bc @@ -36,14 +48,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = '' - An x-cursor theme inspired by macOS and based on KDE Breeze - ''; + description = "An x-cursor theme inspired by macOS and based on KDE Breeze"; homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ - eadwu - ]; + maintainers = with maintainers; [ eadwu ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index 2a9a895b6c..1d677f1457 100644 --- a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-06-22"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0s5fhwfhn4qgk198jw736byxdrfm42l5m681pllbhg02j8ld4iik"; + sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix index c9a549462c..03dd7a49cd 100644 --- a/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.9"; + version = "1.10"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "11fzd44ysy76iwyiwkshpf0vf6m3i3hcxyyihl0lg68nb3cv0g9y"; + sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix index 3b92b143c7..c7c4efa777 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "16jrkdkkg8vrzzdv23zbpwk4gi740gn6gj92m0yqv7d6whrbkcvp"; + sha256 = "04j210nw9w4m8n49cd8y3l0qp60rn00i8wdr6kvc7lhkvqwhpnlg"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix index 8adaa3b183..df548052b8 100644 --- a/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-11-11-0"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "00nl887nm1syy23s9y590ycjlrl15h5scp9hp0yvg0n6jd78rsc7"; + sha256 = "115nmzwpsaq8aa0p7ghfcw79n7h9ifvh0drv3dd4lj2dk33vkpv1"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix index fef15ce79f..f89ff2cee3 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.7"; + version = "0.5.8"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd"; + sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix index 2390498ce7..6bb2e139cb 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z68vhbqnm34axx4zcrds45nz2ppwzr4z1lczxrdiq0zf0cmxyfh"; + sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix index 78dc7623e3..f3219e74bc 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y2n3325qvfiaz526vdf7l5wbh5js25djkz3jmg6x3z5dn00dks6"; + sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index bd02a5f0cc..79b3be3ae3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/third_party/nixpkgs/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.2"; + version = "3.38.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ihxa9g687rbb4s2gxd2pf726adx98ahq4kfad868swl7a8vi504"; + sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index ffc9c7cb44..47e03c0b07 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "3.38.1.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y59afvfrylkikqd0ax0nj41zs6b54219l7k5bp5gzh9lxq06xgk"; + sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1"; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index ca59c5556f..a682e3b493 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.38.1"; + version = "3.38.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sda943nd646nq2y5anj0d7aaxxddznva5bh5gsx6qx0mxhi5jrv"; + sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix index 1e965b8052..fb1b5f50c0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/eog/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qyrs9cp4hsh64jfdpdi2v1hag8izw77qqnsvqwdb33871ya98z1"; + sha256 = "1xqcfil3b68clafnxg1migp54psqh5x6arnlvdqgmvvpq9hwj7dp"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 9c73bf0e18..e52d466b0e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.38.1"; + version = "3.38.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dz4ybhq5rf1hnaf1d6h60ldn9xpdaj9nw42c4iqbw9lqglpiwlg"; + sha256 = "0mflr8a3f2q55rirvqhizji0zinic75jk8mksflszqzgcdcph85z"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index e92333642d..2f22fd86a6 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jajgdl2338nwym980gqw77pcjkprzhnfg8asdjksiksgz8gzzvw"; + sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index b4771641ad..eba9ed1334 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-5V1PQHOZjg+3s9/MRw4qTH2VCpa+2rFQEbkITryBNnY="; + hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix index 2107cad4a5..79334e5b19 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zfh48ibap6jnw20rxls7nbv4zzqs6n5abr2dzyvfx5p2cmq2gha"; + sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 52d0cefdc8..7de22f693d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s938p1snkskn8np5xh5fzp3zrjrnsh99haiz92nvci264bzp3li"; + sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index f42d1a93e0..a3a69eb4e3 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-devel-docs"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07849yhpc4l4jscskpsbjwsp5qs8f0jz3rmh3p1nj13vxmvgm5j5"; + sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index afa12f1cf1..420943580c 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s70swm2acgydz77nxyzn9xv8p03la7sl3cq87s7b8g7lyw943mv"; + sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index 21ffef71ca..ca7ace8e79 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.4.2"; + version = "3.5.1"; src = fetchFromGitHub { owner = "elementary"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index e8f0e37620..66bba6dfe7 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "5.1.0"; + version = "5.1.1"; repoName = "calendar"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-b72BmChl/Ql0ljLRcPMNbJcOV4cVqz5D2j+5BGUi4Go="; + sha256 = "18npf4zzf2dywr1zkr6fqzcbb70297yvdp5wxw7zyam1xwa86v07"; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix b/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix index 4dedf782b7..c2d1ebabae 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix @@ -12,6 +12,7 @@ , configurePhase ? null , meta ? {} , enableDebugInfo ? false +, buildFlags ? [] , ... }@attrs: with stdenv.lib; @@ -39,9 +40,13 @@ let '' else setupHook; - buildInputs = [ erlang perl which gitMinimal wget ]; + buildInputs = buildInputs ++ [ erlang perl which gitMinimal wget ]; propagatedBuildInputs = beamDeps; + buildFlags = [ "SKIP_DEPS=1" ] + ++ lib.optional (enableDebugInfo || erlang.debugInfo) ''ERL_OPTS="$ERL_OPTS +debug_info"'' + ++ buildFlags; + configurePhase = if configurePhase == null then '' runHook preConfigure @@ -58,7 +63,7 @@ let then '' runHook preBuild - make SKIP_DEPS=1 ERL_OPTS="$ERL_OPTS ${debugInfoFlag}" + make $buildFlags "''${buildFlagsArray[@]}" runHook postBuild '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix index e1728e8c93..df7b658520 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix @@ -4,40 +4,45 @@ , autoconf , automake , fontconfig -, gmp +, gmp-static , gperf , libX11 , libpoly , perl +, flex +, bison , pkgconfig +, itktcl +, incrtcl +, tcl +, tk , verilog , xorg +, yices , zlib , ghc }: let - # yices wants a libgmp.a and fails otherwise - gmpStatic = gmp.override { withStatic = true; }; - - ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb])); + ghcWithPackages = ghc.withPackages (g: (with g; [old-time regex-compat syb split ])); in stdenv.mkDerivation rec { pname = "bluespec"; - version = "unstable-2020.02.09"; + version = "unstable-2020.11.04"; src = fetchFromGitHub { - owner = "B-Lang-org"; - repo = "bsc"; - rev = "05c8afb08078e437c635b9c708124b428ac51b3d"; - sha256 = "06yhpkz7wga1a0p9031cfjqbzw7205bj2jxgdghhfzmllaiphniy"; - fetchSubmodules = true; - }; + owner = "B-Lang-org"; + repo = "bsc"; + rev = "103357f32cf63f2ca2b16ebc8e2c675ec5562464"; + sha256 = "0iikzx0fxky0fmc31lyxfldy1wixr2mayzcn24b8d76wd4ix1vk3"; + }; enableParallelBuilding = true; - buildInputs = [ + patches = [ ./libstp_stub_makefile.patch ]; + + buildInputs = yices.buildInputs ++ [ zlib - gmpStatic gperf libpoly # yices + tcl tk libX11 # tcltk xorg.libXft fontconfig @@ -46,6 +51,8 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf perl + flex + bison pkgconfig ghcWithPackages ]; @@ -54,13 +61,13 @@ in stdenv.mkDerivation rec { verilog ]; - patches = [ - # drop stp support https://github.com/B-Lang-org/bsc/pull/31 - (fetchpatch { - url = "https://github.com/flokli/bsc/commit/0bd48ecc2561541dc1368918863c0b2f4915006f.patch"; - sha256 = "0bam9anld33zfi9d4gs502g94w49zhl5iqmbs2d1p5i19aqpy38l"; - }) - ]; + + postUnpack = '' + mkdir -p $sourceRoot/src/vendor/yices/v2.6/yices2 + # XXX: only works because yices.src isn't a tarball. + cp -av ${yices.src}/* $sourceRoot/src/vendor/yices/v2.6/yices2 + chmod -R +rwX $sourceRoot/src/vendor/yices/v2.6/yices2 + ''; preBuild = '' patchShebangs \ @@ -72,11 +79,15 @@ in stdenv.mkDerivation rec { substituteInPlace src/comp/Makefile \ --replace 'BINDDIR' 'BINDIR' \ --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils' + # allow running bsc to bootstrap + export LD_LIBRARY_PATH=/build/source/inst/lib/SAT ''; makeFlags = [ + "NO_DEPS_CHECKS=1" # skip the subrepo check (this deriviation uses yices.src instead of the subrepo) "NOGIT=1" # https://github.com/B-Lang-org/bsc/issues/12 "LDCONFIG=ldconfig" # https://github.com/B-Lang-org/bsc/pull/43 + "STP_STUB=1" ]; installPhase = "mv inst $out"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch b/third_party/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch new file mode 100644 index 0000000000..c714afc670 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/bluespec/libstp_stub_makefile.patch @@ -0,0 +1,28 @@ +diff -ru bsc-orig/src/vendor/stp/Makefile bsc-new/src/vendor/stp/Makefile +--- bsc-orig/src/vendor/stp/Makefile 1969-12-31 16:00:01.000000000 -0800 ++++ bsc-new/src/vendor/stp/Makefile 2020-11-12 17:42:40.115143035 -0800 +@@ -9,12 +9,13 @@ + SRC = src + else + SRC = src_stub ++SNAME += lib/libstp_stub.so + endif + + ifeq ($(OSTYPE), Darwin) +-SNAME=libstp.dylib ++SNAME = lib/libstp.dylib + else +-SNAME=libstp.so.1 ++SNAME += lib/libstp.so.1 + endif + + all: install +@@ -23,7 +24,7 @@ + $(MAKE) -C $(SRC) install + ln -fsn HaskellIfc include_hs + install -m 755 -d $(PREFIX)/lib/SAT +- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT ++ install -m 644 $(SNAME) $(PREFIX)/lib/SAT + + clean: + $(MAKE) -C $(SRC) clean diff --git a/third_party/nixpkgs/pkgs/development/compilers/computecpp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/computecpp/default.nix index 31a0b054ee..7cfc60f050 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/computecpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/computecpp/default.nix @@ -3,24 +3,23 @@ , pkg-config , autoPatchelfHook , installShellFiles -, ncurses5 , ocl-icd , zlib }: stdenv.mkDerivation rec { pname = "computecpp"; - version = "1.3.0"; + version = "2.2.1"; src = fetchzip { - url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz"; - sha256 = "1q6gqjpzz4a260gsd6mm1iv4z8ar3vxaypmgdwl8pb4i7kg6ykaz"; + url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/x86_64-linux-gnu.tar.gz"; + hash = "sha256-niXNWbkXjd35col6dS66HdxFurXfJw/Xb2c5njukxcg="; stripRoot = true; }; dontStrip = true; - buildInputs = [ stdenv.cc.cc.lib ncurses5 ocl-icd zlib ]; + buildInputs = [ stdenv.cc.cc.lib ocl-icd zlib ]; nativeBuildInputs = [ autoPatchelfHook pkg-config installShellFiles ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix new file mode 100644 index 0000000000..5233e248c0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/fasmg/default.nix @@ -0,0 +1,58 @@ +{ stdenv +, fetchzip +}: + +stdenv.mkDerivation rec { + pname = "fasmg"; + version = "j27m"; + + src = fetchzip { + url = "https://flatassembler.net/fasmg.${version}.zip"; + sha256 = "0qmklb24n3r0my2risid8r61pi88gqrvm1c0xvyd0bp1ans6d7zd"; + stripRoot = false; + }; + + buildPhase = let + inherit (stdenv.hostPlatform) system; + + path = { + x86_64-linux = { + bin = "fasmg.x64"; + asm = "source/linux/x64/fasmg.asm"; + }; + x86_64-darwin = { + bin = "source/macos/x64/fasmg"; + asm = "source/macos/x64/fasmg.asm"; + }; + x86-linux = { + bin = "fasmg"; + asm = "source/linux/fasmg.asm"; + }; + x86-darwin = { + bin = "source/macos/fasmg"; + asm = "source/macos/fasmg.asm"; + }; + }.${system} or (throw "Unsopported system: ${system}"); + + in '' + chmod +x ${path.bin} + ./${path.bin} ${path.asm} fasmg + ''; + + outputs = [ "out" "doc" ]; + + installPhase = '' + install -Dm755 fasmg $out/bin/fasmg + + mkdir -p $doc/share/doc/fasmg + cp docs/*.txt $doc/share/doc/fasmg + ''; + + meta = with stdenv.lib; { + description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; + homepage = "https://flatassembler.net"; + license = licenses.bsd3; + maintainers = with maintainers; [ orivej luc65r ]; + platforms = with platforms; intersectLists (linux ++ darwin) x86; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix index 04af8e9125..1d8b912a97 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jsonnet"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "google"; repo = "go-jsonnet"; rev = "v${version}"; - sha256 = "17606gc75wnkm64am4hmlv7m3fy2hi8rnzadp6nrgpcd6rl26m83"; + sha256 = "1rprs8l15nbrx4dw4pdg81c5l22zhj80pl4zwqgsm4113wyyvc98"; }; vendorSha256 = "0nsm4gsbbn8myz4yfi6m7qc3iizhdambsr18iks0clkdn3mi2jn1"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix index 510fca1838..be03f53a76 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jsonnet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jsonnet"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "google"; repo = "jsonnet"; - sha256 = "0wxhc0ghjk88zrrn9a18h979ipkia2rx12489515gzhlplfx6724"; + sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix index e07769967f..7f4c824686 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.4.0"; + version = "1.4.20"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0qgiabpkisqjm9iryidrynqy452vzmpgaw54rd9blr9w7g8r20sr"; + sha256 = "07q16yc7xfw5kzziwxyd7m4dc9msgqk9y2znqw3397kqssj97nqi"; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix index ecb3362e77..45cb09d5a2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "1zigigp168737vjrw5vijgyw4k1bgz4sr7j3rwlibw52snsh4y1c"; + sha256 = "1yk7phxnwkm94qs1gbxsr6sr11a0sgpcyjymmqwf0fsl5njgyb98"; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/muon/default.nix b/third_party/nixpkgs/pkgs/development/compilers/muon/default.nix new file mode 100644 index 0000000000..2e178f775b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/muon/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "muon"; + version = "2019-11-27"; + + src = fetchFromGitHub { + owner = "nickmqb"; + repo = pname; + rev = "6d3a5054ae75b0e5a0ae633cf8cbc3e2a054f8b3"; + sha256 = "1sb1i08421jxlx791g8nh4l239syaj730hagkzc159g0z65614zz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + mkdir -p $out/bin $out/share/mu + cp -r lib $out/share/mu + gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c + ''; + + installPhase = '' + makeWrapper $out/bin/mu-unwrapped $out/bin/mu \ + --add-flags $out/share/mu/lib/core.mu + ''; + + meta = with lib; { + description = "Modern low-level programming language"; + homepage = "https://github.com/nickmqb/muon"; + license = licenses.mit; + maintainers = with maintainers; [ Br1ght0ne ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 0ec259b660..59061c0a2f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -1,13 +1,13 @@ # https://nim-lang.github.io/Nim/packaging.html -{ stdenv, lib, fetchgit, fetchurl, makeWrapper, gdb, openssl, pcre, readline -, boehmgc, sqlite, nim-unwrapped, nim }: +{ stdenv, lib, fetchurl, fetchgit, fetchFromGitHub, makeWrapper, gdb, openssl +, pcre, readline, boehmgc, sqlite, nim-unwrapped, nimble-unwrapped }: let - version = "1.2.6"; + version = "1.4.0"; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z"; + sha256 = "0gf2lqkqzai6mg7mf4y04gdy1ddiavans09i8aisa88ssfza5ywx"; }; meta = with lib; { @@ -139,7 +139,7 @@ let local HOME=$TMPDIR ./bin/nim c koch ./koch boot $kochArgs --parallelBuild:$NIX_BUILD_CORES - ./koch tools $kochArgs --parallelBuild:$NIX_BUILD_CORES + ./koch toolsNoExternal $kochArgs --parallelBuild:$NIX_BUILD_CORES runHook postBuild ''; @@ -153,21 +153,52 @@ let inherit meta; }; + + nimble-unwrapped = stdenv.mkDerivation rec { + pname = "nimble-unwrapped"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "nimble"; + rev = "v" + version; + sha256 = "0vx0mdk31n00dr2rhiip6f4x7aa3z3mnblnmwk7f65ixd5hayq6y"; + }; + + nativeBuildInputs = [ nim-unwrapped ]; + buildInputs = [ openssl ]; + + nimFlags = [ "--cpu:${nimHost.cpu}" "--os:${nimHost.os}" "-d:release" ]; + + buildPhase = '' + runHook preBuild + HOME=$NIX_BUILD_TOP nim c $nimFlags src/nimble + runHook postBuild + ''; + + installPhase = '' + runHook preBuild + install -Dt $out/bin src/nimble + runHook postBuild + ''; + }; + }; wrapped = let - nim = nim-unwrapped; + nim' = nim-unwrapped; + nimble' = nimble-unwrapped; inherit (stdenv) targetPlatform; in stdenv.mkDerivation { - name = "${targetPlatform.config}-nim-wrapper-${nim.version}"; - inherit (nim) version; + name = "${targetPlatform.config}-nim-wrapper-${nim'.version}"; + inherit (nim') version; preferLocalBuild = true; nativeBuildInputs = [ makeWrapper ]; unpackPhase = '' runHook preUnpack - tar xf ${nim.src} nim-$version/config/nim.cfg + tar xf ${nim'.src} nim-$version/config/nim.cfg cd nim-$version runHook postUnpack ''; @@ -210,7 +241,7 @@ let substituteAll config/nim.cfg $out/etc/nim/nim.cfg \ --replace "cc = gcc" "" - for binpath in ${nim}/bin/nim?*; do + for binpath in ${nim'}/bin/nim?*; do local binname=`basename $binpath` makeWrapper \ $binpath $out/bin/${targetPlatform.config}-$binname \ @@ -219,21 +250,25 @@ let done makeWrapper \ - ${nim}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ + ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ $wrapperArgs ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim + makeWrapper \ + ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \ + --suffix PATH : $out/bin + ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble + runHook postBuild ''; dontInstall = true; meta = meta // { - description = nim.meta.description + description = nim'.meta.description + " (${targetPlatform.config} wrapper)"; platforms = lib.platforms.unix; }; - }; in wrapped // wrapperInputs diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix new file mode 100644 index 0000000000..9fa5d62423 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/4.12.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "12"; + patch_version = "0-alpha1"; + src = fetchTarball { + url = "http://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha1.tar.xz"; + sha256 = "1p9nnj7l43b697b6bm767znbf1h0s2lyc1qb8izr1vfpsmnm11ws"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index 1558756e16..79aab1ffe8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -1,12 +1,8 @@ { minor_version, major_version, patch_version -, url ? null -, sha256, ...}@args: +, ...}@args: let versionNoPatch = "${toString major_version}.${toString minor_version}"; version = "${versionNoPatch}.${toString patch_version}"; - real_url = if url == null then - "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" - else url; safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); in @@ -22,6 +18,13 @@ assert aflSupport -> stdenv.lib.versionAtLeast version "4.05"; assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04"; +let + src = args.src or (fetchurl { + url = args.url or "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz"; + inherit (args) sha256; + }); +in + let useNativeCompilers = !stdenv.isMips; inherit (stdenv.lib) optional optionals optionalString; @@ -39,10 +42,7 @@ stdenv.mkDerivation (args // { inherit name; inherit version; - src = fetchurl { - url = real_url; - inherit sha256; - }; + inherit src; prefixKey = "-prefix "; configureFlags = diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix index b2093f2cf4..326aef1a56 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -147,6 +147,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix index 3576608e13..1de5d84a13 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix @@ -151,6 +151,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix index 31ffb4baf0..3c7ddfb8dd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix @@ -151,6 +151,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix index a51b765fb6..050ca2a564 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix @@ -267,6 +267,7 @@ let passthru = { inherit architecture; home = "${openjdk8}/lib/openjdk"; + inherit gtk2; }; }; in openjdk8 diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix index fa96f7b3b0..1dcd3e23e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix @@ -31,10 +31,6 @@ let gtk3 gnome_vfs GConf glib ]; - passthru = { - inherit gtk3; - }; - patches = [ ./fix-java-home-jdk10.patch ./read-truststore-from-env-jdk10.patch @@ -155,6 +151,7 @@ let passthru = { architecture = ""; home = "${openjdk}/lib/openjdk"; + inherit gtk3; }; }; in openjdk diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix index 74c076c204..25876cc638 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/default.nix @@ -24,9 +24,10 @@ if platform.isDarwin then "macos" else platform.parsed.kernel.name; - # Target triple. Rust has slightly different naming conventions than we use. + # Returns the name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. toRustTarget = platform: with platform.parsed; let - cpu_ = platform.rustc.arch or { + cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; @@ -34,6 +35,13 @@ in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + # Returns the name of the rust target if it is standard, or the json file + # containing the custom target spec. + toRustTargetSpec = platform: + if (platform.rustc or {}) ? platform + then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) + else toRustTarget platform; + # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions from # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix index 8977fb84ca..489795ecec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rust-src.nix @@ -1,4 +1,4 @@ -{ stdenv, rustc }: +{ stdenv, rustc, minimalContent ? true }: stdenv.mkDerivation { name = "rust-src"; @@ -6,6 +6,9 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mv src $out - rm -rf $out/{ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch} + rm -rf $out/{${if minimalContent + then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch" + else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor" + }} ''; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 65d8920c4a..1fd3bbaba9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -1,4 +1,5 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget +, targetPackages , fetchurl, file, python3 , llvm_10, darwin, cmake, rust, rustPlatform , pkgconfig, openssl @@ -70,9 +71,9 @@ in stdenv.mkDerivation rec { "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTarget stdenv.buildPlatform}" - "--host=${rust.toRustTarget stdenv.hostPlatform}" - "--target=${rust.toRustTarget stdenv.targetPlatform}" + "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" + "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--target=${rust.toRustTargetSpec stdenv.targetPlatform}" "${setBuild}.cc=${ccForBuild}" "${setHost}.cc=${ccForHost}" @@ -92,6 +93,8 @@ in stdenv.mkDerivation rec { "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ "--enable-profiler" # build libprofiler_builtins + ] ++ optionals stdenv.targetPlatform.isMusl [ + "${setTarget}.musl-root=${targetPackages.stdenv.cc.libc}" ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix index 91fe0b07d2..6b9ab7d483 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -6,7 +6,7 @@ with lib; let repo = "git@github.com:scala/scala.git"; - common = { version, sha256, test, pname }: + common = { version, sha256, tests, pname }: stdenv.mkDerivation rec { inherit version; @@ -40,7 +40,7 @@ let ''; passthru = { - tests = [ test ]; + inherit tests; updateScript = writeScript "update.sh" '' #!${stdenv.shell} @@ -90,28 +90,28 @@ in { scala_2_10 = common { version = "2.10.7"; sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE="; - test = { inherit (nixosTests) scala_2_10; }; + tests = [ nixosTests.scala.scala_2_10 ]; pname = "scala_2_10"; }; scala_2_11 = common { version = "2.11.12"; sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg="; - test = { inherit (nixosTests) scala_2_11; }; + tests = [ nixosTests.scala.scala_2_11 ]; pname = "scala_2_11"; }; scala_2_12 = common { version = "2.12.12"; sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis="; - test = { inherit (nixosTests) scala_2_12; }; + tests = [ nixosTests.scala.scala_2_12 ]; pname = "scala_2_12"; }; scala_2_13 = common { version = "2.13.4"; sha256 = "1alcnzmxga00nsvgy8yky91zw5b4q0xg2697vrrdgjlglpxiqwdw"; - test = { inherit (nixosTests) scala_2_13; }; + tests = [ nixosTests.scala.scala_2_13 ]; pname = "scala_2_13"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix index c17f85b493..c7266614e4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1l"; + milestone_id = "M1m"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr"; + sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x"; + sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c"; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/third_party/nixpkgs/pkgs/development/compilers/wla-dx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/wla-dx/default.nix index 2d3a527fa1..0cebbfa520 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/wla-dx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/wla-dx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = "http://www.villehelin.com/wla.html"; + homepage = "https://www.villehelin.com/wla.html"; description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; license = licenses.gpl2; maintainers = with maintainers; [ matthewbauer ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index aa1d0be1bb..272332e33e 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "13s6czv4p6n6s16kr5r255vldrn9038qjd5yl5xrh91xk6z410cd"; + sha256 = "1l2syrslba4mrxjzj0iblflz72siw3ibqri6p5hf59fk7rmm30a8"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -85,11 +85,6 @@ self: super: { url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; }); - optparse-applicative_0_16_0_0 = appendPatch super.optparse-applicative_0_16_0_0 (pkgs.fetchpatch { - name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff"; - url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; - sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; - }); # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { @@ -300,6 +295,9 @@ self: super: { github-rest = dontCheck super.github-rest; # test suite needs the network gitlib-cmdline = dontCheck super.gitlib-cmdline; GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 + #next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds + #should be fixed soon. maybe even before this is merged. currently glirc is 2.37 + glirc = doJailbreak (super.glirc.override { random = self.random_1_2_0; }); hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; @@ -340,7 +338,8 @@ self: super: { then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 else super.math-functions; matplotlib = dontCheck super.matplotlib; - + # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage + matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :') memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; @@ -371,6 +370,9 @@ self: super: { punycode = dontCheck super.punycode; pwstore-cli = dontCheck super.pwstore-cli; quantities = dontCheck super.quantities; + QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( { + splitmix = self.splitmix_0_1_0_3; + }); redis-io = dontCheck super.redis-io; rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; @@ -394,9 +396,7 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; - # Aarch64 affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 - # Darwin https://hydra.nixos.org/build/129070963/nixlog/1 - trifecta = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.isDarwin) then dontCheck super.trifecta else super.trifecta; + trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; @@ -406,6 +406,7 @@ self: super: { xsd = dontCheck super.xsd; zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 + random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; }); # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; systemd = dontCheck super.systemd; @@ -1380,7 +1381,7 @@ self: super: { in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: { optparse-generic = self.optparse-generic_1_4_4; - optparse-applicative = self.optparse-applicative_0_16_0_0; + optparse-applicative = self.optparse-applicative_0_16_1_0; })) deps) (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; postInstall = drv.postInstall or "" + '' @@ -1390,10 +1391,6 @@ self: super: { ''; })); - optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override { - optparse-applicative = self.optparse-applicative_0_16_0_0; - }; - # Our quickcheck-instances is too old for the newer binary-instances, but # quickcheck-instances is only used in the tests of binary-instances. binary-instances = dontCheck super.binary-instances; @@ -1483,10 +1480,6 @@ self: super: { # Due to tests restricting base in 0.8.0.0 release http-media = doJailbreak super.http-media; - # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10 - # Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version - pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random; - # Use an already merged upstream patch fixing the build with primitive >= 0.7.2 # The version bounds were correctly specified before, so we need to jailbreak as well streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch { @@ -1517,4 +1510,21 @@ self: super: { excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ]; }); + # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 + pipes-text = doJailbreak super.pipes-text; + + # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8 + blas-hs = dontCheck super.blas-hs; + + # 2020-11-23: https://github.com/cdornan/fmt/issues/30 + fmt = dontCheck super.fmt; + + + # 2020-11-27: Tests broken + # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 + servant-swagger = dontCheck super.servant-swagger; + + # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0 + hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5080472666..60d3f42324 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -92,5 +92,4 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; - } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ca49b17ee9..93c4daac22 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -76,7 +76,7 @@ default-package-overrides: # haskell-language-server 0.5.0.0 doesn't accept newer versions - fourmolu ==0.2.* - refinery ==0.2.* - # Stackage Nightly 2020-11-11 + # Stackage Nightly 2020-11-23 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -91,6 +91,7 @@ default-package-overrides: - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 - aeson-combinators ==0.0.4.0 + - aeson-commit ==1.3 - aeson-compat ==0.3.9 - aeson-default ==0.9.1.0 - aeson-diff ==1.1.0.9 @@ -273,7 +274,7 @@ default-package-overrides: - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.5 + - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 - base-compat ==0.11.2 - base-compat-batteries ==0.11.2 @@ -359,7 +360,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.57 + - brick ==0.57.1 - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -368,10 +369,11 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-hs ==0.2.0.3 - bugzilla-redhat ==0.3.0 - - burrito ==1.1.0.2 + - burrito ==1.2.0.0 - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 + - byte-count-reader ==0.10.1.2 - byte-order ==0.1.2.0 - byteable ==0.1.1 - bytedump ==1.0 @@ -393,7 +395,7 @@ default-package-overrides: - ca-province-codes ==1.0.0.0 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - - cabal-file ==0.1.0 + - cabal-file ==0.1.1 - cabal-flatpak ==0.1.0.2 - cabal-plan ==0.7.2.0 - cabal-rpm ==2.0.7 @@ -549,7 +551,7 @@ default-package-overrides: - crackNum ==2.4 - crc32c ==0.0.0 - credential-store ==0.1.2 - - criterion ==1.5.7.0 + - criterion ==1.5.9.0 - criterion-measurement ==0.1.2.0 - cron ==0.7.0 - crypto-api ==0.13.3 @@ -725,7 +727,7 @@ default-package-overrides: - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm2nix ==0.2 + - elm2nix ==0.2.1 - elynx ==0.5.0 - elynx-markov ==0.5.0 - elynx-nexus ==0.5.0 @@ -787,6 +789,8 @@ default-package-overrides: - failable ==1.2.4.0 - fakedata ==0.8.0 - fakedata-parser ==0.1.0.0 + - fakefs ==0.3.0.2 + - fakepull ==0.3.0.2 - fast-digits ==0.3.0.0 - fast-logger ==3.0.2 - fast-math ==1.0.2 @@ -873,6 +877,7 @@ default-package-overrides: - gd ==3000.7.3 - gdp ==0.0.3.0 - general-games ==1.1.1 + - generic-aeson ==0.2.0.11 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.0 @@ -913,10 +918,10 @@ default-package-overrides: - geojson ==4.0.2 - getopt-generics ==0.13.0.4 - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.2 + - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - - ghc-events ==0.13.0 - - ghc-exactprint ==0.6.3.2 + - ghc-events ==0.14.0 + - ghc-exactprint ==0.6.3.3 - ghc-lib ==8.10.2.20200916 - ghc-lib-parser ==8.10.2.20200916 - ghc-lib-parser-ex ==8.10.0.16 @@ -956,7 +961,8 @@ default-package-overrides: - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - githash ==0.1.5.0 - - github-release ==1.3.3 + - github ==0.26 + - github-release ==1.3.5 - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 @@ -992,6 +998,7 @@ default-package-overrides: - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - hadoop-streaming ==0.2.0.3 + - hakyll-convert ==0.3.0.3 - half ==0.3 - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 @@ -1044,6 +1051,7 @@ default-package-overrides: - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.12.15 + - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.4 @@ -1070,7 +1078,7 @@ default-package-overrides: - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 - - hmatrix ==0.20.0.0 + - hmatrix ==0.20.1 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 - hmatrix-morpheus ==0.1.1.2 @@ -1215,7 +1223,7 @@ default-package-overrides: - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - - hyper ==0.1.0.3 + - hyper ==0.2.1.0 - hyperloglog ==0.4.3 - hyphenation ==0.8 - iconv ==0.4.1.3 @@ -1272,7 +1280,7 @@ default-package-overrides: - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - - iproute ==1.7.9 + - iproute ==1.7.10 - IPv6Addr ==1.1.5 - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.1 @@ -1280,7 +1288,7 @@ default-package-overrides: - irc-client ==1.1.2.0 - irc-conduit ==0.3.0.4 - irc-ctcp ==0.1.3.0 - - isbn ==1.1.0.1 + - isbn ==1.1.0.2 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 @@ -1293,9 +1301,11 @@ default-package-overrides: - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 - jack ==0.7.1.4 + - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 - jose ==0.8.4 - jose-jwt ==0.8.0 + - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 @@ -1433,9 +1443,9 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.5.0 + - massiv ==0.5.6.0 - massiv-io ==0.4.0.0 - - massiv-test ==0.1.4 + - massiv-test ==0.1.5 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 - mathexpr ==0.3.0.0 @@ -1472,7 +1482,7 @@ default-package-overrides: - microlens-mtl ==0.2.0.1 - microlens-platform ==0.4.1 - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.6 + - microlens-th ==0.4.3.8 - microspec ==0.2.1.3 - microstache ==1.0.1.1 - midair ==0.2.0.1 @@ -1519,6 +1529,7 @@ default-package-overrides: - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.3 - monad-peel ==0.2.1.2 + - monad-primitive ==0.1 - monad-products ==4.0.1 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 @@ -1542,6 +1553,7 @@ default-package-overrides: - morpheus-graphql-client ==0.16.0 - morpheus-graphql-core ==0.16.0 - morpheus-graphql-subscriptions ==0.16.0 + - moss ==0.2.0.0 - mountpoints ==1.0.2 - mpi-hs ==0.7.2.0 - mpi-hs-binary ==0.1.1.0 @@ -1561,6 +1573,7 @@ default-package-overrides: - mutable-containers ==0.3.4 - mwc-probability ==2.3.1 - mwc-random ==0.14.0.0 + - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.1.7.2 - mysql-simple ==0.4.5 @@ -1609,7 +1622,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - nonempty-containers ==0.3.4.1 - - nonempty-vector ==0.2.0.2 + - nonempty-vector ==0.2.1.0 - nonemptymap ==0.0.6.0 - not-gloss ==0.7.7.0 - nowdoc ==0.1.1.0 @@ -1669,7 +1682,7 @@ default-package-overrides: - optparse-simple ==0.1.1.3 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - - ormolu ==0.1.3.1 + - ormolu ==0.1.4.1 - overhang ==1.0.0 - packcheck ==0.5.1 - packdeps ==0.6.0.0 @@ -1677,9 +1690,10 @@ default-package-overrides: - pagination ==0.2.1 - pagure-cli ==0.2 - pandoc-types ==1.22 - - pantry ==0.5.1.3 + - pantry ==0.5.1.4 - parallel ==3.2.2.0 - parallel-io ==0.3.3 + - parameterized ==0.5.0.0 - paripari ==0.7.0.0 - parseargs ==0.2.0.9 - parsec-class ==1.0.0.0 @@ -1706,7 +1720,7 @@ default-package-overrides: - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - pava ==0.1.0.0 - - pcg-random ==0.1.3.6 + - pcg-random ==0.1.3.7 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 @@ -1774,7 +1788,7 @@ default-package-overrides: - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-orm ==0.5.1 - - postgresql-simple ==0.6.2 + - postgresql-simple ==0.6.3 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 - pptable ==0.3.0.0 @@ -1801,7 +1815,9 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 + - primitive-extras ==0.8 - primitive-unaligned ==0.1.1.1 + - primitive-unlifted ==0.1.3.0 - print-console-colors ==0.1.0.0 - probability ==0.2.7 - process-extras ==0.7.4 @@ -1879,7 +1895,7 @@ default-package-overrides: - range-set-list ==0.1.3.1 - Ranged-sets ==0.4.0 - rank1dynamic ==0.4.1 - - rank2classes ==1.4.0.1 + - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - rate-limit ==1.4.2 @@ -2028,20 +2044,22 @@ default-package-overrides: - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - serialise ==0.2.3.0 - - servant ==0.18.1 + - servant ==0.18.2 - servant-blaze ==0.9.1 - - servant-client ==0.18.1 - - servant-client-core ==0.18.1 + - servant-client ==0.18.2 + - servant-client-core ==0.18.2 - servant-conduit ==0.15.1 - - servant-docs ==0.11.7 - - servant-foreign ==0.15.2 - - servant-http-streams ==0.18.1 + - servant-docs ==0.11.8 + - servant-errors ==0.1.6.0 + - servant-foreign ==0.15.3 + - servant-github-webhook ==0.4.2.0 + - servant-http-streams ==0.18.2 - servant-machines ==0.15.1 - servant-multipart ==0.12 - servant-openapi3 ==2.0.1.0 - servant-pipes ==0.15.2 - servant-rawm ==1.0.0.0 - - servant-server ==0.18.1 + - servant-server ==0.18.2 - servant-swagger ==1.1.10 - servant-swagger-ui ==0.3.4.3.36.1 - servant-swagger-ui-core ==0.3.3 @@ -2151,8 +2169,11 @@ default-package-overrides: - step-function ==0.2 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 + - stm-containers ==1.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 + - stm-hamt ==1.2.0.4 + - stm-lifted ==2.5.0.0 - stm-split ==0.0.2.1 - STMonadTrans ==0.4.4 - stopwatch ==0.1.0.6 @@ -2173,7 +2194,7 @@ default-package-overrides: - strict ==0.4 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.5 - - strict-tuple ==0.1.3 + - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 @@ -2233,7 +2254,7 @@ default-package-overrides: - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.0.2 - - tasty-hspec ==1.1.5.1 + - tasty-hspec ==1.1.6 - tasty-hunit ==0.10.0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 @@ -2282,7 +2303,7 @@ default-package-overrides: - text-regex-replace ==0.1.1.3 - text-region ==0.3.1.0 - text-short ==0.1.3 - - text-show ==3.8.5 + - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.10.1 - textlocal ==0.1.0.5 @@ -2298,7 +2319,7 @@ default-package-overrides: - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 - - th-lift-instances ==0.1.17 + - th-lift-instances ==0.1.18 - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 @@ -2332,7 +2353,7 @@ default-package-overrides: - timeit ==2.0 - timelens ==0.2.0.2 - timer-wheel ==0.3.0 - - timerep ==2.0.0.2 + - timerep ==2.0.1.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2350,7 +2371,8 @@ default-package-overrides: - topograph ==1.0.0.1 - torsor ==0.1 - tostring ==0.2.1.1 - - tracing ==0.0.5.1 + - tracing ==0.0.5.2 + - tracing-control ==0.0.6 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 @@ -2381,6 +2403,7 @@ default-package-overrides: - type-map ==0.1.6.0 - type-natural ==0.9.0.0 - type-of-html ==1.6.1.2 + - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - type-spec ==0.4.0.0 - TypeCompose ==0.9.14 @@ -2496,6 +2519,8 @@ default-package-overrides: - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 - wai-middleware-static ==0.9.0 + - wai-rate-limit ==0.1.0.0 + - wai-rate-limit-redis ==0.1.0.0 - wai-saml2 ==0.2.1.2 - wai-session ==0.3.3 - wai-slack-middleware ==0.2.0 @@ -2521,6 +2546,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 + - witch ==0.0.0.3 - with-location ==0.1.0 - with-utf8 ==1.0.2.1 - witherable-class ==0 @@ -2581,7 +2607,7 @@ default-package-overrides: - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 - yesod-bin ==1.6.0.6 - - yesod-core ==1.6.18.6 + - yesod-core ==1.6.18.7 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 @@ -2602,7 +2628,7 @@ default-package-overrides: - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - - zio ==0.1.0.0 + - zio ==0.1.0.2 - zip ==1.6.0 - zip-archive ==0.4.1 - zip-stream ==0.2.0.1 @@ -2614,6 +2640,7 @@ default-package-overrides: - zot ==0.0.3 - zstd ==0.1.2.0 - ztail ==1.2.0.2 + - zydiskell ==0.2.0.0 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. @@ -2667,6 +2694,13 @@ package-maintainers: # - pipes-mongodb - streaming-wai kiwi: + - config-schema + - config-value + - glirc + - irc-core + - matterhorn + - mattermost-api + - mattermost-api-qc - Unique psibi: - path-pieces @@ -2678,6 +2712,9 @@ package-maintainers: - Agda roberth: - arion-compose + - hercules-ci-agent + - hercules-ci-api-agent + - hercules-ci-api-core cdepillabout: - pretty-simple - spago @@ -3140,6 +3177,7 @@ broken-packages: - arbor-monad-metric-datadog - arbtt - arch-hs + - archive-libarchive - archiver - archlinux - archlinux-web @@ -3422,6 +3460,7 @@ broken-packages: - bindings-apr-util - bindings-bfd - bindings-cctools + - bindings-common - bindings-dc1394 - bindings-eskit - bindings-EsounD @@ -3518,7 +3557,6 @@ broken-packages: - blakesum - blakesum-demo - blas - - blas-hs - BlastHTTP - blastxml - blatex @@ -3744,6 +3782,7 @@ broken-packages: - call-haskell-from-anything - camfort - campfire + - candid - canon - canonical-filepath - canonical-json @@ -3900,6 +3939,9 @@ broken-packages: - citeproc-hs-pandoc-filter - cj-token - cjk + - cl3 + - cl3-hmatrix-interface + - cl3-linear-interface - clac - clafer - claferIG @@ -4113,9 +4155,7 @@ broken-packages: - conffmt - confide - config-parser - - config-schema - config-select - - config-value - config-value-getopt - ConfigFileTH - Configger @@ -4192,6 +4232,7 @@ broken-packages: - CoreDump - CoreErlang - CoreFoundation + - corenlp-parser - Coroutine - coroutine-enumerator - coroutine-iteratee @@ -4209,6 +4250,7 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit + - cpkg - CPL - cplusplus-th - cprng-aes-effect @@ -4298,6 +4340,7 @@ broken-packages: - curry-frontend - CurryDB - cursedcsv + - cursor-fuzzy-time-gen - curves - custom-prelude - CV @@ -4988,6 +5031,7 @@ broken-packages: - fastirc - fastly - FastPush + - fastsum - FastxPipe - fathead-util - fault-tree @@ -5144,7 +5188,6 @@ broken-packages: - FM-SBLEX - fmark - FModExRaw - - fmt - fmt-for-rio - fmt-terminal-colors - fn-extra @@ -5173,6 +5216,7 @@ broken-packages: - FormalGrammars - format - format-status + - formatn - formattable - forml - formlets @@ -5290,6 +5334,7 @@ broken-packages: - fusion - futun - future + - fuzzy-time-gen - fuzzy-timings - fwgl - fwgl-glfw @@ -5505,7 +5550,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - glob-posix - global @@ -6050,6 +6094,7 @@ broken-packages: - hasql-postgres-options - hasql-queue - hasql-simple + - hasql-th - hastache - hastache-aeson - haste @@ -6131,6 +6176,7 @@ broken-packages: - hdr-histogram - HDRUtils - headergen + - heap-console - heapsort - heart-app - heart-core @@ -6149,6 +6195,7 @@ broken-packages: - hedgehog-gen-json - hedgehog-generic - hedgehog-golden + - hedgehog-servant - Hedi - hedis-config - hedis-pile @@ -6179,9 +6226,6 @@ broken-packages: - HERA - herbalizer - HerbiePlugin - - hercules-ci-agent - - hercules-ci-api-agent - - hercules-ci-api-core - heredocs - Hermes - hermit @@ -6750,6 +6794,7 @@ broken-packages: - hw-json-simd - hw-json-simple-cursor - hw-json-standard-cursor + - hw-prim-bits - hw-simd - hw-uri - hwall-auth-iitk @@ -6969,7 +7014,6 @@ broken-packages: - iptadmin - IPv6DB - Irc - - irc-core - irc-dcc - irc-fun-bot - irc-fun-client @@ -7390,6 +7434,7 @@ broken-packages: - lhe - lhs2TeX-hl - lhslatex + - libarchive - LibClang - libconfig - libcspm @@ -7712,9 +7757,6 @@ broken-packages: - matrix-market - matrix-sized - matsuri - - matterhorn - - mattermost-api - - mattermost-api-qc - maude - maxent - maxent-learner-hw @@ -7810,6 +7852,10 @@ broken-packages: - midimory - midisurface - mighttpd + - migrant-core + - migrant-hdbc + - migrant-postgresql-simple + - migrant-sqlite-simple - mikmod - mikrokosmos - miku @@ -7883,6 +7929,7 @@ broken-packages: - monad-log - monad-lrs - monad-mersenne-random + - monad-metrics-extensible - monad-mock - monad-open - monad-parallel-progressbar @@ -8005,6 +8052,7 @@ broken-packages: - mu-protobuf - mu-rpc - mu-schema + - mu-servant-server - mu-tracing - MuCheck - MuCheck-Hspec @@ -8088,6 +8136,9 @@ broken-packages: - nagios-plugin-ekg - nakadi-client - named-lock + - named-servant + - named-servant-client + - named-servant-server - named-sop - namelist - namespace @@ -8164,6 +8215,7 @@ broken-packages: - network-hans - network-house - network-interfacerequest + - network-messagepack-rpc-websocket - network-minihttp - network-msgpack-rpc - network-netpacket @@ -8675,7 +8727,6 @@ broken-packages: - pipes-s3 - pipes-shell - pipes-sqlite-simple - - pipes-text - pipes-transduce - pipes-vector - pipes-zeromq4 @@ -8790,6 +8841,7 @@ broken-packages: - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed + - postgresql-syntax - postgresql-tx-query - postgresql-tx-squeal - postgresql-typed-lifted @@ -9123,6 +9175,7 @@ broken-packages: - rclient - rdioh - react-flux + - react-flux-servant - react-haskell - react-tutorial-haskell-server - reaction-logic @@ -9194,6 +9247,8 @@ broken-packages: - reflex-gloss - reflex-gloss-scene - reflex-libtelnet + - reflex-localize + - reflex-localize-dom - reflex-orphans - reflex-process - reflex-sdl2 @@ -9332,6 +9387,7 @@ broken-packages: - rfc-prelude - rfc-psql - rfc-redis + - rfc-servant - rg - rhythm-game-tutorial - rib @@ -9373,6 +9429,7 @@ broken-packages: - roc-cluster - roc-cluster-demo - rock + - rocksdb-haskell - roku-api - rollbar - rollbar-hs @@ -9544,6 +9601,7 @@ broken-packages: - sdl2-cairo-image - sdl2-compositor - sdl2-fps + - sdr - seakale - seakale-postgresql - seakale-tests @@ -9596,6 +9654,78 @@ broken-packages: - serpentine - serv - serv-wai + - servant-aeson-specs + - servant-auth-cookie + - servant-auth-hmac + - servant-auth-token + - servant-auth-token-acid + - servant-auth-token-api + - servant-auth-token-leveldb + - servant-auth-token-persistent + - servant-auth-token-rocksdb + - servant-auth-wordpress + - servant-avro + - servant-cassava + - servant-cli + - servant-client-js + - servant-client-namedargs + - servant-csharp + - servant-db + - servant-db-postgresql + - servant-dhall + - servant-docs-simple + - servant-ede + - servant-ekg + - servant-elm + - servant-examples + - servant-fiat-content + - servant-generate + - servant-generic + - servant-github + - servant-haxl-client + - servant-hmac-auth + - servant-http2-client + - servant-iCalendar + - servant-jquery + - servant-js + - servant-JuicyPixels + - servant-kotlin + - servant-matrix-param + - servant-mock + - servant-namedargs + - servant-nix + - servant-openapi3 + - servant-pagination + - servant-pandoc + - servant-pool + - servant-postgresql + - servant-proto-lens + - servant-purescript + - servant-pushbullet-client + - servant-py + - servant-quickcheck + - servant-rawm-client + - servant-reason + - servant-reflex + - servant-router + - servant-scotty + - servant-seo + - servant-serf + - servant-server-namedargs + - servant-smsc-ru + - servant-snap + - servant-streaming + - servant-streaming-client + - servant-streaming-docs + - servant-streaming-server + - servant-swagger-tags + - servant-to-elm + - servant-waargonaut + - servant-yaml + - servant-zeppelin + - servant-zeppelin-client + - servant-zeppelin-server + - servant-zeppelin-swagger - server-generic - serversession-backend-acid-state - serversession-backend-persistent @@ -9751,6 +9881,7 @@ broken-packages: - skeletons - skell - skemmtun + - skews - skulk - skylark-client - skylighting-lucid @@ -10259,7 +10390,6 @@ broken-packages: - Tape - tapioca - target - - tart - task - task-distribution - taskell @@ -10495,6 +10625,7 @@ broken-packages: - tomato-rubato-openal - toml - tonatona-google-server-api + - tonatona-servant - too-many-cells - toodles - top @@ -10677,6 +10808,9 @@ broken-packages: - typesafe-precure - typescript-docs - typograffiti + - typson-beam + - typson-esqueleto + - typson-selda - tyro - u2f - uber @@ -10866,6 +11000,7 @@ broken-packages: - verilog - verismith - versioning + - versioning-servant - vflow-types - vfr-waypoints - vgrep @@ -11091,6 +11226,7 @@ broken-packages: - wsedit - wshterm - wsjtx-udp + - wss-client - wstunnel - wtk - wtk-gtk @@ -11361,6 +11497,7 @@ broken-packages: - zeromq3-haskell - zeromq4-clone-pattern - zeromq4-conduit + - zeromq4-patterns - zeroth - zettelkast - ZFS diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index a1fcd89803..154c9ec14c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -20659,8 +20659,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.9"; - sha256 = "1y4mchf317bkhwivnppnsk9r567c0cjymg3mc1n6h0cn799rx7bk"; + version = "0.3.10"; + sha256 = "16m08h11c8wwi159ppn698m60nk54k4dgxa2di2j02g58l16pmcn"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21834,24 +21834,25 @@ self: { }) {}; "Z-IO" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hashable, hspec - , hspec-discover, HUnit, primitive, QuickCheck + ({ mkDerivation, base, bytestring, containers, exceptions, hashable + , hspec, hspec-discover, HUnit, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, unix-time , unordered-containers, word8, Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.1.8.0"; - sha256 = "14xh727r7zasm92ah0a6wccn1zksg0pmrvh8xdaldh4qkj706ga7"; + version = "0.1.9.0"; + sha256 = "1f9774065arknwm8f1avq7v769cfa610dy45winva3ys4345xcyy"; libraryHaskellDepends = [ - base exceptions primitive stm time unix-time unordered-containers - Z-Data + base containers exceptions primitive stm time unix-time + unordered-containers Z-Data ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ base bytestring hashable hspec HUnit primitive QuickCheck quickcheck-instances scientific word8 Z-Data zlib ]; + testToolDepends = [ hspec-discover ]; description = "Simple and high performance IO toolkit for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -24076,6 +24077,37 @@ self: { broken = true; }) {}; + "advent-of-code-ocr" = callPackage + ({ mkDerivation, base, containers, criterion, data-default-class + , heredoc, hspec, optparse-applicative, template-haskell, th-lift + , th-lift-instances + }: + mkDerivation { + pname = "advent-of-code-ocr"; + version = "0.1.0.0"; + sha256 = "03qak7hic0kbmxz7krq5z2a8ah6z7pzr7r3sybd5h778m4sgvdca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default-class heredoc template-haskell th-lift + th-lift-instances + ]; + executableHaskellDepends = [ + base containers data-default-class heredoc optparse-applicative + template-haskell th-lift th-lift-instances + ]; + testHaskellDepends = [ + base containers data-default-class heredoc hspec template-haskell + th-lift th-lift-instances + ]; + benchmarkHaskellDepends = [ + base containers criterion data-default-class heredoc + template-haskell th-lift th-lift-instances + ]; + description = "Parse Advent of Code ASCII art letters"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aern2-mp" = callPackage ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens , mixed-types-num, QuickCheck, regex-tdfa, rounded @@ -31960,6 +31992,8 @@ self: { libraryToolDepends = [ cpphs ]; description = "Common interface using libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archive-sig" = callPackage @@ -33405,8 +33439,8 @@ self: { ({ mkDerivation, async, base, process, text }: mkDerivation { pname = "aspell-pipe"; - version = "0.5"; - sha256 = "19qgw7nwbbkw1p40ljmjgbb00i44nmqy41m2bcs74w076izz51mf"; + version = "0.6"; + sha256 = "09dw4v4j5pmqi8pdh3p7kk7f8pph5w33s7vd21fgvhv3arnrj6p8"; libraryHaskellDepends = [ async base process text ]; description = "Pipe-based interface to the Aspell program"; license = stdenv.lib.licenses.bsd3; @@ -37143,18 +37177,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.2.0.5"; - sha256 = "0n7q9s1vsmh5adkhpgycz8y6q49xqf77fpmm73cw0iqgjly4x9hp"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_6" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -37164,7 +37186,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -37224,6 +37245,8 @@ self: { pname = "barbly"; version = "0.1.0.0"; sha256 = "1mmbvgw5g2jb8qv7vd00iym9xyb07jx03wi6x1ldqvzfn2vcc22l"; + revision = "1"; + editedCabalFile = "09xb9p2ik8kpa2gras9jqs4rr55bsbd7xnmgijxxzwf9hl00k0by"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38599,8 +38622,8 @@ self: { }: mkDerivation { pname = "beam-automigrate"; - version = "0.1.0.0"; - sha256 = "1a9pjmzzyibp6fgrn0p9scczzc2afx5n1947qn5ifcz23hnwnj55"; + version = "0.1.0.1"; + sha256 = "0sjp09wfp6qlrbl6w8ddwngsnrwvp225msqgnv0l1x4nwxia5kpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40606,6 +40629,8 @@ self: { libraryHaskellDepends = [ base ]; description = "This package is obsolete. Look for bindings-DSL instead."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bindings-dc1394" = callPackage @@ -42522,6 +42547,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; + "bitvec_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, gauge + , ghc-prim, integer-gmp, primitive, quickcheck-classes, random + , tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "bitvec"; + version = "1.1.0.0"; + sha256 = "1blfi62immsx7hvg9krdbcp9n1p2a9qyhm9j30lc0g2jcl1n11mz"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp primitive vector + ]; + testHaskellDepends = [ + base integer-gmp primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base containers gauge integer-gmp random vector + ]; + description = "Space-efficient bit vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bitwise" = callPackage ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { @@ -42896,8 +42945,6 @@ self: { testHaskellDepends = [ base vector ]; description = "Low-level Haskell bindings to Blas"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) blas;}; "blastxml" = callPackage @@ -44690,18 +44737,20 @@ self: { "box" = callPackage ({ mkDerivation, attoparsec, base, comonad, concurrency , contravariant, dejafu, doctest, exceptions, generic-lens, lens - , mmorph, mtl, numhask, optparse-generic, profunctors, random, text - , time, transformers, transformers-base, websockets + , mmorph, mtl, numhask, numhask-space, optparse-generic + , profunctors, random, text, time, transformers, transformers-base + , websockets }: mkDerivation { pname = "box"; - version = "0.6.0"; - sha256 = "0kv3j0fh2ahn4x2lgpghhkrbw5y1cy5mdlrriycqv4slrdzaqyks"; + version = "0.6.2"; + sha256 = "1mwmz97s8mvan8fn8ps0gnzsidar1ygjfkgrcjglfklh5bmm8823"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base comonad concurrency contravariant exceptions lens - mmorph numhask profunctors text time transformers transformers-base + mmorph numhask numhask-space profunctors text time transformers + transformers-base ]; executableHaskellDepends = [ base concurrency dejafu exceptions generic-lens lens mtl numhask @@ -44720,8 +44769,8 @@ self: { }: mkDerivation { pname = "box-csv"; - version = "0.0.2"; - sha256 = "09qmxd9mxyag6zx8y5yv7bphycbs35zfkkf7kvkdmjqdk7l7b0fd"; + version = "0.0.3"; + sha256 = "16kg45hma04r6slw2fic5jbamkcbv6mgqybw081w76hckcg72522"; libraryHaskellDepends = [ attoparsec base box generic-lens lens numhask scientific text time ]; @@ -44733,18 +44782,19 @@ self: { }) {}; "box-socket" = callPackage - ({ mkDerivation, base, box, concurrency, doctest, exceptions - , generic-lens, lens, numhask, optparse-generic, websockets + ({ mkDerivation, base, box, bytestring, concurrency, doctest + , exceptions, generic-lens, lens, network, network-simple, numhask + , optparse-generic, websockets }: mkDerivation { pname = "box-socket"; - version = "0.0.2"; - sha256 = "0wf7smpzczqm0yqnphmp46bgm67nyhj0swn0vxhdgb8z0362szsp"; + version = "0.1.1"; + sha256 = "162c3rnr5h5a8sixwnsbvf6fdbghsxx1ckvgdn4pd4b5xfa287j0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base box concurrency exceptions generic-lens lens numhask - websockets + base box bytestring concurrency exceptions generic-lens lens + network network-simple numhask websockets ]; executableHaskellDepends = [ base box concurrency generic-lens lens numhask optparse-generic @@ -44954,34 +45004,6 @@ self: { }) {}; "brick" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.57"; - sha256 = "15481cmm208gxcs96rcvg6qgx87b2fk7ws82675viasw64mhvmg1"; - revision = "1"; - editedCabalFile = "0vi6a3m6i4x6pndmcc39x37pyd9ar7m6z7b0lahnw6ayssxiq3pq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "brick_0_57_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -45007,7 +45029,6 @@ self: { ]; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brick-dropdownmenu" = callPackage @@ -46264,23 +46285,6 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; - version = "1.1.0.2"; - sha256 = "1k625j5syyiq66i88zy6q0mvwkjl5jsj79sxdmd1rbam3m39whx1"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck text ]; - description = "Parse and render URI templates"; - license = stdenv.lib.licenses.isc; - }) {}; - - "burrito_1_2_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, parsec , QuickCheck, template-haskell, text, transformers }: @@ -46295,7 +46299,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -48006,29 +48009,6 @@ self: { }) {}; "cabal-file" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, extra - , filepath, hackage-security, optparse-applicative, simple-cabal - , simple-cmd, simple-cmd-args, time - }: - mkDerivation { - pname = "cabal-file"; - version = "0.1.0"; - sha256 = "1khf39awvpnqxs0rlqa6n5810x9kkn31975v6kbmwwdrjjp2qlqw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal directory extra filepath hackage-security - optparse-applicative simple-cabal simple-cmd time - ]; - executableHaskellDepends = [ - base bytestring Cabal directory extra filepath optparse-applicative - simple-cabal simple-cmd simple-cmd-args - ]; - description = "Cabal file access"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-file_0_1_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, extra , filepath, hackage-security, optparse-applicative, simple-cabal , simple-cmd, simple-cmd-args, time @@ -48049,7 +48029,6 @@ self: { ]; description = "Cabal file access"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-file-th" = callPackage @@ -49790,6 +49769,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "candid" = callPackage + ({ mkDerivation, base, base32, bytestring, cereal, constraints + , containers, crc, directory, dlist, doctest, filepath, hex-text + , leb128-cereal, megaparsec, mtl, optparse-applicative + , prettyprinter, row-types, scientific, smallcheck, split, tasty + , tasty-hunit, tasty-rerun, tasty-smallcheck, template-haskell + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "candid"; + version = "0.1"; + sha256 = "0mg7h936if93wdrhnri07530rnz7mnwlz5hpj1qp4bcwknsjs3b4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base32 bytestring cereal constraints containers crc dlist + hex-text leb128-cereal megaparsec mtl prettyprinter row-types + scientific split template-haskell text transformers + unordered-containers vector + ]; + executableHaskellDepends = [ + base bytestring hex-text optparse-applicative prettyprinter text + ]; + testHaskellDepends = [ + base bytestring directory doctest filepath leb128-cereal + prettyprinter row-types smallcheck tasty tasty-hunit tasty-rerun + tasty-smallcheck template-haskell text unordered-containers vector + ]; + description = "Candid integration"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "canon" = callPackage ({ mkDerivation, arithmoi, array, base, containers, random }: mkDerivation { @@ -50067,19 +50080,19 @@ self: { }) {}; "capnp" = callPackage - ({ mkDerivation, async, base, bytes, bytestring, containers, cpu - , data-default, data-default-instances-vector, deepseq, directory - , exceptions, filepath, focus, hashable, heredoc, hspec, list-t - , monad-stm, mtl, network, network-simple, pretty-show, primitive - , process, process-extras, QuickCheck, quickcheck-instances - , quickcheck-io, reinterpret-cast, resourcet, safe-exceptions, stm - , stm-containers, supervisors, text, transformers, vector - , wl-pprint-text + ({ mkDerivation, async, base, bifunctors, bytes, bytestring + , containers, cpu, data-default, data-default-instances-vector + , deepseq, directory, exceptions, filepath, focus, hashable + , heredoc, hspec, list-t, monad-stm, mtl, network, network-simple + , pretty-show, primitive, process, process-extras, QuickCheck + , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet + , safe-exceptions, stm, stm-containers, supervisors, text + , transformers, vector, wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.7.0.0"; - sha256 = "1mzs7f50840jbyzdipff47rwjmxv7i0rk6w4rdljzkw36yz4kj4v"; + version = "0.8.0.0"; + sha256 = "0jqq1yal41rnc8z66b24kiycyxdzwpqykx1p8v1rc3qbn4i3n255"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50090,9 +50103,9 @@ self: { text transformers vector ]; executableHaskellDepends = [ - base bytes bytestring containers data-default directory exceptions - filepath monad-stm mtl primitive reinterpret-cast safe-exceptions - text transformers vector wl-pprint-text + base bifunctors bytes bytestring containers data-default directory + exceptions filepath monad-stm mtl primitive reinterpret-cast + safe-exceptions text transformers vector wl-pprint-text ]; testHaskellDepends = [ async base bytes bytestring containers data-default deepseq @@ -54305,6 +54318,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Clifford Algebra of three dimensional space"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cl3-hmatrix-interface" = callPackage @@ -54316,6 +54331,8 @@ self: { libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cl3-linear-interface" = callPackage @@ -54327,6 +54344,8 @@ self: { libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clac" = callPackage @@ -55342,16 +55361,17 @@ self: { "cli-extras" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , exceptions, io-streams, lens, logging-effect, monad-loops, mtl - , process, terminal-size, text, time, transformers, which + , exceptions, io-streams, lens, logging-effect, monad-logger + , monad-loops, mtl, process, terminal-size, text, time + , transformers, which }: mkDerivation { pname = "cli-extras"; - version = "0.1.0.0"; - sha256 = "14li1rkkaihklq62m9v9in2lbsr19v1h228a77ik25qarqw4xp9d"; + version = "0.1.0.1"; + sha256 = "1fggrnhdbr2ialdd93d0m81b85izs1gvcs8bkmwm8wdxgw4v7hsi"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions - io-streams lens logging-effect monad-loops mtl process + io-streams lens logging-effect monad-logger monad-loops mtl process terminal-size text time transformers which ]; description = "Miscellaneous utilities for building and working with command line interfaces"; @@ -55366,8 +55386,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.1.0.0"; - sha256 = "1d9b8wyxzi233lq8qh3fh6v7icikjy4ryhhw033s5207biqqrifh"; + version = "0.1.0.1"; + sha256 = "0jchv1j7dgay6xzny9rinsybavs4ggk93450cka6sp7015z06ysr"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text @@ -55384,8 +55404,8 @@ self: { }: mkDerivation { pname = "cli-nix"; - version = "0.1.0.0"; - sha256 = "0z858fjsrnfb9cwzq8hxyhpwn61m50rjv1916c7zf8nrfsa82z0y"; + version = "0.1.0.1"; + sha256 = "1ynrni7zyhw8g70bdmd5vamnkw5vac4n5nmxwyka52nqy3zrrlwj"; libraryHaskellDepends = [ base cli-extras data-default exceptions lens logging-effect mtl text @@ -55881,8 +55901,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "2.0.0"; - sha256 = "0jkikp92k6pdqpa0c2mda81pplshyn7rdw1g2h2hhpjjg0g9npd1"; + version = "2.0.1"; + sha256 = "0s01582a2iyibwhlkmmf4n9h0fs3w0sjip65j78c4hldc91ylvqd"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -60127,6 +60147,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_4" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, kan-extensions + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , resourcet, safe, silently, split, text, transformers, unix + , unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.4"; + sha256 = "1w30chhqryhkv82mvwqi1q09fvfxva70280q3nf4h97amld860lz"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec kan-extensions mwc-random + transformers vector + ]; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers @@ -60946,8 +60995,7 @@ self: { testHaskellDepends = [ base config-value text ]; description = "Schema definitions for the config-value package"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "config-select" = callPackage @@ -60974,13 +61022,14 @@ self: { pname = "config-value"; version = "0.8"; sha256 = "1l2w2ylxx9d48pjnc9490kisawz48mf038f108g3zvb0j3iz9vyn"; + revision = "1"; + editedCabalFile = "0s121lvv1bv658ig1r3gdkf37wjyvgy958ll1497r8hsc6y73f4m"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; description = "Simple, layout-based value language similar to YAML or JSON"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "config-value-getopt" = callPackage @@ -63092,6 +63141,8 @@ self: { librarySystemDepends = [ rocksdb ]; description = "Launches CoreNLP and parses the JSON output"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) rocksdb;}; "cornea" = callPackage @@ -63499,6 +63550,8 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cplex-hs" = callPackage @@ -64401,43 +64454,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, binary-orphans, bytestring - , cassava, code-page, containers, criterion-measurement, deepseq - , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery - , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-compat, vector - , vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.7.0"; - sha256 = "1qzn2k1b2all543v47p93p15a5y8lps002vbxmkr6xrinp91cvqk"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary - binary-orphans bytestring cassava code-page containers - criterion-measurement deepseq directory exceptions filepath Glob - js-flot js-jquery microstache mtl mwc-random optparse-applicative - parsec statistics text time transformers transformers-compat vector - vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_9_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, binary-orphans, bytestring , cassava, code-page, containers, criterion-measurement, deepseq @@ -64472,7 +64488,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-compare" = callPackage @@ -66602,6 +66617,8 @@ self: { base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cursor-gen" = callPackage @@ -67588,6 +67605,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-as" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "data-as"; + version = "0.0.0.2"; + sha256 = "1rqdffwyxrnvsrqchnknjdmdz7afzhplyalnrclrm5zm6gj0dlia"; + libraryHaskellDepends = [ base profunctors ]; + description = "Simple extensible sum"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-ascii" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , hashable, semigroups, text @@ -71050,6 +71078,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deferred-folds_0_9_15" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.15"; + sha256 = "0jijnjy6x6f86dmlhiaj9gl13zbwzaz4gpb8svzdwwws48bwwyqr"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -71415,8 +71466,8 @@ self: { }: mkDerivation { pname = "dense"; - version = "0.1.0.0"; - sha256 = "1cyprx6z66cmg98j2zijjjznicfvybr678h4vaj4ppmfxgalkz99"; + version = "0.1.0.1"; + sha256 = "00hm40myj6m7hh9v5w75252wi7azf5fq6ldmpn7p0cv4sxj8mnmg"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens linear primitive semigroupoids template-haskell transformers @@ -74970,8 +75021,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.0"; - sha256 = "1zh4xf5a8ppfhcnkhai4mi0a7aj7m8qp8hcnyfi6s3nc86k7wj2w"; + version = "1.8.1"; + sha256 = "07rhg7r4v05q1y6rin4b5v49231r2w35jfwnrbg7b7s1skdld9g3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81666,8 +81717,8 @@ self: { }: mkDerivation { pname = "elm2nix"; - version = "0.2"; - sha256 = "1bv2sid1adrg3327h9611kspfxkhgwcawjq59iapp776n74x2iq4"; + version = "0.2.1"; + sha256 = "1lgqbmd5419apak7hy22p0fpjzcki74snpgqsq2qmhpvyi5qbf3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87521,6 +87572,8 @@ self: { ]; description = "A fast open-union type suitable for 100+ contained alternatives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fathead-util" = callPackage @@ -91723,8 +91776,6 @@ self: { ]; description = "A new formatting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fmt-for-rio" = callPackage @@ -92500,6 +92551,25 @@ self: { broken = true; }) {}; + "formatn" = callPackage + ({ mkDerivation, attoparsec, base, containers, doctest, foldl + , generic-lens, numhask, scientific, tdigest, text, transformers + }: + mkDerivation { + pname = "formatn"; + version = "0.0.1"; + sha256 = "0rw1xli4df72wxylf211jhm0v2y842rfn8nalrp04yzklvyrri84"; + libraryHaskellDepends = [ + attoparsec base containers foldl generic-lens numhask scientific + tdigest text transformers + ]; + testHaskellDepends = [ base doctest numhask ]; + description = "Number text formatting"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "formattable" = callPackage ({ mkDerivation, base, bytestring, data-default-class , double-conversion, hspec, HUnit, lens, old-locale, QuickCheck @@ -95680,6 +95750,8 @@ self: { base criterion fuzzy-time genvalidity-criterion ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fuzzy-timings" = callPackage @@ -98762,23 +98834,6 @@ self: { }) {}; "ghc-check" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, process, safe-exceptions, template-haskell - , transformers - }: - mkDerivation { - pname = "ghc-check"; - version = "0.5.0.2"; - sha256 = "1pncxn9lvwcxlgwf18yr20xbh2qxf80samf2laaxjhx09d31w8h2"; - libraryHaskellDepends = [ - base containers directory filepath ghc ghc-paths process - safe-exceptions template-haskell transformers - ]; - description = "detect mismatches between compile-time and run-time versions of the ghc api"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-check_0_5_0_3" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-paths, process, safe-exceptions, template-haskell , transformers @@ -98793,7 +98848,6 @@ self: { ]; description = "detect mismatches between compile-time and run-time versions of the ghc api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-clippy-plugin" = callPackage @@ -98973,25 +99027,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; - version = "0.13.0"; - sha256 = "1b4d1h71czskm2vgbhkrkdkj5h218b34zn7pjhyp314wfqkmn935"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-events_0_14_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: @@ -99008,7 +99043,6 @@ self: { testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -99062,29 +99096,6 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.6.3.2"; - sha256 = "1bzf8mafz20pn7cq2483b9w3hjrwfbb0ahbcb3y7xy5yy52qvmln"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-exactprint_0_6_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb @@ -99105,7 +99116,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -100929,6 +100939,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_25" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.25"; + sha256 = "0yz80wcxhy1mm441507qsj2f7380l2iwh4s1miwpd8kb5m147n9w"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base @@ -101133,7 +101163,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_2" = callPackage + "gi-gtk_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -101141,8 +101171,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.2"; - sha256 = "1lmbb3q4f73f7yihnl4qjv7qvzrys3jqsh3dg9wwdg9bxg900ghp"; + version = "4.0.3"; + sha256 = "1zfqnjnzlrry7cbrzfamrh5465h06y6px0b1xh1yz7iaacg0739z"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -101948,8 +101978,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20201116"; - sha256 = "0xv7n9f6l90l4k964675v0lgs22gcy97ic86mbfb40rl0fk0jalr"; + version = "8.20201127"; + sha256 = "0n9m5ffgbzms0nh9dskrc7vjgwwwi9f9gxyh498wnspf96729zz7"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -102574,26 +102604,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; - version = "1.3.3"; - sha256 = "15im4vsz04sx0iq83xmvk5ak4p7rj33jawk5lxkmv1ajwvklbpk7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ base ]; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_3_5" = callPackage ({ mkDerivation, aeson, base, burrito, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers @@ -102611,7 +102621,6 @@ self: { executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-rest" = callPackage @@ -103521,6 +103530,8 @@ self: { pname = "glirc"; version = "2.37"; sha256 = "1222dz42lyk44xgs10wwjpd2qn4l0ak3v98vj103xh535hki9ibn"; + revision = "1"; + editedCabalFile = "19y9hhn24w6lqdwv1skijrvj5plqs3xqcz3h8wv1ax8g8ak07xsx"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -103535,8 +103546,7 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "gll" = callPackage @@ -112584,7 +112594,7 @@ self: { , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa , resourcet, scientific, tagsoup, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, unordered-containers, util-linux, vector, wai + , time-locale-compat, unordered-containers, utillinux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { @@ -112608,12 +112618,12 @@ self: { base bytestring containers filepath QuickCheck tasty tasty-hunit tasty-quickcheck text unordered-containers yaml ]; - testToolDepends = [ util-linux ]; + testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) util-linux;}; + }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process @@ -112748,6 +112758,31 @@ self: { broken = true; }) {}; + "hakyll-contrib-i18n" = callPackage + ({ mkDerivation, base, binary-instances, bytestring, filepath + , hakyll, pandoc, pandoc-include-code, pandoc-types, text, time + , time-locale-compat, unordered-containers, yaml + }: + mkDerivation { + pname = "hakyll-contrib-i18n"; + version = "0.1.1.0"; + sha256 = "1jmw3ns8s0l974b2xb6ylwd0swjcq69fwpakb4g4k2rvhqnzd6jg"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary-instances bytestring filepath hakyll text time + time-locale-compat unordered-containers yaml + ]; + executableHaskellDepends = [ + base filepath hakyll pandoc pandoc-include-code pandoc-types + unordered-containers + ]; + description = "A Hakyll library for internationalization"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hakyll-contrib-links" = callPackage ({ mkDerivation, base, binary, containers, hakyll, pandoc , pandoc-types, parsec, QuickCheck, test-framework @@ -116391,6 +116426,29 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_24_7" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.24.7"; + sha256 = "10xp6z6whfx3iad09l83mcszzj99cc9wcnvk593ypx6zhjv0r555"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -116403,6 +116461,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_24_5" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.24.5"; + sha256 = "0fd5bsf2bnjaq9j8zs9l5837z9x2iryivs57y96c7fx6vxxb9xai"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading" = callPackage ({ mkDerivation }: mkDerivation { @@ -117834,19 +117905,26 @@ self: { }) {}; "haskell-xmpp" = callPackage - ({ mkDerivation, array, base, HaXml, html, mtl, network, polyparse - , pretty, random, regex-compat, stm, utf8-string + ({ mkDerivation, aeson, array, base, blaze-markup, bytestring + , HaXml, hspec, hspec-discover, html, http-client, http-conduit + , mtl, network, network-bsd, polyparse, pretty, random + , regex-compat, singlethongs, stm, text, time, unliftio + , utf8-string, uuid, xml-conduit, xml-hamlet }: mkDerivation { pname = "haskell-xmpp"; - version = "1.0.2"; - sha256 = "1z4x4mn0vry8mwq6ily668ignmf4s9m92fmga15dr83y7aq5wd59"; + version = "2.0.1"; + sha256 = "0x06a43h930ad17shvc8iwibkpgbfk6lkkr9mnp0xnwaf6kzrf47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base HaXml html mtl network polyparse pretty random - regex-compat stm utf8-string + aeson array base blaze-markup bytestring HaXml html http-client + http-conduit mtl network network-bsd polyparse pretty random + regex-compat singlethongs stm text time unliftio utf8-string uuid + xml-conduit xml-hamlet ]; + executableHaskellDepends = [ base hspec text ]; + executableToolDepends = [ hspec-discover ]; description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120058,6 +120136,8 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-transaction" = callPackage @@ -121885,6 +121965,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "headroom_0_3_2_0" = callPackage + ({ mkDerivation, aeson, base, data-default-class, doctest, either + , file-embed, hspec, hspec-discover, microlens, microlens-th + , mustache, optparse-applicative, pcre-heavy, pcre-light + , QuickCheck, rio, template-haskell, time, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.3.2.0"; + sha256 = "0770d1b8ikijkmqqnb6nygqj7cv6fphz1165x478ry61sr3i6hs3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base data-default-class either file-embed microlens + microlens-th mustache optparse-applicative pcre-heavy pcre-light + rio template-haskell time yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative pcre-light QuickCheck + rio time + ]; + testToolDepends = [ hspec-discover ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -121897,6 +122005,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heap-console" = callPackage + ({ mkDerivation, base, containers, exceptions, ghc-heap, ghc-prim + , haskeline, hspec, hspec-discover, mtl, show-combinators + }: + mkDerivation { + pname = "heap-console"; + version = "0.1.0.1"; + sha256 = "1z2sdw64w50q2353ccsjpahncdp8czihpkizclgvx1gkqiv9mv02"; + libraryHaskellDepends = [ + base containers exceptions ghc-heap ghc-prim haskeline mtl + show-combinators + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "interactively inspect Haskell values at runtime"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "heaps" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -122421,6 +122549,8 @@ self: { ]; description = "Hedgehog property testing for Servant APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis" = callPackage @@ -123186,8 +123316,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.7.4"; - sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l"; + version = "0.7.5"; + sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123225,8 +123355,7 @@ self: { doHaddock = false; description = "Runs Continuous Integration tasks on your machines"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; "hercules-ci-api-agent" = callPackage @@ -123257,8 +123386,7 @@ self: { ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "hercules-ci-api-core" = callPackage @@ -123281,8 +123409,7 @@ self: { ]; description = "Types and convenience modules use across Hercules CI API packages"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "here" = callPackage @@ -127221,8 +127348,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.2.2"; - sha256 = "1jb4yr9piyq2l4d6xxn6vywa1ghvws97qkzymnmldzxpyqiixnl8"; + version = "3.2.3"; + sha256 = "1y6drmvcz90cpih446k1kjbyhin652wi9b9x7xjylxxp8jksd8x0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127455,25 +127582,6 @@ self: { }) {}; "hmatrix" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, semigroups, split, storable-complex - , vector - }: - mkDerivation { - pname = "hmatrix"; - version = "0.20.0.0"; - sha256 = "1sqy1aci5zfagkb34mz3xdil7cl96z4b4cx28cha54vc5sx1lhpg"; - configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random semigroups split - storable-complex vector - ]; - librarySystemDepends = [ openblasCompat ]; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_20_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , openblasCompat, primitive, random, semigroups, split , storable-complex, vector @@ -127490,7 +127598,6 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -128252,6 +128359,8 @@ self: { pname = "hnn"; version = "0.3"; sha256 = "0hqmzl95riis1m6f0zfp303f2k0j8szkcb6rcfmx6d3grm38b7fr"; + revision = "1"; + editedCabalFile = "18lmh6fpkpxa9lfcygzag60nrxl5qab1gllpfamgz0l5ydph9f3z"; libraryHaskellDepends = [ base binary bytestring hmatrix mwc-random random vector vector-binary-instances zlib @@ -128517,6 +128626,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "hocon" = callPackage + ({ mkDerivation, base, hspec, MissingH, parsec, split }: + mkDerivation { + pname = "hocon"; + version = "0.1.0.1"; + sha256 = "06xk118q1f5cik98w3swqw61nc7skx0bvf7mj8iyji8wm6sb1p1w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hspec MissingH parsec split ]; + executableHaskellDepends = [ base hspec MissingH parsec split ]; + testHaskellDepends = [ base hspec MissingH parsec split ]; + description = "Small library for typesafe's configuration specification"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hodatime" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , directory, exceptions, filepath, fingertree, mtl, parsec @@ -134530,8 +134654,8 @@ self: { }: mkDerivation { pname = "hspec-hashable"; - version = "0.1.0.0"; - sha256 = "1gqlw2k6k37m25292dpm8j8k0f2jdqz7lmsisa2f1mqlqxpm9k0i"; + version = "0.1.0.1"; + sha256 = "0gvqi8600vm3ms1b45qvx32kw7g7pgwxkmbfbdmicxxlbp2da6qy"; libraryHaskellDepends = [ base hashable hspec QuickCheck ]; testHaskellDepends = [ base hashable hspec hspec-core QuickCheck silently @@ -134784,12 +134908,16 @@ self: { }) {}; "hspec-slow" = callPackage - ({ mkDerivation, base, hspec, mtl, stm, time, transformers }: + ({ mkDerivation, base, hspec, hspec-core, mtl, stm, time + , transformers + }: mkDerivation { pname = "hspec-slow"; - version = "0.1.0.0"; - sha256 = "1nvhvxqmvlkg7zjh0b59rfdjghcinal7ncf3l1jin21zrjcwzfhq"; - libraryHaskellDepends = [ base hspec mtl stm time transformers ]; + version = "0.2.0.1"; + sha256 = "1rik9r0y6zzc92dzdzhmxj05hr1yacvdrfvsxqqqavxd7v0pp6y6"; + libraryHaskellDepends = [ + base hspec hspec-core mtl stm time transformers + ]; testHaskellDepends = [ base hspec mtl stm ]; description = "Find slow test cases"; license = stdenv.lib.licenses.bsd3; @@ -139517,6 +139645,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -140737,19 +140867,6 @@ self: { }) {}; "hyper" = callPackage - ({ mkDerivation, base, blaze-html, deepseq, text }: - mkDerivation { - pname = "hyper"; - version = "0.1.0.3"; - sha256 = "0bc2mvxaggdyikdx51qc1li8idmnlw3ha2n3qli6jf1zz8mlqx0s"; - revision = "1"; - editedCabalFile = "1qfavgvdlmsip57grhxs0mawh82nxrq4m0mv9z3vam1b9j6nw2cc"; - libraryHaskellDepends = [ base blaze-html deepseq text ]; - description = "Display class for the HyperHaskell graphical Haskell interpreter"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hyper_0_2_1_0" = callPackage ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; @@ -140758,7 +140875,6 @@ self: { libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-extra" = callPackage @@ -142917,8 +143033,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.3"; - sha256 = "0gz2rrzlj6031w837whpsh932jjihf49yk7rh05dw13zxvn19fl8"; + version = "0.1.2.4"; + sha256 = "1jjw64pdz3jgd4jys1rg95bhrjyiizjdi0rwwqldc27a7misd2ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145899,8 +146015,8 @@ self: { }: mkDerivation { pname = "ipfs"; - version = "1.1.5.0"; - sha256 = "050zj21m4pg8jnpd594p2wc5m3nn4j6cmmv0069mi7kg473dqz2m"; + version = "1.1.5.1"; + sha256 = "0c93s1s3l72yw2lb28v37bnhmvcn5s2w1620fsx0z4ij1z8dnk19"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media ip lens monad-logger regex-compat rio servant servant-client servant-server @@ -145913,7 +146029,7 @@ self: { text vector yaml ]; description = "Access IPFS locally and remotely"; - license = stdenv.lib.licenses.agpl3Plus; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -145995,27 +146111,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, bytestring, containers - , doctest, hspec, network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.9"; - sha256 = "1m306fi39ifqq53sklwn81q96wam8nvx7mr5hv4m9f26kiczlism"; - revision = "1"; - editedCabalFile = "1vbzch9lainl05ydym5z8x0kz0a0ywwba45d7xgg5fb8cp2n5zxh"; - libraryHaskellDepends = [ - appar base byteorder bytestring containers network - ]; - testHaskellDepends = [ - appar base byteorder bytestring containers doctest hspec network - QuickCheck safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_10" = callPackage ({ mkDerivation, appar, base, byteorder, bytestring, containers , doctest, hspec, network, QuickCheck, safe }: @@ -146032,7 +146127,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -146211,6 +146305,8 @@ self: { pname = "irc-core"; version = "2.9"; sha256 = "1n1fd46am795bsb96jnq2kj3gn787q5j41115g1smfp01zbnjp1b"; + revision = "1"; + editedCabalFile = "12z28f96iw9jni57rdzy8kz7sa1zwfs5k3fvfmf6sgx6wzhwcm6h"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -146218,8 +146314,7 @@ self: { testHaskellDepends = [ base hashable HUnit text ]; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "irc-ctcp" = callPackage @@ -146511,18 +146606,6 @@ self: { }) {}; "isbn" = callPackage - ({ mkDerivation, base, hspec, text }: - mkDerivation { - pname = "isbn"; - version = "1.1.0.1"; - sha256 = "0s7b06a0d37bhb38k2my6g6brn6bywxr59kw2c103dp4y4kzrcpn"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base hspec text ]; - description = "ISBN Validation and Manipulation"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "isbn_1_1_0_2" = callPackage ({ mkDerivation, base, hspec, text }: mkDerivation { pname = "isbn"; @@ -146532,7 +146615,6 @@ self: { testHaskellDepends = [ base hspec text ]; description = "ISBN Validation and Manipulation"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isdicom" = callPackage @@ -147574,6 +147656,8 @@ self: { pname = "j"; version = "0.2.1.0"; sha256 = "1r2lldy35sfzqrd82v2fj113l10mhvllf4yxbkrfy0y7wv0c5v8n"; + revision = "1"; + editedCabalFile = "022ah42q1ba8ank33jn5r9h7fbs3579mlrk6ks8q7vbcm4rnalj0"; libraryHaskellDepends = [ base bytestring repa unix ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; @@ -154471,8 +154555,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.4.0.0"; - sha256 = "139y3kgbrjv8x16rda9ixhcdl6xs26blq0sgcz7zpzwgbp60yflb"; + version = "1.4.1.1"; + sha256 = "0bc3qzhyip8dq7w8gf3wxlrlfd8swd1n6y6nbj2pnp7710jj8gb9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -157962,6 +158046,8 @@ self: { ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libarchive;}; "libarchive-conduit" = callPackage @@ -163568,10 +163654,8 @@ self: { }: mkDerivation { pname = "lsp"; - version = "1.0.0.0"; - sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r"; - revision = "1"; - editedCabalFile = "1pgxvwfn7avkpdl6f3p7rqaivdz438yqkzsz0rp1y0s80mymvz1i"; + version = "1.0.0.1"; + sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166758,8 +166842,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.5.0"; - sha256 = "1nlx8lakwnpplmgiiv692jbs03b52wqvclfyvaxcaf8yqdjms3r9"; + version = "0.5.6.0"; + sha256 = "13vzprqhyjz1qvsq6b29d8h9xgsrifbpbs2c5cw702hi7mw5zjhp"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive scheduler unliftio-core vector @@ -166772,6 +166856,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_5_7_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.7.0"; + sha256 = "04vv16h048gkfgqsdf3a42qrg62cik9j30p4s13rykq0shzcaf62"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels @@ -166822,8 +166929,10 @@ self: { }: mkDerivation { pname = "massiv-test"; - version = "0.1.4"; - sha256 = "1qhvph2s6bkw3zb43arq1zvrfyr09phqjwxhzsqxi2x2fcrdyvyn"; + version = "0.1.5"; + sha256 = "0n9fcdz9v7j1r2iln9h0wkjr7jkghi3r3a3lm0713p6hwy6cpgff"; + revision = "1"; + editedCabalFile = "0v6vnjsqklb8yaf63zhx9ni0ak83zyjq2l3mb8zazp54inyyfjr0"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector @@ -167458,8 +167567,7 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api" = callPackage @@ -167488,8 +167596,7 @@ self: { ]; description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api-qc" = callPackage @@ -167505,8 +167612,7 @@ self: { ]; description = "QuickCheck instances for the Mattermost client API library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "maude" = callPackage @@ -169938,23 +170044,6 @@ self: { }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell - , th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.3.6"; - sha256 = "1pw0ljpyhpj4jsgs25i4mi1a07vpbwfik84fc2kip1pzajflrcql"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens ]; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_3_8" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell , th-abstraction, transformers }: @@ -169969,7 +170058,6 @@ self: { testHaskellDepends = [ base microlens ]; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "micrologger" = callPackage @@ -170322,6 +170410,85 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "migrant-core" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "migrant-core"; + version = "0.1.0.2"; + sha256 = "1na0vcrmw3vy6v9qxxpprhga9ja7izwbp856pdpqiq98p4h8xmiw"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "migrant-hdbc" = callPackage + ({ mkDerivation, base, HDBC, HDBC-sqlite3, HUnit, migrant-core + , process, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "migrant-hdbc"; + version = "0.1.0.2"; + sha256 = "084vqb1z0ipxn07nswlcw0bbh0bfywm7hyvakb75xg8rv5kfak15"; + libraryHaskellDepends = [ base HDBC migrant-core text ]; + testHaskellDepends = [ + base HDBC HDBC-sqlite3 HUnit migrant-core process QuickCheck random + tasty tasty-hunit tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "migrant-postgresql-simple" = callPackage + ({ mkDerivation, base, HUnit, migrant-core, postgresql-simple + , process, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "migrant-postgresql-simple"; + version = "0.1.0.2"; + sha256 = "1x1gsf0vp82n6dmyiamj1cvs9fww7j1ffh6d9qr075z5sj8zbhzx"; + libraryHaskellDepends = [ + base migrant-core postgresql-simple text + ]; + testHaskellDepends = [ + base HUnit migrant-core postgresql-simple process QuickCheck random + tasty tasty-hunit tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "migrant-sqlite-simple" = callPackage + ({ mkDerivation, base, HUnit, migrant-core, QuickCheck + , sqlite-simple, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "migrant-sqlite-simple"; + version = "0.1.0.2"; + sha256 = "140fchiid0kjp1cdw114w497h0fsrskn9195bkjv44sdmq2l8car"; + libraryHaskellDepends = [ base migrant-core sqlite-simple text ]; + testHaskellDepends = [ + base HUnit migrant-core QuickCheck sqlite-simple tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mikmod" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -172866,6 +173033,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_36" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.36"; + sha256 = "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -173048,6 +173237,8 @@ self: { ]; description = "An extensible and type-safe wrapper around EKG metrics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-mock" = callPackage @@ -176197,8 +176388,8 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.4.0.2"; - sha256 = "0d33d7nw5rfmyyrahv0sc0mdwzp5ywm040hfm9c1wm9h1miahx4n"; + version = "0.4.0.3"; + sha256 = "0wc562fw89l3qmyf28axj41cyj88ppkg0jsif9rsrdgj4ypq2zrj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -176275,6 +176466,8 @@ self: { ]; description = "Servant servers for Mu definitions"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mu-tracing" = callPackage @@ -177725,18 +177918,19 @@ self: { }) {}; "mutable-lens" = callPackage - ({ mkDerivation, base, containers, doctest, lens, primitive, stm - , tasty, tasty-hunit, transformers + ({ mkDerivation, base, containers, doctest, extra, lens, primitive + , stm, tasty, tasty-hunit, transformers }: mkDerivation { pname = "mutable-lens"; - version = "0.4.0.0"; - sha256 = "14mywx7lh3yw8gfqy8h2hml2vr3vjfnxnvfvcg37kfskkfyaf6lm"; + version = "0.4.1.0"; + sha256 = "013z1jj8g996vzwal7vlkfy4h3s67y03k5j1sg78dc9abpc87l2z"; libraryHaskellDepends = [ base lens primitive stm ]; testHaskellDepends = [ base containers doctest lens primitive stm tasty tasty-hunit transformers ]; + benchmarkHaskellDepends = [ base extra primitive ]; description = "Interoperate mutable references with regular lens"; license = stdenv.lib.licenses.asl20; }) {}; @@ -178736,6 +178930,8 @@ self: { sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53"; libraryHaskellDepends = [ base named servant ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-servant-client" = callPackage @@ -178751,6 +178947,8 @@ self: { ]; description = "client support for named-servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-servant-server" = callPackage @@ -178766,6 +178964,8 @@ self: { ]; description = "server support for named-servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-sop" = callPackage @@ -180497,16 +180697,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_3_1_2_0" = callPackage + "network_3_1_2_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.0"; - sha256 = "07zbaaa4f0rnc4xqg5kbzqivmr9lqz2g6bw01gmqkmh9k9svsap0"; - revision = "1"; - editedCabalFile = "079svy0nr035xhz4gd6cila0wvsjl23hi3hq5407m3qdmcf4rkis"; + version = "3.1.2.1"; + sha256 = "0jlx8dls0h95znpcb66bd95k4mp3aaa733h89pq5ymyb8m29bapw"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -181021,6 +181219,8 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-metrics" = callPackage @@ -182153,19 +182353,20 @@ self: { "ngx-export-tools-extra" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, base, base64, binary , bytestring, case-insensitive, containers, ede - , enclosed-exceptions, http-client, http-types, ngx-export + , enclosed-exceptions, http-client, http-types, network, ngx-export , ngx-export-tools, safe, snap-core, snap-server, template-haskell , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.8.0"; - sha256 = "15jqvrbsabwcix1pkvqc1q9gwfskyil9v995109rzfasw9aihaqk"; + version = "0.5.9.0"; + sha256 = "073zzhrv9g7q8miqxws79h2hiqi3yssyb7smsb1mrx4y1rsmq4ss"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client - http-types ngx-export ngx-export-tools safe snap-core snap-server - template-haskell text time trifecta unordered-containers + http-types network ngx-export ngx-export-tools safe snap-core + snap-server template-haskell text time trifecta + unordered-containers ]; description = "More extra tools for Nginx haskell module"; license = stdenv.lib.licenses.bsd3; @@ -182585,22 +182786,23 @@ self: { "nix-thunk" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cli-extras - , cli-git, cli-nix, containers, data-default, directory, either - , exceptions, extra, filepath, git, github, here, lens - , logging-effect, megaparsec, modern-uri, mtl, optparse-applicative - , temporary, text, time, unix, which, yaml + , cli-git, cli-nix, containers, cryptonite, data-default, directory + , either, exceptions, extra, filepath, github, here, lens + , logging-effect, megaparsec, memory, modern-uri, monad-logger, mtl + , optparse-applicative, temporary, text, time, unix, which, yaml }: mkDerivation { pname = "nix-thunk"; - version = "0.2.0.0"; - sha256 = "1bkdcq4qvgnavpkvfvy6il691wwpw6lyba0hhxzjxbm132q46v2y"; + version = "0.2.0.2"; + sha256 = "1jxdxb8ri0cd7ni9z80xlb86d81bb83c6ki5wj7jx7sn9inzz8z7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cli-extras cli-git cli-nix - containers data-default directory either exceptions extra filepath - git github here lens logging-effect megaparsec modern-uri mtl - optparse-applicative temporary text time unix which yaml + containers cryptonite data-default directory either exceptions + extra filepath github here lens logging-effect megaparsec memory + modern-uri monad-logger mtl optparse-applicative temporary text + time unix which yaml ]; executableHaskellDepends = [ base cli-extras optparse-applicative text @@ -183371,21 +183573,6 @@ self: { }) {}; "nonempty-vector" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest - , primitive, vector - }: - mkDerivation { - pname = "nonempty-vector"; - version = "0.2.0.2"; - sha256 = "1w7nmjqlrrymgpainzm7fx4fc6jfl45j7rx73xfcwjsdxl0fl3c2"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base deepseq primitive vector ]; - testHaskellDepends = [ base doctest ]; - description = "Non-empty vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "nonempty-vector_0_2_1_0" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest , primitive, vector }: @@ -183398,7 +183585,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Non-empty vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonemptymap" = callPackage @@ -184438,19 +184624,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "numhask_0_7_0_0" = callPackage + ({ mkDerivation, base, bifunctors, doctest, mmorph, protolude + , QuickCheck, random, text, transformers + }: + mkDerivation { + pname = "numhask"; + version = "0.7.0.0"; + sha256 = "03rf8yk30kqbmq4jdvm3jnqdfx09nmki0kd7y9g2v7g07j2y1qx9"; + revision = "1"; + editedCabalFile = "1n1kilds4c98swbjrybl18d7z82bq4m56nlv03an7b9002wv8xn4"; + libraryHaskellDepends = [ + base bifunctors mmorph protolude random text transformers + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "A numeric class hierarchy"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest - , hmatrix, numhask, vector + , numhask, vector }: mkDerivation { pname = "numhask-array"; - version = "0.7.0"; - sha256 = "1izfym0y9920i2pbzil3z3sn8rzk23lj1rbgj0x0hc7y2p0w5lbm"; + version = "0.8.0"; + sha256 = "03c12d34s20f01vc9kpgrm3n4xi8h4kqzlndj1ncpqb69xx3fhc5"; libraryHaskellDepends = [ - adjunctions base deepseq distributive hmatrix numhask vector + adjunctions base deepseq distributive numhask vector ]; testHaskellDepends = [ base doctest numhask ]; - description = "n-dimensional arrays"; + description = "Multi-dimensional array interface for numhask"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -184550,14 +184755,14 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.6.1"; - sha256 = "0kqq2p0j7p7my33lw0alcc6il3chvsaj75cm1py0wa681jfmzxcv"; + version = "0.7.0.0"; + sha256 = "1vvm6px9wlqm07sc2p2df100x1pg2rgy363c59v1c910120lpdjd"; libraryHaskellDepends = [ adjunctions base containers distributive numhask semigroupoids tdigest text time ]; testHaskellDepends = [ base doctest numhask ]; - description = "numerical spaces"; + description = "Numerical spaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -187799,18 +188004,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-applicative_0_16_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, process - , QuickCheck, transformers, transformers-compat + "optparse-applicative_0_16_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck + , transformers, transformers-compat }: mkDerivation { pname = "optparse-applicative"; - version = "0.16.0.0"; - sha256 = "0aybamakg9zjac0b78lhfa1bvilkb76yryis6h0pf5j1khrkri89"; + version = "0.16.1.0"; + sha256 = "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; - testHaskellDepends = [ base bytestring QuickCheck ]; + testHaskellDepends = [ base QuickCheck ]; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -188420,33 +188625,6 @@ self: { }) {}; "ormolu" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, text - }: - mkDerivation { - pname = "ormolu"; - version = "0.1.3.1"; - sha256 = "1qad2s270rhgm2chhrmjd5zsv6bqykba978vn0hakm29mgck2zgw"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc-lib-parser mtl syb - text - ]; - executableHaskellDepends = [ - base ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ormolu_0_1_4_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec , hspec-discover, mtl, optparse-applicative, path, path-io, syb @@ -188472,7 +188650,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orthotope" = callPackage @@ -189537,8 +189714,10 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.3"; - sha256 = "0x6l3318g2x3q69drbnk2dkzn8l6c5m0msfnmwzbq6g6952gnsam"; + version = "0.3.8.4"; + sha256 = "098xp2n6rmg2vhaip8yyvrr534cllb1s6kj9p6r4iqqv4w3nc2sb"; + revision = "1"; + editedCabalFile = "1p1gkq4sgyxnfnna1avjmbw4ifrsmw920qhnaa4nkmbpgmccdca2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -190002,8 +190181,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.1"; - sha256 = "0b6xh5fzxw5v9hh1xjksh2bwzmlnv7wra5l1s9gzfwl623xgh445"; + version = "0.3.2"; + sha256 = "1dj07dnljy1b7m9sq5dlxvvl8rbla8cf129s2wcw24x31j3ga96b"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -190155,47 +190334,6 @@ self: { }) {}; "pantry" = 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.1.3"; - sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss"; - 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; - }) {}; - - "pantry_0_5_1_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -190234,7 +190372,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pantry-tmp" = callPackage @@ -192771,23 +192908,6 @@ self: { }) {}; "pcg-random" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest - , entropy, primitive, random - }: - mkDerivation { - pname = "pcg-random"; - version = "0.1.3.6"; - sha256 = "1m8xnic207ajbpz0q81h7xr9xmp1dzm6474vyvack6iidbzi4l08"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring entropy primitive random - ]; - testHaskellDepends = [ base doctest ]; - description = "Haskell bindings to the PCG random number generator"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pcg-random_0_1_3_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest , entropy, primitive, random }: @@ -192802,7 +192922,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Haskell bindings to the PCG random number generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pcgen" = callPackage @@ -195518,12 +195637,12 @@ self: { }) {}; "phonetic-languages-common" = callPackage - ({ mkDerivation, base, subG, vector }: + ({ mkDerivation, base, subG, subG-instances, vector }: mkDerivation { pname = "phonetic-languages-common"; - version = "0.1.1.0"; - sha256 = "08i9g7yaiwryy9ndd0adbl3cskqva71mi45x55knc6r9wdhnprph"; - libraryHaskellDepends = [ base subG vector ]; + version = "0.1.2.0"; + sha256 = "16m215rydybgn7wi5g3lh694z8zja2yr7b5p1rn33vgph2h5i8v7"; + libraryHaskellDepends = [ base subG subG-instances vector ]; description = "A generalization of the uniqueness-periods-vector-common package"; license = stdenv.lib.licenses.mit; }) {}; @@ -195540,12 +195659,12 @@ self: { }) {}; "phonetic-languages-constraints" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, subG, subG-instances, vector }: mkDerivation { pname = "phonetic-languages-constraints"; - version = "0.3.2.0"; - sha256 = "16gq0vr20bk3mg8b1w7gdlv32wr5vf9q0dj4f6x42x476fd4dcj3"; - libraryHaskellDepends = [ base vector ]; + version = "0.4.0.0"; + sha256 = "11m389rpz7ddvmkf5wrasc41kmy67fki234fjcgi1djk8iawp5pw"; + libraryHaskellDepends = [ base subG subG-instances vector ]; description = "Constraints to filter the needed permutations"; license = stdenv.lib.licenses.mit; }) {}; @@ -195561,8 +195680,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-examples"; - version = "0.6.2.0"; - sha256 = "1gjlbzd7hy280sy7qpzdrljpr59rmln8g0s7rsmkhzqbvfbyfgfj"; + version = "0.6.2.1"; + sha256 = "0k9cwvfdxf13izbww7g08p0x702xgmm7dck3mjk4maajjfia34zm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195589,8 +195708,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-general"; - version = "0.3.0.0"; - sha256 = "0ay0814py6kxq4r64jlzpr1nkjdpkh5vdiw0kxn6ifzrh382681h"; + version = "0.3.0.1"; + sha256 = "1b99xf5glwdas2s8wsdgpwnzg5gmybdp6c3q547mi5xd7w6flh99"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-plus print-info subG vector @@ -195636,8 +195755,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-properties"; - version = "0.3.0.0"; - sha256 = "1bf0k2wlypaiff84alnf94c5adbkbz1d3bkdbmd04bq937yc3rfq"; + version = "0.3.0.1"; + sha256 = "0b3wnzlka9dapk1478jr35pnd3ykj3mn5nkhvmwjdsxigzzaa1wf"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-rhythmicity phonetic-languages-vector ukrainian-phonetics-basic vector @@ -195663,8 +195782,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-common"; - version = "0.2.0.0"; - sha256 = "0yksj6zinpyj1a61gikdkyh6f5xiqjlk66yywip3hgfigg809k8g"; + version = "0.3.0.0"; + sha256 = "1l5czk3ncwbv324k96gyc77lx8nvxxqpqggbyxw18wrwpmyn46i8"; libraryHaskellDepends = [ base phonetic-languages-permutations subG subG-instances vector ]; @@ -195672,6 +195791,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-simplified-properties-lists" = callPackage + ({ mkDerivation, base, phonetic-languages-rhythmicity + , phonetic-languages-simplified-common, ukrainian-phonetics-basic + , vector + }: + mkDerivation { + pname = "phonetic-languages-simplified-properties-lists"; + version = "0.1.3.1"; + sha256 = "1cbai5vi33fp7l3vpd4n0adjh0dbazhy7sms7716zd7vi4b2zm6s"; + libraryHaskellDepends = [ + base phonetic-languages-rhythmicity + phonetic-languages-simplified-common ukrainian-phonetics-basic + vector + ]; + description = "A generalization of the uniqueness-periods-vector-properties package"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-ukrainian" = callPackage ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: mkDerivation { @@ -197455,8 +197592,6 @@ self: { ]; description = "properly streaming text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-transduce" = callPackage @@ -200745,6 +200880,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_3_3" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.3.3"; + sha256 = "0aivmhzs1cnr86j6xv6nix913walqfvgirydzrp09l5ppp5i2sps"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -201061,36 +201226,6 @@ self: { }) {}; "postgresql-simple" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, bytestring-builder, case-insensitive, containers - , cryptohash-md5, filepath, hashable, HUnit, inspection-testing - , Only, postgresql-libpq, scientific, tasty, tasty-golden - , tasty-hunit, template-haskell, text, time, transformers - , uuid-types, vector - }: - mkDerivation { - pname = "postgresql-simple"; - version = "0.6.2"; - sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv"; - revision = "4"; - editedCabalFile = "03s0cbwqgkvzr1wkan7icfjb9qlz95pbs3pqv2mkpf117m3y1yb0"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring bytestring-builder - case-insensitive containers hashable Only postgresql-libpq - scientific template-haskell text time transformers uuid-types - vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive containers - cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq - tasty tasty-golden tasty-hunit text time vector - ]; - benchmarkHaskellDepends = [ base vector ]; - description = "Mid-Level PostgreSQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple_0_6_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash-md5, filepath, hashable, HUnit, inspection-testing @@ -201116,7 +201251,6 @@ self: { benchmarkHaskellDepends = [ base vector ]; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-bind" = callPackage @@ -201325,6 +201459,8 @@ self: { ]; description = "PostgreSQL AST parsing and rendering"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-transactional" = callPackage @@ -202198,26 +202334,23 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring , comonad, containers, deepseq, directory, doctest, hashable, lens , lens-action, pcre-heavy, pcre-light, pretty-terminal, QuickCheck - , safe, stm, string-conversions, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-lift - , th-lift-instances, these, time + , safe, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, these, time }: mkDerivation { pname = "predicate-typed"; - version = "0.7.4.4"; - sha256 = "0ynlwwh8x5zmr8i3vijdava61ixyv7c0cqb2i9y89pbc4nn72pcm"; + version = "0.7.4.5"; + sha256 = "00q5q7s4b208lr3r8nlnchi3racmdcbvqrr7xyzslz6fr4dih112"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad containers deepseq directory hashable lens pcre-heavy pcre-light - pretty-terminal QuickCheck safe string-conversions template-haskell - text th-lift th-lift-instances these time + pretty-terminal QuickCheck safe template-haskell text these time ]; testHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad containers deepseq directory doctest hashable lens lens-action pcre-heavy - pcre-light pretty-terminal QuickCheck safe stm string-conversions - tasty tasty-hunit tasty-quickcheck template-haskell text th-lift - th-lift-instances these time + pcre-light pretty-terminal QuickCheck safe tasty tasty-hunit + tasty-quickcheck template-haskell text these time ]; description = "Predicates, Refinement types and Dsl"; license = stdenv.lib.licenses.bsd3; @@ -203582,6 +203715,18 @@ self: { }) {}; "primitive-unlifted" = callPackage + ({ mkDerivation, base, bytestring, primitive, stm, text-short }: + mkDerivation { + pname = "primitive-unlifted"; + version = "0.1.3.0"; + sha256 = "1q7scarsdv51x74g6ahvc5znk9h628s984a7bawig0lnx67wzwih"; + libraryHaskellDepends = [ base bytestring primitive text-short ]; + testHaskellDepends = [ base primitive stm ]; + description = "Primitive GHC types with unlifted types inside"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primitive-unlifted_1_0_0_0" = callPackage ({ mkDerivation, array, base, bytestring, primitive, QuickCheck , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short }: @@ -203598,6 +203743,7 @@ self: { ]; description = "Primitive GHC types with unlifted types inside"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primula-board" = callPackage @@ -204826,18 +204972,18 @@ self: { "prolude" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers - , generic-random, mongoDB, persistent, persistent-mongoDB + , generic-random, mongoDB, mtl, persistent, persistent-mongoDB , QuickCheck, quickcheck-instances, safe-exceptions, scientific - , text, time, vector + , swagger2, text, time, vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.9"; - sha256 = "0fnahs81xv2nx6cv6avp8bkhbprhy9vyhq5y3d0mna8iw06s0xfs"; + version = "0.0.0.11"; + sha256 = "0y9x5layrwd1na7rzrpc9syngcpg4h5cyd6lgg10xvbjkxqjz19v"; libraryHaskellDepends = [ - aeson base bytestring cassava containers generic-random mongoDB + aeson base bytestring cassava containers generic-random mongoDB mtl persistent persistent-mongoDB QuickCheck quickcheck-instances - safe-exceptions scientific text time vector + safe-exceptions scientific swagger2 text time vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -205950,8 +206096,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.9.0"; sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; - revision = "2"; - editedCabalFile = "1njlypxh9p0dfqywgqgyzgx9h822d37jbnnd9zbl0ci99k1247g6"; + revision = "3"; + editedCabalFile = "0x0a5rjylmh4pdmr9iyadywzh06qxypq48b78skvm09bkkvrxghq"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -208283,8 +208429,8 @@ self: { }: mkDerivation { pname = "quickcheck-arbitrary-template"; - version = "0.2.1.0"; - sha256 = "1g9b39bhjcx44l8mwj5hwbjkd575prd46v16jz895q4f3ibqnfvp"; + version = "0.2.1.1"; + sha256 = "0cmk6kp895qrirdavbfp96k9yggs83bjcknyvwbkfzx5zbdc87y7"; libraryHaskellDepends = [ base QuickCheck safe template-haskell ]; testHaskellDepends = [ base QuickCheck safe tasty tasty-golden tasty-hunit @@ -210532,27 +210678,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest - , markdown-unlit, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.4.0.1"; - sha256 = "1r72z98jvnih16x074izb0wp9gwbsjs2ihvj8a72xxyakdad71r9"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rank2classes_1_4_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest , markdown-unlit, tasty, tasty-hunit, template-haskell , transformers @@ -210571,7 +210696,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rapid" = callPackage @@ -211476,6 +211600,8 @@ self: { libraryHaskellDepends = [ aeson base react-flux servant text ]; description = "Allow react-flux stores to send requests to a servant server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "react-haskell" = callPackage @@ -212050,22 +212176,22 @@ self: { "readme-lhs" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, containers, doctest - , foldl, numhask, pandoc, pandoc-types, scientific, tdigest, text + , foldl, generic-lens, numhask, pandoc, pandoc-types, text , transformers }: mkDerivation { pname = "readme-lhs"; - version = "0.7.0"; - sha256 = "0sgfqx34yzlvn2999wh2681gk6dan9nrlkzd3indybkmal9mc80b"; + version = "0.8.0"; + sha256 = "1yircw8xhrzj40y6026bjb8jx7mm3zkkss7bzvbph1vbpgcazsc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base blaze-html containers foldl numhask pandoc - pandoc-types scientific tdigest text transformers + attoparsec base blaze-html containers foldl generic-lens numhask + pandoc pandoc-types text transformers ]; - executableHaskellDepends = [ base numhask text ]; - testHaskellDepends = [ base containers doctest ]; - description = "See readme.md"; + executableHaskellDepends = [ base numhask ]; + testHaskellDepends = [ base doctest numhask ]; + description = "Literate programming support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -213497,8 +213623,8 @@ self: { }: mkDerivation { pname = "reflex-dom-retractable"; - version = "0.1.6.0"; - sha256 = "0xmxbyf72jnlyyr1iqgms43has4z3qv7ini5jrn1xkyhjmdanrcw"; + version = "0.1.7.0"; + sha256 = "0f40hxnlv7fpdjws0c720dz91zjxg8fxjl9qsmlilhapjzrjz9d2"; libraryHaskellDepends = [ base containers jsaddle mtl ref-tf reflex reflex-dom ]; @@ -213549,6 +213675,17 @@ self: { broken = true; }) {}; + "reflex-external-ref" = callPackage + ({ mkDerivation, base, deepseq, reflex }: + mkDerivation { + pname = "reflex-external-ref"; + version = "1.0.3.1"; + sha256 = "0mv17j5g0h7y1ym4563xr1vc0sdvw0g4wdpx0a9aryk3i0k0i4mx"; + libraryHaskellDepends = [ base deepseq reflex ]; + description = "External reference with reactivity support"; + license = stdenv.lib.licenses.mit; + }) {}; + "reflex-fsnotify" = callPackage ({ mkDerivation, base, containers, directory, filepath, fsnotify , reflex @@ -213702,6 +213839,57 @@ self: { broken = true; }) {}; + "reflex-localize" = callPackage + ({ mkDerivation, base, jsaddle, mtl, reflex, reflex-external-ref + , text + }: + mkDerivation { + pname = "reflex-localize"; + version = "1.0.2.0"; + sha256 = "0iwxj8shik06r1wdhl8p5spvvn43xswilzhid8mfc3hj5khpzdzm"; + libraryHaskellDepends = [ + base jsaddle mtl reflex reflex-external-ref text + ]; + description = "Localization library for reflex"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reflex-localize-dom" = callPackage + ({ mkDerivation, base, containers, reflex, reflex-dom + , reflex-localize, text + }: + mkDerivation { + pname = "reflex-localize-dom"; + version = "1.0.0.0"; + sha256 = "1y2m15l6xxcmhhpn5jq3dfvzd04s5d84pm5s7iff9s0gkikhz4ga"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers reflex reflex-dom reflex-localize text + ]; + description = "Helper widgets for reflex-localize"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reflex-monad-auth" = callPackage + ({ mkDerivation, base, jsaddle, mtl, reflex, reflex-external-ref }: + mkDerivation { + pname = "reflex-monad-auth"; + version = "0.1.0.1"; + sha256 = "1gfhh462rd401rmcnb7lgn9443y2fg16xpyp4kgkzi8c4l8ja4af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base jsaddle mtl reflex reflex-external-ref + ]; + description = "Utilities to split reflex app to authorized and not authorized contexts"; + license = stdenv.lib.licenses.mit; + }) {}; + "reflex-orphans" = callPackage ({ mkDerivation, base, deepseq, dependent-map, mtl, ref-tf, reflex , tasty, tasty-hunit, these @@ -216267,6 +216455,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "req_3_8_0" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, exceptions, hspec + , hspec-core, hspec-discover, http-api-data, http-client + , http-client-tls, http-types, modern-uri, monad-control, mtl + , QuickCheck, retry, template-haskell, text, time, transformers + , transformers-base, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "req"; + version = "3.8.0"; + sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection exceptions http-api-data http-client + http-client-tls http-types modern-uri monad-control mtl retry + template-haskell text time transformers transformers-base + unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-client http-types modern-uri monad-control mtl + QuickCheck retry template-haskell text time unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh @@ -216775,6 +216995,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet-pool" = callPackage + ({ mkDerivation, base, resource-pool, resourcet }: + mkDerivation { + pname = "resourcet-pool"; + version = "0.1.0.0"; + sha256 = "1jf6sbyhxrqbkdxiv330rk46kdvbrr0c4pybnm9cmij9wdqs15bd"; + libraryHaskellDepends = [ base resource-pool resourcet ]; + description = "A small library to convert a Pool into an Acquire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -217587,6 +217818,8 @@ self: { ]; description = "The Servant extensions from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc1413-server" = callPackage @@ -218777,6 +219010,8 @@ self: { ]; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) rocksdb;}; "rocksdb-haskell-jprupp" = callPackage @@ -219601,8 +219836,8 @@ self: { ({ mkDerivation, base, hspec, rowdy, yesod-core }: mkDerivation { pname = "rowdy-yesod"; - version = "0.0.1.0"; - sha256 = "17k9bbxwpmxpswkmax6jrlcfrp6qhgdkjixsp4d6rn7mj676010g"; + version = "0.0.1.1"; + sha256 = "120n4n17n3pkpc23bpjn2vc7w3zaifmyd4mr86n16hn993482b1s"; libraryHaskellDepends = [ base rowdy yesod-core ]; testHaskellDepends = [ base hspec rowdy yesod-core ]; description = "An EDSL for web application routes"; @@ -219848,10 +220083,8 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.6.0.0"; - sha256 = "0crp7z6s5xch5jggyyg1a2jcijgl5cg17wiiqkcfmwjdkraz7ax9"; - revision = "1"; - editedCabalFile = "1xgqfn7dlzz79j4krmqg4d2xlybm6x4b0s8gklphn3lccwpicfy8"; + version = "0.6.0.1"; + sha256 = "07fmf5d93ywgqz4fp0aw5n1vzqlphrhcmiqrc0xpcphi17ig9m7l"; libraryHaskellDepends = [ atom-conduit base base-compat-batteries conduit conduit-combinators containers dublincore-xml-conduit microlens microlens-th safe @@ -223718,6 +223951,8 @@ self: { description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seacat" = callPackage @@ -225410,8 +225645,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.18.1"; - sha256 = "15brknvia5kd1fiyxlqghhhnajwrgai9yspkg5nd0v2k1g9dllky"; + version = "0.18.2"; + sha256 = "18mfjj9za8g9rgj7a6j0ly6lf1ykfwrlpy3cf53lv1gxvb19gmk5"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive deepseq http-api-data http-media http-types mmorph @@ -225445,6 +225680,8 @@ self: { ]; description = "Servant support for JuicyPixels"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-aeson-specs" = callPackage @@ -225470,6 +225707,8 @@ self: { ]; description = "generic tests for aeson serialization in servant"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth" = callPackage @@ -225498,6 +225737,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.0"; sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83"; + revision = "1"; + editedCabalFile = "0q7bazq4ilijclpz23fshpjcspnrfalh7jhqi5gg03m00wwibn4n"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -225539,6 +225780,8 @@ self: { ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-docs" = callPackage @@ -225598,6 +225841,8 @@ self: { ]; description = "Authentication via HMAC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-server" = callPackage @@ -225665,6 +225910,8 @@ self: { ]; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-acid" = callPackage @@ -225686,6 +225933,8 @@ self: { ]; description = "Acid-state backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-api" = callPackage @@ -225702,6 +225951,8 @@ self: { ]; description = "Servant based API for token based authorisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-leveldb" = callPackage @@ -225723,6 +225974,8 @@ self: { ]; description = "Leveldb backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-persistent" = callPackage @@ -225742,6 +225995,8 @@ self: { ]; description = "Persistent backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-rocksdb" = callPackage @@ -225764,6 +226019,8 @@ self: { ]; description = "RocksDB backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-wordpress" = callPackage @@ -225779,6 +226036,8 @@ self: { ]; description = "Authenticate Routes Using Wordpress Cookies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-avro" = callPackage @@ -225796,6 +226055,8 @@ self: { ]; description = "Avro content type for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-blaze" = callPackage @@ -225831,6 +226092,8 @@ self: { ]; description = "Servant CSV content-type for cassava"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-checked-exceptions" = callPackage @@ -225903,6 +226166,8 @@ self: { ]; description = "Command line interface for Servant API clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-client" = callPackage @@ -225916,10 +226181,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.18.1"; - sha256 = "0pv9xj5a6caqxsnlnv4ijzavgmsgi0n3zri4h84mrjki2h2z1837"; - revision = "1"; - editedCabalFile = "1d2f8l2zs2gy880g3i9l3jwjrxygb705qz1f81ral7ik56465m83"; + version = "0.18.2"; + sha256 = "0acwpjmi5r62jgmpw508jq942kq5dhdy5602w9v7g318inxzwwi1"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -225945,10 +226208,10 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.18.1"; - sha256 = "1pp4r8l1130ph680kcw7zpk1p76z88ip21cf4dghckmj0lflyw9h"; + version = "0.18.2"; + sha256 = "0b449c28z20sx98pc2d4p65jr3m9glsa47jjc2w4gf90jisl173r"; revision = "1"; - editedCabalFile = "04lk4zwx5g652krn561fd02wbrsg9jrj93hw7gv6z2xay8dr05m1"; + editedCabalFile = "0vwj97h6x7zwvyx3ra09yhpi37mnn2kw5m27wnkzwwvk487swqxd"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -225977,6 +226240,8 @@ self: { ]; description = "A servant client for frontend JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-client-namedargs" = callPackage @@ -225998,6 +226263,8 @@ self: { ]; description = "Automatically derive API client functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-conduit" = callPackage @@ -226037,6 +226304,8 @@ self: { ]; description = "Generate servant client library for C#"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-db" = callPackage @@ -226048,6 +226317,8 @@ self: { libraryHaskellDepends = [ base servant ]; description = "Servant types for defining API with relational DBs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-db-postgresql" = callPackage @@ -226073,6 +226344,8 @@ self: { ]; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-dhall" = callPackage @@ -226094,6 +226367,8 @@ self: { ]; description = "Servant Dhall content-type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-docs" = callPackage @@ -226104,8 +226379,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.7"; - sha256 = "01m8ixxs310mcmnd1c5na2ycbnc9xwizdnzzcjdbli5r1mngpgc8"; + version = "0.11.8"; + sha256 = "0zbsv75zyfg44l4822qnmvw2naxcxwgnpzc55jnvz766l2dydjrb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226144,6 +226419,8 @@ self: { ]; description = "Generate endpoints overview for Servant API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-ede" = callPackage @@ -226167,6 +226444,8 @@ self: { ]; description = "Combinators for rendering EDE templates in servant web applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-ekg" = callPackage @@ -226193,6 +226472,8 @@ self: { ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-elm" = callPackage @@ -226215,6 +226496,8 @@ self: { ]; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-errors" = callPackage @@ -226260,25 +226543,37 @@ self: { ]; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-exceptions" = callPackage - ({ mkDerivation, aeson, base, exceptions, http-media, http-types - , mtl, servant, servant-server, text, wai, warp + ({ mkDerivation, aeson, base, exceptions, http-types, servant, text }: mkDerivation { pname = "servant-exceptions"; - version = "0.1.1"; - sha256 = "1qdb6ins7l0ryyrmg9j5pw428rlhkmzpbq5jqawfn01j8vf9yav5"; - isLibrary = true; - isExecutable = true; + version = "0.2.1"; + sha256 = "1bzxac87x3nfg5hllqxfi2qrdkiy2zfxwzkcg6vyjirnwpqvn49b"; libraryHaskellDepends = [ - aeson base exceptions http-media http-types mtl servant - servant-server text wai + aeson base exceptions http-types servant text ]; - executableHaskellDepends = [ - aeson base exceptions http-types servant-server text warp + description = "Extensible exceptions for servant APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-exceptions-server" = callPackage + ({ mkDerivation, base, exceptions, http-media, http-types, mtl + , servant, servant-exceptions, servant-server, text, wai + }: + mkDerivation { + pname = "servant-exceptions-server"; + version = "0.2.1"; + sha256 = "1cx9d2hx09mx1kypdhwyqhl6s1aipvxi4ak4xy4jrd0fy8r8wy9g"; + libraryHaskellDepends = [ + base exceptions http-media http-types mtl servant + servant-exceptions servant-server text wai ]; + description = "Extensible exceptions for servant API servers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -226293,6 +226588,8 @@ self: { ]; description = "Fiat content types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-flatten" = callPackage @@ -226312,8 +226609,8 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.15.2"; - sha256 = "0vxm80cnd4w8zpyq7brnnjmcarb0vj7xgikwpc0il1w6hjgis7vl"; + version = "0.15.3"; + sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -226334,6 +226631,8 @@ self: { libraryHaskellDepends = [ base servant servant-server ]; description = "Utilities for generating mock server implementations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-generic" = callPackage @@ -226350,6 +226649,8 @@ self: { ]; description = "Specify Servant APIs with records"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-github" = callPackage @@ -226373,6 +226674,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings to GitHub API using servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-github-webhook" = callPackage @@ -226422,6 +226725,8 @@ self: { ]; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-hmac-auth" = callPackage @@ -226448,6 +226753,8 @@ self: { testHaskellDepends = [ base ]; description = "Servant authentication with HMAC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-http-streams" = callPackage @@ -226462,10 +226769,8 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.18.1"; - sha256 = "05ji6zg6v8cysfbh0850cmwrian0n2clvqn3b348cz3qms0ijrpg"; - revision = "1"; - editedCabalFile = "0xpscs5y480n19n3i4sn7xmb6kra7cyjxq64ic18cpqijv1jwlm1"; + version = "0.18.2"; + sha256 = "1kyiv8qamw9dxv2ax7hx9n7w9507vjvwn89x4nvlsc87nq91hvg0"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -226507,6 +226812,8 @@ self: { ]; description = "Generate HTTP2 clients from Servant API descriptions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-iCalendar" = callPackage @@ -226523,6 +226830,8 @@ self: { ]; description = "Servant support for iCalendar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-jquery" = callPackage @@ -226541,6 +226850,8 @@ self: { ]; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-js" = callPackage @@ -226564,6 +226875,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-jsonrpc" = callPackage @@ -226630,6 +226943,8 @@ self: { ]; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-lucid" = callPackage @@ -226698,6 +227013,8 @@ self: { ]; description = "Matrix parameter combinator for servant"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-mock" = callPackage @@ -226726,6 +227043,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-multipart" = callPackage @@ -226788,6 +227107,8 @@ self: { testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-nix" = callPackage @@ -226809,6 +227130,8 @@ self: { ]; description = "Servant Nix content-type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-openapi3" = callPackage @@ -226837,6 +227160,38 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "servant-openapi3_2_0_1_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , Cabal, cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , lens-aeson, openapi3, QuickCheck, servant, singleton-bool + , template-haskell, text, time, unordered-containers, utf8-string + , vector + }: + mkDerivation { + pname = "servant-openapi3"; + version = "2.0.1.1"; + sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring hspec http-media + insert-ordered-containers lens openapi3 QuickCheck servant + singleton-bool text unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat directory doctest filepath hspec lens + lens-aeson openapi3 QuickCheck servant template-haskell text time + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-options" = callPackage @@ -226870,6 +227225,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck servant-server text ]; description = "Type-safe pagination for Servant APIs"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pandoc" = callPackage @@ -226887,6 +227244,8 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pipes" = callPackage @@ -226921,6 +227280,8 @@ self: { libraryHaskellDepends = [ base resource-pool servant time ]; description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-postgresql" = callPackage @@ -226937,6 +227298,8 @@ self: { ]; description = "Useful functions and instances for using servant with a PostgreSQL context"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-proto-lens" = callPackage @@ -226959,6 +227322,8 @@ self: { ]; description = "Servant Content-Type for proto-lens protobuf modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-purescript" = callPackage @@ -226982,6 +227347,8 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -227001,6 +227368,8 @@ self: { ]; description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-py" = callPackage @@ -227022,6 +227391,8 @@ self: { ]; description = "Automatically derive python functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-quickcheck" = callPackage @@ -227050,6 +227421,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-rawm" = callPackage @@ -227072,6 +227445,8 @@ self: { libraryHaskellDepends = [ base servant-client-core servant-rawm ]; description = "The client implementation of servant-rawm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-rawm-docs" = callPackage @@ -227123,6 +227498,8 @@ self: { ]; description = "Derive Reason types to interact with a Haskell backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-reflex" = callPackage @@ -227145,6 +227522,8 @@ self: { ]; description = "servant API generator for reflex apps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-response" = callPackage @@ -227177,6 +227556,8 @@ self: { ]; description = "Servant router for non-server applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-ruby" = callPackage @@ -227209,6 +227590,8 @@ self: { ]; description = "Generate a web service for servant 'Resource's using scotty and JSON"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-seo" = callPackage @@ -227231,6 +227614,8 @@ self: { ]; description = "Generate Robots.txt and Sitemap.xml specification for your servant API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-serf" = callPackage @@ -227250,6 +227635,8 @@ self: { doHaddock = false; description = "Generates a servant API module"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-server" = callPackage @@ -227263,10 +227650,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.18.1"; - sha256 = "1azyaprki2mxqxb67h792qrjzxy8cy9m9f7zxg22g60l3j197df5"; - revision = "1"; - editedCabalFile = "1z136vqfbxliq141y4i6m9d3bif4k0ay34xximlnnfxjazx4r0ph"; + version = "0.18.2"; + sha256 = "05ricb3w1app6c094zwaq2jnqv53jpf4n89ffynm31dvf6h9qdih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227304,6 +227689,8 @@ self: { ]; description = "Automatically derive API server functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-smsc-ru" = callPackage @@ -227326,6 +227713,8 @@ self: { ]; description = "Servant client for smsc.ru service for sending SMS to cell phones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-snap" = callPackage @@ -227363,6 +227752,8 @@ self: { ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-stache" = callPackage @@ -227425,6 +227816,8 @@ self: { testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-client" = callPackage @@ -227450,6 +227843,8 @@ self: { ]; description = "Client instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-docs" = callPackage @@ -227467,6 +227862,8 @@ self: { ]; description = "Client instances for the 'servant-docs' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-server" = callPackage @@ -227493,6 +227890,8 @@ self: { ]; description = "Server instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-subscriber" = callPackage @@ -227563,6 +227962,8 @@ self: { ]; description = "Swagger Tags for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-swagger-ui" = callPackage @@ -227657,6 +228058,8 @@ self: { ]; description = "Automatically generate Elm clients for Servant APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-tracing" = callPackage @@ -227711,6 +228114,8 @@ self: { ]; description = "Servant Integration for Waargonaut JSON Package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-wasm" = callPackage @@ -227787,6 +228192,8 @@ self: { ]; description = "Servant support for yaml"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin" = callPackage @@ -227798,6 +228205,8 @@ self: { libraryHaskellDepends = [ base singletons ]; description = "Types and definitions of servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-client" = callPackage @@ -227821,6 +228230,8 @@ self: { ]; description = "Client library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-server" = callPackage @@ -227844,6 +228255,8 @@ self: { ]; description = "Server library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-swagger" = callPackage @@ -227865,6 +228278,8 @@ self: { ]; description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "server-generic" = callPackage @@ -232554,6 +232969,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -232642,6 +233059,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_10_1" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , directory, filepath, pretty-show, skylighting-core, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.10.1"; + sha256 = "0zpf6p3c0byp3pv9bgg77ndq89n3fhcazyln44pq8lxnmjy0x15v"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory filepath + pretty-show text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -232673,6 +233113,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_10_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + , transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.10.1"; + sha256 = "10da31x6zj1b3kydr63g36zmmqpqmgcbwdalhxvbmxliw1m5kfvx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl safe text transformers utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text utf8-string + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -238205,8 +238677,8 @@ self: { }: mkDerivation { pname = "sr-extra"; - version = "1.80"; - sha256 = "03xm9km8wzvz8g1czj320k00xf2dzdi8rm74l7xdr9h7bxcwyh84"; + version = "1.85.1"; + sha256 = "15x8d413m8ldl81b5yx13nprr4k0aszx33mjm880za0k90s8r65x"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -242521,20 +242993,6 @@ self: { }) {}; "strict-tuple" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; - version = "0.1.3"; - sha256 = "0dyiwgkbr1d97jbri7a2q4by7g0wiszpw3hgfgqv4rfp25lsv39j"; - revision = "1"; - editedCabalFile = "1bkizfki8v5p0n8sy59s4zqjmv1mnv3s45327cig9cr081ibv9yy"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_4" = callPackage ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; @@ -242544,7 +243002,6 @@ self: { testHaskellDepends = [ base ]; description = "Strict tuples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -247788,8 +248245,8 @@ self: { }: mkDerivation { pname = "tart"; - version = "0.2"; - sha256 = "03pi46lr5b9qcc35ffwxwzv9ll51cyv526kjcvaags3ky917rxxn"; + version = "0.3"; + sha256 = "0zqj8cz4q1447an9fak73vzandd497xa745km3w4y3cffnc0zwyw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247801,8 +248258,6 @@ self: { ]; description = "Terminal Art"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "task" = callPackage @@ -248233,24 +248688,6 @@ self: { }) {}; "tasty-hspec" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-hspec"; - version = "1.1.5.1"; - sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; - revision = "6"; - editedCabalFile = "0xa7h0p5r41m2a3l5r9ggmm4bc2a6wzgb4qvcqfl0dd2yb922bkz"; - libraryHaskellDepends = [ - base hspec hspec-core QuickCheck tasty tasty-quickcheck - tasty-smallcheck - ]; - description = "Hspec support for the Tasty test framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-hspec_1_1_6" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty , tasty-quickcheck, tasty-smallcheck }: @@ -248264,7 +248701,6 @@ self: { ]; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-html" = callPackage @@ -251899,38 +252335,6 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers, criterion - , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim - , hspec, hspec-discover, integer-gmp, QuickCheck - , quickcheck-instances, template-haskell, text, th-abstraction - , th-lift, transformers, transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.8.5"; - sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg"; - revision = "3"; - editedCabalFile = "13gqszvlbqpgb2am8ny8v1p56yx5l9vqs2w45g8ld53f50ll62rv"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot-th ghc-prim - integer-gmp template-haskell text th-abstraction th-lift - transformers transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - QuickCheck quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show_3_9" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -251958,7 +252362,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -252707,25 +253110,6 @@ self: { }) {}; "th-lift-instances" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, th-lift, transformers, vector - }: - mkDerivation { - pname = "th-lift-instances"; - version = "0.1.17"; - sha256 = "0k59j460dcr9vidmww2has78g3zx2wl0cjlpqc1laqai9w8klda5"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text th-lift - transformers vector - ]; - testHaskellDepends = [ - base bytestring containers QuickCheck template-haskell text vector - ]; - description = "Lift instances for template-haskell for common data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift-instances_0_1_18" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector }: @@ -252742,7 +253126,6 @@ self: { ]; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-nowq" = callPackage @@ -254054,14 +254437,14 @@ self: { broken = true; }) {}; - "time_1_11" = callPackage + "time_1_11_1" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck, random , tasty, tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.11"; - sha256 = "16kmc754gz73plwb7lnk206r9v99va8y4ilbm347h6xmi5z7avp9"; + version = "1.11.1"; + sha256 = "0l0nqqg38xz2q78pi4i4jsbrb1jkn9ch0xlq17kn7824dh0j21vw"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -254698,8 +255081,8 @@ self: { }: mkDerivation { pname = "timerep"; - version = "2.0.0.2"; - sha256 = "0fakjs6fgva6i035jiyr8hcgnrivw601cy8n3ja232d07izl2khx"; + version = "2.0.1.0"; + sha256 = "1l67gbfjydq0xapry5k9pwzxmp6z7ixzyvwshnszryspcckagxif"; libraryHaskellDepends = [ attoparsec base monoid-subclasses text time ]; @@ -256120,6 +256503,8 @@ self: { ]; description = "tonatona plugin for servant"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "too-many-cells" = callPackage @@ -256751,26 +257136,6 @@ self: { }) {}; "tracing" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, hspec, http-client, mtl, network - , random, stm, text, time, transformers, unliftio - }: - mkDerivation { - pname = "tracing"; - version = "0.0.5.1"; - sha256 = "06d4fik133jbwbznk6fccwhw21n750gnigw9gj25sgjkghydmllb"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive containers - http-client mtl network random stm text time transformers unliftio - ]; - testHaskellDepends = [ - base containers hspec mtl stm text unliftio - ]; - description = "Distributed tracing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tracing_0_0_5_2" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, hspec, http-client, mtl, network , random, stm, text, time, transformers, unliftio @@ -256788,7 +257153,6 @@ self: { ]; description = "Distributed tracing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracing-control" = callPackage @@ -261246,8 +261610,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.9.1"; - sha256 = "0vw0mbkii7j5rr5fp370j8grq355cg0ddw55f24gbjw1z0wc71hx"; + version = "0.7.10.1"; + sha256 = "0zq0bl4j1hwf2q0ipl0vp0q19lhs0bnwmrh7qh1qn53g078aj5ga"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -261335,6 +261699,95 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "typson-beam" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-migrate + , beam-postgres, bytestring, exceptions, hedgehog, HUnit, microlens + , postgresql-simple, tasty, tasty-hedgehog, tasty-hunit + , test-fixture, typson-core + }: + mkDerivation { + pname = "typson-beam"; + version = "0.1.0.1"; + sha256 = "0zhi81hvas561c1qxnnbyrdsc3di8iakrhyz59ppc551cgzf28da"; + libraryHaskellDepends = [ + aeson base beam-core beam-postgres postgresql-simple typson-core + ]; + testHaskellDepends = [ + aeson base beam-core beam-migrate beam-postgres bytestring + exceptions hedgehog HUnit microlens postgresql-simple tasty + tasty-hedgehog tasty-hunit test-fixture typson-core + ]; + description = "Typson Beam Integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "typson-core" = callPackage + ({ mkDerivation, aeson, base, containers, profunctors, text + , unordered-containers, vector + }: + mkDerivation { + pname = "typson-core"; + version = "0.1.0.1"; + sha256 = "1mgpr6j1q18ky6acpg9zahvb07lr3902cwawizp399k25d7s7a9q"; + libraryHaskellDepends = [ + aeson base containers profunctors text unordered-containers vector + ]; + description = "Type-safe PostgreSQL JSON Querying"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "typson-esqueleto" = callPackage + ({ mkDerivation, aeson, base, bytestring, esqueleto, exceptions + , hedgehog, microlens, persistent, persistent-postgresql + , persistent-template, postgresql-simple, tasty, tasty-hedgehog + , tasty-hunit, test-fixture, text, typson-core + }: + mkDerivation { + pname = "typson-esqueleto"; + version = "0.1.0.1"; + sha256 = "15dw1vp676sg8d1iyfcr1psx4vaix8mi4mbp4p431138yqa56qx4"; + libraryHaskellDepends = [ + aeson base esqueleto persistent persistent-template text + typson-core + ]; + testHaskellDepends = [ + aeson base bytestring esqueleto exceptions hedgehog microlens + persistent persistent-postgresql persistent-template + postgresql-simple tasty tasty-hedgehog tasty-hunit test-fixture + text typson-core + ]; + description = "Typson Esqueleto Integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "typson-selda" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, hedgehog + , HUnit, microlens, selda, selda-json, selda-postgresql, tasty + , tasty-hedgehog, tasty-hunit, test-fixture, text, typson-core + }: + mkDerivation { + pname = "typson-selda"; + version = "0.1.0.0"; + sha256 = "09jp1p82d0vv879rnxmingbdph6qcfszlywrn6h8r26apmh9v5pr"; + libraryHaskellDepends = [ + aeson base bytestring selda selda-json selda-postgresql text + typson-core + ]; + testHaskellDepends = [ + aeson base bytestring exceptions hedgehog HUnit microlens selda + selda-json selda-postgresql tasty tasty-hedgehog tasty-hunit + test-fixture text typson-core + ]; + description = "Typson Selda Integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tyro" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, protolude , reflection, singletons, test-framework, test-framework-hunit @@ -261831,8 +262284,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "ukrainian-phonetics-basic"; - version = "0.2.0.2"; - sha256 = "016q1wq4wbwxjd3a4fbj68h525q8gc2v1gn211mq3divhzc3rhwz"; + version = "0.3.1.2"; + sha256 = "0a4fdf64wv23kpnmz0jggm7vc0iazzsv8kpip3qjpnyfq2yqw06r"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = stdenv.lib.licenses.mit; @@ -262046,6 +262499,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unbounded-delays_0_1_1_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unbounded-delays"; + version = "0.1.1.1"; + sha256 = "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar"; + libraryHaskellDepends = [ base ]; + description = "Unbounded thread delays and timeouts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unbounded-delays-units" = callPackage ({ mkDerivation, base, unbounded-delays, units, units-defs }: mkDerivation { @@ -265519,19 +265984,18 @@ self: { }) {}; "uusi" = callPackage - ({ mkDerivation, base, Cabal, HUnit, microlens, microlens-th, text + ({ mkDerivation, base, Cabal, filepath, HUnit, microlens + , microlens-th, text }: mkDerivation { pname = "uusi"; - version = "0.2.0.0"; - sha256 = "0ycl5nml9v9dxksi2bcl5bff0nirn9g5cs8p0f09lxg81kis2zjl"; - revision = "1"; - editedCabalFile = "13w8xn1mqjjjb3ismi0l78xm7bkhrvyph0wgyfvf6pyn1866qzmn"; + version = "0.2.1.0"; + sha256 = "11r7p2g4pkxd57xvnbids3r6gwr76ar8c2kpdvpi9jlp01p0rfbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal microlens microlens-th text ]; executableHaskellDepends = [ - base Cabal microlens microlens-th text + base Cabal filepath microlens microlens-th text ]; testHaskellDepends = [ base Cabal HUnit microlens microlens-th text @@ -267412,6 +267876,8 @@ self: { ]; description = "Servant combinators for the versioning library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "versions" = callPackage @@ -268467,8 +268933,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.15"; - sha256 = "1jg6d8k06dz2nnbddxis83hlrwjhdf735q8zr4gv7sx6wnl60f3n"; + version = "3.7"; + sha256 = "1d2fdlgnzrjhd59niw0qm4qiqa8zcpjxj340r82018n06w4v5vsy"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -268496,8 +268962,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.2"; - sha256 = "0xzh76lmyhd43myghnw9w7cil38jiryrbz19myp5krr9r1g6rwyb"; + version = "0.3"; + sha256 = "1q5qy4ah75xq4imr28i97f07qmbwaaisb7zc25ms6vr0cz4ijg7w"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring extra file-embed filepath resourcet @@ -268917,6 +269383,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_1_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, http2, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.3"; + sha256 = "17s8cf0fdbkg9z2pvpsbhxg2cy5yy3c94513gkgf81lfl38zdrn7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types http2 HUnit iproute network + old-locale resourcet streaming-commons text time transformers unix + unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-feature-flags" = callPackage ({ mkDerivation, aeson, base, bytestring, random, text , unordered-containers, wai, warp @@ -274548,6 +275044,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -279253,43 +279751,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, fast-logger - , gauge, hspec, hspec-expectations, http-types, HUnit, memory - , monad-logger, mtl, network, parsec, path-pieces, primitive - , random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.18.6"; - sha256 = "1iay7lrc52krhnlkvr6bxchnwk9lj316fv2d47bh3bfay69wqc69"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_18_7" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, bytestring, case-insensitive, cereal, clientsession , conduit, conduit-extra, containers, cookie, deepseq, fast-logger @@ -279324,7 +279785,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -281947,18 +282407,20 @@ self: { "zeolite-lang" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable - , mtl, parsec, regex-tdfa, transformers, unix + , mtl, parsec, regex-tdfa, time, transformers, unix }: mkDerivation { pname = "zeolite-lang"; - version = "0.8.0.0"; - sha256 = "1ahr69w65hd70jc0jrc3dfz1gnjqxlg9w24djzm6826wskg31fa9"; + version = "0.9.0.0"; + sha256 = "0gcjjxavsc763a218rswzk7zrx917qg5sid7gpy81yw054kfp6ws"; + revision = "1"; + editedCabalFile = "0c76xxaxqwsh0ybvf5r6wza9gq7y7hiqm75pazmrhkzvm48q1dl8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable mtl parsec regex-tdfa - transformers unix + time transformers unix ]; executableHaskellDepends = [ base containers directory filepath unix @@ -282189,6 +282651,8 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeromq4-simple" = callPackage @@ -282449,14 +282913,15 @@ self: { }: mkDerivation { pname = "zio"; - version = "0.1.0.0"; - sha256 = "001bkysr4n5azly7cmn7xbgw0bg00ib4yg83klz0k0b5217wg982"; + version = "0.1.0.2"; + sha256 = "15ka58l6xv3v4x5rcam75gq37mfcxjngm0frz9k0rmzqyf07l06k"; libraryHaskellDepends = [ base mtl transformers unexceptionalio unexceptionalio-trans ]; testHaskellDepends = [ base mtl transformers unexceptionalio unexceptionalio-trans ]; + description = "App-centric Monad-transformer based on Scala ZIO (UIO + ReaderT + ExceptT)"; license = stdenv.lib.licenses.mpl20; }) {}; @@ -283252,18 +283717,18 @@ self: { }) {}; "zydiskell" = callPackage - ({ mkDerivation, base, bytestring, fixed-vector, storable-record - , vector + ({ mkDerivation, base, bytestring, containers, fixed-vector + , storable-record }: mkDerivation { pname = "zydiskell"; - version = "0.1.1.0"; - sha256 = "16fc3k0m0aln0ssy6nl2fjgl6l8svpyddyr0hrvzm0h5lbnk3h0w"; + version = "0.2.0.0"; + sha256 = "0pbwhvl6mff5k0rvpjijqpncqbm5g53ij1bc3ckq66q2v5ikswk8"; libraryHaskellDepends = [ - base bytestring fixed-vector storable-record vector + base bytestring containers fixed-vector storable-record ]; testHaskellDepends = [ - base bytestring fixed-vector storable-record vector + base bytestring containers fixed-vector storable-record ]; description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler"; license = stdenv.lib.licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix index b9485fdcab..99e6d96628 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/dart/default.nix @@ -12,6 +12,10 @@ let aarch64 = "arm64"; in { + "1.24.3-x86_64-darwin" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "1n4cq4jrms4j0yl54b3w14agcgy8dbipv5788jziwk8q06a8c69l"; + }; "1.24.3-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3"; @@ -24,6 +28,10 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; }; + "2.7.2-x86_64-darwin" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "111zl075qdk2zd4d4mmfkn30jmzsri9nq3nspnmc2l245gdq34jj"; + }; "2.7.2-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v"; @@ -36,10 +44,18 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; }; + "2.10.0-x86_64-darwin" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "1n4qgsax5wi7krgvvs0dy7fz39nlykiw8gr0gdacc85hgyhqg09j"; + }; "2.10.0-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb"; }; + "2.9.0-4.0.dev-x86_64-darwin" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "0gj91pbvqrxsvxaj742cllqha2z65867gggzq9hq5139vkkpfj9s"; + }; "2.9.0-4.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; @@ -52,6 +68,10 @@ let url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; }; + "2.11.0-161.0.dev-x86_64-darwin" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "0mlwxp7jkkjafxkc4vqlgwl62y0hk1arhfrvc9hpm9dv98g3bdjj"; + }; "2.11.0-161.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i"; @@ -93,7 +113,7 @@ stdenv.mkDerivation { with C-style syntax. It offers compilation to JavaScript, interfaces, mixins, abstract classes, reified generics, and optional typing. ''; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix index d85448a967..8190dc0f29 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/icon-lang/default.nix @@ -1,45 +1,37 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }: +{ stdenv, fetchFromGitHub +, libX11, libXt +, withGraphics ? true +}: stdenv.mkDerivation rec { pname = "icon-lang"; - version = "9.5.1"; + version = "9.5.20i"; + src = fetchFromGitHub { owner = "gtownsend"; repo = "icon"; - rev = "rel${builtins.replaceStrings ["."] [""] version}"; - sha256 = "1gkvj678ldlr1m5kjhx6zpmq11nls8kxa7pyy64whgakfzrypynw"; + rev = "v${version}"; + sha256 = "0072b3jk8mc94w818z8bklhjdf9rf0d9a7lkvw40pz3niy7zv84s"; }; buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ]; - patches = [ - # Patch on git master, likely won't be necessary in future release - (fetchpatch { - url = "https://github.com/gtownsend/icon/commit/bfc4a6004d0d3984c8066289b8d8e563640c4ddd.patch"; - sha256 = "1pqapjghk10rb73a1mfflki2wipjy4kvnravhmrilkqzb9hd6v8m"; - excludes = [ - "doc/relnotes.htm" - "src/h/version.h" - ]; - }) - ]; + configurePhase = let + target = if withGraphics then "X-Configure" else "Configure"; + platform = if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macintosh" + else if stdenv.isBSD then "bsd" + else if stdenv.isCygwin then "cygwin" + else if stdenv.isSunOS then "solaris" + else throw "unsupported system"; + in "make ${target} name=${platform}"; - configurePhase = - let - _name = if stdenv.isDarwin then "macintosh" else "linux"; - in - '' - make ${stdenv.lib.optionalString withGraphics "X-"}Configure name=${_name} - ''; - - installPhase = '' - make Install dest=$out - ''; + installPhase = "make Install dest=$out"; meta = with stdenv.lib; { description = ''A very high level general-purpose programming language''; maintainers = with maintainers; [ vrthra yurrriq ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd ++ cygwin ++ illumos; license = licenses.publicDomain; homepage = "https://www.cs.arizona.edu/icon/"; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix index 832a8323d5..30e26bf87a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.24"; - sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm"; + version = "7.3.25"; + sha256 = "1yq2fwpg9jgcafcrq4ffqm52r0f80pi6zy7fj1yb1qwim96mlcb9"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix index 571c7af8fc..b45da1fb86 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.12"; - sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf"; + version = "7.4.13"; + sha256 = "1nhzldjp8jfd1hivfyn5wydim5daibz0vkfxgys2xj8igs2kk8qm"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index 26bd8a8f36..e6ab1f2187 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -18,8 +18,8 @@ , ucsEncoding ? 4 # For the Python package set , packageOverrides ? (self: super: {}) -, buildPackages , pkgsBuildBuild +, pkgsBuildHost , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget @@ -28,6 +28,7 @@ , passthruFun , static ? false , enableOptimizations ? (!stdenv.isDarwin) +, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: assert x11Support -> tcl != null @@ -38,9 +39,8 @@ assert x11Support -> tcl != null with stdenv.lib; let - - pythonAttr = "python${sourceVersion.major}${sourceVersion.minor}"; - pythonForBuild = buildPackages.${pythonAttr}; + buildPackages = pkgsBuildHost; + inherit (passthru) pythonForBuild; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -49,11 +49,12 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch pythonForBuild; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + inherit hasDistutilsCxxPatch; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; } // { inherit ucsEncoding; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 02777063a7..cd06c2b636 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -19,12 +19,11 @@ , nukeReferences # For the Python package set , packageOverrides ? (self: super: {}) -, buildPackages , pkgsBuildBuild +, pkgsBuildHost , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget -, pythonForBuild ? buildPackages.${pythonAttr} , sourceVersion , sha256 , passthruFun @@ -58,7 +57,8 @@ assert bluezSupport -> bluez != null; with stdenv.lib; let - + buildPackages = pkgsBuildHost; + inherit (passthru) pythonForBuild; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -67,11 +67,12 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch pythonForBuild; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + inherit hasDistutilsCxxPatch; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; }; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; @@ -95,8 +96,6 @@ let hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - inherit pythonForBuild; - pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" else pythonForBuild.interpreter; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 19a7f44de3..2f35073823 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -14,12 +14,12 @@ with pkgs; , packageOverrides , sitePackages , hasDistutilsCxxPatch - , pythonPackagesBuildBuild - , pythonForBuild # provides pythonPackagesBuildHost - , pythonPackagesBuildTarget - , pythonPackagesHostHost - , self # is pythonPackagesHostTarget - , pythonPackagesTargetTarget + , pythonOnBuildForBuild + , pythonOnBuildForHost + , pythonOnBuildForTarget + , pythonOnHostForHost + , pythonOnTargetForTarget + , self # is pythonOnHostForTarget }: let pythonPackages = callPackage ({ pkgs, stdenv, python, overrides }: let @@ -28,11 +28,11 @@ with pkgs; python = self; }; otherSplices = { - selfBuildBuild = pythonPackagesBuildBuild; - selfBuildHost = pythonForBuild.pkgs; - selfBuildTarget = pythonPackagesBuildTarget; - selfHostHost = pythonPackagesHostHost; - selfTargetTarget = pythonPackagesTargetTarget; + selfBuildBuild = pythonOnBuildForBuild.pkgs; + selfBuildHost = pythonOnBuildForHost.pkgs; + selfBuildTarget = pythonOnBuildForTarget.pkgs; + selfHostHost = pythonOnHostForHost.pkgs; + selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget. }; keep = self: { # TODO maybe only define these here so nothing is needed to be kept in sync. @@ -99,7 +99,10 @@ with pkgs; inherit sourceVersion; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; - inherit hasDistutilsCxxPatch pythonForBuild; + inherit hasDistutilsCxxPatch; + # TODO: rename to pythonOnBuild + # Not done immediately because its likely used outside Nixpkgs. + pythonForBuild = pythonOnBuildForHost; tests = callPackage ./tests.nix { python = self; @@ -188,7 +191,6 @@ in { # Minimal versions of Python (built without optional dependencies) python3Minimal = (python38.override { self = python3Minimal; - pythonForBuild = pkgs.buildPackages.python3Minimal; # strip down that python version as much as possible openssl = null; readline = null; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index 0647ce8786..8feeb3c51b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -5,10 +5,16 @@ , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget , sourceVersion , pythonVersion , sha256 , passthruFun +, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}" }: assert zlibSupport -> zlib != null; @@ -25,12 +31,11 @@ let sitePackages = "site-packages"; hasDistutilsCxxPatch = false; - # No cross-compiling for now. - pythonForBuild = self; - pythonPackagesBuildBuild = {}; - pythonPackagesBuildTarget = {}; - pythonPackagesHostHost = {}; - pythonPackagesTargetTarget = {}; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix index 05798cbaf1..572cbdccbf 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -4,7 +4,7 @@ let python = let packageOverrides = self: super: { - typeddep = super.callPackage ./typeddep {}; + typeddep = self.callPackage ./typeddep {}; }; in interpreter.override {inherit packageOverrides; self = python;}; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix index 6de4ab6da3..2c51c691a8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "18pz6gjzqy6a62xkcmjanhr7kgxpvpmc0blrk4igz8ldcybz44if"; + sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; }; FONTCONFIG_FILE = fontsConf; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix index 656546dcb6..9fd220e5b9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix +++ b/third_party/nixpkgs/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 = "0xvnd7afx058sg7j51bmbikqgn4sl0246nkhr8zlqcrbr3nqi6p4"; + sha256 = "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia"; }; meta = oldAttrs.meta // { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix index d908346f19..9bdd31f400 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libX11, libXt }: +{ stdenv, fetchurl, unzip, libX11, libXt, libnsl }: stdenv.mkDerivation { pname = "unicon-lang"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { url = "http://unicon.org/dist/uni-2-4-2010.zip"; sha256 = "1g9l2dfp99dqih2ir2limqfjgagh3v9aqly6x0l3qavx3qkkwf61"; }; - buildInputs = [ libX11 libXt unzip ]; + buildInputs = [ libnsl libX11 libXt unzip ]; hardeningDisable = [ "fortify" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix index b6914f944a..126300aa19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.7.15"; + version = "1.7.16"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "1jqc98pc6gfxsbfdar7x3nlaywyibix8gl9gvs44zwrdi5mpiiyc"; + sha256 = "1vmhwjhppjv8m0ysk2qz0wl47cbl8i40bjjq5l4jmmp1ysvlbknf"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix index d4a0f671e8..6bc487e261 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set C++ wrappers around the LV2 C API"; - homepage = "http://lvtoolkit.org"; + homepage = "https://lvtk.org/"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index d99ee57ef9..0b20474664 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.0"; + version = "4.4.6"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1r3ymwk10ry6mz4zd08q7l5msq7h15931l7f0clw2siqs8r81x7c"; + sha256 = "1vlvnpkks5mm6ppdmp88mdn39f3ynig6qas83nkjn7x47z2zr6x0"; }; # Do not build static libraries @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; # Still using GPLv2 but as the rest of the Linphone projects have switched # to GPLv3, this might too, so check this when bumping the version number. - license = licenses.gpl2Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ raskin jluttine ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix index 400326f6fc..61d3996a4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "1pkjbwpi0047lbc55cva99rj6p70gbw09l14vrym0igwipnxxx0z"; + sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix index 240710b5a5..fdd98cb00b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.6.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h"; + sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix index 40922bae47..8eac88df79 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -42,7 +42,7 @@ let in { fmt_7 = generic { - version = "7.1.2"; - sha256 = "1ixwkqdbm01rcmqni15z4jj2rzhb3w7nlhkw2w4dzc4m101vr6yz"; + version = "7.1.3"; + sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index 14f822432e..086f6472ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.2.0"; + version = "0.3.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; + sha256 = "1f7hfwik7a9kzw0q1k3xc1yisrgg8lbp5pjr337phc9hm38lhq3c"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index 70b3d7e767..6019a69f35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "05k5ws1qgbfkxf6y923r61m42gy45l9awqqbfjqgrb3ricfr4wha"; + sha256 = "159qd4al19k1i5a54m2q2mxvig4z2lz9h3rd5rq44bklybdc0i7j"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index 614a8f048a..c08d5924b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { postInstall = '' rmdir $out/bin mv $out/lib/itcl${version}/* $out/lib + ln -s libitcl${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ + $out/lib/libitcl${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itcl${version} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix index 36503fc1ad..3c70369eb9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { postInstall = '' rmdir $out/bin mv $out/lib/itk${version}/* $out/lib + ln -s libitk${version}${stdenv.hostPlatform.extensions.sharedLibrary} \ + $out/lib/libitk${stdenv.lib.versions.major version}${stdenv.hostPlatform.extensions.sharedLibrary} rmdir $out/lib/itk${version} ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix index c545ad68e7..10587a72ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/io/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.6"; + version = "2.8.0"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1nzkv8gi56l1m4h7s8bcvqm0naq3bhh7fazcmgdhcr2zkjs5zfmn"; + sha256 = "02c54cjf3sdwbc9rcgg3xkx1f3yk8p5iv3iwvq78f5vfxsj53lkk"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix index 6d7745b0e3..5f09c08d4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldutils/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitLab -, qtbase , qtcharts , qtsvg , qmake @@ -9,17 +8,16 @@ mkDerivation rec { pname = "ldutils"; - version = "1.01"; + version = "1.03"; src = fetchFromGitLab { owner = "ldutils-projects"; repo = pname; rev = "v_${version}"; - sha256 = "09k2d5wj70xfr3sb4s9ajczq0lh65705pggs54zqqqjxazivbmgk"; + sha256 = "0pi05py71hh5vlhl0kjh9wxmd7yixw10s0kr2wb4l4c0abqxr82j"; }; buildInputs = [ - qtbase qtcharts qtsvg ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index 5d1894da57..10732a14e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lib3mf"; - version = "1.8.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; rev = "v${version}"; - sha256 = "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd"; + sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19"; }; nativeBuildInputs = [ cmake ninja ]; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]; postPatch = '' - rmdir UnitTests/googletest - ln -s ${gtest.src} UnitTests/googletest + rmdir Tests/googletest + ln -s ${gtest.src} Tests/googletest # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in diff --git a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix index 09456433c1..25422c8b7d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "1d6ql4vq338dvz61d5im06dh8m9rqfk37f9i356j3njpq604i1f6"; + sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d"; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix index f436f947d0..42c680835f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.2"; + version = "1.5.2.pl01"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "09sjrvq8xsj1gnl2wwyv4lbmicyzzl6x1ac2rrn53xnp34bxnckv"; + sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 940093ed4b..d966631dc2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.3"; + version = "3.14.4"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "1hq1q2frqnm4wxcfr7vn8kqwyfdz3hx22w40kn69zh140pig6jc5"; + sha256 = "1x72icq5lp5cfv6kyxqc3863wa164s0g41nbi6gldr8syprzdk1l"; }; nativeBuildInputs = [ cmake pkgconfig xxd ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch new file mode 100644 index 0000000000..84ee18084c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch @@ -0,0 +1,25 @@ +From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Wed, 25 Nov 2020 20:09:50 +0100 +Subject: [PATCH] Remove unsupported clang flags + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index f13a6bb..b305150 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -69,7 +69,7 @@ PREFIX ?= /usr/local + LIBDIRNAME ?= /lib/faketime + PLATFORM ?=$(shell uname) + +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) + ifeq ($(PLATFORM),SunOS) + CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 + endif +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix index 10cc5cace7..6c751e07b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./no-date-in-gzip-man-page.patch - ]; + ] ++ (stdenv.lib.optionals stdenv.cc.isClang [ + # https://github.com/wolfcw/libfaketime/issues/277 + ./0001-Remove-unsupported-clang-flags.patch + ]); postPatch = '' patchShebangs test src @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; LIBDIRNAME = "/lib"; - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; checkInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix new file mode 100644 index 0000000000..8413d5be44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libff/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake, boost, gmp, openssl, pkg-config }: + +stdenv.mkDerivation rec { + pname = "libff"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "scipr-lab"; + repo = "libff"; + rev = "v${version}"; + sha256 = "0dczi829497vqlmn6n4fgi89bc2h9f13gx30av5z2h6ikik7crgn"; + fetchSubmodules = true; + }; + + cmakeFlags = [ "-DWITH_PROCPS=Off" ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost gmp openssl ]; + + meta = with stdenv.lib; { + description = "C++ library for Finite Fields and Elliptic Curves"; + changelog = "https://github.com/scipr-lab/libff/blob/develop/CHANGELOG.md"; + homepage = "https://github.com/scipr-lab/libff"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arturcygan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix new file mode 100644 index 0000000000..5741d4cb5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }: + +stdenv.mkDerivation { + name = "libnixxml"; + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "libnixxml"; + rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; + sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; + }; + configureFlags = [ "--with-gd" "--with-glib" ]; + CFLAGS = "-Wall"; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ]; + doCheck = false; + postPatch = '' + ./bootstrap + ''; + + meta = with stdenv.lib; { + description = "XML-based Nix-friendly data integration library"; + homepage = https://github.com/svanderburg/libnixxml; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnova/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnova/default.nix index 413e404ce1..8cdbdbd747 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnova/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnova/default.nix @@ -1,17 +1,25 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchgit, autoreconfHook }: stdenv.mkDerivation rec { - name = "libnova-0.12.3"; + pname = "libnova"; + version = "0.16"; - src = fetchurl { - url = "mirror://sourceforge/libnova/${name}.tar.gz"; - sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; + # pull from git repo because upstream stopped tarball releases after v0.15 + src = fetchgit { + url = "https://git.code.sf.net/p/libnova/${pname}"; + rev = "v${version}"; + sha256 = "0icwylwkixihzni0kgl0j8dx3qhqvym6zv2hkw2dy6v9zvysrb1b"; }; + nativeBuildInputs = [ + autoreconfHook + ]; + meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; homepage = "http://libnova.sf.net"; - platforms = platforms.unix; license = licenses.gpl2; + maintainers = with maintainers; [ hjones2199 ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix index c1cd3ca8d5..4971e37a42 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "1wpjrihi2gci3kwq9b3i3avd6bk3x7g22r0n6hvlphapkaf1ig6y"; + sha256 = "1721cy6zaq086nrwh9x4d7k1jiaygg1wkvyx486i9bj9z53lc3wd"; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 55171cd3de..2ceb2125db 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -7,7 +7,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.38.0"; + version = "2.40.0"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "12rs0gklgzn8bplqjmaxixk04pr870i333mmcp9i5bhkn8x86zbx"; + sha256 = "KZNriNDxRKR14KFJrAbzZLfSQ3iiZ8PKC80fVh0AQls="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 95f7beff88..5845916239 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "mirror://sourceforge/sidplay-residfp/${pname}/${majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "0d866czmnmhnhb2j37rlrdphjdi2b75kak9barm9xqwg2z0nmmhz"; + sha256 = "04vdrrkh5y9x9rrmj6gdp242ah70b4sslwqfby8wp2riis4hr9z0"; }; nativeBuildInputs = [ pkgconfig ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix index 60bb092c6f..bde1cbf44e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtins"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "mfontanini"; repo = pname; rev = "v${version}"; - sha256 = "0gv661gdf018zk1sr6fnvcmd5akqjihs4h6zzxv6881v6yhhglrz"; + sha256 = "09ah1a7ska7xiki7625mn1d8i96il3hxbkc39ba8fn1a5383kmqa"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix index a65e6b2153..b69e99de41 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, boost }: +{ stdenv, fetchurl, boost, llvmPackages }: stdenv.mkDerivation rec { pname = "mdds"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "0zg0v9rfs92ff1gpnb06gzbxbnd9nqdar5fk8dnkmy0jpnf5qn7i"; + sha256 = "1kzy70b18f2dsqarmdmzbj9nc9kf2lvc5xxgkg6wdax3jf12lsm6"; }; postInstall = '' @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" ''; + buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + checkInputs = [ boost ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix index ec575aa08f..8938ab90fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mxml"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "1kv36fxxh7bwfydhb90zjgsrvpyzvx1p5d0ayfvd3j8gip2rjhnp"; + sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index f1ed04aa9b..7bcbff7876 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -1,11 +1,30 @@ -{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg -, fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts +{ stdenv +, fetchFromGitHub +, SDL +, ffmpeg +, frei0r +, libjack2 +, libdv +, libsamplerate +, libvorbis +, libxml2 +, movit +, pkgconfig +, sox +, qtbase +, qtsvg +, fftw +, vid-stab +, opencv3 +, ladspa-sdk +, genericUpdater +, common-updater-scripts +, ladspaPlugins +, mkDerivation +, which }: - let inherit (stdenv.lib) getDev; in - -stdenv.mkDerivation rec { +mkDerivation rec { pname = "mlt"; version = "6.22.1"; @@ -17,17 +36,36 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig qtbase qtsvg sox fftw vid-stab opencv3 + SDL + ffmpeg + frei0r + libjack2 + libdv + libsamplerate + libvorbis + libxml2 + movit + pkgconfig + qtbase + qtsvg + sox + fftw + vid-stab + opencv3 ladspa-sdk + ladspaPlugins ]; + nativeBuildInputs = [ which ]; + outputs = [ "out" "dev" ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" + "--avformat-swscale" + "--enable-gpl" + "--enable-gpl3" "--enable-opengl" ]; @@ -39,9 +77,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' - wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + qtWrapperArgs = [ + "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" + "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" + ]; + postInstall = '' # Remove an unnecessary reference to movit.dev. s=${movit.dev}/include t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix index cafc5c85f2..b90a8ba13a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nanopb/default.nix @@ -7,20 +7,20 @@ , stdenv }: -let - pythonRuntime = python3.withPackages(ps: [ ps.protobuf ]); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "nanopb"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "16zxk42wzn519bpxf4578qn97k0h1cnbkvqqkqvka9sl0n3lz2dp"; + sha256 = "sha256-32YU6LfPojvEVA2Z3DRZdGzDkSpAUgo1BueC/pl9qlY="; }; - nativeBuildInputs = [ cmake python3 ]; + nativeBuildInputs = [ cmake python3 python3.pkgs.wrapPython ]; + + pythonPath = with python3.pkgs; [ python3.pkgs.protobuf six ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" # generate $out/lib/libprotobuf-nanopb.so{.0,} @@ -28,32 +28,16 @@ in stdenv.mkDerivation rec { "-Dnanopb_PROTOC_PATH=${protobuf}/bin/protoc" ]; - # On a case-insensitive filesystem (such as on Darwin), CMake fails to create - # the build directory because of the existence of the BUILD file. - # TODO: This can be removed once https://github.com/nanopb/nanopb/pull/537 is merged. - preConfigure = "rm BUILD"; - - # install the generator which requires Python3 with the protobuf package. It - # also requires the nanopb module that's generated by CMake to be in a - # relative location to the generator itself so we move it out of the - # python.sitePackages into the shared generator folder. postInstall = '' mkdir -p $out/share/nanopb/generator/proto - cp ../generator/nanopb_generator.py $out/share/nanopb/generator/nanopb_generator.py - cp ../generator/proto/_utils.py $out/share/nanopb/generator/proto/_utils.py cp ../generator/proto/nanopb.proto $out/share/nanopb/generator/proto/nanopb.proto - mv $out/${python3.sitePackages}/nanopb_pb2.py $out/share/nanopb/generator/proto - rm -rf $out/${python3.sitePackages} - - mkdir $out/bin - substitute ${./protoc-gen-nanopb} $out/bin/protoc-gen-nanopb \ - --subst-var-by python ${pythonRuntime}/bin/python \ - --subst-var-by out $out - chmod +x $out/bin/protoc-gen-nanopb - cp ../pb_common.c ../pb_decode.c ../pb_encode.c $out/include/ ''; + postFixup = '' + wrapPythonPrograms + ''; + passthru.tests = { simple-proto2 = callPackage ./test-simple-proto2 {}; simple-proto3 = callPackage ./test-simple-proto3 {}; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/protoc-gen-nanopb b/third_party/nixpkgs/pkgs/development/libraries/nanopb/protoc-gen-nanopb deleted file mode 100644 index 764e6614b1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/protoc-gen-nanopb +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -exec @python@ @out@/share/nanopb/generator/nanopb_generator.py --protoc-plugin diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix index c10b396fe0..43da97c2ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }: +{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap +, pkg-config }: -let version = "2.8"; in +let version = "3.4"; in stdenv.mkDerivation { pname = "ndpi"; @@ -10,13 +11,16 @@ stdenv.mkDerivation { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0lc4vga89pm954vf92g9fa6xwsjkb13jd6wrcc35zy5j04nf9rzf"; + sha256 = "0xjh9gv0mq0213bjfs5ahrh6m7l7g99jjg8104c0pw54hz0p5pq1"; }; configureScript = "./autogen.sh"; nativeBuildInputs = [which autoconf automake libtool]; - buildInputs = [libpcap]; + buildInputs = [ + libpcap + pkg-config + ]; meta = with stdenv.lib; { description = "A library for deep-packet inspection"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix index e9b89e8390..64eb6d79ab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nlopt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nlopt"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "stevengj"; repo = pname; rev = "v${version}"; - sha256 = "1k6x14lgyfhfqpbs7xx8mrgklp8l6jkkcs39zgi2sj3kg6n0hdc9"; + sha256 = "0xm8y9cg5p2vgxbn8wn8gqfpxkbm0m4qsidp0bq1dqs8gvj9017v"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/noise-suppression-for-voice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/noise-suppression-for-voice/default.nix deleted file mode 100644 index 27b77a3bd3..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/noise-suppression-for-voice/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "noise-suppression-for-voice-unstable"; - version = "2020-10-10"; - - src = fetchFromGitHub { - owner = "werman"; - repo = "noise-suppression-for-voice"; - rev = "15bac8f34018184d7d4de1b3b2ba98c433705f6c"; - sha256 = "11pwisbcks7g0mdgcrrv49v3ci1l6m26bbb7f67xz4pr1hai5dwc"; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description = "A real-time noise suppression plugin for voice"; - longDescription = '' -The plugin is meant to suppress a wide range of noise origins (from original paper): computer fans, office, crowd, airplane, car, train, construction. - ''; - homepage = "https://github.com/werman/noise-suppression-for-voice"; - license = licenses.gpl3; - maintainers = [ maintainers.henrikolsson ]; - platforms = platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix index bb43604db0..85ba37a9d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "4.11.1"; meta = { - homepage = "https://phonon.kde.org/"; + homepage = "https://community.kde.org/Phonon"; description = "Multimedia API for Qt"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 2bc5b12dfb..68e07e7b42 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.042"; + version = "1.045"; src = fetchurl { url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "0cc8dn6g7adj2pgs8hvczg68i3xhlk6978m4gxamgibilf9jw1av"; + sha256 = "1y45jx7i30ik2pjv33y16fi5i5jpmi0zp1jh32pwywd3diaiazv6"; }; buildInputs = [ fastjet ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index c4b766b709..f03f9ea88f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -19,7 +19,6 @@ , libsndfile , vulkan-headers , vulkan-loader -, libpulseaudio , makeFontsConf , callPackage , nixosTests @@ -40,7 +39,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.15"; + version = "0.3.16"; outputs = [ "out" @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "1lmsn13pbr0cigb5ri9nd3102ffbaf8nsz5c8aawf6lsz7mhkx9x"; + sha256 = "0ivfx3rbg2iwjdh412zjpk9y5mzw7zh6asv4sji8lq0dzhwbz1qc"; }; patches = [ @@ -65,11 +64,8 @@ stdenv.mkDerivation rec { ./alsa-profiles-use-libdir.patch # Move installed tests into their own output. ./installed-tests-path.patch - # Fix older clients (e.g. Chrome/Chromium): - (fetchpatch { # protocol-native: do version check on HELLO - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b8c7b36d3b8be16593f554964cf2f852c21b5c2c.patch"; - sha256 = "18461grisrgqbad6bfa1bm17mslddgfmjfprc9vjvab2mmpsjss9"; - }) + # Change the path of the pipewire-pulse binary in the service definition. + ./pipewire-pulse-path.patch ]; nativeBuildInputs = [ @@ -78,7 +74,6 @@ stdenv.mkDerivation rec { meson ninja pkgconfig - removeReferencesTo ]; buildInputs = [ @@ -86,7 +81,6 @@ stdenv.mkDerivation rec { dbus glib libjack2 - libpulseaudio libsndfile udev vulkan-headers @@ -104,7 +98,7 @@ stdenv.mkDerivation rec { "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dlibpulse-path=${placeholder "pulse"}/lib" + "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" "-Dgstreamer=${mesonBool gstreamerSupport}" "-Dffmpeg=${mesonBool ffmpegSupport}" @@ -118,10 +112,10 @@ stdenv.mkDerivation rec { doCheck = true; - # Pulseaudio asserts lead to dev references. - # TODO This should be fixed in the pulseaudio sources instead. - preFixup = '' - remove-references-to -t ${libpulseaudio.dev} "$(readlink -f $pulse/lib/libpulse.so)" + postInstall = '' + moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" + moveToOutput "bin/pipewire-pulse" "$pulse" ''; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch new file mode 100644 index 0000000000..6ac86b111e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/pipewire-pulse-path.patch @@ -0,0 +1,24 @@ +diff --git a/meson_options.txt b/meson_options.txt +index 4b9e46b8..9d73ed06 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -147,3 +147,6 @@ option('pw-cat', + option('udevrulesdir', + type : 'string', + description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') ++option('pipewire_pulse_prefix', ++ type : 'string', ++ description : 'Install directory for the pipewire-pulse daemon') +diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build +index 29fc93d4..f78946f2 100644 +--- a/src/daemon/systemd/user/meson.build ++++ b/src/daemon/systemd/user/meson.build +@@ -6,7 +6,7 @@ install_data( + + systemd_config = configuration_data() + systemd_config.set('PW_BINARY', join_paths(pipewire_bindir, 'pipewire')) +-systemd_config.set('PW_PULSE_BINARY', join_paths(pipewire_bindir, 'pipewire-pulse')) ++systemd_config.set('PW_PULSE_BINARY', join_paths(get_option('pipewire_pulse_prefix'), 'bin/pipewire-pulse')) + + configure_file(input : 'pipewire.service.in', + output : 'pipewire.service', diff --git a/third_party/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix index 8366c37e50..cb8e05b6a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.26"; + version = "1.27"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "15n3vy1v5gian0gh5y7vq5a6n3fngfwb41sbvrlwbjw0yh23sb1b"; + sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix index f0064dbd36..e8ae15ed31 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "-DPRECICE_PETScMapping=OFF" "-DBUILD_SHARED_LIBS=ON" "-DPYTHON_LIBRARIES=${python3.libPrefix}" - "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" + "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix index fdc35f149a..43da67d3d9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-iodbc=${libiodbc}" ]; meta = with stdenv.lib; { - homepage = "http://psqlodbc.projects.postgresql.org/"; + homepage = "https://odbc.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix index d9b04781ba..7436641a2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "dywnLSJHeGaR3+0lTLpacWQL0rWlF8+LNCy+oCCO9C4="; + sha256 = "0q620bfd9lnph68jhqn7iv9bqmks7qk90riq6f6nr4kqc4xnravd"; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" '' else '' - export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix index c098680d27..a427bd5d05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.0.3"; + version = "10.0.4"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "14c4ig51hhrvrwhhriklylp40349xqgd3filajsvqk9vaww6na7f"; + sha256 = "1jqijnni2pmbbdk2g3pi14178j7mls8dj2bcwf1lds5ar0ghsagc"; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 308fadbdfd..7b3d5b3db1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.4.4"; + version = "1.5.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0y4m29wyvhhxb7fap9z07zwgcqlr4ifwynf8a7yp5ldjpzfzxpix"; + sha256 = "0qm9rvvkqypqh0vpgkrlqgaxkqdvs3finpr5niwxc6ypblc3ir1g"; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ boothead ]; + maintainers = with maintainers; [ commandodev ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix index f4c9e1e711..cedffcaaef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/relibc/default.nix @@ -63,7 +63,8 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - TARGET = buildPackages.rust.toRustTarget stdenvNoCC.targetPlatform; + # TODO: should be hostPlatform + TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix index 6e2542e1db..9ec9eabebe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/werman/noise-suppression-for-voice"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ panaeon ]; + maintainers = with maintainers; [ panaeon henrikolsson ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 0cb36fd026..002c0a3c1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.12.7"; + version = "6.14.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0cpi0v691xsh20hj5x2y2z7dmjvhd3brr0swszv0xqjg2q0f7zdb"; + sha256 = "0k5385apwyhc3pzfq9104mphf6lf1lb33nhcfbpqiwwn9q14z6n3"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix index 42ba4f2520..3943c4dbbc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/blis/default.nix @@ -17,13 +17,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "blis"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; rev = version; - sha256 = "13g9kg7x8j9icg4frdq3wpl2cmp0jnh93mw48daa7ym399w17423"; + sha256 = "0fp0nskydan3i7sj7qkabwc9sjh7mw73pjpgzh50qchkkcv0s3n1"; }; inherit blas64; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 7b91940033..1887d53e30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -20,12 +20,11 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 year = if stdenvNoCC.isDarwin then "2019" else "2020"; - spot = if stdenvNoCC.isDarwin then "3" else "3"; - rel = if stdenvNoCC.isDarwin then "199" else "279"; + spot = if stdenvNoCC.isDarwin then "3" else "4"; + rel = if stdenvNoCC.isDarwin then "199" else "304"; - # Replace `openmpSpot` by `spot` after 2020.3. Release 2020.03 - # adresses performance regressions and does not update OpenMP. - openmpSpot = if stdenvNoCC.isDarwin then spot else "2"; + # Replace `openmpSpot` by `spot` after 2020. + openmpSpot = if stdenvNoCC.isDarwin then spot else "3"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; @@ -47,8 +46,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16903/l_mkl_${version}.tgz"; - sha256 = "013shn3c823bjfssq4jyl3na5lbzj99s09ds608ljqllri7473ib"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16917/l_mkl_${version}.tgz"; + hash = "sha256-IxTUZTaXTb0I8qTk+emhVdx+eeJ5jHTn3fqtAKWRfqU="; }); nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 8c3b03bd7c..17197823d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; - homepage = "https://www.openlibm.org/"; + homepage = "https://openlibm.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix b/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix index 6ab463bea1..cc3abd80d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "1zgfhqv43qcfkfdyf1p82bcfv05n6iix6yw6qx1y5bnb7dv74irw"; + sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 6b83b5c051..fa506733c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "07yz459xnj7cs99mfhnq8wr9cvkrnbd479scqyxz55nlimrg8dc9"; + sha256 = "106yhsjwjadxsl9dqxywg287mdwsksman02hdalhav18vcnvnlpj"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index 1961e8aef6..a4120b7ba4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.8.1"; + version = "1.9.0"; in stdenv.mkDerivation { name = "ucx-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "0yfnx4shgydkp447kipavjzgl6z58jan6l7znhdi8ry4zbgk568a"; + sha256 = "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index e08aea2e1e..05b23e25af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; + sha256 = "0czk8xw1jra0fjf6w4bcaridyz3wz2br3v7ik1g7z0j5grx9n8r1"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 18ee99804d..6d310443e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; doCheck = true; checkInputs = [ nss_3_53.tools ]; + preCheck = '' + substituteInPlace tests/testrun.sh \ + --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ + --replace 'TMPFOLDER=/tmp' '$(mktemp -d)' + ''; # enable deprecated soap headers required by lasso # https://dev.entrouvert.org/issues/18771 diff --git a/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix index b957253eeb..0015600f97 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zookeeper_mt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; - maintainers = [ maintainers.boothead ]; + maintainers = [ maintainers.commandodev ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/node-packages/composition.nix b/third_party/nixpkgs/pkgs/development/node-packages/composition.nix index 17879f381d..027a981ea5 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/composition.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/composition.nix @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 045418f787..8604015d88 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -33,6 +33,7 @@ , "coc-jest" , "coc-json" , "coc-lists" +, "coc-markdownlint" , "coc-metals" , "coc-pairs" , "coc-prettier" @@ -49,6 +50,7 @@ , "coc-tslint-plugin" , "coc-tsserver" , "coc-vetur" +, "coc-vimlsp" , "coc-vimtex" , "coc-wxml" , "coc-yaml" @@ -88,6 +90,7 @@ , "graphql-cli" , "grunt-cli" , "makam" +, "gqlint" , "gtop" , "gulp" , "gulp-cli" @@ -186,6 +189,7 @@ , "ssb-server" , "stackdriver-statsd-backend" , "stf" +, "stylelint" , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 5c9621809c..1c88382c29 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1100.1" = { + "@angular-devkit/architect-0.1100.2" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1100.1"; + version = "0.1100.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.1.tgz"; - sha512 = "DIAvTRRY+k7T2xHf4RVV06P16D0V7wSf1MSpGSDWVpfWcA3HNOSGfsk1F+COMlbFehXuKztwieXarv5rXbBCng=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1100.2.tgz"; + sha512 = "wSMMM8eBPol48OtvIyrIq2H9rOIiJmrPEtPbH0BSuPX0B8BckVImeTPzloqxSrpul4tY7Iwx0zwISDEgb59Vbw=="; }; }; "@angular-devkit/core-11.0.0" = { @@ -49,6 +49,15 @@ let sha512 = "ui3g7w/0SpU9oq8uwN9upR8Y1eOXZ+P2p3NyDydBrR7ZEfEkRLS1mhozN/ib8farrwK5N3kIIJxMb5t3187Hng=="; }; }; + "@angular-devkit/core-11.0.2" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "11.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.0.2.tgz"; + sha512 = "vUmmUNmNM9oRcDmt0PunU/ayglo0apq4pGL9Z5jj6alf2WwEiTcGHjyuZSDIO9MOLi41519jp3mDx79qXvvyww=="; + }; + }; "@angular-devkit/schematics-11.0.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; @@ -67,6 +76,15 @@ let sha512 = "rAOnAndcybEH398xf5wzmcUPCoCi0dKiOo/+1dkKU5aTxynw1OUnANt5K6A+ZZTGnJmfjtP0ovkZGYun9IUDxQ=="; }; }; + "@angular-devkit/schematics-11.0.2" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "11.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.0.2.tgz"; + sha512 = "unNewc+Y9ofrdKxXNoSHKUL6wvV8Vgh2nJMTLI1VAw8nfqgWphI+s5XwbVzog65nhZ10xJeaUm9u5R8pxLDpQg=="; + }; + }; "@angular-devkit/schematics-cli-0.1100.1" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -292,31 +310,22 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/code-frame-7.8.3" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; - }; - }; - "@babel/compat-data-7.12.5" = { + "@babel/compat-data-7.12.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.5"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz"; - sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz"; + sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; }; }; - "@babel/core-7.12.3" = { + "@babel/core-7.12.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.3"; + version = "7.12.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"; - sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz"; + sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ=="; }; }; "@babel/core-7.9.0" = { @@ -400,13 +409,13 @@ let sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.1" = { + "@babel/helper-create-regexp-features-plugin-7.12.7" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.1"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; - sha512 = "rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz"; + sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ=="; }; }; "@babel/helper-define-map-7.10.5" = { @@ -454,13 +463,13 @@ let sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.1" = { + "@babel/helper-member-expression-to-functions-7.12.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.1"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; - sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; + sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; }; }; "@babel/helper-module-imports-7.12.5" = { @@ -481,13 +490,13 @@ let sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; }; }; - "@babel/helper-optimise-call-expression-7.10.4" = { + "@babel/helper-optimise-call-expression-7.12.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz"; + sha512 = "I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw=="; }; }; "@babel/helper-plugin-utils-7.10.4" = { @@ -499,15 +508,6 @@ let sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; }; }; - "@babel/helper-regex-7.10.5" = { - name = "_at_babel_slash_helper-regex"; - packageName = "@babel/helper-regex"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; - sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; - }; - }; "@babel/helper-remap-async-to-generator-7.12.1" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; @@ -598,13 +598,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.5" = { + "@babel/parser-7.12.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.5"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz"; - sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.7.tgz"; + sha512 = "oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -688,13 +688,13 @@ let sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.5" = { + "@babel/plugin-proposal-numeric-separator-7.12.7" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.5"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz"; - sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; + sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.12.1" = { @@ -715,13 +715,13 @@ let sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.1" = { + "@babel/plugin-proposal-optional-chaining-7.12.7" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.1"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz"; - sha512 = "c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; + sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA=="; }; }; "@babel/plugin-proposal-private-methods-7.12.1" = { @@ -1138,13 +1138,13 @@ let sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.5" = { + "@babel/plugin-transform-react-jsx-7.12.7" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.5"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz"; - sha512 = "2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz"; + sha512 = "YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ=="; }; }; "@babel/plugin-transform-react-jsx-source-7.12.1" = { @@ -1201,13 +1201,13 @@ let sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.1" = { + "@babel/plugin-transform-sticky-regex-7.12.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.1"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz"; - sha512 = "CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; + sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg=="; }; }; "@babel/plugin-transform-template-literals-7.12.1" = { @@ -1255,22 +1255,22 @@ let sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; }; }; - "@babel/polyfill-7.11.5" = { + "@babel/polyfill-7.12.1" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.11.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.11.5.tgz"; - sha512 = "FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g=="; - }; - }; - "@babel/preset-env-7.12.1" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz"; - sha512 = "H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz"; + sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; + }; + }; + "@babel/preset-env-7.12.7" = { + name = "_at_babel_slash_preset-env"; + packageName = "@babel/preset-env"; + version = "7.12.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.7.tgz"; + sha512 = "OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew=="; }; }; "@babel/preset-flow-7.12.1" = { @@ -1300,13 +1300,13 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.1" = { + "@babel/preset-typescript-7.12.7" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.12.1"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.1.tgz"; - sha512 = "hNK/DhmoJPsksdHuI/RVrcEws7GN5eamhi28JkO52MqIxU8Z0QpmiSOQxZHWOHV7I3P4UjHV97ay4TcamMA6Kw=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz"; + sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw=="; }; }; "@babel/register-7.12.1" = { @@ -1318,15 +1318,6 @@ let sha512 = "XWcmseMIncOjoydKZnWvWi0/5CUCD+ZYKhRwgYlWOrA8fGZ/FjuLRpqtIhLOVD/fvR1b9DQHtZPn68VvhpYf+Q=="; }; }; - "@babel/runtime-7.11.2" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; - sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; - }; - }; "@babel/runtime-7.12.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1345,22 +1336,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/template-7.10.4" = { + "@babel/template-7.12.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.10.4"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz"; - sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; + sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; }; }; - "@babel/traverse-7.12.5" = { + "@babel/traverse-7.12.9" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.5"; + version = "7.12.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz"; - sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz"; + sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw=="; }; }; "@babel/types-7.10.4" = { @@ -1372,13 +1363,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.6" = { + "@babel/types-7.12.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.6"; + version = "7.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz"; - sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.7.tgz"; + sha512 = "MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1642,15 +1633,6 @@ let sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A=="; }; }; - "@eslint/eslintrc-0.1.3" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz"; - sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; - }; - }; "@eslint/eslintrc-0.2.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -1714,22 +1696,31 @@ let sha512 = "y2IZFynVtRxMQ4uxXYUnrnXZa+pvSH1R1aSUAfC6RsUb2UNOxC6zRehdLGSOyF4s9Wy+j3/CPm6fC0T5UJYoQg=="; }; }; - "@expo/bunyan-3.0.2" = { + "@expo/bunyan-4.0.0" = { name = "_at_expo_slash_bunyan"; packageName = "@expo/bunyan"; - version = "3.0.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/bunyan/-/bunyan-3.0.2.tgz"; - sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg=="; + url = "https://registry.npmjs.org/@expo/bunyan/-/bunyan-4.0.0.tgz"; + sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.14" = { + "@expo/config-3.3.16" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.14"; + version = "3.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.14.tgz"; - sha512 = "nYnnNJRr3UZlBsUk4esbeYS2AfR3EFw4x9bVZQbbWKgDapFj26QIjGYeolZrO0yFhllSC/TU+2YNIyt6sQwRpw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.16.tgz"; + sha512 = "iEjyV8OfaA0fPPsKYkkcod6wCd6sAtWOxAAT+7xriGqJV5aYnpL1hcBxPkPKavYzWMJUEEOwajmqoJy1uVP6ig=="; + }; + }; + "@expo/config-plugins-1.0.3" = { + name = "_at_expo_slash_config-plugins"; + packageName = "@expo/config-plugins"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.3.tgz"; + sha512 = "Tc17MLfNIHl7h+YmE4cEvIK4WZq5fFShdrXJGNoNmubJ6xPeqDTLL7qCVNSzckkU4+XgfV1qt5uU+qezZLvbCw=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1750,22 +1741,22 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.39" = { + "@expo/dev-server-0.1.41" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.39"; + version = "0.1.41"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.39.tgz"; - sha512 = "PTNrPQ7z3yYLijePiqOKTtjTtzpn9HECE0LQKFcf/IVHxxVe/ScRWJAu6xndL51sXWJgE3PXg8r47UMLHb7Y2w=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.41.tgz"; + sha512 = "Mgqm79SE01bXiOG5DsJyuP/FAszkGKC22rfvjGb0tCVHbcvuVLjxm2fnnylBj9FRcTW6Rz3hAB1RaC5RayqNcg=="; }; }; - "@expo/dev-tools-0.13.58" = { + "@expo/dev-tools-0.13.62" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.58"; + version = "0.13.62"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.58.tgz"; - sha512 = "CdlCPWEzvA69ZucdeCYFoM0fEBVufcSwOOs2xcEJo2cVHGJkCUFhEwASXHdPOGt773DF1ISF4mKQAUsLtmA7qw=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.62.tgz"; + sha512 = "6DeV6VxdJFPz7xYwNgIvb5GGRweHC9dS/XkkKic7Nm0c8FV+BPEm0Z/JThJ76fliTFiUPB6L7hNNCLbzObW9Zw=="; }; }; "@expo/eas-build-job-0.1.2" = { @@ -1777,31 +1768,31 @@ let sha512 = "hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA=="; }; }; - "@expo/image-utils-0.3.7" = { + "@expo/image-utils-0.3.9" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.7"; + version = "0.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.7.tgz"; - sha512 = "Vo1p5uv1JlRacgVIiVa+83oRoHfC7grSU8cypAtgvOYpbmdCWR8+3F4v+vaabHe6ktvIKRE78jh6vHMGwv2aOA=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.9.tgz"; + sha512 = "VarvpeNXtvPexmJSEllDF1RRHrjznsgf2Y0bZ2IehmOZwxdqz/YssGxY2ztMx5pn3utuhc9Enx140BHDBOp8UQ=="; }; }; - "@expo/json-file-8.2.24" = { + "@expo/json-file-8.2.25" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.24"; + version = "8.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.24.tgz"; - sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.25.tgz"; + sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA=="; }; }; - "@expo/metro-config-0.1.39" = { + "@expo/metro-config-0.1.41" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.39"; + version = "0.1.41"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.39.tgz"; - sha512 = "oCeBGyLPmo65HeUPKEBMiZCbh2RfEbH8AO7Apwitn1zs8LZf9DvVtpEh7mlYRJlmKCrxaM4NjuFZMcquh72aiQ=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.41.tgz"; + sha512 = "eq2FT7/KCwQSW5R5iMLu2a8amwZ7Oz3tUIKWZtbpj6LCPbRyrF+htnjsO1eIQJ02QDE1HIs2cxFeUHjoWJSh7g=="; }; }; "@expo/ngrok-2.4.3" = { @@ -1930,13 +1921,13 @@ let sha512 = "oqar3vmvxkVx1OBG7hTjTbCaVVUX2o+aEMLxZWLUiubL0ly1qxgQKEt5p3g3pzkxTft+b1oMf8bT7jMi6iOv+Q=="; }; }; - "@expo/package-manager-0.0.33" = { + "@expo/package-manager-0.0.34" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.33"; + version = "0.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.33.tgz"; - sha512 = "zhY1a67/Fsg9FjKj2AajNDywpcbERACA7kw9eR3uJEzQwdwYiqX9cmMO8K69UKJUY2kpba4edJY9/PEMJFfPiQ=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.34.tgz"; + sha512 = "/zxESSNAjeBI7BlrFlmmLbEDNblJhR0fd9rZGPOwNlRoeojCJ0yh+nTUWXQtBgolffQMYq0LkTTjTDszqs4M+g=="; }; }; "@expo/plist-0.0.10" = { @@ -1957,13 +1948,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.21" = { + "@expo/schemer-1.3.22" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.21"; + version = "1.3.22"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.21.tgz"; - sha512 = "8rk1P9bFmTLZa4yr/6rNMP5QOJy/BDu+73c/vKpAr/JXgJwxRnlaLYe/rZkwQFMl5aPyaa4JsattVBU4IdxAiA=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.22.tgz"; + sha512 = "ALB9FB0DwypyNT0sL4zlM6ncQxado8eT46MOTclGoWNkVWNeeZC8O0GYHoEXLOjvfNUP5j02ATtnXCqyXAz5Hg=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -2002,22 +1993,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.43" = { + "@expo/webpack-config-0.12.46" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.43"; + version = "0.12.46"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.43.tgz"; - sha512 = "2XNqppNrngC4WrJJRnKpST6Xzez6GbUxB+SwhKVef8qf4Uw2vE50p0zpGTcIzs+aAIaKW3cFSIRQnhxkVrGXww=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.46.tgz"; + sha512 = "lVOmaBAKrw2PO1TsEOkeCFLLxGuWcoHpAeN/SgVKcQCKZuSAYqTG5qf4Rino7TdVjbCOu+Apec4AIyg2oW6Y8w=="; }; }; - "@expo/xdl-58.0.19" = { + "@expo/xdl-59.0.2" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "58.0.19"; + version = "59.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.19.tgz"; - sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.2.tgz"; + sha512 = "hTwJkac/+y5arWDZnQCb3lbOsgiz5tyY+ikr1LHcO8emiPpctY98H9v7MKwsxu6GsXfmwrztqgtkVBRviKh56A=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2065,22 +2056,49 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.150.1" = { + "@fluentui/react-7.153.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.150.1"; + version = "7.153.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.150.1.tgz"; - sha512 = "DgK9eR7eo/dYUtutkmPBqq7EiBls2L/4yNQO5Sv9JgE7GQPPbMMGvsK4ZAHa42E3K01CC5XO5SnP0BWD62B/RA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.2.tgz"; + sha512 = "8D/zFzv9WaHqX5qu5oT20rjxkKf3GMhc40AOK+wloIfqzGe/OOXpg2zr0Hz+OXEijkGU7UPsjZ6uys/UAcXERQ=="; }; }; - "@fluentui/react-focus-7.16.18" = { + "@fluentui/react-compose-0.19.12" = { + name = "_at_fluentui_slash_react-compose"; + packageName = "@fluentui/react-compose"; + version = "0.19.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-compose/-/react-compose-0.19.12.tgz"; + sha512 = "GTcZ3kd2rTk3Q7xXJB8cTPfv0Q0vOdeIrLcJ02lXfjE9h3GPTE62rV4iFzBIZyXIKL8IdR6Jh8WNIBkVMWhhxw=="; + }; + }; + "@fluentui/react-focus-7.16.19" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.18"; + version = "7.16.19"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.18.tgz"; - sha512 = "3GXZXhEIyX0OF1rBZmpRbx/llcOuKQa6cq5JTEcg7aLy7DWzmyRPm1eJLD/5anPPF8R68W0gT0pd57nhFreatg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.19.tgz"; + sha512 = "BUnSJ7CRs0gfaEXVr5w9YQsZXB18J35k7H7eyB5wLLLgwdK/ogt6uYcu3p0q5ZEjju8C/wmJ2zgwFCMKiAyTUA=="; + }; + }; + "@fluentui/react-stylesheets-0.2.4" = { + name = "_at_fluentui_slash_react-stylesheets"; + packageName = "@fluentui/react-stylesheets"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-stylesheets/-/react-stylesheets-0.2.4.tgz"; + sha512 = "zTyDxBsQsm5iz59SXn83+BrC3tUnwQdJc/xcPYWWVISIyPby/75URbWK5uYJ5p5Qy0GrpgKDGYAbpXZlN89SRQ=="; + }; + }; + "@fluentui/react-theme-provider-0.18.0" = { + name = "_at_fluentui_slash_react-theme-provider"; + packageName = "@fluentui/react-theme-provider"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-theme-provider/-/react-theme-provider-0.18.0.tgz"; + sha512 = "dKSOZ1Sl2uVrDzjvfRtwHUluedU0MhEASukyeqGTpKTmg3ucPMYEZn+dgzFqRNpjs9trbb++N8R6Z19CWokXOw=="; }; }; "@fluentui/react-window-provider-1.0.1" = { @@ -2137,31 +2155,31 @@ let sha512 = "wkB/L9cRxlPB4m9k9WQJZYPbnRxfEu2bkxvI9pVGHMsmoQxMZiM2GkhCBHDTBYJb7cxCS6Wv3LJb1w0iEqw24w=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.5" = { + "@graphql-tools/graphql-file-loader-6.2.6" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.5.tgz"; - sha512 = "vYDn71FHqwCxWgw8swoVOsD5C0xGz/Lw4zUQnPcgZfAzhAAwl6e/rVWl/HF1UNNSf5CSZu+2oidjOWCI5Wl6Gg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.6.tgz"; + sha512 = "L+RdYl5C6+X0zdOTUotY0K5zwqvSGpqI/qcZpVvCDenoAcVTyaNLmnd/ViErwedhCaGqAAV0wI1nPtyKFPlMUg=="; }; }; - "@graphql-tools/import-6.2.4" = { + "@graphql-tools/import-6.2.5" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.4.tgz"; - sha512 = "Q6fk6hbtDevoEVcgwb3WRn7XOqGY4MnX3Mvc+x8/b8k4RZ4wT+0WSLRDXGAKiVKRxGhgouU2lZVnGE/LDrGSCg=="; - }; - }; - "@graphql-tools/json-file-loader-6.2.5" = { - name = "_at_graphql-tools_slash_json-file-loader"; - packageName = "@graphql-tools/json-file-loader"; version = "6.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.5.tgz"; - sha512 = "9LS7WuQdSHlRUvXD7ixt5aDpr3hWsueURHOaWe7T0xZ+KWMTw+LIRtWIliCRzbjNmZ+4ZhwHB3Vc1SO2bfYLgg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.5.tgz"; + sha512 = "ZGXT5tDod7m+LO38fc+o0JzR1LstL0RF35HKEWoUdxRIVaaeYH9VMuan9Gn+9M9RDME3RnzEa9aGzf9ATj8bTA=="; + }; + }; + "@graphql-tools/json-file-loader-6.2.6" = { + name = "_at_graphql-tools_slash_json-file-loader"; + packageName = "@graphql-tools/json-file-loader"; + version = "6.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.6.tgz"; + sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -2182,13 +2200,13 @@ let sha512 = "T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw=="; }; }; - "@graphql-tools/schema-7.0.0" = { + "@graphql-tools/schema-7.1.0" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.0.0.tgz"; - sha512 = "yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.0.tgz"; + sha512 = "1TwaRfWOfxtTqk8ckBrLi3283Sl0tQmUleAnelID1mql4YgYyArrKRkHfWZs9DbydngTxj/uV10aLYioJMR6tQ=="; }; }; "@graphql-tools/url-loader-6.4.0" = { @@ -2209,13 +2227,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.0.2" = { + "@graphql-tools/utils-7.1.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.0.2"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.0.2.tgz"; - sha512 = "VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.0.tgz"; + sha512 = "lMTgy08BdqQ31zyyCRrxcKZ6gAKQB9amGKJGg0mb3b4I3iJQKeaw9a7T96yGe1frGak1UK9y7OoYqx8RG7KitA=="; }; }; "@graphql-tools/wrap-7.0.1" = { @@ -2506,283 +2524,283 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jimp/bmp-0.9.8" = { + "@jimp/bmp-0.12.1" = { name = "_at_jimp_slash_bmp"; packageName = "@jimp/bmp"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.9.8.tgz"; - sha512 = "CZYQPEC3iUBMuaGWrtIG+GKNl93q/PkdudrCKJR/B96dfNngsmoosEm3LuFgJHEcJIfvnJkNqKw74l+zEiqCbg=="; + url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.12.1.tgz"; + sha512 = "t16IamuBMv4GiGa1VAMzsgrVKVANxXG81wXECzbikOUkUv7pKJ2vHZDgkLBEsZQ9sAvFCneM1+yoSRpuENrfVQ=="; }; }; - "@jimp/core-0.9.8" = { + "@jimp/core-0.12.1" = { name = "_at_jimp_slash_core"; packageName = "@jimp/core"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/core/-/core-0.9.8.tgz"; - sha512 = "N4GCjcXb0QwR5GBABDK2xQ3cKyaF7LlCYeJEG9mV7G/ynBoRqJe4JA6YKU9Ww9imGkci/4A594nQo8tUIqdcBw=="; + url = "https://registry.npmjs.org/@jimp/core/-/core-0.12.1.tgz"; + sha512 = "mWfjExYEjHxBal+1gPesGChOQBSpxO7WUQkrO9KM7orboitOdQ15G5UA75ce7XVZ+5t+FQPOLmVkVZzzTQSEJA=="; }; }; - "@jimp/custom-0.9.8" = { + "@jimp/custom-0.12.1" = { name = "_at_jimp_slash_custom"; packageName = "@jimp/custom"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.9.8.tgz"; - sha512 = "1UpJjI7fhX02BWLJ/KEqPwkHH60eNkCNeD6hEd+IZdTwLXfZCfFiM5BVlpgiZYZJSsVoRiAL4ne2Q5mCiKPKyw=="; + url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.12.1.tgz"; + sha512 = "bVClp8FEJ/11GFTKeRTrfH7NgUWvVO5/tQzO/68aOwMIhbz9BOYQGh533K9+mSy29VjZJo8jxZ0C9ZwYHuFwfA=="; }; }; - "@jimp/gif-0.9.8" = { + "@jimp/gif-0.12.1" = { name = "_at_jimp_slash_gif"; packageName = "@jimp/gif"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.9.8.tgz"; - sha512 = "LEbfpcO1sBJIQCJHchZjNlyNxzPjZQQ4X32klpQHZJG58n9FvL7Uuh1rpkrJRbqv3cU3P0ENNtTrsBDxsYwcfA=="; + url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.12.1.tgz"; + sha512 = "cGn/AcvMGUGcqR6ByClGSnrja4AYmTwsGVXTQ1+EmfAdTiy6ztGgZCTDpZ/tq4SpdHXwm9wDHez7damKhTrH0g=="; }; }; - "@jimp/jpeg-0.9.8" = { + "@jimp/jpeg-0.12.1" = { name = "_at_jimp_slash_jpeg"; packageName = "@jimp/jpeg"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.9.8.tgz"; - sha512 = "5u29SUzbZ32ZMmOaz3gO0hXatwSCnsvEAXRCKZoPPgbsPoyFAiZKVxjfLzjkeQF6awkvJ8hZni5chM15SNMg+g=="; + url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.12.1.tgz"; + sha512 = "UoCUHbKLj2CDCETd7LrJnmK/ExDsSfJXmc1pKkfgomvepjXogdl2KTHf141wL6D+9CfSD2VBWQLC5TvjMvcr9A=="; }; }; - "@jimp/plugin-blit-0.9.8" = { + "@jimp/plugin-blit-0.12.1" = { name = "_at_jimp_slash_plugin-blit"; packageName = "@jimp/plugin-blit"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz"; - sha512 = "6xTDomxJybhBcby1IUVaPydZFhxf+V0DRgfDlVK81kR9kSCoshJpzWqDuWrMqjNEPspPE7jRQwHMs0FdU7mVwQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.12.1.tgz"; + sha512 = "VRBB6bx6EpQuaH0WX8ytlGNqUQcmuxXBbzL3e+cD0W6MluYibzQy089okvXcyUS72Q+qpSMmUDCVr3pDqLAsSA=="; }; }; - "@jimp/plugin-blur-0.9.8" = { + "@jimp/plugin-blur-0.12.1" = { name = "_at_jimp_slash_plugin-blur"; packageName = "@jimp/plugin-blur"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz"; - sha512 = "dqbxuNFBRbmt35iIRacdgma7nlXklmPThsKcGWNTDmqb/hniK5IC+0xSPzBV4qMI2fLGP39LWHqqDZ0xDz14dA=="; + url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.12.1.tgz"; + sha512 = "rTFY0yrwVJFNgNsAlYGn2GYCRLVEcPQ6cqAuhNylXuR/7oH3Acul+ZWafeKtvN8D8uMlth/6VP74gruXvwffZw=="; }; }; - "@jimp/plugin-circle-0.9.8" = { + "@jimp/plugin-circle-0.12.1" = { name = "_at_jimp_slash_plugin-circle"; packageName = "@jimp/plugin-circle"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz"; - sha512 = "+UStXUPCzPqzTixLC8eVqcFcEa6TS+BEM/6/hyM11TDb9sbiMGeUtgpwZP/euR5H5gfpAQDA1Ppzqhh5fuMDlw=="; + url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.12.1.tgz"; + sha512 = "+/OiBDjby7RBbQoDX8ZsqJRr1PaGPdTaaKUVGAsrE7KCNO9ODYNFAizB9lpidXkGgJ4Wx5R4mJy21i22oY/a4Q=="; }; }; - "@jimp/plugin-color-0.9.8" = { + "@jimp/plugin-color-0.12.1" = { name = "_at_jimp_slash_plugin-color"; packageName = "@jimp/plugin-color"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.9.8.tgz"; - sha512 = "SDHxOQsJHpt75hk6+sSlCPc2B3UJlXosFW+iLZ11xX1Qr0IdDtbfYlIoPmjKQFIDUNzqLSue/z7sKQ1OMZr/QA=="; + url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.12.1.tgz"; + sha512 = "xlnK/msWN4uZ+Bu7+UrCs9oMzTSA9QE0jWFnF3h0aBsD8t1LGxozkckHe8nHtC/y/sxIa8BGKSfkiaW+r6FbnA=="; }; }; - "@jimp/plugin-contain-0.9.8" = { + "@jimp/plugin-contain-0.12.1" = { name = "_at_jimp_slash_plugin-contain"; packageName = "@jimp/plugin-contain"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz"; - sha512 = "oK52CPt7efozuLYCML7qOmpFeDt3zpU8qq8UZlnjsDs15reU6L8EiUbwYpJvzoEnEOh1ZqamB8F/gymViEO5og=="; + url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.12.1.tgz"; + sha512 = "WZ/D6G0jhnBh2bkBh610PEh/caGhAUIAxYLsQsfSSlOxPsDhbj3S6hMbFKRgnDvf0hsd5zTIA0j1B0UG4kh18A=="; }; }; - "@jimp/plugin-cover-0.9.8" = { + "@jimp/plugin-cover-0.12.1" = { name = "_at_jimp_slash_plugin-cover"; packageName = "@jimp/plugin-cover"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz"; - sha512 = "nnamtHzMrNd5j5HRSPd1VzpZ8v9YYtUJPtvCdHOOiIjqG72jxJ2kTBlsS3oG5XS64h/2MJwpl/fmmMs1Tj1CmQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.12.1.tgz"; + sha512 = "ddWwTQO40GcabJ2UwUYCeuNxnjV4rBTiLprnjGMqAJCzdz3q3Sp20FkRf+H+E22k2v2LHss8dIOFOF4i6ycr9Q=="; }; }; - "@jimp/plugin-crop-0.9.8" = { + "@jimp/plugin-crop-0.12.1" = { name = "_at_jimp_slash_plugin-crop"; packageName = "@jimp/plugin-crop"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz"; - sha512 = "Nv/6AIp4aJmbSIH2uiIqm+kSoShKM8eaX2fyrUTj811kio0hwD3f/vIxrWebvAqwDZjAFIAmMufFoFCVg6caoQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.12.1.tgz"; + sha512 = "CKjVkrNO8FDZKYVpMireQW4SgKBSOdF+Ip/1sWssHHe77+jGEKqOjhYju+VhT3dZJ3+75rJNI9II7Kethp+rTw=="; }; }; - "@jimp/plugin-displace-0.9.8" = { + "@jimp/plugin-displace-0.12.1" = { name = "_at_jimp_slash_plugin-displace"; packageName = "@jimp/plugin-displace"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz"; - sha512 = "0OgPjkOVa2xdbqI8P6gBKX/UK36RbaYVrFyXL8Jy9oNF69+LYWyTskuCu9YbGxzlCVjY/JFqQOvrKDbxgMYAKA=="; + url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.12.1.tgz"; + sha512 = "MQAw2iuf1/bVJ6P95WWTLA+WBjvIZ7TeGBerkvBaTK8oWdj+NSLNRIYOIoyPbZ7DTL8f1SN4Vd6KD6BZaoWrwg=="; }; }; - "@jimp/plugin-dither-0.9.8" = { + "@jimp/plugin-dither-0.12.1" = { name = "_at_jimp_slash_plugin-dither"; packageName = "@jimp/plugin-dither"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz"; - sha512 = "jGM/4ByniZJnmV2fv8hKwyyydXZe/YzvgBcnB8XxzCq8kVR3Imcn+qnd2PEPZzIPKOTH4Cig/zo9Vk9Bs+m5FQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.12.1.tgz"; + sha512 = "mCrBHdx2ViTLJDLcrobqGLlGhZF/Mq41bURWlElQ2ArvrQ3/xR52We9DNDfC08oQ2JVb6q3v1GnCCdn0KNojGQ=="; }; }; - "@jimp/plugin-fisheye-0.9.8" = { + "@jimp/plugin-fisheye-0.12.1" = { name = "_at_jimp_slash_plugin-fisheye"; packageName = "@jimp/plugin-fisheye"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz"; - sha512 = "VnsalrD05f4pxG1msjnkwIFi5QveOqRm4y7VkoZKNX+iqs4TvRnH5+HpBnfdMzX/RXBi+Lf/kpTtuZgbOu/QWw=="; + url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.12.1.tgz"; + sha512 = "CHvYSXtHNplzkkYzB44tENPDmvfUHiYCnAETTY+Hx58kZ0w8ERZ+OiLhUmiBcvH/QHm/US1iiNjgGUAfeQX6dg=="; }; }; - "@jimp/plugin-flip-0.9.8" = { + "@jimp/plugin-flip-0.12.1" = { name = "_at_jimp_slash_plugin-flip"; packageName = "@jimp/plugin-flip"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz"; - sha512 = "XbiZ4OfHD6woc0f6Sk7XxB6a7IyMjTRQ4pNU7APjaNxsl3L6qZC8qfCQphWVe3DHx7f3y7jEiPMvNnqRDP1xgA=="; + url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.12.1.tgz"; + sha512 = "xi+Yayrnln8A/C9E3yQBExjxwBSeCkt/ZQg1CxLgszVyX/3Zo8+nkV8MJYpkTpj8LCZGTOKlsE05mxu/a3lbJQ=="; }; }; - "@jimp/plugin-gaussian-0.9.8" = { + "@jimp/plugin-gaussian-0.12.1" = { name = "_at_jimp_slash_plugin-gaussian"; packageName = "@jimp/plugin-gaussian"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz"; - sha512 = "ZBl5RA6+4XAD+mtqLfiG7u+qd8W5yqq3RBNca8eFqUSVo1v+eB2tzeLel0CWfVC/z6cw93Awm/nVnm6/CL2Oew=="; + url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.12.1.tgz"; + sha512 = "7O6eKlhL37hsLfV6WAX1Cvce7vOqSwL1oWbBveC1agutDlrtvcTh1s2mQ4Pde654hCJu55mq1Ur10+ote5j3qw=="; }; }; - "@jimp/plugin-invert-0.9.8" = { + "@jimp/plugin-invert-0.12.1" = { name = "_at_jimp_slash_plugin-invert"; packageName = "@jimp/plugin-invert"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz"; - sha512 = "ESploqCoF6qUv5IWhVLaO5fEcrYZEsAWPFflh6ROiD2mmFKQxfeK+vHnk3IDLHtUwWTkAZQNbk89BVq7xvaNpQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.12.1.tgz"; + sha512 = "JTAs7A1Erbxwl+7ph7tgcb2PZ4WzB+3nb2WbfiWU8iCrKj17mMDSc5soaCCycn8wfwqvgB1vhRfGpseOLWxsuQ=="; }; }; - "@jimp/plugin-mask-0.9.8" = { + "@jimp/plugin-mask-0.12.1" = { name = "_at_jimp_slash_plugin-mask"; packageName = "@jimp/plugin-mask"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz"; - sha512 = "zSvEisTV4iGsBReitEdnQuGJq9/1xB5mPATadYZmIlp8r5HpD72HQb0WdEtb51/pu9Odt8KAxUf0ASg/PRVUiQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.12.1.tgz"; + sha512 = "bnDdY0RO/x5Mhqoy+056SN1wEj++sD4muAKqLD2CIT8Zq5M/0TA4hkdf/+lwFy3H2C0YTK39PSE9xyb4jPX3kA=="; }; }; - "@jimp/plugin-normalize-0.9.8" = { + "@jimp/plugin-normalize-0.12.1" = { name = "_at_jimp_slash_plugin-normalize"; packageName = "@jimp/plugin-normalize"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz"; - sha512 = "dPFBfwTa67K1tRw1leCidQT25R3ozrTUUOpO4jcGFHqXvBTWaR8sML1qxdfOBWs164mE5YpfdTvu6MM/junvCg=="; + url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.12.1.tgz"; + sha512 = "4kSaI4JLM/PNjHwbnAHgyh51V5IlPfPxYvsZyZ1US32pebWtocxSMaSuOaJUg7OGSkwSDBv81UR2h5D+Dz1b5A=="; }; }; - "@jimp/plugin-print-0.9.8" = { + "@jimp/plugin-print-0.12.1" = { name = "_at_jimp_slash_plugin-print"; packageName = "@jimp/plugin-print"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.9.8.tgz"; - sha512 = "nLLPv1/faehRsOjecXXUb6kzhRcZzImO55XuFZ0c90ZyoiHm4UFREwO5sKxHGvpLXS6RnkhvSav4+IWD2qGbEQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.12.1.tgz"; + sha512 = "T0lNS3qU9SwCHOEz7AGrdp50+gqiWGZibOL3350/X/dqoFs1EvGDjKVeWncsGCyLlpfd7M/AibHZgu8Fx2bWng=="; }; }; - "@jimp/plugin-resize-0.9.8" = { + "@jimp/plugin-resize-0.12.1" = { name = "_at_jimp_slash_plugin-resize"; packageName = "@jimp/plugin-resize"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz"; - sha512 = "L80NZ+HKsiKFyeDc6AfneC4+5XACrdL2vnyAVfAAsb3pmamgT/jDInWvvGhyI0Y76vx2w6XikplzEznW/QQvWg=="; + url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.12.1.tgz"; + sha512 = "sbNn4tdBGcgGlPt9XFxCuDl4ZOoxa8/Re8nAikyxYhRss2Dqz91ARbBQxOf1vlUGeicQMsjEuWbPQAogTSJRug=="; }; }; - "@jimp/plugin-rotate-0.9.8" = { + "@jimp/plugin-rotate-0.12.1" = { name = "_at_jimp_slash_plugin-rotate"; packageName = "@jimp/plugin-rotate"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz"; - sha512 = "bpqzQheISYnBXKyU1lIj46uR7mRs0UhgEREWK70HnvFJSlRshdcoNMIrKamyrJeFdJrkYPSfR/a6D0d5zsWf1Q=="; + url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.12.1.tgz"; + sha512 = "RYkLzwG2ervG6hHy8iepbIVeWdT1kz4Qz044eloqo6c66MK0KAqp228YI8+CAKm0joQnVDC/A0FgRIj/K8uyAw=="; }; }; - "@jimp/plugin-scale-0.9.8" = { + "@jimp/plugin-scale-0.12.1" = { name = "_at_jimp_slash_plugin-scale"; packageName = "@jimp/plugin-scale"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz"; - sha512 = "QU3ZS4Lre8nN66U9dKCOC4FNfaOh/QJFYUmQPKpPS924oYbtnm4OlmsdfpK2hVMSVVyVOis8M+xpA1rDBnIp7w=="; + url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.12.1.tgz"; + sha512 = "zjNVI1fUj+ywfG78T1ZU33g9a5sk4rhEQkkhtny8koAscnVsDN2YaZEKoFli54kqaWh5kSS5DDL7a/9pEfXnFQ=="; }; }; - "@jimp/plugin-shadow-0.9.8" = { + "@jimp/plugin-shadow-0.12.1" = { name = "_at_jimp_slash_plugin-shadow"; packageName = "@jimp/plugin-shadow"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz"; - sha512 = "t/pE+QS3r1ZUxGIQNmwWDI3c5+/hLU+gxXD+C3EEC47/qk3gTBHpj/xDdGQBoObdT/HRjR048vC2BgBfzjj2hg=="; + url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.12.1.tgz"; + sha512 = "Z82IwvunXWQ2jXegd3W3TYUXpfJcEvNbHodr7Z+oVnwhM1OoQ5QC6RSRQwsj2qXIhbGffQjH8eguHgEgAV+u5w=="; }; }; - "@jimp/plugin-threshold-0.9.8" = { + "@jimp/plugin-threshold-0.12.1" = { name = "_at_jimp_slash_plugin-threshold"; packageName = "@jimp/plugin-threshold"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz"; - sha512 = "WWmC3lnIwOTPvkKu55w4DUY8Ehlzf3nU98bY0QtIzkqxkAOZU5m+lvgC/JxO5FyGiA57j9FLMIf0LsWkjARj7g=="; + url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.12.1.tgz"; + sha512 = "PFezt5fSk0q+xKvdpuv0eLggy2I7EgYotrK8TRZOT0jimuYFXPF0Z514c6szumoW5kEsRz04L1HkPT1FqI97Yg=="; }; }; - "@jimp/plugins-0.9.8" = { + "@jimp/plugins-0.12.1" = { name = "_at_jimp_slash_plugins"; packageName = "@jimp/plugins"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.9.8.tgz"; - sha512 = "tD+cxS9SuEZaQ1hhAkNKw9TkUAqfoBAhdWPBrEZDr/GvGPrvJR4pYmmpSYhc5IZmMbXfQayHTTGqjj8D18bToA=="; + url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.12.1.tgz"; + sha512 = "7+Yp29T6BbYo+Oqnc+m7A5AH+O+Oy5xnxvxlfmsp48+SuwEZ4akJp13Gu2PSmRlylENzR7MlWOxzhas5ERNlIg=="; }; }; - "@jimp/png-0.9.8" = { + "@jimp/png-0.12.1" = { name = "_at_jimp_slash_png"; packageName = "@jimp/png"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/png/-/png-0.9.8.tgz"; - sha512 = "9CqR8d40zQCDhbnXHqcwkAMnvlV0vk9xSyE6LHjkYHS7x18Unsz5txQdsaEkEcXxCrOQSoWyITfLezlrWXRJAA=="; + url = "https://registry.npmjs.org/@jimp/png/-/png-0.12.1.tgz"; + sha512 = "tOUSJMJzcMAN82F9/Q20IToquIVWzvOe/7NIpVQJn6m+Lq6TtVmd7d8gdcna9AEFm2FIza5lhq2Kta6Xj0KXhQ=="; }; }; - "@jimp/tiff-0.9.8" = { + "@jimp/tiff-0.12.1" = { name = "_at_jimp_slash_tiff"; packageName = "@jimp/tiff"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.9.8.tgz"; - sha512 = "eMxcpJivJqMByn2dZxUHLeh6qvVs5J/52kBF3TFa3C922OJ97D9l1C1h0WKUCBqFMWzMYapQQ4vwnLgpJ5tkow=="; + url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.12.1.tgz"; + sha512 = "bzWDgv3202TKhaBGzV9OFF0PVQWEb4194h9kv5js348SSnbCusz/tzTE1EwKrnbDZThZPgTB1ryKs7D+Q9Mhmg=="; }; }; - "@jimp/types-0.9.8" = { + "@jimp/types-0.12.1" = { name = "_at_jimp_slash_types"; packageName = "@jimp/types"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/types/-/types-0.9.8.tgz"; - sha512 = "H5y/uqt0lqJ/ZN8pWqFG+pv8jPAppMKkTMByuC8YBIjWSsornwv44hjiWl93sbYhduLZY8ubz/CbX9jH2X6EwA=="; + url = "https://registry.npmjs.org/@jimp/types/-/types-0.12.1.tgz"; + sha512 = "hg5OKXpWWeKGuDrfibrjWWhr7hqb7f552wqnPWSLQpVrdWgjH+hpOv6cOzdo9bsU78qGTelZJPxr0ERRoc+MhQ=="; }; }; - "@jimp/utils-0.9.8" = { + "@jimp/utils-0.12.1" = { name = "_at_jimp_slash_utils"; packageName = "@jimp/utils"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.9.8.tgz"; - sha512 = "UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw=="; + url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.12.1.tgz"; + sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; "@joplinapp/fork-htmlparser2-4.1.8" = { @@ -3370,6 +3388,15 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; + "@mdn/browser-compat-data-2.0.5" = { + name = "_at_mdn_slash_browser-compat-data"; + packageName = "@mdn/browser-compat-data"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-2.0.5.tgz"; + sha512 = "JTosoRJrq5E8QYLwPfqB22zZxyBzUEx+1ooOPMcrFYgWplOeS8K8B6VD3WHD+9XV+R1X5vimruSL9ALYuxfD+A=="; + }; + }; "@medv/blessed-2.0.1" = { name = "_at_medv_slash_blessed"; packageName = "@medv/blessed"; @@ -3433,13 +3460,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-5.3.1" = { + "@netlify/build-5.3.3" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "5.3.1"; + version = "5.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.1.tgz"; - sha512 = "4Qb4TuqOoRP2fopebyAonjNu0Ay3GVjOQSqzJUcENPg7MNIwzqd/V7nY+OtQJyA8/1Xjd4cwdPP20SIoGoBvMQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.3.tgz"; + sha512 = "PgAPLFZeHeR45mM2km/UHXfg/3K9NtrGKAaoG7vwU36XYEaVaB/psBp0PzrfJbRiBER+vqnxrDTOyHJc4Z0w1g=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3496,13 +3523,13 @@ let sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw=="; }; }; - "@netlify/plugin-edge-handlers-1.9.0" = { + "@netlify/plugin-edge-handlers-1.10.0" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.9.0.tgz"; - sha512 = "5JRVj9lVxG3VKI3vUk95AkS2ZatDHEcOBPZ5En4j+vKlfwQpn0oCbTbHQ5V45Zf0dKZv3rULAYZ//vHmVIH/Nw=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.10.0.tgz"; + sha512 = "ZgabL4Q+DfB5lqq36QYvGIhLifoiVz5oDfqLp1w7hRsJYwUhUPqeJx/0zph17ZaJB4CvHRadFOeyJeDSkzrERg=="; }; }; "@netlify/run-utils-1.0.5" = { @@ -3514,103 +3541,103 @@ let sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; }; }; - "@netlify/traffic-mesh-agent-0.24.0" = { + "@netlify/traffic-mesh-agent-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent"; packageName = "@netlify/traffic-mesh-agent"; - version = "0.24.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0.tgz"; - sha512 = "m3nfdolp8+jwy7sBKz6iuw1MRRZR27onrUtQz3Iwor7CE0+rIWJm+aPc5AFYUlISDM5zTCXgVGDeiPHJv5cOQQ=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.0.tgz"; + sha512 = "a+jXM75Ir9PavNTzDRkZWQT7jHc02wWF8mRYXWbvku+VLqmmkA61RyhAgSeo5dMWSdMofSRkoifnW7leyv7Obw=="; }; }; - "@netlify/traffic-mesh-agent-darwin-x64-0.24.0" = { + "@netlify/traffic-mesh-agent-darwin-x64-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.24.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0.tgz"; - sha512 = "aFh/04aTRNI7BAyUbpXvH6AZ+XcJMxwroQWfMYjyVm7F+T4bg0XRcteoVjX/U2NhxkNhCXMqBgrHFsVNZLlJ7w=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.0.tgz"; + sha512 = "a0EDNrdLBjxp+GYj/WQSifuQZorFQkY6spO4wuOl3mQV3tKTkBmu09+FsfitYpgZHDMoPzfhvURJrUtJIHTgqQ=="; }; }; - "@netlify/traffic-mesh-agent-linux-x64-0.24.0" = { + "@netlify/traffic-mesh-agent-linux-x64-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.24.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0.tgz"; - sha512 = "cUHUpajpK3WrE78F29fEuOKuRG+mkXoPoe2SL9wO+sCrAw18A9px/tfWWFwC9iJLSr/WLHYAAOJhdm02ypa65A=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.0.tgz"; + sha512 = "m7p/0eTXKILxCpTqQOmBkYdIjYKwSC2KZbPpDJ4sYfnMIF3qa9uMp8qrK9At/oGPckeiTq4Id775veldhwt2lw=="; }; }; - "@netlify/traffic-mesh-agent-win32-x64-0.24.0" = { + "@netlify/traffic-mesh-agent-win32-x64-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.24.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0.tgz"; - sha512 = "9K4QA5VcJK9Wrx9BTKSaeOaX9es7lfS97iJMB1micSFuLIK5o/DS9oxaa4tMjzIy0Ck/Pa717XX9TGx9MpCexA=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.0.tgz"; + sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg=="; }; }; - "@netlify/zip-it-and-ship-it-1.4.0" = { + "@netlify/zip-it-and-ship-it-1.4.2" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.0.tgz"; - sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.2.tgz"; + sha512 = "iwwKQrBnLONYm1x7g6GZvHmjeZ03/L2NUYL/2NcpNYtE4sWB+M5OTDdnlVsu8u65dR7wtH4hKjOO2ID6vS7rQQ=="; }; }; - "@node-red/editor-api-1.2.5" = { + "@node-red/editor-api-1.2.6" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.5.tgz"; - sha512 = "ZoWCBDPtuP9wxKxC/SK5hzTMTg6QQlvouoZelZ5h2nS2UGL3Mk+udsJL56FwSYrb/w4JfqG58wmG+DEsmjBKGg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.6.tgz"; + sha512 = "RM243A8AgpoHEc8cu8STCYsJVx790clVxvRUCaLfbAyb+dKn+9b0TOKWsmLUW4fhrMqwwVlFOMulVHPhg0HhGg=="; }; }; - "@node-red/editor-client-1.2.5" = { + "@node-red/editor-client-1.2.6" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.5.tgz"; - sha512 = "pqf+JSp0mNQ3o8fnEH6NKJQNj7/QJQKAHGKjmm1uAnaOJMGpOeO7Wap6/obPKzf0o67uVteYKD81LfhsI0afgQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.6.tgz"; + sha512 = "2hMnMVcqhR77mHqHzVj3hNJGZ8VcaO+lhggNYhORJXEqYCeAULj92hMCeoA4pjHDqGBn2F+gldli1WOs1/JgJg=="; }; }; - "@node-red/nodes-1.2.5" = { + "@node-red/nodes-1.2.6" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.5.tgz"; - sha512 = "4rHYyIGYrLSZWlxX/KWyOQ4+M6srPd/0i3Idw/68PMBCw9ygyn9DpcBGd6IEqbkSa4BRdcjkomOpmmGsRuCDkw=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.6.tgz"; + sha512 = "1LlECIzKKBHUOsWGLw31FT1mWL2mSecr9gBh2FqwnP7gNejebYjwP2zuHKOYs9sPRm3550zOJ5mlutXiiFKwYg=="; }; }; - "@node-red/registry-1.2.5" = { + "@node-red/registry-1.2.6" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.5.tgz"; - sha512 = "NPF+9abbj2bF/WKgV6sC+hskAJh1AUZPUx1aM/x6xk0tCtotOqx7KRDZlbzKMqT1hKb7V1tsBYtzdIMmCdJncQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.6.tgz"; + sha512 = "+zwHxnMr9Adve627dtw2jl/KSjTY+a5JrwJN10TSKMxVLwYeBLm/ugRTA9tkGiCjr2w9pgsnMUZRFFLfdyRZCQ=="; }; }; - "@node-red/runtime-1.2.5" = { + "@node-red/runtime-1.2.6" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.5.tgz"; - sha512 = "5RR90HtNAs194+hqh803MmaKZxmfUboGYHMO5dcAhv+e1Fh5SM2lDpGJDLM7j3QI4bWRqdi82qd1y2kXvLqgYA=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.6.tgz"; + sha512 = "zfQGK4Hqssv5TV8S5WLZ77BHYmyylarZvEScVQpivhJHg6HeZL+MffqqtPIyTM1ulklPZvO6fPmq/f5T/CgAgw=="; }; }; - "@node-red/util-1.2.5" = { + "@node-red/util-1.2.6" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.5.tgz"; - sha512 = "V+/bWsEg8PIZemgzpjqcpq+/zcjuj/fJ3qoJNRDWFYQ+6VU24W+cGiz795z1KfmyloeMLw3LPikp7lQGikTtIw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.6.tgz"; + sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -3703,13 +3730,13 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.8.0" = { + "@npmcli/run-script-1.8.1" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.0.tgz"; - sha512 = "ljPLRbQM5byhqacWl9kIjt/yPMee0heaTskaMBFaFvYzOXNJ64h27xV96Sr+LnjJpqR0qJejG36QzJkXILvghQ=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.1.tgz"; + sha512 = "G8c86g9cQHyRINosIcpovzv0BkXQc3urhL1ORf3KTe4TS4UBsg2O4Z2feca/W3pfzdHEJzc83ETBW4aKbb3SaA=="; }; }; "@oclif/color-0.1.2" = { @@ -3721,15 +3748,6 @@ let sha512 = "M9o+DOrb8l603qvgz1FogJBUGLqcMFL1aFg2ZEL0FbXJofiNTLOWIeB4faeZTLwE6dt0xH9GpCVpzksMMzGbmA=="; }; }; - "@oclif/command-1.6.1" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.6.1.tgz"; - sha512 = "pvmMmfGn+zm4e4RwVw63mg9sIaqKqmVsFbImQoUrCO/43UmWzoSHWNXKdgEGigOezWrkZfFucaeZcSbp149OWg=="; - }; - }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -3739,15 +3757,6 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/config-1.15.1" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz"; - sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ=="; - }; - }; "@oclif/config-1.17.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -3757,15 +3766,6 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/errors-1.2.2" = { - name = "_at_oclif_slash_errors"; - packageName = "@oclif/errors"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.2.2.tgz"; - sha512 = "Eq8BFuJUQcbAPVofDxwdE0bL14inIiwt5EaKRVY9ZDIG11jwdXZqiQEECJx0VfnLyUZdYfRd/znDI/MytdJoKg=="; - }; - }; "@oclif/errors-1.3.3" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -3856,15 +3856,6 @@ let sha512 = "G440PCuMi/OT8b71aWkR+kCWikngGtyRjOR24sPMDbpUFV4+B3r51fz1fcqeUiiEOYqUpr0Uy/sneUe1O/NfBg=="; }; }; - "@oclif/plugin-plugins-1.9.0" = { - name = "_at_oclif_slash_plugin-plugins"; - packageName = "@oclif/plugin-plugins"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.0.tgz"; - sha512 = "sq31nJk/n5pH5qGDioj2Z9x6MlRUrc/kkQrfCYKRPbQM80qewSP4RcPK3/gDvDSOAWD3wLAK9oMbDQO9lqImMA=="; - }; - }; "@oclif/plugin-plugins-1.9.1" = { name = "_at_oclif_slash_plugin-plugins"; packageName = "@oclif/plugin-plugins"; @@ -3874,6 +3865,15 @@ let sha512 = "/lE644CeLZ9ZNpDzHTKSadUtHjo86CbKZBazJiBEeH3LAzf90AeiX447slVByGIAHOglvPgWLKaTUGuWdF/iwQ=="; }; }; + "@oclif/plugin-plugins-1.9.4" = { + name = "_at_oclif_slash_plugin-plugins"; + packageName = "@oclif/plugin-plugins"; + version = "1.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.4.tgz"; + sha512 = "C5hEbX4zzTjzbym2RJUE4wxz2aL2ocb826HDs3suscsjMPA3mRHyu8/rWJW1Cgc2MeoIybNdrfyPU/zmpWkaWw=="; + }; + }; "@oclif/plugin-warn-if-update-available-1.7.0" = { name = "_at_oclif_slash_plugin-warn-if-update-available"; packageName = "@oclif/plugin-warn-if-update-available"; @@ -4027,310 +4027,310 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@ot-builder/bin-composite-types-0.10.33" = { + "@ot-builder/bin-composite-types-0.10.34" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.33.tgz"; - sha512 = "6Ls0hv6JRVzyeT3By9wl34B1d2exTKp6eilU7z4MZzGR78MU73H6nVDp9NTlwhA545K1dqAk6lAN2ApUo60UaQ=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.34.tgz"; + sha512 = "Tapb8mSXEZcmZNwB9KKo0CFLu8ZajAEAqxH07Py/lvS+2Rpe6LZWoPbLcHRwAP47cHbbO3IxZLWhvlWfOmaxHA=="; }; }; - "@ot-builder/bin-util-0.10.33" = { + "@ot-builder/bin-util-0.10.34" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.33.tgz"; - sha512 = "ijm6023Wlv4l6jt04Zq/Ts2GJDtDN++NDD70VQ0PsKcX0N5/Ebzbn2v+2cNaTFirGY1O+H1tGtLcPFVR32aDLw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.34.tgz"; + sha512 = "hyu0SLfWzMG9VKy54Nmxa723owd6o3miF1NR5FN/ff+ZkWbRqzSCm7haw40801ESC2DqMWjeZDyJBU4A+aHMFQ=="; }; }; - "@ot-builder/cli-help-shower-0.10.33" = { + "@ot-builder/cli-help-shower-0.10.34" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.33.tgz"; - sha512 = "720ibT7AxqrTfcYdOuPC4/RTQV8HgOt3W5yz1Z7tF0Dtj7Oka5X3qiLHlBiaNQYfRlmvap84NG1JXI9KedYtQA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.34.tgz"; + sha512 = "bCo9xNGvXSkEN7e8mK7sFHYLoCEsGIzPoZeyeWbEe4rWC6FQAAPWwlzCWldaNcbK/nGJsHYiHxLGO3LjeFl00A=="; }; }; - "@ot-builder/cli-proc-0.10.33" = { + "@ot-builder/cli-proc-0.10.34" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.33.tgz"; - sha512 = "ou8I9QUwwttYreAmeTsdRHSJeudclIEQdDitKXTDJFB3qombH2n1509BHN+lod5TbDEO/L/Nhyz82xQxmEnvUw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.34.tgz"; + sha512 = "nckPcf5wm1nGm2Aw+JXllYGp5MGdJzGqYoS7wAbkA2i371rhD8LM6j+hQNorZ07rb6rFc2v09MMtuNmO8CpoaA=="; }; }; - "@ot-builder/cli-shared-0.10.33" = { + "@ot-builder/cli-shared-0.10.34" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.33.tgz"; - sha512 = "pZXxdWoIj/XntJ2+NbpW+N5IdRJzTRMa+0SQdKr/xqrLq9qIKkcBhaqeY8HzqKF8CXPDdwEsgtXrAvmrStE1VA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.34.tgz"; + sha512 = "tCH4OJnc+9trMBffqZDW/tHmRj72+sqwE9JNCBRA4iabiL8rQQEKWLm3iYEygS7/X7oZSLU+idQK+gI/9rLy0Q=="; }; }; - "@ot-builder/common-impl-0.10.33" = { + "@ot-builder/common-impl-0.10.34" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.33.tgz"; - sha512 = "5lZxnaoP2qQ5/57BDhdtY3y5qdUScUi9AOBb0xIEG2MbzSEqruoY01AbxhNG47oJGeVCTrgRP9u0xPOhWY+4+A=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.34.tgz"; + sha512 = "igfcrSnhHEJZdziq1XKFnb2ZV82t/+3Ez+1lE9N0V542CzhRsGKHDcd1X3msfhRqc88ykl+zW/sKWLWvsnseKA=="; }; }; - "@ot-builder/errors-0.10.33" = { + "@ot-builder/errors-0.10.34" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.33.tgz"; - sha512 = "Eq3ghzkxLIZasfh2Sc49MDoaCwmW6c4xaqq9yZSmY1txd6s8WrzWisDBYdt7qwCHVW2EcbsJMNpSKECzAfegpA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.34.tgz"; + sha512 = "p/vBXtzbFt34KC4fgAHxpbxTVI12rVcbyPvTu6dmwAkwaQG6gF22STwdc5rK9Qllr475Ppkojfp165udUo250g=="; }; }; - "@ot-builder/io-bin-cff-0.10.33" = { + "@ot-builder/io-bin-cff-0.10.34" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.33.tgz"; - sha512 = "QffGC05YocTrzNDhNa2gF64/iZqarERvRM8EnGRyZM4THHE/LwWHVMtirDl/DI8V1Ex00XTpxfCPwRerhQWBvw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.34.tgz"; + sha512 = "GvL+LGXXgJtHoSr00Qkm/LI9dpMJXXkXzZFjpfIyjx5o74ao7zod85SjxfBqzVdRUFcNvVbOSIiM7xrW1IgiTA=="; }; }; - "@ot-builder/io-bin-encoding-0.10.33" = { + "@ot-builder/io-bin-encoding-0.10.34" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.33.tgz"; - sha512 = "WUFSdfpv55uuiPTOepAPrcXqRLDeyLb3dY9OjUeX2bPbWTHoNH0n6SaKAf0PAKhCMeELoPibd6tXMe1BRtpVag=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.34.tgz"; + sha512 = "euzzwHXtjVTiFa5RPonkYOOP/rX0vqeUfupW6SiGIPrp0YszrjHGbWk+pLxxkbTteA30o+Xc7IQ8sppXd+AGGw=="; }; }; - "@ot-builder/io-bin-ext-private-0.10.33" = { + "@ot-builder/io-bin-ext-private-0.10.34" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.33.tgz"; - sha512 = "fq97OoqCT+sdZ0tfwpPeWHXbji5a3dxZLNw4WkRRJ1Ih8/IwL8NNZPpwv4MbgWvl18Bwsfeu0VHXkwiZKmlo6Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.34.tgz"; + sha512 = "5TjCMXPLR6mfpG0E3h/EvKWuaLzoLOJQZxlnAeHh2zg5w0uzoMFArxhY08cE7iKlITQLlLwV5EgagcgjmD+xrw=="; }; }; - "@ot-builder/io-bin-font-0.10.33" = { + "@ot-builder/io-bin-font-0.10.34" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.33.tgz"; - sha512 = "Kyf0e5g1ovpCX3ndbvyRUpdpNK227WWxr+KFRZzuy0vV+IJS+vbJ6TnLeYBCblIgrUGtGn12XJi7VL5wLN6eWg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.34.tgz"; + sha512 = "wfPhUDtg8f4WL/tAS031qVXR33HCa8zC4K+TfMWgLeVhApPGtT8qhPsUN7VMZwvu6L92YYVlG1BYLo/bQZtcdA=="; }; }; - "@ot-builder/io-bin-glyph-store-0.10.33" = { + "@ot-builder/io-bin-glyph-store-0.10.34" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.33.tgz"; - sha512 = "0pMS9l8Ip+IWokPV90VC2x1Xqvm3oAmVxK+FUgY9kogbZAwnQXmMzkXSvNk+HDHv6yVXq73c/v9AzztPVzW3DQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.34.tgz"; + sha512 = "0izykazfWE77KEN9N17fyrftUEiTMFiYZAV06mGDpOmHyRLM0oFAnGheWE7n5rRj5ft/9tuH/Yi3z1RPkM2LzQ=="; }; }; - "@ot-builder/io-bin-layout-0.10.33" = { + "@ot-builder/io-bin-layout-0.10.34" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.33.tgz"; - sha512 = "GjGUw00uuPIownm+gQoF9ntBJuaInqofYtb43ScjS1gvQX+qcjg7ZMHoaOcF0N9MmbgQRoQYde0JFXuagHdlVg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.34.tgz"; + sha512 = "35689IuO84kKg25ltvzJemF49zoEYv/uT1CEEvPbI8vfsss32CVBDxVsyHoIMeCVz872i3q0LEMquZ4v7bQP1A=="; }; }; - "@ot-builder/io-bin-metadata-0.10.33" = { + "@ot-builder/io-bin-metadata-0.10.34" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.33.tgz"; - sha512 = "0Wf5CVkJH3e6imQSsqMKuGV3xX//Vj8Mf3dRkuxCj9EC7C1W1dZoVwrBwKg8DS25uYyERQCHrjuJ4+hbArnfcQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.34.tgz"; + sha512 = "hHvHgbW9q/rY7RLKUZ6bd15mjWuInyek1N+t81XeF58/W6AC50Ya65wxhG381wui1NGgUJrcwUcO6K36RQCyFA=="; }; }; - "@ot-builder/io-bin-metric-0.10.33" = { + "@ot-builder/io-bin-metric-0.10.34" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.33.tgz"; - sha512 = "lJQWWJl5fZaB1/u+s8xp/5bOrG6WKdz6HV9C669HhiUF29RbeYVgHqUz7Mf4tlcXqulTUddDwDGS552GuyJEfw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.34.tgz"; + sha512 = "9MgzLr/GVWEF2aKDBu0UZ+9X6a84IxQw3Yhnw9MigMdK345We/rtuL1Q1Io5XW9XDcj89EqP/31cUSAr/bD0YQ=="; }; }; - "@ot-builder/io-bin-name-0.10.33" = { + "@ot-builder/io-bin-name-0.10.34" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.33.tgz"; - sha512 = "rCuiBuln5t7e8CGHAFJqa8duCVFlPbhSXGb7TsOyrqyNbEwZPrCDx40grMVB46xjKdAj8ZeE1Y1jikxSNlPW7g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.34.tgz"; + sha512 = "s/PGAiUV/Qvz7b3dejSXrvk7g8H75yTKfa4HbmZDUPL9PB0+0+BEYbCeHeTTGD3EjZCA5tH1oi19IfuXzFWMsw=="; }; }; - "@ot-builder/io-bin-sfnt-0.10.33" = { + "@ot-builder/io-bin-sfnt-0.10.34" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.33.tgz"; - sha512 = "vLRxvsh8LYOwLPqPEGdedG9/KqVpfeR6ceHa0zYc0Y/5FwOYjwbscIdr3SlyKJsPBFVvbOuzvmIBkKC7rASc8w=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.34.tgz"; + sha512 = "/GcMw5E1fvZ5B67jUfLbDWzHzMxQRnAMx0OAXq3FseY4dr28OOppieKbHK6f7K+cuscyOxcY/sycpDPLgI21wA=="; }; }; - "@ot-builder/io-bin-ttf-0.10.33" = { + "@ot-builder/io-bin-ttf-0.10.34" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.33.tgz"; - sha512 = "8yJoOjvwpRPyRMs45/uNNS9kBS3iQFLCSdLRlikH9cqxCHDpVH0vr74XHf0LCWwhnG/DJzcbB6L8LRnhl+QH2A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.34.tgz"; + sha512 = "X8xX76EP24H4DxQJO1kvIwmXfCuTyoCbvYB+6oXuITt4LbIjvbDoCn/PDKdxxUdDxDkcdN+5yZZAxc64Cinzew=="; }; }; - "@ot-builder/ot-0.10.33" = { + "@ot-builder/ot-0.10.34" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.33.tgz"; - sha512 = "fFR3y7oFFmdOHSPQV0yU5hYj9Ahg+M0Y46rvcI8JaUDywIWeuDV0p0YBZ83x4p4wX5k571aiY5lxQtZrDAHSRA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.34.tgz"; + sha512 = "TFEhsVLr7zqDVDCupvw0+OIDzeUry+g/csgmn+fUIx5NBlyDLF78CJytYUha/HhzIyh3NeTgIDDVTU0K04jo2Q=="; }; }; - "@ot-builder/ot-encoding-0.10.33" = { + "@ot-builder/ot-encoding-0.10.34" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.33.tgz"; - sha512 = "rAt3lLA3sWtQCfGB1IPfkEzDpSjE4xom/qR7+xT38FXKu5SUqWQYLIqmtLmXX9oSo6oQ3z1Urx4rbdGYdwHpwQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.34.tgz"; + sha512 = "InJjxEU008C4tfOvw+dZ3R+g5xIjOkwawPMYnSnWLJFII5uWLQKTcq7pzYiM4/vsVLvgUFBfpKvMxbf7Ul9l7g=="; }; }; - "@ot-builder/ot-ext-private-0.10.33" = { + "@ot-builder/ot-ext-private-0.10.34" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.33.tgz"; - sha512 = "+cQV1aTbCFXX+OyEIvRohlLbHpXTlzPJ8E4PICOyfqe41fw1DHbDEdilyQRvdLQ6TJqvvxktBD4xt+IOluviPw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.34.tgz"; + sha512 = "+q1U1PhBIjc83SZhMgqIi9O9p85vW338MvWEwehxnIijT84XJJeiQ2kWektiz62rxGjL23YnPqLljFojMbG7/Q=="; }; }; - "@ot-builder/ot-glyphs-0.10.33" = { + "@ot-builder/ot-glyphs-0.10.34" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.33.tgz"; - sha512 = "jpPxTDct01TTpJptMFDIuKzXYxhiNXpQIfikydKXQU+M7jDQJJLjIjAnz33MVzeMxR6+8og0F2qgG/OFcDMpTQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.34.tgz"; + sha512 = "YzXak7LFJVekz/nyi8hPVipY3PTTM+tmPit875TX56+/OuhwuQWbT5HeM++kmlGc/VYxbFzndJybR87YsuNvjQ=="; }; }; - "@ot-builder/ot-layout-0.10.33" = { + "@ot-builder/ot-layout-0.10.34" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.33.tgz"; - sha512 = "aa2b4Oa5B2YFZ//A+MAEEVBcLv0XEKTjtUARAj3bTthHNnPWJHjGjHUpNPMccBJNWysKwlz37cxAItpMXgpgOg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.34.tgz"; + sha512 = "ftGx58faieUlzWefhRrcR/m4gmAVvIge4SkBDVanIaFgPst8CsH01THkhtbIanzHoZARn+FcU5SXruRC0VhVdA=="; }; }; - "@ot-builder/ot-metadata-0.10.33" = { + "@ot-builder/ot-metadata-0.10.34" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.33.tgz"; - sha512 = "pwwf49hCU3mjWkUUT4mIN7dtJr7fBtXozcOQ70vVAzTPE3kUOD/eun4Vs2UqHGkPRvOU89eEQQgQ+5941aH8rg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.34.tgz"; + sha512 = "w1uqzSQWfmIr1zP7s4tCfVzyc55s18D//QgkHHZAEEcO28pfslMSIRm70DiggXo1uYVARlUUT/BAcnK/U+qQBA=="; }; }; - "@ot-builder/ot-name-0.10.33" = { + "@ot-builder/ot-name-0.10.34" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.33.tgz"; - sha512 = "32jR7zRnkMLWmkdiQzXryRaPycbiJNJiPY016/efcv4hYuHvrq/tpXA5P6bEV205njy7n5KA7txrkSWZP9+0JA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.34.tgz"; + sha512 = "1aw41J3vyAKaSyEBzRNlpRcBiSZkajp5MCy0hRaa68ZwEY/mPcQkSh4KjZEMyx+ndFmHKRdL3396ksVKftOgVg=="; }; }; - "@ot-builder/ot-sfnt-0.10.33" = { + "@ot-builder/ot-sfnt-0.10.34" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.33.tgz"; - sha512 = "/T4TfeimVDhLMRXInKhz2EGKzzWLAgijNaQpc7OO+Cxy3z43g0B6d7EzlsAD8W9lauYpuMnXEItvznY0wBgi7A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.34.tgz"; + sha512 = "I88VMnJY0HxXLf2P+xnTIRheSsyCphnh8Vjj/zfroNHB98vdPIbE7d44cCv4C2u1zNRGwbhogMLBKghfhbqjuA=="; }; }; - "@ot-builder/ot-standard-glyph-namer-0.10.33" = { + "@ot-builder/ot-standard-glyph-namer-0.10.34" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.33.tgz"; - sha512 = "PDz2ZupCN7DmIRSOvJWrv/uCUwUqEmWZSSrzu9vaSpIglbjSzKtQ9axi/SZIAMughky9YMxME8yiKFpHzI/FGw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.34.tgz"; + sha512 = "AjdOIfQxyN2dIlA8RAzFeu9ysGS9yMiZN1nVjHaTdHjl6nZx16Xjhtf1xEa5GbMORDaWkFeaXnYWM1kp/IYAhw=="; }; }; - "@ot-builder/prelude-0.10.33" = { + "@ot-builder/prelude-0.10.34" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.33.tgz"; - sha512 = "3dUiOB4e4BUT4u6YssK1pe/W8wSMw2+XG9TqtW9ZRrnFAaVxmEnrh7okde5Y26Rq/TtMiMmd7zUaP+ut9x9VYg=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.34.tgz"; + sha512 = "z7OuMrGgr6sYn+UWOctyWDpCra2+nRPPpmUkbbP7RhTh3ANjJFePeMaOQiYogz7u7IKlDzlg5D4qY/F/gJNuPA=="; }; }; - "@ot-builder/primitive-0.10.33" = { + "@ot-builder/primitive-0.10.34" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.33.tgz"; - sha512 = "0wNZRIgJ9j2fqF8m3ldGmqlRrR7JJesBJe1841pD/yY756A0aY0/mkqBB2SKo58YYZA+HZicUT8dlD1EgNCbXw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.34.tgz"; + sha512 = "67yTVBkLzfQy0F3xfHA+NYAWy+A2Z6udWznK7nW0McK9PtOvCjCNl68UrW+vmohR8T4t0PGTC3lHX7dBkxyQTQ=="; }; }; - "@ot-builder/rectify-0.10.33" = { + "@ot-builder/rectify-0.10.34" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.33.tgz"; - sha512 = "JqAcAgy2feCstg++bgeH9JofhOSc++Sx/ZjIGRNgtu8qiGRxRGP2MTZdn4zEy4etQYpRSgiuJbCx1K9XmwNXHA=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.34.tgz"; + sha512 = "rT9t9eYjRlx/EioSWwkrNHMSNlXr1UufB2+Tni6DRCWoTV0XjgFsAt1fjj+vTcxtvy7ZZuZKOdwkyxITiMPK4A=="; }; }; - "@ot-builder/stat-glyphs-0.10.33" = { + "@ot-builder/stat-glyphs-0.10.34" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.33.tgz"; - sha512 = "fwvn4vnmQGKHVHOVrNUA56I++k8bbxyYrMh/ifdZhn7FrlCldeM5UvQfPbjsVoU1aIKGkr+WM6BBF1WkbXPsxg=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.34.tgz"; + sha512 = "cqWuTCGgelc6Dqg0nW3kkylFkP0dc7vvSlnSQr1eZaq6YD36o/ckWzXLc/caGY6GefFYVfGx+kpzx45f5MdCIQ=="; }; }; - "@ot-builder/trace-0.10.33" = { + "@ot-builder/trace-0.10.34" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.33.tgz"; - sha512 = "8AKK0zw3z90ozZI/V2vByGc2QPTN3fJol/MwEsyY1wART7s0YIo2/Q4gFq72T2sTw10aBNH3CQ5cP8DPRFqCwg=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.34.tgz"; + sha512 = "EW9xYkpocQV0M+sdVlOhSAucs/tRoZogQ+NVZ+yLJTcPAEE+PFyvU81Rd0+R9Lp1LOpLmYDQFJpzh3n/z+i9aA=="; }; }; - "@ot-builder/var-store-0.10.33" = { + "@ot-builder/var-store-0.10.34" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.33.tgz"; - sha512 = "3+9BBDVQ3FmG10XWsJwsVTh6ViNdiVej2Zw5h0aXtUkS9InaFkE4aRGSaqfm9zVhunTaxZ/cFNwZAXXLAJKSrQ=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.34.tgz"; + sha512 = "ldEosnnwcx/NDz+mb9Z2Ta9hlhhviK2QIrXY5PIdvhtlcj6U/dMPgmvHhZwF15+0f1r03V7EIq/v5Y3T78+Phw=="; }; }; - "@ot-builder/variance-0.10.33" = { + "@ot-builder/variance-0.10.34" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.33.tgz"; - sha512 = "Fk4yLjEK1lcvfbUgLFfyepWyYToHtAPYjh/A7KgDPhnq1MYc5kNx8w3r9Pq9vHXr5csl36kyP7+iJC6z1HHPsQ=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.34.tgz"; + sha512 = "McAXf0TPT+GjAZS2iT5ULZq0FR9oOQK3Vbc0g5KXxxd9/wWsINT+nSuO/YFR1O9TT1lBf7cT3OUXrAM2tKlU5Q=="; }; }; "@parcel/fs-1.11.0" = { @@ -4531,13 +4531,13 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@react-native-community/cli-debugger-ui-4.9.0" = { + "@react-native-community/cli-debugger-ui-4.13.1" = { name = "_at_react-native-community_slash_cli-debugger-ui"; packageName = "@react-native-community/cli-debugger-ui"; - version = "4.9.0"; + version = "4.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.9.0.tgz"; - sha512 = "fBFGamHm4VUrDqkBGnsrwQL8OC6Om7K6EBQb4xj0nWekpXt1HSa3ScylYHTTWwYcpRf9htGMRGiv4dQDY/odAw=="; + url = "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.13.1.tgz"; + sha512 = "UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg=="; }; }; "@react-native-community/cli-platform-android-4.13.0" = { @@ -4675,13 +4675,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.0.1" = { + "@schematics/angular-11.0.2" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.1.tgz"; - sha512 = "cYq3NhFn4DLSXXtbYYU2w0sginkMfN1w7pXjZLT/+etXXbtANQAXSPrPrDQql004ZNMbuDKuC0aoXjv8hgXOfw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.0.2.tgz"; + sha512 = "tUIuCYJUzHYuiXGJ2KCuwxMocS56kPHaM8+neVYWwWbOxKzLZXv80gMm/pIWxrqUDCkIUi3yb4ienudFhgQLYg=="; }; }; "@schematics/schematics-0.1100.1" = { @@ -4693,13 +4693,13 @@ let sha512 = "Y5J/qafyZtsu6spEFywGLjYMqEgONSDx9m8c8KL4c45+KqqerQeh2QQHims3G0brKUFIK3nCw95zqw+RMsGcsA=="; }; }; - "@schematics/update-0.1100.1" = { + "@schematics/update-0.1100.2" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1100.1"; + version = "0.1100.2"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.1.tgz"; - sha512 = "EVcqdM/d5rC5L1UYnwhFMk/TjHlNgL5LGfroE13C38A+WpKKJquAjgOQLj4nPvJ5csdEZqn3Sui9yeEWc3hklQ=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1100.2.tgz"; + sha512 = "pETCmQylIQ7RM+8uqDkI3KfOaX5H7nuzmMXby28zdLPMZniYti0gJxieiVFhvdz2Ot2Axj0hznfmraFgC9mQMw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4729,13 +4729,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.3.1" = { + "@serverless/components-3.4.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.3.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.3.1.tgz"; - sha512 = "4oGHMepZ18WmnNPj+PQ0GHevGZ1jU+RtMiu1bGhqS9BLdc28UDUKiCBxOjCCm/8Sdsw6NXYIhu5DDIYCpFExJQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.4.2.tgz"; + sha512 = "yBQwN4Z0LqsYzA+SCTh6/LaGEPAu6lNAr32j2pjjZWCnDwpV1TKaSCNDTAPNSVk5L2/8exRpiEQUNM0NyTGWqA=="; }; }; "@serverless/core-1.1.2" = { @@ -4828,24 +4828,6 @@ let sha512 = "raOPIoPSTrkWKBDuozkYWvLXP2W65K9Uk4ud+lPcbhhBSamO3uVW40nuAkC19MdIoAsFi5oTGYpcc9UDx8b+lg=="; }; }; - "@shiftkey/node-abi-2.19.2-pre" = { - name = "_at_shiftkey_slash_node-abi"; - packageName = "@shiftkey/node-abi"; - version = "2.19.2-pre"; - src = fetchurl { - url = "https://registry.npmjs.org/@shiftkey/node-abi/-/node-abi-2.19.2-pre.tgz"; - sha512 = "+LfXo6nd2uZ8cGSJ66zL3OuddvG2oMWMc9GzpDoX2ZNMLmYpu+ReoEKXtmoKVwd6JSavDymldebCxSJh9NQ9cg=="; - }; - }; - "@shiftkey/prebuild-install-6.0.1-pre2" = { - name = "_at_shiftkey_slash_prebuild-install"; - packageName = "@shiftkey/prebuild-install"; - version = "6.0.1-pre2"; - src = fetchurl { - url = "https://registry.npmjs.org/@shiftkey/prebuild-install/-/prebuild-install-6.0.1-pre2.tgz"; - sha512 = "wDV1DgFxi0F+kTpyGNdnDctdw3Rb9aP8RBAGFE2wXr1+pXSCJRRA+Qh5ko5dKc0LeNIBZzjEECjmtAykajv+Xw=="; - }; - }; "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -4963,13 +4945,13 @@ let sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw=="; }; }; - "@snyk/dep-graph-1.20.0" = { + "@snyk/dep-graph-1.21.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.20.0.tgz"; - sha512 = "/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.21.0.tgz"; + sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw=="; }; }; "@snyk/docker-registry-v2-client-1.13.9" = { @@ -4999,6 +4981,15 @@ let sha512 = "tJF+dY/wTfexwYuCgFB3RpWl4RGcf2H9RT9yurkTVi5wwKfvcNwZMUMwSlTDEFOqwmAsJ7e0uNVRlkPQHekCcQ=="; }; }; + "@snyk/java-call-graph-builder-1.16.5" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.5.tgz"; + sha512 = "6H4hkq/qYljJoH1QnZsTRPMqp9Kt5AOEZYGJAeSHkhJdfUYSLtqwN4WsU6yVR3vWAaDQ8Lllp3m6EL7nstMPZA=="; + }; + }; "@snyk/rpm-parser-2.2.1" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; @@ -5359,13 +5350,13 @@ let sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A=="; }; }; - "@types/babel__traverse-7.0.15" = { + "@types/babel__traverse-7.0.16" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.15"; + version = "7.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; - sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz"; + sha512 = "S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w=="; }; }; "@types/babylon-6.16.5" = { @@ -5422,6 +5413,15 @@ let sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ=="; }; }; + "@types/classnames-2.2.11" = { + name = "_at_types_slash_classnames"; + packageName = "@types/classnames"; + version = "2.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz"; + sha512 = "2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw=="; + }; + }; "@types/clone-2.1.0" = { name = "_at_types_slash_clone"; packageName = "@types/clone"; @@ -5431,6 +5431,15 @@ let sha512 = "d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA=="; }; }; + "@types/component-emitter-1.2.10" = { + name = "_at_types_slash_component-emitter"; + packageName = "@types/component-emitter"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz"; + sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; + }; + }; "@types/configstore-2.1.1" = { name = "_at_types_slash_configstore"; packageName = "@types/configstore"; @@ -5638,6 +5647,15 @@ let sha512 = "RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA=="; }; }; + "@types/express-serve-static-core-4.17.14" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz"; + sha512 = "uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA=="; + }; + }; "@types/fancy-log-1.3.0" = { name = "_at_types_slash_fancy-log"; packageName = "@types/fancy-log"; @@ -6070,13 +6088,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.45" = { + "@types/node-10.17.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.45"; + version = "10.17.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.45.tgz"; - sha512 = "a+oe0zGtwRsSDynACia/z1e4gKPNnDhAV3G6GWY6ZNCzaujNCdKC7dE2JFkGHAlUhCRHgXNmWbh417bi9dEXBw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.47.tgz"; + sha512 = "YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw=="; }; }; "@types/node-12.7.12" = { @@ -6088,13 +6106,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.31" = { + "@types/node-13.13.33" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.31"; + version = "13.13.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.31.tgz"; - sha512 = "gBk54XbcRj8EKTi7Syo4JU4purbRJaZpkvMVs7+t+b9JaOtwsGo7vCbXdVJN3gH/wu/GyZGD8lAKo0qpQuNjOw=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.33.tgz"; + sha512 = "1B3GM1yuYsFyEvBb+ljBqWBOylsWDYioZ5wpu8AhXdIhq20neXS7eaSC8GkwHE0yQYGiOIV43lMsgRYTgKZefQ=="; }; }; "@types/node-14.11.1" = { @@ -6106,13 +6124,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.8" = { + "@types/node-14.14.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.8"; + version = "14.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.8.tgz"; - sha512 = "z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz"; + sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="; }; }; "@types/node-6.14.13" = { @@ -6745,76 +6763,76 @@ let sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA=="; }; }; - "@vue/compiler-core-3.0.2" = { + "@vue/compiler-core-3.0.3" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.2.tgz"; - sha512 = "GOlEMTlC/OdzBkKaKOniYErbkjoKxkBOmulxGmMR10I2JJX6TvXd/peaO/kla2xhpliV/M6Z4TLJp0yjAvRIAw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.3.tgz"; + sha512 = "iWlRT8RYLmz7zkg84pTOriNUzjH7XACWN++ImFkskWXWeev29IKi7p76T9jKDaMZoPiGcUZ0k9wayuASWVxOwg=="; }; }; - "@vue/compiler-dom-3.0.2" = { + "@vue/compiler-dom-3.0.3" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.2.tgz"; - sha512 = "jvaL4QF2yXBJVD+JLbM2YA3e5fNfflJnfQ+GtfYk46ENGsEetqbkZqcX7fO+RHdG8tZBo7LCNBvgD0QLr+V4sg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.3.tgz"; + sha512 = "6GdUbDPjsc0MDZGAgpi4lox+d+aW9/brscwBOLOFfy9wcI9b6yLPmBbjdIsJq3pYdJWbdvACdJ77avBBdHEP8A=="; }; }; - "@vue/compiler-sfc-3.0.2" = { + "@vue/compiler-sfc-3.0.3" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.2.tgz"; - sha512 = "viYjT5ehDSLM3v0jQ9hbTs4I5e/7lSlYsDOp7TQ1qcwHRvzoTQMTkFpY/Iae+LFKM124Ld17tBfXgfrZl9dt+g=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.3.tgz"; + sha512 = "YocHSirye85kRVC4lU0+SE6uhrwGJzbhwkrqG4g6kmsAUopZ0qUjbICMlej5bYx2+AUz9yBIM7hpK8nIKFVFjg=="; }; }; - "@vue/compiler-ssr-3.0.2" = { + "@vue/compiler-ssr-3.0.3" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.2.tgz"; - sha512 = "gOgK1lf+0bFl+kQj6TU0TU1jIDFlsPRlSBZaUUA16DGeeiJrFanhsMuIs/l9U0IBFr/VJcHgzYpTXqHp95luHw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.3.tgz"; + sha512 = "IjJMoHCiDk939Ix7Q5wrex59TVJr6JFQ95gf36f4G4UrVau0GGY/3HudnWT/6eyWJ7267+odqQs1uCZgDfL/Ww=="; }; }; - "@vue/reactivity-3.0.2" = { + "@vue/reactivity-3.0.3" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.2.tgz"; - sha512 = "GdRloNcBar4yqWGXOcba1t//j/WizwfthfPUYkjcIPHjYnA/vTEQYp0C9+ZjPdinv1WRK1BSMeN/xj31kQES4A=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.3.tgz"; + sha512 = "t39Qmc42MX7wJtf8L6tHlu17eP9Rc5w4aRnxpLHNWoaRxddv/7FBhWqusJ2Bwkk8ixFHOQeejcLMt5G469WYJw=="; }; }; - "@vue/runtime-core-3.0.2" = { + "@vue/runtime-core-3.0.3" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.2.tgz"; - sha512 = "3m/jOs2xSipEFah9FgpEzvC9nERFonVGLN06+pf8iYPIy54Nlv7D2cyrk3Lhbjz4w3PbIrkxJnoTJYvJM7HDfA=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.3.tgz"; + sha512 = "Fd1JVnYI6at0W/2ERwJuTSq4S22gNt8bKEbICcvCAac7hJUZ1rylThlrhsvrgA+DVkWU01r0niNZQ4UddlNw7g=="; }; }; - "@vue/runtime-dom-3.0.2" = { + "@vue/runtime-dom-3.0.3" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.2.tgz"; - sha512 = "vqC1KK1yWthTw1FKzajT0gYQaEqAq7bpeeXQC473nllGC5YHbJhNAJLSmrDun1tjXqGF0UNCWYljYm+++BJv6w=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.3.tgz"; + sha512 = "ytTvSlRaEYvLQUkkpruIBizWIwuIeHER0Ch/evO6kUaPLjZjX3NerVxA40cqJx8rRjb9keQso21U2Jcpk8GsTg=="; }; }; - "@vue/shared-3.0.2" = { + "@vue/shared-3.0.3" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.2.tgz"; - sha512 = "Zx869zlNoujFOclKIoYmkh8ES2RcS/+Jn546yOiPyZ+3+Ejivnr+fb8l+DdXUEFjo+iVDNR3KyLzg03aBFfZ4Q=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.3.tgz"; + sha512 = "yGgkF7u4W0Dmwri9XdeY50kOowN4UIX7aBQ///jbxx37itpzVjK7QzvD3ltQtPfWaJDGBfssGL0wpAgwX9OJpQ=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -7447,6 +7465,15 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; + "abort-controller-3.0.0" = { + name = "abort-controller"; + packageName = "abort-controller"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + }; + }; "absolute-0.0.1" = { name = "absolute"; packageName = "absolute"; @@ -7717,13 +7744,22 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-2.9.0" = { + "addons-linter-2.12.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "2.9.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.9.0.tgz"; - sha512 = "OrkDQ9S/GAJzMe+izsFMFOtRq9geFFt3O5c7Fi6pehGi7RY2PSMpPmKjMK1j/rPa9jrG0e9zocptMrOi11uvug=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.12.0.tgz"; + sha512 = "Kv2Joa81UfxCWHYK13G9ZNKb/z5cJP1TlshCh9vA2dBH55szabIN+yIxujgNCIg2/k/wDya3OihBmyFNkFmFkw=="; + }; + }; + "addons-scanner-utils-3.0.0" = { + name = "addons-scanner-utils"; + packageName = "addons-scanner-utils"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-3.0.0.tgz"; + sha512 = "bX8Sx5iwvG9bHZrfP4xv+3xFU93Mk6WnBmIHm+ep4DEiqUunRRpbrs7uEgAnlWnqC46VnrFsOJdCB/MY+pHG1g=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -8869,6 +8905,15 @@ let sha512 = "Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg=="; }; }; + "archiver-5.1.0" = { + name = "archiver"; + packageName = "archiver"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-5.1.0.tgz"; + sha512 = "iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA=="; + }; + }; "archiver-utils-2.1.0" = { name = "archiver-utils"; packageName = "archiver-utils"; @@ -9184,13 +9229,13 @@ let sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; - "array-includes-3.1.1" = { + "array-includes-3.1.2" = { name = "array-includes"; packageName = "array-includes"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz"; - sha512 = "c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz"; + sha512 = "w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw=="; }; }; "array-initial-1.1.0" = { @@ -9976,13 +10021,22 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.794.0" = { + "aws-sdk-2.784.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.794.0"; + version = "2.784.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.794.0.tgz"; - sha512 = "Qqz8v0WfeGveaZTPo9+52nNUep/CTuo18OcdCwF4WrnNBv7bAxExUOwN9XkqhoxLjBDk/LuMmHGhOXRljFQgRw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz"; + sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; + }; + }; + "aws-sdk-2.799.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.799.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.799.0.tgz"; + sha512 = "NYAoiNU+bJXhlJsC0rFqrmD5t5ho7/VxldmziP6HLPYHfOCI9Uvk6UVjfPmhLWPm0mHnIxhsHqmsNGyjhHNYmw=="; }; }; "aws-sign2-0.6.0" = { @@ -10201,13 +10255,13 @@ let sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-loader-8.2.1" = { + "babel-loader-8.2.2" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz"; - sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz"; + sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -10336,13 +10390,13 @@ let sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; }; }; - "babel-plugin-styled-components-1.11.1" = { + "babel-plugin-styled-components-1.12.0" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz"; - sha512 = "YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz"; + sha512 = "FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -10993,13 +11047,13 @@ let sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ=="; }; }; - "bep53-range-1.0.0" = { + "bep53-range-1.1.0" = { name = "bep53-range"; packageName = "bep53-range"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.0.0.tgz"; - sha512 = "CNsnREjxe2/wD559wzFXMycUnbmUDA9C2Bs6Z2tm++amSma7JowAAxAnaZJMuDq3cWSx9HSIbV04H06QQ11zTA=="; + url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.1.0.tgz"; + sha512 = "yGQTG4NtwTciX0Bkgk1FqQL4p+NiCQKpTSFho2lrxvUkXIlzyJDwraj8aYxAxRZMnnOhRr7QlIBoMRPEnIR34Q=="; }; }; "better-ajv-errors-0.6.7" = { @@ -12100,13 +12154,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.10.0" = { + "browserslist-4.14.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.10.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz"; - sha512 = "TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; + sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; "browserslist-4.14.7" = { @@ -12271,13 +12325,13 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; - "buffer-6.0.2" = { + "buffer-6.0.3" = { name = "buffer"; packageName = "buffer"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-6.0.2.tgz"; - sha512 = "XeXCUm+F7uY7fIzq4pKy+BLbZk4SgYS5xwlZOFYD3UEcAD+PwOoTaFr/SaXvhR1yRa8SKyPSZ7LNX4N65w7h8A=="; + url = "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"; + sha512 = "FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="; }; }; "buffer-alloc-1.2.0" = { @@ -13045,13 +13099,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001159" = { + "caniuse-lite-1.0.30001161" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001159"; + version = "1.0.30001161"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; - sha512 = "w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz"; + sha512 = "JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g=="; }; }; "canvas-2.6.1" = { @@ -13522,15 +13576,6 @@ let sha512 = "9vhoi1qXSBPn6//ZxIgSe3M2QhKHzIPZQzmrZgmPADsqW0Jxpe3db1e7aGSRUMXbxAQ04SfypdT8dGaSvIvKDw=="; }; }; - "chmodr-1.2.0" = { - name = "chmodr"; - packageName = "chmodr"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chmodr/-/chmodr-1.2.0.tgz"; - sha512 = "Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA=="; - }; - }; "chokidar-1.7.0" = { name = "chokidar"; packageName = "chokidar"; @@ -13855,15 +13900,6 @@ let sha512 = "eDu0vN44ZBvoEU0oRIKwWPIccGWXtdnUNmKJuTukZ1de00Uoqavb5pfIMKiC7/r+knQ5RbvAjGuVZiN3JwJL4Q=="; }; }; - "clean-stack-1.3.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-1.3.0.tgz"; - sha1 = "9e821501ae979986c46b1d66d2d432db2fd4ae31"; - }; - }; "clean-stack-2.2.0" = { name = "clean-stack"; packageName = "clean-stack"; @@ -13873,13 +13909,13 @@ let sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; }; - "clean-stack-3.0.0" = { + "clean-stack-3.0.1" = { name = "clean-stack"; packageName = "clean-stack"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.0.tgz"; - sha512 = "RHxtgFvXsRQ+1AM7dlozLDY7ssmvUUh0XEnfnyhYgJTO6beNZHBogiaCwGM9Q3rFrUkYxOtsZRC0zAturg5bjg=="; + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz"; + sha512 = "lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg=="; }; }; "clean-webpack-plugin-3.0.0" = { @@ -14080,15 +14116,6 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; - "cli-ux-5.4.6" = { - name = "cli-ux"; - packageName = "cli-ux"; - version = "5.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.6.tgz"; - sha512 = "EeiS2TzEndRVknCqE+8Ri8g0bsP617a1nq6n+3Trwft1JCDzyUNlX2J1fl7fwTgRPWtmBmiF6xIyueL5YGs65g=="; - }; - }; "cli-ux-5.5.0" = { name = "cli-ux"; packageName = "cli-ux"; @@ -14098,6 +14125,15 @@ let sha512 = "aXoHgEOtkem8sJmQrU/jXsojCq8uOp8++9lybCbt9mFDyPouSNawSdoPjuM00PPaSPCJThvY0VNYOQNd6gGQCA=="; }; }; + "cli-ux-5.5.1" = { + name = "cli-ux"; + packageName = "cli-ux"; + version = "5.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.5.1.tgz"; + sha512 = "t3DT1U1C3rArLGYLpKa3m9dr/8uKZRI8HRm/rXKL7UTjm4c+Yd9zHNWg1tP8uaJkUbhmvx5SQHwb3VWpPUVdHQ=="; + }; + }; "cli-width-1.1.1" = { name = "cli-width"; packageName = "cli-width"; @@ -14548,13 +14584,13 @@ let sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; }; }; - "codecs-2.1.0" = { + "codecs-2.2.0" = { name = "codecs"; packageName = "codecs"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-2.1.0.tgz"; - sha512 = "nSWYToViFEpZXOxhtMQ6IDs76TN9xKIkHOu1KCr/iFiBcgzKuY1AFPZktuXN8r82FbZ/TXP9fwITszLgcp3eQg=="; + url = "https://registry.npmjs.org/codecs/-/codecs-2.2.0.tgz"; + sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; "codepage-1.4.0" = { @@ -15214,13 +15250,13 @@ let sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg=="; }; }; - "compress-commons-4.0.1" = { + "compress-commons-4.0.2" = { name = "compress-commons"; packageName = "compress-commons"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz"; - sha512 = "xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA=="; + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.2.tgz"; + sha512 = "qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A=="; }; }; "compressible-2.0.18" = { @@ -15980,13 +16016,13 @@ let sha512 = "gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw=="; }; }; - "core-js-2.6.11" = { + "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; - version = "2.6.11"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; "core-js-3.6.5" = { @@ -15998,22 +16034,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-3.7.0" = { + "core-js-3.8.0" = { name = "core-js"; packageName = "core-js"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz"; - sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz"; + sha512 = "W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA=="; }; }; - "core-js-compat-3.7.0" = { + "core-js-compat-3.8.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz"; - sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz"; + sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ=="; }; }; "core-util-is-1.0.2" = { @@ -16178,13 +16214,13 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; - "crc32-stream-4.0.0" = { + "crc32-stream-4.0.1" = { name = "crc32-stream"; packageName = "crc32-stream"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz"; - sha512 = "tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw=="; + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.1.tgz"; + sha512 = "FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw=="; }; }; "create-ecdh-4.0.4" = { @@ -16313,15 +16349,6 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; - "cross-spawn-7.0.1" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz"; - sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; - }; - }; "cross-spawn-7.0.3" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -16574,13 +16601,13 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-tree-1.1.0" = { + "css-tree-1.1.2" = { name = "css-tree"; packageName = "css-tree"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.0.tgz"; - sha512 = "SKwwAnwRPotiopzQBpK4o+W6Uu8PA759iWdJ1EXy3zkj+sSUcsdhnhvdv4dy5AtjcX0OGXxS7h73YAMXu8QXBw=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz"; + sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ=="; }; }; "css-what-1.0.0" = { @@ -16700,13 +16727,13 @@ let sha1 = "178b43a44621221c27756086f531e02f42900ee8"; }; }; - "csso-4.1.1" = { + "csso-4.2.0" = { name = "csso"; packageName = "csso"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.1.1.tgz"; - sha512 = "Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA=="; + url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; + sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; }; }; "cssom-0.3.8" = { @@ -17681,13 +17708,13 @@ let sha512 = "HngNLtPEBWRo8EFVmHFmSXAjtCX8rGNqeXQI0Gh7wCTSqwaKgPIDqu9m07wABVopNwzvOeCb+2711vQhDlcIXw=="; }; }; - "deasync-0.1.15" = { + "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; - version = "0.1.15"; + version = "0.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.15.tgz"; - sha512 = "pxMaCYu8cQIbGkA4Y1R0PLSooPIpH1WgFBLeJ+zLxQgHfkZG86ViJSmZmONSjZJ/R3NjwkMcIWZAzpLB2G9/CA=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz"; + sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; "deasync-0.1.21" = { @@ -17798,6 +17825,15 @@ let sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; + "debug-3.2.7" = { + name = "debug"; + packageName = "debug"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; "debug-4.1.1" = { name = "debug"; packageName = "debug"; @@ -17816,13 +17852,13 @@ let sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; - "debug-4.3.0" = { + "debug-4.3.1" = { name = "debug"; packageName = "debug"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; - sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; + sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; "debug-fabulous-1.1.0" = { @@ -18995,13 +19031,13 @@ let sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; }; }; - "dispensary-0.57.0" = { + "dispensary-0.59.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.57.0"; + version = "0.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.57.0.tgz"; - sha512 = "vgRaZa9Ok8QdrAVtx+s6heBgI1RGT+Y6VA336oPWYADZZz83K+5NOTpLamEKRyJdRY5pYLaWhV2Js7bau1JyKg=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.59.0.tgz"; + sha512 = "JSnh4AhtYgwoyUHtunZbAhklkD9IeNacK1IDlrAJSZjzBMGFoTp9+Nggg+ITJ+F1geXc04DZ55ixnjFr5Ozknw=="; }; }; "diveSync-0.3.0" = { @@ -19823,15 +19859,6 @@ let sha1 = "ffdc56dcc35d02926dd50ad13439bbc54061d598"; }; }; - "ejs-2.5.7" = { - name = "ejs"; - packageName = "ejs"; - version = "2.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz"; - sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a"; - }; - }; "ejs-2.7.4" = { name = "ejs"; packageName = "ejs"; @@ -19850,13 +19877,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.598" = { + "electron-to-chromium-1.3.610" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.598"; + version = "1.3.610"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz"; - sha512 = "G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz"; + sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -19905,6 +19932,15 @@ let sha512 = "x+p+XNxLk8ittsYN7294mCnQ2i48udu3UGdHBv2gw1u1MVigXctcfbp5H9ebqTJnDxkbs6PdOSBOAdYGGDN7uA=="; }; }; + "elfy-1.0.0" = { + name = "elfy"; + packageName = "elfy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elfy/-/elfy-1.0.0.tgz"; + sha512 = "4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ=="; + }; + }; "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; @@ -20005,15 +20041,6 @@ let sha512 = "5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw=="; }; }; - "emojis-list-2.1.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; - }; - }; "emojis-list-3.0.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -20140,6 +20167,15 @@ let sha512 = "buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ=="; }; }; + "endian-reader-0.3.0" = { + name = "endian-reader"; + packageName = "endian-reader"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/endian-reader/-/endian-reader-0.3.0.tgz"; + sha1 = "84eca436b80aed0d0639c47291338b932efe50a0"; + }; + }; "ends-with-0.2.0" = { name = "ends-with"; packageName = "ends-with"; @@ -20239,13 +20275,13 @@ let sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; }; }; - "enhanced-resolve-5.3.1" = { + "enhanced-resolve-5.3.2" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz"; - sha512 = "G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.2.tgz"; + sha512 = "G28GCrglCAH6+EqMN2D+Q2wCUS1O1vVQJBn8ME2I/Api41YBe4vLWWRBOUbwDH7vwzSZdljxwTRVqnf+sm6XqQ=="; }; }; "enquirer-2.3.6" = { @@ -20536,15 +20572,6 @@ let sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; }; - "es6-error-3.2.0" = { - name = "es6-error"; - packageName = "es6-error"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-3.2.0.tgz"; - sha1 = "e567cfdcb324d4e7ae5922a3700ada5de879a0ca"; - }; - }; "es6-error-4.1.1" = { name = "es6-error"; packageName = "es6-error"; @@ -20833,15 +20860,6 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.11.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz"; - sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw=="; - }; - }; "eslint-7.13.0" = { name = "eslint"; packageName = "eslint"; @@ -20851,6 +20869,15 @@ let sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ=="; }; }; + "eslint-7.14.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz"; + sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; + }; + }; "eslint-plugin-no-unsanitized-3.1.4" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; @@ -21274,6 +21301,15 @@ let sha512 = "vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g=="; }; }; + "event-target-shim-5.0.1" = { + name = "event-target-shim"; + packageName = "event-target-shim"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + }; + }; "event-to-promise-0.8.0" = { name = "event-to-promise"; packageName = "event-to-promise"; @@ -21544,15 +21580,6 @@ let sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; }; }; - "exeunt-1.1.0" = { - name = "exeunt"; - packageName = "exeunt"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/exeunt/-/exeunt-1.1.0.tgz"; - sha1 = "af72db6f94b3cb75e921aee375d513049843d284"; - }; - }; "exif-parser-0.1.12" = { name = "exif-parser"; packageName = "exif-parser"; @@ -21643,13 +21670,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.49" = { + "expo-pwa-0.0.52" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.49"; + version = "0.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.49.tgz"; - sha512 = "HzwUGdnN9g5Ov/3r2uXwyjYP0xNtgOre1Z+Cywxg7GQWoFiklBfvYraIQFfwOjXVnsgo7bF4GFd4QW4v5vi9wA=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.52.tgz"; + sha512 = "LzpcL/nzFrBJqCCEaDOmWx4BfvmQFhAetUSG8/WcyMcTvqTC/WlboK+mlSj0mN5vw1/H/UCMqj6GoT07QIaUWQ=="; }; }; "express-2.5.11" = { @@ -22165,15 +22192,6 @@ let sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; }; }; - "fast-redact-2.1.0" = { - name = "fast-redact"; - packageName = "fast-redact"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-2.1.0.tgz"; - sha512 = "0LkHpTLyadJavq9sRzzyqIoMZemWli77K2/MGOkafrR64B9ItrvZ9aT+jluvNDsv0YEHjSNhlMBtbokuoqii4A=="; - }; - }; "fast-redact-3.0.0" = { name = "fast-redact"; packageName = "fast-redact"; @@ -22264,13 +22282,14 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "faunadb-3.0.1" = { + "faunadb-git+https://github.com/fauna/faunadb-js.git#triage/bearer-to-basic" = { name = "faunadb"; packageName = "faunadb"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-3.0.1.tgz"; - sha512 = "WlfPjC0V9xHs4NTunOWmYZtJfbJ45Z1VAIKKka6+mRrmijWOFQzJVDY9CqS6X9kvepM36EjmtNkIvV0OJ1wTEA=="; + version = "4.0.0"; + src = fetchgit { + url = "https://github.com/fauna/faunadb-js.git"; + rev = "135256ed60a8043201085f18ed6fd2032cc9dd88"; + sha256 = "0c7dae0478258a6cc72621ea148471492616b8b03e79cf975aee9fdc3bd480a0"; }; }; "faye-websocket-0.10.0" = { @@ -22633,15 +22652,6 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; - "filesize-6.0.1" = { - name = "filesize"; - packageName = "filesize"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz"; - sha512 = "u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg=="; - }; - }; "filesize-6.1.0" = { name = "filesize"; packageName = "filesize"; @@ -22885,15 +22895,6 @@ let sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw=="; }; }; - "first-chunk-stream-4.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-4.0.0.tgz"; - sha512 = "8TOz/mJp7+zc2HN63vnJHotwceq4gQI1+/gdJVnJcG4dEB96oUxw7wV9We4QKjSFWUc/V0ADDfaGba5cDoG6EA=="; - }; - }; "fkill-6.2.0" = { name = "fkill"; packageName = "fkill"; @@ -23326,22 +23327,22 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "forever-monitor-3.0.1" = { + "forever-monitor-3.0.3" = { name = "forever-monitor"; packageName = "forever-monitor"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-3.0.1.tgz"; - sha512 = "47VfT5AYpxn1bnsnH6UfpBWKpMVnSz42MZwH+hwz/wACd9THyUu/fRoCRIT758fzCAbRoHIlkVUAL+WmlxSKeg=="; + url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-3.0.3.tgz"; + sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ=="; }; }; - "fork-ts-checker-webpack-plugin-3.1.1" = { + "fork-ts-checker-webpack-plugin-4.1.6" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "3.1.1"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; - sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz"; + sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; "fork-ts-checker-webpack-plugin-6.0.2" = { @@ -23470,22 +23471,22 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-and-or-0.1.2" = { + "fp-and-or-0.1.3" = { name = "fp-and-or"; packageName = "fp-and-or"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.2.tgz"; - sha512 = "3P8x4W/BF5x5xreG06D28I1+sOKyNKo2rShYyEBg/0XJDGuocwcv2KnD4CeuK4OSokFQbuuTlkdb4NlWNHhcKQ=="; + url = "https://registry.npmjs.org/fp-and-or/-/fp-and-or-0.1.3.tgz"; + sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.8.6" = { + "fp-ts-2.9.0" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.8.6"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.6.tgz"; - sha512 = "fGGpKf/Jy3UT4s16oM+hr/8F5QXFcZ+20NAvaZXH5Y5jsiLPMDCaNqffXq0z1Kr6ZUJj0346cH9tq+cI2SoJ4w=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.0.tgz"; + sha512 = "zYPaS+3BWy+hRhkCMJXLTHxdy7oshyKOfHge/S/n+LcLL5VIhctR9Xucxi3GwJbjwDZaz9IIbU1o+YjK0LsgYg=="; }; }; "fragment-cache-0.2.1" = { @@ -23803,13 +23804,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fs2-0.3.8" = { + "fs2-0.3.9" = { name = "fs2"; packageName = "fs2"; - version = "0.3.8"; + version = "0.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/fs2/-/fs2-0.3.8.tgz"; - sha512 = "HxOTRiFS3PqwAOmlp1mTwLA+xhQBdaP82b5aBamc/rHKFVyn4qL8YpngaAleD52PNMzBm6TsGOoU/Hq+bAfBhA=="; + url = "https://registry.npmjs.org/fs2/-/fs2-0.3.9.tgz"; + sha512 = "WsOqncODWRlkjwll+73bAxVW3JPChDgaPX3DT4iTTm73UmG4VgALa7LaFblP232/DN60itkOrPZ8kaP1feksGQ=="; }; }; "fsevents-1.2.13" = { @@ -24091,13 +24092,13 @@ let sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; }; }; - "get-browser-rtc-1.0.2" = { + "get-browser-rtc-1.1.0" = { name = "get-browser-rtc"; packageName = "get-browser-rtc"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz"; - sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; + url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz"; + sha512 = "MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ=="; }; }; "get-caller-file-1.0.3" = { @@ -26153,13 +26154,13 @@ let sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653"; }; }; - "highlight.js-10.3.2" = { + "highlight.js-10.4.0" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.3.2"; + version = "10.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.3.2.tgz"; - sha512 = "3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.0.tgz"; + sha512 = "EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA=="; }; }; "highlight.js-8.2.0" = { @@ -26180,13 +26181,13 @@ let sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; }; }; - "highlight.js-9.18.3" = { + "highlight.js-9.18.5" = { name = "highlight.js"; packageName = "highlight.js"; - version = "9.18.3"; + version = "9.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz"; - sha512 = "zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz"; + sha512 = "a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA=="; }; }; "hipchatter-0.3.2" = { @@ -27189,15 +27190,6 @@ let sha512 = "y5AxkxqpPTj2dkaAEkDnrMuSX4JNicXHD6yTpLfFnflVejL6yJpzf27obrnlf2PSSQiWUf3735Y9tJEjxvqnoA=="; }; }; - "immer-1.10.0" = { - name = "immer"; - packageName = "immer"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz"; - sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="; - }; - }; "immer-7.0.15" = { name = "immer"; packageName = "immer"; @@ -27207,6 +27199,15 @@ let sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; + "immer-7.0.9" = { + name = "immer"; + packageName = "immer"; + version = "7.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz"; + sha512 = "Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A=="; + }; + }; "import-cwd-3.0.0" = { name = "import-cwd"; packageName = "import-cwd"; @@ -27603,15 +27604,6 @@ let sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; - "inquirer-7.0.4" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz"; - sha512 = "Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ=="; - }; - }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -28215,13 +28207,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.1.0" = { + "is-core-module-2.2.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz"; - sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -29709,13 +29701,13 @@ let sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; }; }; - "jimp-0.9.8" = { + "jimp-0.12.1" = { name = "jimp"; packageName = "jimp"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/jimp/-/jimp-0.9.8.tgz"; - sha512 = "DHN4apKMwLIvD/TKO9tFfPuankNuVK98vCwHm/Jv9z5cJnrd38xhi+4I7IAGmDU3jIDlrEVhzTkFH1Ymv5yTQQ=="; + url = "https://registry.npmjs.org/jimp/-/jimp-0.12.1.tgz"; + sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; "jju-1.4.0" = { @@ -29781,15 +29773,6 @@ let sha512 = "qL4+1iycQjZ1fs8zk3jSRk7cg3ROBUHk7GKtiLAQLFzLPKErnILUvz5DLszSQvz3s1sTjPbywLDISVUtBY6HaA=="; }; }; - "jpeg-js-0.3.7" = { - name = "jpeg-js"; - packageName = "jpeg-js"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.7.tgz"; - sha512 = "9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ=="; - }; - }; "jpeg-js-0.4.2" = { name = "jpeg-js"; packageName = "jpeg-js"; @@ -29826,13 +29809,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.19.2" = { + "jquery.terminal-2.20.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.19.2"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.19.2.tgz"; - sha512 = "oljqqqN19/tqmsSdr4exz75DlQQ35c/FhP0EkrmQUt1NCXtYGujb8G5uCATDV+EhbDpF6nleH8YsOmzpqpKT/g=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.0.tgz"; + sha512 = "8Wq9i5mwj8MnkFHEFZebn+l4K4HEsRXSanrQwq/u6lEP39/44b1vJzmYsqJLq57JALrY6Cp9b5fC4hMlWhi1Zw=="; }; }; "js-base64-2.6.4" = { @@ -30438,13 +30421,13 @@ let sha1 = "4fcd246dc5d0e38691907c44ab002f782d1d94cc"; }; }; - "jsonlint-1.6.2" = { + "jsonlint-1.6.3" = { name = "jsonlint"; packageName = "jsonlint"; - version = "1.6.2"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz"; - sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; + url = "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz"; + sha512 = "jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A=="; }; }; "jsonparse-0.0.5" = { @@ -30871,13 +30854,13 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "keytar-7.1.0" = { + "keytar-7.2.0" = { name = "keytar"; packageName = "keytar"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/keytar/-/keytar-7.1.0.tgz"; - sha512 = "ciDrtCcvhKpmVfPMVAiKSeKKQd+8S2VWOIcJP0Rdwz/ezSxHxYrycpwufDGpEHJqLyi/F7C7iwoz0eKGllzcMw=="; + url = "https://registry.npmjs.org/keytar/-/keytar-7.2.0.tgz"; + sha512 = "ECSaWvoLKI5SI0pGpZQeUV1/lpBYfkaxvoSp3zkiPOz05VavwSfLi8DdEaa9N2ekQZv3Chy+o7aP6n9mairBgw=="; }; }; "keyv-3.0.0" = { @@ -31852,15 +31835,6 @@ let sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA=="; }; }; - "loader-utils-1.2.3" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; - sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; - }; - }; "loader-utils-1.4.0" = { name = "loader-utils"; packageName = "loader-utils"; @@ -33004,15 +32978,6 @@ let sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; }; }; - "lodash.sample-4.2.1" = { - name = "lodash.sample"; - packageName = "lodash.sample"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.sample/-/lodash.sample-4.2.1.tgz"; - sha1 = "5e4291b0c753fa1abeb0aab8fb29df1b66f07f6d"; - }; - }; "lodash.set-4.3.2" = { name = "lodash.set"; packageName = "lodash.set"; @@ -33022,15 +32987,6 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; - "lodash.snakecase-4.1.1" = { - name = "lodash.snakecase"; - packageName = "lodash.snakecase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; - sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d"; - }; - }; "lodash.some-4.6.0" = { name = "lodash.some"; packageName = "lodash.some"; @@ -33301,13 +33257,13 @@ let sha512 = "/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ=="; }; }; - "loglevel-1.7.0" = { + "loglevel-1.7.1" = { name = "loglevel"; packageName = "loglevel"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz"; - sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz"; + sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -34129,13 +34085,13 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; - "markdown-it-toc-done-right-4.1.0" = { + "markdown-it-toc-done-right-4.2.0" = { name = "markdown-it-toc-done-right"; packageName = "markdown-it-toc-done-right"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.1.0.tgz"; - sha512 = "UhD2Oj6cZV3ycYPoelt4hTkwKIK3zbPP1wjjdpCq7UGtWQOFalDFDv1s2zBYV6aR2gMs/X8kpJcOYsQmUbiXDw=="; + url = "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.2.0.tgz"; + sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ=="; }; }; "markdown-link-extractor-1.2.6" = { @@ -34210,13 +34166,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.4" = { + "marked-1.2.5" = { name = "marked"; packageName = "marked"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.4.tgz"; - sha512 = "6x5TFGCTKSQBLTZtOburGxCxFEBJEGYVLwCMTBCxzvyuisGcC20UNzDSJhCr/cJ/Kmh6ulfJm10g6WWEAJ3kvg=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.5.tgz"; + sha512 = "2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA=="; }; }; "marked-terminal-4.1.0" = { @@ -34462,13 +34418,13 @@ let sha512 = "qJXNcFcuCSPqUF0Tb0uYcFDIq67qwB3sxo9RPdf9vG8T90ViKnksFqdB/Coq2a7sTnxL/Ify2y7aIQXDkQFH0w=="; }; }; - "mdast-util-to-markdown-0.5.3" = { + "mdast-util-to-markdown-0.5.4" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz"; - sha512 = "sr8q7fQJ1xoCqZSXW6dO/MYu2Md+a4Hfk9uO+XHCfiBhVM0EgWtfAV7BuN+ff6otUeu2xDyt1o7vhZGwOG3+BA=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.4.tgz"; + sha512 = "0jQTkbWYx0HdEA/h++7faebJWr5JyBoBeiRf0u3F4F3QtnyyGaWIsOwo749kRb1ttKrLLr+wRtOkfou9yB0p6A=="; }; }; "mdast-util-to-nlcst-4.0.1" = { @@ -34489,6 +34445,15 @@ let sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A=="; }; }; + "mdast-util-to-string-2.0.0" = { + name = "mdast-util-to-string"; + packageName = "mdast-util-to-string"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"; + sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="; + }; + }; "mdmanifest-1.0.8" = { name = "mdmanifest"; packageName = "mdmanifest"; @@ -34498,15 +34463,6 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.40" = { - name = "mdn-browser-compat-data"; - packageName = "mdn-browser-compat-data"; - version = "1.0.40"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.40.tgz"; - sha512 = "yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw=="; - }; - }; "mdn-data-2.0.14" = { name = "mdn-data"; packageName = "mdn-data"; @@ -35812,15 +35768,6 @@ let sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317"; }; }; - "moment-2.20.1" = { - name = "moment"; - packageName = "moment"; - version = "2.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"; - sha512 = "Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="; - }; - }; "moment-2.29.1" = { name = "moment"; packageName = "moment"; @@ -35956,13 +35903,13 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.2.5" = { + "mqtt-4.2.6" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.5.tgz"; - sha512 = "l19iRa4en8qM19xYCsdkt2VWg/JPTQTUL0Gq//p1rRUSEBxywicylfGZQy4Ru2Pl/nN5gI0q5E66DIVybGSaRg=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.6.tgz"; + sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; }; }; "mqtt-packet-6.6.0" = { @@ -36514,13 +36461,13 @@ let sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; }; }; - "nanoid-3.1.16" = { + "nanoid-3.1.18" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.16"; + version = "3.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz"; - sha512 = "+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.18.tgz"; + sha512 = "rndlDjbbHbcV3xi+R2fpJ+PbGMdfBxz5v1fATIQFq0DP64FsicQdwnKLy47K4kZHdRpmQXtz24eGsxQqamzYTA=="; }; }; "nanolru-1.0.0" = { @@ -36721,13 +36668,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.7" = { + "nearley-2.19.8" = { name = "nearley"; packageName = "nearley"; - version = "2.19.7"; + version = "2.19.8"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.7.tgz"; - sha512 = "Y+KNwhBPcSJKeyQCFjn8B/MIe+DDlhaaDgjVldhy5xtFewIbiQgcbZV8k2gCVwkI1ZsKCnjIYZbR+0Fim5QYgg=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.8.tgz"; + sha512 = "te4JCrxbzLvVqUWfVOASgsbkWaFvJ6JlHTRQzfnU862bnyHGHEGX2s5OYvLAS4NDPmQvRtC2tBdV6THy6xHFyQ=="; }; }; "neat-csv-2.1.0" = { @@ -38037,15 +37984,6 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; - "npm-run-path-3.1.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz"; - sha512 = "Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="; - }; - }; "npm-run-path-4.0.1" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -38208,13 +38146,13 @@ let sha512 = "e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA=="; }; }; - "oas-resolver-2.5.2" = { + "oas-resolver-2.5.3" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.2.tgz"; - sha512 = "dEuG5nE9IMl0FQNQuROsoriP4/944PajSBKAoZMyp9b2eXfmPv9ZKeHRCKjf5RWLm0GezaPKcdCLbB0/Xiqtdw=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.3.tgz"; + sha512 = "y4gP5tabqP3YcNVHNAEJAlcqZ40Y9lxemzmXvt54evbrvuGiK5dEhuE33Rf+191TOwzlxMoIgbwMYeuOM7BwjA=="; }; }; "oas-schema-walker-1.1.5" = { @@ -38235,13 +38173,13 @@ let sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw=="; }; }; - "oas-validator-5.0.3" = { + "oas-validator-5.0.4" = { name = "oas-validator"; packageName = "oas-validator"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.3.tgz"; - sha512 = "PYhenXnQr/T+MmrzBT+cTnyOcIZ4wVzvjS/gvbZZNexnhl1Gu/UiCg6rsEmBetE9CfthoxG0gfGTUSYPRmUlWA=="; + url = "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.4.tgz"; + sha512 = "/v+5BbPXl7JuKf1bYhEGIfbJZR7zBf5QJNM2RAe1e0bsABsp35nAfeptZq0hb+9RMecGSFxmzhuvlOT0/KioiQ=="; }; }; "oauth-0.9.15" = { @@ -38398,13 +38336,13 @@ let sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; - "object-is-1.1.3" = { + "object-is-1.1.4" = { name = "object-is"; packageName = "object-is"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz"; - sha512 = "teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz"; + sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg=="; }; }; "object-keys-0.2.0" = { @@ -38452,13 +38390,13 @@ let sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; }; }; - "object-treeify-1.1.29" = { + "object-treeify-1.1.30" = { name = "object-treeify"; packageName = "object-treeify"; - version = "1.1.29"; + version = "1.1.30"; src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.29.tgz"; - sha512 = "XnPIMyiv6fJeb/z3Bz+u43Fcw3C9fs1uoRITd8x3mau/rsSAUhx7qpIO10Q/dzJeMleJesccUSMiFx8FF+ruBA=="; + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.30.tgz"; + sha512 = "BhsTZj8kbeCnyBKWuAgAakbGgrcVV/IJhUAGF25lOSwDZoHoDmnynUtXfyrrDn8A1Xy3G9k5uLP+V5onOOq3WA=="; }; }; "object-visit-1.0.1" = { @@ -38497,22 +38435,22 @@ let sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "object.entries-1.1.2" = { + "object.entries-1.1.3" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz"; - sha512 = "BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz"; + sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg=="; }; }; - "object.getownpropertydescriptors-2.1.0" = { + "object.getownpropertydescriptors-2.1.1" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz"; + sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng=="; }; }; "object.map-1.0.1" = { @@ -38551,13 +38489,13 @@ let sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad"; }; }; - "object.values-1.1.1" = { + "object.values-1.1.2" = { name = "object.values"; packageName = "object.values"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; - sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz"; + sha512 = "MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag=="; }; }; "objectorarray-1.0.4" = { @@ -38632,13 +38570,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.150.1" = { + "office-ui-fabric-react-7.153.2" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.150.1"; + version = "7.153.2"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.150.1.tgz"; - sha512 = "S0ZtEyZs9lHdmVyT2Q9/4Y6XOmltndV4AtAB2dn4oanGMJQ1/o8jio9ZdE9Q2jc1YgK3EEYvXwck0E3kUfWU5w=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.2.tgz"; + sha512 = "IIGn6k5698tq8mAWNq1SfJjgTh6Aa1S/8jmR1rRlxJ1fwdAtzW09RxVc1f6R3akkE7sPEb3r3q+POSGGAZNXaQ=="; }; }; "omggif-1.0.10" = { @@ -39433,22 +39371,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-0.10.33" = { + "ot-builder-0.10.34" = { name = "ot-builder"; packageName = "ot-builder"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.33.tgz"; - sha512 = "Xs2G7yDDlNcMOUTgBDHdtT4iLMs90uqwylB5T4l96+o9ePXSsa0TwtzrI7D5eFpiZY+u2PjXUNRcfvfh/HvQvw=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.34.tgz"; + sha512 = "KYSsffceh64QcSE4fBGrSBf2twXxkGQzHcPqGTWpz1PcJ56hHpZyhmWqtltorrH5sjOjLIVGUqvGO19/vTsb8g=="; }; }; - "otb-ttc-bundle-0.10.33" = { + "otb-ttc-bundle-0.10.34" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "0.10.33"; + version = "0.10.34"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.33.tgz"; - sha512 = "xt7ZOSlNWN6DcWzH/2kYUVoB37FQjhe7ZZJ9JO7RysRQxlJWBciHpOK6oYHOm9rA1RGDbUYbVj9411yV5dqmXg=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.34.tgz"; + sha512 = "zMUBVgo7ARvdwlh/SfmEKwRrPMzqiAZKjR+FTvImBwNYj98aoDGxPk5QP2uiLcDneJjMlCiL08N/i7B0edypmg=="; }; }; "p-all-2.1.0" = { @@ -39613,6 +39551,15 @@ let sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg=="; }; }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + }; "p-locate-2.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -41242,15 +41189,6 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-6.6.1" = { - name = "pino"; - packageName = "pino"; - version = "6.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.6.1.tgz"; - sha512 = "DOgm7rn6ctBkBYemHXSLj7+j3o3U1q1FWBXbHcprur8mA93QcJSycEkEqhqKiFB9Mx/3Qld2FGr6+9yfQza0kA=="; - }; - }; "pino-6.7.0" = { name = "pino"; packageName = "pino"; @@ -41485,6 +41423,15 @@ let sha1 = "72b726aa6fac1edeee42256c7d8dc256b335677f"; }; }; + "pluralize-5.1.0" = { + name = "pluralize"; + packageName = "pluralize"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pluralize/-/pluralize-5.1.0.tgz"; + sha1 = "586a3944a76c481f89774f755652779f61d692b2"; + }; + }; "pluralize-7.0.0" = { name = "pluralize"; packageName = "pluralize"; @@ -41693,13 +41640,13 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postcss-8.1.1" = { + "postcss-8.1.7" = { name = "postcss"; packageName = "postcss"; - version = "8.1.1"; + version = "8.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.1.1.tgz"; - sha512 = "9DGLSsjooH3kSNjTZUOt2eIj2ZTW0VI2PZ/3My+8TC7KIbH2OKwUlISfDsf63EP4aiRUt3XkEWMWvyJHvJelEg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.1.7.tgz"; + sha512 = "llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ=="; }; }; "postcss-calc-7.0.5" = { @@ -42404,13 +42351,13 @@ let sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; - "prettier-2.1.2" = { + "prettier-2.2.0" = { name = "prettier"; packageName = "prettier"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; - sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.2.0.tgz"; + sha512 = "yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw=="; }; }; "prettier-bytes-1.0.4" = { @@ -44123,13 +44070,13 @@ let sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw=="; }; }; - "queue-microtask-1.2.0" = { + "queue-microtask-1.2.2" = { name = "queue-microtask"; packageName = "queue-microtask"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.0.tgz"; - sha512 = "J95OVUiS4b8qqmpqhCodN8yPpHG2mpZUPQ8tDGyIY0VhM+kBHszOuvsMJVGNQ1OH2BnTFbqz45i+2jGpDw9H0w=="; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz"; + sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg=="; }; }; "quick-format-unescaped-4.0.1" = { @@ -44492,13 +44439,13 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; - "react-dev-utils-10.2.1" = { + "react-dev-utils-11.0.1" = { name = "react-dev-utils"; packageName = "react-dev-utils"; - version = "10.2.1"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; - sha512 = "XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ=="; + url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz"; + sha512 = "rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA=="; }; }; "react-devtools-core-4.10.0" = { @@ -45104,13 +45051,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.6" = { + "reftools-1.1.7" = { name = "reftools"; packageName = "reftools"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.6.tgz"; - sha512 = "rQfJ025lvPjw9qyQuNPqE+cRs5qVs7BMrZwgRJnmuMcX/8r/eJE8f5/RCunJWViXKHmN5K2DFafYzglLOHE/tw=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.7.tgz"; + sha512 = "I+KZFkQvZjMZqVWxRezTC/kQ2kLhGRZ7C+4ARbgmb5WJbvFUlbrZ/6qlz6mb+cGcPNYib+xqL8kZlxCsSZ7Hew=="; }; }; "regenerate-1.4.2" = { @@ -45581,13 +45528,13 @@ let sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; }; }; - "render-media-4.0.0" = { + "render-media-4.1.0" = { name = "render-media"; packageName = "render-media"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/render-media/-/render-media-4.0.0.tgz"; - sha512 = "HVvQP29EOTBSnj2CjjiNGhRTpvHM+kWf/AMf1rCB8Y2lKaYgvivTLrAHi9jrYs0EUkJ/7M98RgDI/7rguTnE+w=="; + url = "https://registry.npmjs.org/render-media/-/render-media-4.1.0.tgz"; + sha512 = "F5BMWDmgATEoyPCtKjmGNTGN1ghoZlfRQ3MJh8dS/MrvIUIxupiof/Y9uahChipXcqQ57twVbgMmyQmuO1vokw=="; }; }; "renderkid-2.0.4" = { @@ -46805,6 +46752,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-compare-1.1.4" = { + name = "safe-compare"; + packageName = "safe-compare"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-compare/-/safe-compare-1.1.4.tgz"; + sha512 = "b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ=="; + }; + }; "safe-join-0.1.3" = { name = "safe-join"; packageName = "safe-join"; @@ -47606,13 +47562,13 @@ let sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; - "seventh-0.7.36" = { + "seventh-0.7.38" = { name = "seventh"; packageName = "seventh"; - version = "0.7.36"; + version = "0.7.38"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.36.tgz"; - sha512 = "JeOf8Xybc1QeKhb0Hrj4w9WWYpmgGrjhvV48f0Ap/K2jra1TAnVYvKuJfpW01YFuRtwan6Jc3dN6t1JJrIPxcQ=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.38.tgz"; + sha512 = "dYQGR+HQcuOtKytJ8/R4UFiPY3RIYLrniKRcqLjJCHOnccyJTpu52lBpPdyS6TpXNH13MJhtzh8GHUi/OmRUhw=="; }; }; "sha.js-2.4.11" = { @@ -47984,13 +47940,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.22.0" = { + "simple-git-2.24.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.22.0"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.22.0.tgz"; - sha512 = "/8WMNrQ5slYl05jYOpeh4BIyMQc84PkEvk9YAcBHVJaPoAgoxzLzdRzUzWDZJ9U6Z2pUjLxkGcQC0kU4pbRN5Q=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.24.0.tgz"; + sha512 = "nF31Xai5lTYgRCiSJ1lHzK0Vk9jWOvAFW12bdBaWy2bhodio04eOWYurvyM/nTBYsPIiQl3PFvdod5TRcPvzww=="; }; }; "simple-markdown-0.4.4" = { @@ -48389,22 +48345,22 @@ let sha512 = "HIXpMCRp5IdQDFH/CY6WqOUt5X5Ec55KC9dFVjlMLe/2zeqsImJn1vbjpE5uBoLYIdYi1SteTqtsJhyJZWRK8g=="; }; }; - "snyk-cpp-plugin-2.1.0" = { + "snyk-cpp-plugin-2.2.1" = { name = "snyk-cpp-plugin"; packageName = "snyk-cpp-plugin"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.1.0.tgz"; - sha512 = "TcAlIkHtTvKdPIORxFRr/Ur//ucWK7eFBwlMR4gPeIhKbmEE/PZedBXW2IM8ZUdPIhG53lAP/Eq++1bVFSmZ9g=="; + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-2.2.1.tgz"; + sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.7.4" = { + "snyk-docker-plugin-4.12.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.7.4"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.4.tgz"; - sha512 = "tGSuGCJjdhpW8Dpc6pvjISLPku6AOYUdJ8X98+6ntIeVeb974K9CpWeofWZIqTz5vKi+oFK5SbyVU9KDNAyHfQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.12.0.tgz"; + sha512 = "iN5GUTpMR4dx/hmjxh1GnJ9vrMpbOUhD8gsdWgFPZ5Qg+ImPQ2WBJBal/hyfkauM0TaKQEAgIwT6xZ1ovaIvWQ=="; }; }; "snyk-go-parser-1.4.1" = { @@ -48461,13 +48417,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.23.1" = { + "snyk-mvn-plugin-2.23.4" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.23.1"; + version = "2.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.1.tgz"; - sha512 = "WPEZxCoUyZUs/vvsI3OF9nVQLbED8FlhrLG1HHtSM2JPZs4ashB2HqgM93zG0Vk5kxns3aiZcWL4q6vnZReyFA=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.4.tgz"; + sha512 = "1dWqvFu6eo2KsXFDqRF28JFwrdzpc0k+GwpIqv7vF2kHarsMxnLnT/akhjbKzs+xlRTNFvqdKhEQxjdq2nSD1Q=="; }; }; "snyk-nodejs-lockfile-parser-1.30.1" = { @@ -48686,13 +48642,13 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; - "socket.io-parser-4.0.1" = { + "socket.io-parser-4.0.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.1.tgz"; - sha512 = "5JfNykYptCwU2lkOI0ieoePWm+6stEhkZ2UnLDjqnE1YEjUlXXLd1lpxPZ+g+h3rtaytwWkWrLQCaJULlGqjOg=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.2.tgz"; + sha512 = "Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g=="; }; }; "sockjs-0.3.20" = { @@ -50540,31 +50496,31 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trim-1.2.2" = { + "string.prototype.trim-1.2.3" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz"; - sha512 = "b5yrbl3BXIjHau9Prk7U0RRYcUYdN4wGSVaqoBQS50CCE3KBuYU0TYRNPFCP7aVoNMX87HKThdMRVIP3giclKg=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.3.tgz"; + sha512 = "16IL9pIBA5asNOSukPfxX2W68BaBvxyiRK16H3RA/lWW9BDosh+w7f+LhomPHpXJ82QEe7w7/rY/S1CV97raLg=="; }; }; - "string.prototype.trimend-1.0.2" = { + "string.prototype.trimend-1.0.3" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; - sha512 = "8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; + sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw=="; }; }; - "string.prototype.trimstart-1.0.2" = { + "string.prototype.trimstart-1.0.3" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; - sha512 = "7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; + sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg=="; }; }; "string2compact-1.3.0" = { @@ -51404,13 +51360,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.36.2" = { + "swagger-ui-dist-3.37.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.36.2"; + version = "3.37.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.36.2.tgz"; - sha512 = "jbxorhRC/FKk8yMx5zEbg1A1sXc/vsW2vrDTJ3clmaMr9F12zsy161kwnxjVt/vVkMglDOz+BC8ZMY01toxHwA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.37.2.tgz"; + sha512 = "XIT4asxgeL4GUNPPsqpEqLt20M/u6OhFYqTh42IoEAvAyv5e9EGw5uhP9dLAD10opcMYqdkJ5qU+MpN2HZ5xyA=="; }; }; "swagger2openapi-6.2.3" = { @@ -51422,13 +51378,13 @@ let sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ=="; }; }; - "swagger2openapi-7.0.3" = { + "swagger2openapi-7.0.4" = { name = "swagger2openapi"; packageName = "swagger2openapi"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.3.tgz"; - sha512 = "JSFUmXSR7Qx9WwSKCEqaL4oQfhLLCU2r8Zgf30g15FdSkihItZ6fKFnqSsfqQ6MsmnLlcBf8+OhnQHbi1R0ydg=="; + url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.4.tgz"; + sha512 = "MGzJU44XSXHKxvtx/NbBnP3z5s1KzN5xhqIBERoZEKfRiZ56lNUo5TGOv0dJ8n7JGeheCeU0CydfvbSOh+DaXg=="; }; }; "sway-1.0.0" = { @@ -51521,13 +51477,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.30.1" = { + "systeminformation-4.30.6" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.30.1"; + version = "4.30.6"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.1.tgz"; - sha512 = "FrZISqs8G/oZfnzodPU/zCk41JIfa0os2WY6CJKuk9FwIVc9UWMJfRlgP307AkFu8IRjuVI/HiCNiP4dAnURTA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.6.tgz"; + sha512 = "NV7zo9NU7fWSuiCORZmMLe90cFrrTS6jfalrQ0/5B7JGQ2ei15c2gmfICBwWdmviyv/FXAFVReySxOtDDkppqw=="; }; }; "syswide-cas-5.3.0" = { @@ -51575,13 +51531,13 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-6.0.3" = { + "table-6.0.4" = { name = "table"; packageName = "table"; - version = "6.0.3"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.0.3.tgz"; - sha512 = "8321ZMcf1B9HvVX/btKv8mMZahCjn2aYrDlpqHaBFCfnox64edeH9kEid0vTLTRR8gWR2A20aDgeuTTea4sVtw=="; + url = "https://registry.npmjs.org/table/-/table-6.0.4.tgz"; + sha512 = "sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw=="; }; }; "table-layout-0.4.5" = { @@ -52026,13 +51982,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.4.0" = { + "terser-5.5.1" = { name = "terser"; packageName = "terser"; - version = "5.4.0"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.4.0.tgz"; - sha512 = "3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz"; + sha512 = "6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -53565,13 +53521,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.15.3" = { + "twig-1.15.4" = { name = "twig"; packageName = "twig"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.15.3.tgz"; - sha512 = "ePfzzS7vzzn/Kb8vs/IkCvCNZltBPeBW8B/1blN/Bxh5ubxnZEGI5ysgr8t1Dr0/We9ahLDfqC78fNzDvCMkpw=="; + url = "https://registry.npmjs.org/twig/-/twig-1.15.4.tgz"; + sha512 = "gRpGrpdf+MswqF6eSjEdYZTa/jt3ZWHK/NU59IbTYJMBQXJ1W+7IxaGEwLkQjd+mNT15j9sQTzQumxUBkuQueQ=="; }; }; "twitter-1.7.1" = { @@ -53826,6 +53782,15 @@ let sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; }; }; + "typescript-4.1.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz"; + sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -53934,6 +53899,15 @@ let sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; }; }; + "uglify-js-3.12.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz"; + sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA=="; + }; + }; "uglify-js-3.4.10" = { name = "uglify-js"; packageName = "uglify-js"; @@ -54123,13 +54097,13 @@ let sha512 = "N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="; }; }; - "underscore-1.11.0" = { + "underscore-1.12.0" = { name = "underscore"; packageName = "underscore"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz"; - sha512 = "xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz"; + sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="; }; }; "underscore-1.2.1" = { @@ -54879,6 +54853,15 @@ let sha512 = "ghi1XxsVYPOZPDsOZrfOJIwQU5I3JVYB3Q6IbBGn1KFeOa89i0nUy5tCEkY9pVm83U83qZ1QG40RQKGknllV4w=="; }; }; + "upath-2.0.1" = { + name = "upath"; + packageName = "upath"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-2.0.1.tgz"; + sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; + }; + }; "update-check-1.5.2" = { name = "update-check"; packageName = "update-check"; @@ -56338,13 +56321,13 @@ let sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="; }; }; - "vls-0.5.9" = { + "vls-0.5.10" = { name = "vls"; packageName = "vls"; - version = "0.5.9"; + version = "0.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.5.9.tgz"; - sha512 = "9IGH1YFto0XvLHRKzdOQmkzqnIQOO/yTe77ieaOTJM4Zrr5dDqZKEBwboJyEpx5jy4R1TNUh7HTI+DwhWUtiLQ=="; + url = "https://registry.npmjs.org/vls/-/vls-0.5.10.tgz"; + sha512 = "/zXdkUatCptsDGmrEVh0A/LEQ48qEwrKe+7HiIwUOmiz+0DkoHsyf/j6eppXMVRWMcHWopwd9/VTNCRlFf2NFw=="; }; }; "vm-browserify-1.1.2" = { @@ -56860,13 +56843,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.2" = { + "vue-3.0.3" = { name = "vue"; packageName = "vue"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.2.tgz"; - sha512 = "ciKFjutKRs+2Vbvgrist1oDd5wZQqtOel/K//ku54zLbf8tcTV+XbyAfanTHcTkML9CUj09vnC+y+5uaOz2/9g=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.3.tgz"; + sha512 = "BZG5meD5vLWdvfnRL5WqfDy+cnXO1X/SweModGUna78bdFPZW6+ZO1tU9p0acrskX3DKFcfSp2s4SZnMjABx6w=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -57328,13 +57311,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.111.0" = { + "webtorrent-0.112.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.111.0"; + version = "0.112.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.111.0.tgz"; - sha512 = "DrQVuFSLEB54dm+5tuRclXaeuH5tx7qlp0DYE0mCK7vbYEmn1UJr5GLXztYW/y4Yxie4CSSGeo5LjTxy59z0og=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.0.tgz"; + sha512 = "3Fe4tzeXhZKI0KXGGkr9gyzlx7eKjfU9Se2VJhdE1AcpHppxApuechaWu/KS24amUv4j+xPXE7f3Lc4wF+7QSQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -58570,6 +58553,15 @@ let sha512 = "z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="; }; }; + "xmldom-0.4.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz"; + sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA=="; + }; + }; "xmlhttprequest-1.8.0" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -58922,6 +58914,15 @@ let sha512 = "6+nLw8xa9uK1BOEOykaiYAJVh6/CjxWXK/q9b5FpRgNslt8s22F2xMBqVIKgCRjNgGvGPBy8Vog7WN7yh4amtA=="; }; }; + "yargs-16.1.0" = { + name = "yargs"; + packageName = "yargs"; + version = "16.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-16.1.0.tgz"; + sha512 = "upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g=="; + }; + }; "yargs-16.1.1" = { name = "yargs"; packageName = "yargs"; @@ -59183,6 +59184,15 @@ let sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; "yoga-layout-prebuilt-1.10.0" = { name = "yoga-layout-prebuilt"; packageName = "yoga-layout-prebuilt"; @@ -59273,13 +59283,13 @@ let sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ=="; }; }; - "zip-stream-4.0.2" = { + "zip-stream-4.0.4" = { name = "zip-stream"; packageName = "zip-stream"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz"; - sha512 = "TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g=="; + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.4.tgz"; + sha512 = "a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw=="; }; }; "zmq-2.15.3" = { @@ -59315,17 +59325,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.1.tgz"; - sha512 = "zB20jTLQxLpkJjhbYelhRyMcgGsjwbD8pSYYAO6QX656Tx1tCtJ2UskEtf4ePQvgzu0Ds2dnAEfco+tekIMRTA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.0.2.tgz"; + sha512 = "mebt4ikwXD3gsbHRxKCpn83yW3UVnhiVDEpSXljs1YxscZ1X1dXrxb2g6LdAJwVp9xY5ERqRQeZM7eChqLTrvg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1100.1" - sources."@angular-devkit/core-11.0.1" - sources."@angular-devkit/schematics-11.0.1" - sources."@schematics/angular-11.0.1" - sources."@schematics/update-0.1100.1" + sources."@angular-devkit/architect-0.1100.2" + sources."@angular-devkit/core-11.0.2" + sources."@angular-devkit/schematics-11.0.2" + sources."@schematics/angular-11.0.2" + sources."@schematics/update-0.1100.2" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" @@ -59426,7 +59436,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."humanize-ms-1.2.1" @@ -59440,7 +59450,7 @@ in sources."ini-1.3.5" sources."inquirer-7.3.3" sources."ip-1.1.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -59957,7 +59967,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -60036,7 +60046,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."domexception-1.0.1" @@ -60197,7 +60207,7 @@ in sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -60248,7 +60258,7 @@ in sources."browserslist-4.14.7" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -60269,7 +60279,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" @@ -60326,7 +60336,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -60436,14 +60446,14 @@ in sources."supports-color-7.2.0" sources."symbol-observable-2.0.3" sources."tapable-1.1.3" - (sources."terser-5.4.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."commander-2.20.3" ]; }) (sources."terser-webpack-plugin-5.0.3" // { dependencies = [ - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."schema-utils-3.0.0" sources."source-map-0.6.1" ]; @@ -60473,7 +60483,7 @@ in sources."wcwidth-1.0.1" (sources."webpack-5.4.0" // { dependencies = [ - sources."enhanced-resolve-5.3.1" + sources."enhanced-resolve-5.3.2" sources."schema-utils-3.0.0" sources."tapable-2.1.1" ]; @@ -60488,6 +60498,7 @@ in sources."windows-release-4.0.0" sources."wrappy-1.0.2" sources."yaml-1.10.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -60512,7 +60523,7 @@ in sources."@apollo/federation-0.20.4" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.45" + sources."@types/node-10.17.47" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -60522,16 +60533,17 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.5" - (sources."@babel/core-7.12.3" // { + sources."@babel/compat-data-7.12.7" + (sources."@babel/core-7.12.9" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/generator-7.12.5" + sources."@babel/types-7.12.7" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" @@ -60542,61 +60554,64 @@ in ]; }) sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) (sources."@babel/helper-explode-assignable-expression-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - (sources."@babel/helper-member-expression-to-functions-7.12.1" // { + (sources."@babel/helper-member-expression-to-functions-7.12.7" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) (sources."@babel/helper-module-imports-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" + ]; + }) + (sources."@babel/helper-optimise-call-expression-7.12.7" // { + dependencies = [ + sources."@babel/types-7.12.7" ]; }) - sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.5" (sources."@babel/helper-remap-async-to-generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) (sources."@babel/helper-replace-supers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) (sources."@babel/helper-simple-access-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) sources."@babel/helper-validator-identifier-7.10.4" @@ -60604,11 +60619,11 @@ in sources."@babel/helper-wrap-function-7.12.3" (sources."@babel/helpers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -60616,10 +60631,10 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.5" + sources."@babel/plugin-proposal-numeric-separator-7.12.7" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.7" sources."@babel/plugin-proposal-private-methods-7.12.1" sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -60664,21 +60679,21 @@ in sources."@babel/plugin-transform-reserved-words-7.12.1" sources."@babel/plugin-transform-shorthand-properties-7.12.1" sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" sources."@babel/plugin-transform-typeof-symbol-7.12.1" sources."@babel/plugin-transform-typescript-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.1" // { + (sources."@babel/preset-env-7.12.7" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.1" + sources."@babel/preset-typescript-7.12.7" (sources."@babel/register-7.12.1" // { dependencies = [ sources."make-dir-2.1.0" @@ -60687,11 +60702,15 @@ in ]; }) sources."@babel/runtime-7.12.5" - sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.5" // { + (sources."@babel/template-7.12.7" // { + dependencies = [ + sources."@babel/types-7.12.7" + ]; + }) + (sources."@babel/traverse-7.12.9" // { dependencies = [ sources."@babel/generator-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" ]; }) sources."@babel/types-7.10.4" @@ -60735,7 +60754,7 @@ in (sources."@oclif/errors-1.3.3" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."clean-stack-3.0.0" + sources."clean-stack-3.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."escape-string-regexp-4.0.0" @@ -60828,7 +60847,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -60849,24 +60868,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.9" sources."@vue/cli-ui-addon-widgets-4.5.9" - (sources."@vue/compiler-core-3.0.2" // { + (sources."@vue/compiler-core-3.0.3" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.2" - (sources."@vue/compiler-sfc-3.0.2" // { + sources."@vue/compiler-dom-3.0.3" + (sources."@vue/compiler-sfc-3.0.3" // { dependencies = [ - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.2" - sources."@vue/reactivity-3.0.2" - sources."@vue/runtime-core-3.0.2" - sources."@vue/runtime-dom-3.0.2" - sources."@vue/shared-3.0.2" + sources."@vue/compiler-ssr-3.0.3" + sources."@vue/reactivity-3.0.3" + sources."@vue/runtime-core-3.0.3" + sources."@vue/runtime-dom-3.0.3" + sources."@vue/shared-3.0.3" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -61069,7 +61088,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -61128,7 +61147,7 @@ in sources."ansi-escapes-4.3.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.0" - sources."clean-stack-3.0.0" + sources."clean-stack-3.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."escape-string-regexp-4.0.0" @@ -61186,8 +61205,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.7.0" - (sources."core-js-compat-3.7.0" // { + sources."core-js-3.8.0" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -61212,7 +61231,7 @@ in sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" - (sources."debug-4.3.0" // { + (sources."debug-4.3.1" // { dependencies = [ sources."ms-2.1.2" ]; @@ -61278,7 +61297,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -61552,7 +61571,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -61692,7 +61711,7 @@ in sources."wrap-ansi-3.0.1" ]; }) - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" sources."long-4.0.0" sources."lowdb-1.0.0" sources."lower-case-2.0.1" @@ -61767,7 +61786,7 @@ in sources."node-releases-1.1.67" (sources."nodemon-1.19.4" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" sources."semver-5.7.1" ]; @@ -61801,10 +61820,14 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" - sources."object-treeify-1.1.29" + sources."object-treeify-1.1.30" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + (sources."object.getownpropertydescriptors-2.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -61868,7 +61891,7 @@ in sources."pkg-dir-3.0.0" (sources."portfinder-1.0.28" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" ]; }) @@ -62099,16 +62122,8 @@ in sources."strict-uri-encode-1.1.0" sources."string-hash-1.1.3" sources."string-width-4.2.0" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -62294,7 +62309,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.2" + sources."vue-3.0.3" ]; }) sources."watch-1.0.2" @@ -62482,9 +62497,9 @@ in sources."@babel/generator-7.12.5" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/types-7.12.6" + sources."@babel/parser-7.12.7" + sources."@babel/template-7.12.7" + sources."@babel/types-7.12.7" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -62557,14 +62572,14 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.15.2.tgz"; - sha512 = "40tSBJENAo8bC9RA+IplD/OACRBiZbTBXdt/Q7qaTdDiaMz/ITXCYuALeY6cGK6bO3Frmw2B5djwGbjxlrLa6A=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.15.3.tgz"; + sha512 = "RYp9vX+/ojXMCpxMOsZu9e4X5+k3Nlq3vW4gdMkIVXIlk7hfvNcBfAYMeq3ao68cyYQFLJWVkFY0DlQfn0hQhQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.3" // { + (sources."@babel/core-7.12.9" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -62576,38 +62591,38 @@ in }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/parser-7.12.7" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" - sources."async-2.6.3" + sources."async-3.2.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chalk-2.4.2" - sources."chmodr-1.2.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.4.0" sources."commander-2.20.3" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" - sources."debug-4.3.0" - sources."ejs-2.5.7" + sources."debug-4.3.1" + sources."ejs-3.1.5" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" + sources."filelist-1.0.1" sources."fs-extra-5.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -62630,19 +62645,24 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."is-3.3.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" + (sources."jake-10.8.2" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json5-2.1.3" sources."jsonfile-4.0.0" - sources."jsonlint-1.6.2" + sources."jsonlint-1.6.3" sources."lodash-4.17.20" sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."moment-2.20.1" + sources."moment-2.29.1" sources."ms-2.1.2" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { @@ -62668,7 +62688,7 @@ in sources."which-1.3.1" sources."xml2js-0.2.8" sources."xml2tss-0.0.5" - sources."xmldom-0.1.31" + sources."xmldom-0.4.0" ]; buildInputs = globalBuildInputs; meta = { @@ -62691,7 +62711,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -62920,7 +62940,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -63120,10 +63140,9 @@ in sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.7" - sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-typed-array-1.1.3" @@ -63197,16 +63216,8 @@ in ]; }) sources."stream-splicer-2.0.1" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.3.0" sources."subarg-1.0.0" sources."syntax-error-1.4.0" @@ -63332,7 +63343,7 @@ in sources."cookie-0.4.0" sources."cookie-parser-1.4.5" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -63440,7 +63451,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -63704,7 +63715,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.31" + sources."@types/node-13.13.33" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -63724,7 +63735,7 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-2.0.1" - sources."bep53-range-1.0.0" + sources."bep53-range-1.1.0" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -63751,7 +63762,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" ]; }) sources."castv2-client-1.2.0" @@ -63822,7 +63833,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-browser-rtc-1.0.2" + sources."get-browser-rtc-1.1.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -63846,7 +63857,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -64162,7 +64173,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" sources."encoding-0.1.13" @@ -64246,10 +64257,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.13.0.tgz"; - sha512 = "09jUr50HgKBPxlK88p6CrJXGdu5owMT5c951Ajxwp2lhmFlo26NYn5eVo69shEaZvkpFvlskQWn5lqvrDox0Vw=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.14.0.tgz"; + sha512 = "ccxtSRTqVIuIQrtS5SI0uevO2WC7cSA9dNtiZ/PveDKyxhqyQlfRs9n0bdOJdXteYt6BKUIiqFV8Q48Z71y89A=="; }; buildInputs = globalBuildInputs; meta = { @@ -64304,10 +64315,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.4.tgz"; - sha512 = "Ej4dq5XOkMfnJkHIgUj2FlARz3sU3ACsrSq4YmLD3zj11uf/1nkPf5or89GOngQ1/KyCa1Llj1ai8+oTHyJAQw=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.5.tgz"; + sha512 = "MwoSWGr8mco+/Bth/4zr0kNRuG9rXYgyAEI1mGOuRsMqy2G9LEr4azSP68V2EuIPzYVcYx6ZZk2o5e8b/ux0/w=="; }; buildInputs = globalBuildInputs; meta = { @@ -64322,10 +64333,10 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.12.0.tgz"; - sha512 = "1H9GKq8S1nqv6R3Y2ws+mK+GdVGu3SRsr5uEyRR1KGyfGCDjHyUJY9r4ISlD7DqQ0aq3ukphyv/vhi9uDlkvmA=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.12.1.tgz"; + sha512 = "DskyUQMQXxaHAAAcAzlEFAbxFQaSrRhHEVTsGGB6Q3naW7GvQFze2Otrd4FOxfzTYZlGio5yJpGB7a09K5Snrg=="; }; dependencies = [ sources."isexe-2.0.0" @@ -64369,7 +64380,7 @@ in sha512 = "qC1BifVAAuI5cPT6fEQuP0RIjwDWqhLCH+AUJrQ7lW2IghWInjOarhj9AHWS+1cZLnsVrMMYXL6i8HZLnkRDQQ=="; }; dependencies = [ - sources."typescript-4.0.5" + sources."typescript-4.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -64401,10 +64412,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.0"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.0.tgz"; - sha512 = "EvoHLu7a0H3NB8z3JqXUTggKNTCi28on2dsE7/EJ7AYT1i3SgPaDaU/M7lkK/mUqokbHhAKwcEZBcAr2PtRAgg=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.3.tgz"; + sha512 = "St4Vg5DSHaBW0zqXoSKlKL0KJiASSGMIKDUX2zp/l8ImJd6YI5+SoEwYjCxA2c5x01hZ7k3prXDdfgpKp304RA=="; }; buildInputs = globalBuildInputs; meta = { @@ -64454,10 +64465,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.11"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.11.tgz"; - sha512 = "FG0sCSIbkOe+RRikjHuDp+lFJWXyKBcDSTXDbS7T6q4dNwpkpl4+wNSkvN0tWKnXwNFd2HJt5GuFn5xj9DFK8g=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.14.tgz"; + sha512 = "vFv90gkUJr9xICYCT4NXFd1EQDGWjJfpcnHqTcgd8A8og5yKfL5cqoSxuwcT15nP4nx06sKBCmnkjMB2DPKn9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -64469,13 +64480,31 @@ in bypassCache = true; reconstructLock = true; }; + coc-markdownlint = nodeEnv.buildNodePackage { + name = "coc-markdownlint"; + packageName = "coc-markdownlint"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.8.0.tgz"; + sha512 = "HgdVA3F61GPN4sPxVNyeVWQd0p8oykchGgpovcX5QAVveAcWpUpxYXquX1y2B+EhBFZYNEOQVsr5zdVPzrko6w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Markdownlint extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-markdownlint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.6"; + version = "0.9.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.6.tgz"; - sha512 = "5NSCyYUbOployL6Vfanw7LeIYAi9+8LTqXjKqmVCSRql/YpscZJj7Y3KnhUc4P6WYuORXTl7r9Wwau6T/McyQw=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.8.tgz"; + sha512 = "3mkLfoTaPWT7u2oELILGGtS8jofBsb1MzATB8T4tNJODbrZFXQf5KIV4GBk81RVM1MLGvNtvD/VO/pmwUhrSxQ=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.10" @@ -64509,7 +64538,7 @@ in }) sources."date-format-3.0.0" sources."debounce-1.2.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."duplexer2-0.1.4" @@ -64522,7 +64551,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.0" - sources."fp-ts-2.8.6" + sources."fp-ts-2.9.0" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -64549,7 +64578,6 @@ in sources."is-callable-1.2.2" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" - sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" @@ -64615,16 +64643,8 @@ in sources."date-format-2.1.0" ]; }) - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -64674,10 +64694,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.18"; + version = "1.1.19"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.18.tgz"; - sha512 = "K2rny+Gy8TKZTWFpRqQ0cuH1QkrClml7cNh6A39vkQfbgmDXgaTbli/V0oWslSnVyPOtidGS3vIhZ09mukVhvw=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.19.tgz"; + sha512 = "449bRHSru5ESxrWjgnizpI2OIXmzXN1/nEoPIkawJIsM4RvWAZJsMmsrgqweBRrQmyHy1sih7eIV3AkeZWbg7g=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -64754,7 +64774,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -64811,7 +64831,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -64821,7 +64841,7 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" @@ -64851,7 +64871,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -65058,7 +65078,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -65125,7 +65145,7 @@ in sources."lodash-4.17.20" sources."lodash.merge-4.6.2" sources."log-symbols-2.2.0" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -65290,11 +65310,11 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.1.2" + sources."prettier-2.2.0" sources."prettier-eslint-11.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ignore-3.3.10" sources."prettier-1.19.1" ]; @@ -65477,7 +65497,7 @@ in sources."ansi-regex-3.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."file-entry-cache-2.0.0" sources."flat-cache-1.3.4" sources."globby-7.1.1" @@ -65690,10 +65710,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.16.0.tgz"; - sha512 = "fZk7sIDnex4PCibUZX14cIkJZvMb4ibZtdLHvSF1dtQsRvxxifSPHsnUsLwvHMm/rxStFTD2q27B20ZXaFbpgg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.17.0.tgz"; + sha512 = "fL8O5Is3mvXiWPckw0vrGTldP8oMiNB8pjN/YGiDd/o5M8gQPc0N8a6urSByEHzEoFaV9hf7Lm0ZjK7muS0hjg=="; }; buildInputs = globalBuildInputs; meta = { @@ -65708,10 +65728,10 @@ in coc-smartf = nodeEnv.buildNodePackage { name = "coc-smartf"; packageName = "coc-smartf"; - version = "1.1.10"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.1.10.tgz"; - sha512 = "xjRDR+1qPw3KclL67v7y8D5l8mrUyYvCGWaLegZ3iLjYpRMwGI5oZKi4sHfRk8kFqrmVbHfvh6yDHiIUnTJWyA=="; + url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.1.11.tgz"; + sha512 = "srtsGTwfnrN47BAcafyThuv1eFvlPUFrSDZPJ4RtgxbpcPZCGa60rAPOkFELCjtt9EO0XuKxRJsXtL2PI+ft6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -65767,14 +65787,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.3" + sources."@babel/core-7.12.9" sources."@babel/generator-7.12.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" @@ -65785,10 +65805,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/parser-7.12.7" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -65814,7 +65834,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -65835,7 +65855,7 @@ in sources."convert-source-map-1.7.0" sources."cosmiconfig-7.0.0" sources."cssesc-3.0.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -65852,7 +65872,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -65906,7 +65926,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -65933,7 +65953,11 @@ in sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" sources."mdast-util-from-markdown-0.8.1" - sources."mdast-util-to-markdown-0.5.3" + (sources."mdast-util-to-markdown-0.5.4" // { + dependencies = [ + sources."mdast-util-to-string-2.0.0" + ]; + }) sources."mdast-util-to-string-1.1.0" sources."meow-8.0.0" sources."merge2-1.4.1" @@ -66047,7 +66071,7 @@ in sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.0.3" + sources."table-6.0.4" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" @@ -66141,7 +66165,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."minimatch-3.0.4" @@ -66206,13 +66230,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.0.tgz"; - sha512 = "mGqubDWL5kRHhcoCoAG5LyODhBEh7ORXhCTCZ1GLj7waEaHxtmFSoBlD0H4KwijvI/P+08ji/DLBfp842BPkgw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.1.tgz"; + sha512 = "Tys5fRAdzYfi2MyRQ8X5fKLw8vhluuT/0/Uac+eOzMnWSJ0zgMpxtXTo5AA1icsLgUTHHOXgq6CJHUbKs6xGVA=="; }; dependencies = [ - sources."typescript-4.0.5" + sources."typescript-4.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -66251,6 +66275,7 @@ in sources."astral-regex-1.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."builtin-modules-1.1.1" sources."callsites-3.1.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -66263,15 +66288,17 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-is-0.1.3" + sources."diff-4.0.2" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.13.0" + sources."eslint-7.14.0" sources."eslint-plugin-vue-7.1.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { @@ -66305,16 +66332,19 @@ in sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" sources."import-fresh-3.2.2" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -66335,10 +66365,13 @@ in sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-parse-1.0.6" sources."prelude-ls-1.2.1" + sources."prettier-2.2.0" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" + sources."resolve-1.19.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" sources."semver-7.3.2" @@ -66357,11 +66390,20 @@ in sources."supports-color-5.5.0" sources."table-5.4.6" sources."text-table-0.2.0" + sources."tslib-1.14.1" + (sources."tslint-6.1.3" // { + dependencies = [ + sources."chalk-2.4.2" + sources."semver-5.7.1" + ]; + }) + sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" + sources."typescript-4.1.2" sources."uri-js-4.4.0" sources."v8-compile-cache-2.2.0" - sources."vls-0.5.9" + sources."vls-0.5.10" (sources."vue-eslint-parser-7.1.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -66382,6 +66424,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-vimlsp = nodeEnv.buildNodePackage { + name = "coc-vimlsp"; + packageName = "coc-vimlsp"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.11.0.tgz"; + sha512 = "tcou7cmYgzjLLPfLEyuea5umVkITER0IqDsJCc/3IeuPFyL03D7EDyeXIcyR+fJwXpJ0AzO6rzoLBMqpt4hYGg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "vim language server extension for coc.nvim"; + homepage = "https://github.com/iamcco/coc-vim#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; @@ -66420,10 +66480,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.2.tgz"; - sha512 = "schv9IuNXZIGJqoSUQf/zDTgtSG1Kqht5s9yrlWGPhByHofheyffW3jrXrI/yMY9CT/5/Mg37udFrAbx8WCpCg=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.1.3.tgz"; + sha512 = "BBDyx+KUBUcTOoE+E0sZ1pp0mMNWmrqHIeVykEvMN9bt/agtf4vvlJojv54sJETN9LHwbLNLl9pIQkM2HzoWmQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -66437,6 +66497,7 @@ in sources."js-yaml-3.14.0" sources."jsonc-parser-2.3.1" sources."ms-2.0.0" + sources."prettier-2.2.0" (sources."request-light-0.2.5" // { dependencies = [ sources."vscode-nls-4.1.2" @@ -66861,7 +66922,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -67059,7 +67120,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.30.1" + sources."systeminformation-4.30.6" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67073,7 +67134,7 @@ in sources."type-fest-0.8.1" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."underscore-1.11.0" + sources."underscore-1.12.0" sources."unique-string-2.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" @@ -67146,7 +67207,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -67286,7 +67347,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -67517,7 +67578,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -67544,7 +67605,7 @@ in sources."custom-error-instance-2.1.1" sources."cycle-onionify-4.0.0" sources."d-1.0.1" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."es5-ext-0.10.53" @@ -67661,14 +67722,12 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.0.tgz"; - sha512 = "TonJ7eOtCbqURfE8VaHKXHPvsFMNrya+0XZMvpGAiQ8Snlig70BfZi0CUr0MNM8WQxap1xe3GivtKOBwuQsRCg=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.1.tgz"; + sha512 = "ryEU58YUtn4gxaEQ/Zwt3Bbmkoc3MghLNbNKs1MUg8zDWyM+az1SvMmZ7QaXye9DNNwn5TS2/Ok+fpw2KKvZhA=="; }; dependencies = [ - sources."ansi-escapes-4.3.1" - sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."at-least-node-1.0.0" sources."balanced-match-1.0.0" @@ -67677,9 +67736,6 @@ in sources."buffer-from-0.1.2" sources."builtins-1.0.3" sources."chalk-4.1.0" - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cli-width-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-4.1.1" @@ -67688,15 +67744,7 @@ in sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."duplexer2-0.0.2" - sources."emoji-regex-8.0.0" sources."envinfo-7.7.3" - sources."escape-string-regexp-1.0.5" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."tmp-0.0.33" - ]; - }) - sources."figures-3.2.0" sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" @@ -67705,11 +67753,8 @@ in sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" - sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-7.3.3" - sources."is-fullwidth-code-point-3.0.0" sources."isarray-0.0.1" sources."isexe-2.0.0" (sources."jsonfile-6.1.0" // { @@ -67717,33 +67762,24 @@ in sources."universalify-2.0.0" ]; }) - sources."lodash-4.17.20" - sources."mimic-fn-2.1.0" + sources."kleur-3.0.3" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."mute-stream-0.0.8" sources."once-1.4.0" - sources."onetime-5.1.2" - sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."process-nextick-args-2.0.1" + sources."prompts-2.4.0" sources."readable-stream-1.1.14" - sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" - sources."run-async-2.4.1" - sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" - sources."string-width-4.2.0" + sources."sisteransi-1.0.5" sources."string_decoder-0.10.31" - sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { @@ -67753,7 +67789,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."through-2.3.8" (sources."through2-0.6.5" // { dependencies = [ sources."readable-stream-1.0.34" @@ -67764,8 +67799,6 @@ in sources."rimraf-3.0.2" ]; }) - sources."tslib-1.14.1" - sources."type-fest-0.11.0" sources."uid-number-0.0.6" sources."universalify-1.0.0" sources."util-deprecate-1.0.2" @@ -67877,7 +67910,7 @@ in }) (sources."bittorrent-dht-7.10.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."blake2b-2.1.3" @@ -67966,7 +67999,7 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" @@ -68081,7 +68114,7 @@ in sources."http-signature-1.2.0" (sources."hypercore-7.7.1" // { dependencies = [ - sources."codecs-2.1.0" + sources."codecs-2.2.0" sources."unordered-set-2.0.1" ]; }) @@ -68095,7 +68128,7 @@ in sources."hyperdrive-http-4.4.0" (sources."hyperdrive-network-speed-2.1.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."i-0.3.6" @@ -68619,22 +68652,22 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.43.0"; + version = "6.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.43.0.tgz"; - sha512 = "0xS3XRHG+6k2Si0+mbLIg1HOSmPkTR6cbzFaTS0u96QxrAPHqxHPC1FWZ2x4PcApLH7FI+KSDquU049Sja6kKw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.56.0.tgz"; + sha512 = "xgJH1i6nINcRVAGW1ek+NQJOyOgsS9VDGsWW0sN51v3IUGbPgHSZXTpBtqykVjkb+KoiP1V3NkiKY76n7zd+Kw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.3" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.794.0" + sources."aws-sdk-2.784.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -68788,17 +68821,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.3" + sources."@babel/core-7.12.9" sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" sources."@babel/helper-builder-react-jsx-experimental-7.12.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" @@ -68806,23 +68839,23 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.12.1" sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/plugin-transform-react-jsx-7.12.7" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -68877,7 +68910,7 @@ in sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."debounce-fn-4.0.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -68942,7 +68975,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -69147,8 +69180,11 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.150.1" - sources."@fluentui/react-focus-7.16.18" + sources."@fluentui/react-7.153.2" + sources."@fluentui/react-compose-0.19.12" + sources."@fluentui/react-focus-7.16.19" + sources."@fluentui/react-stylesheets-0.2.4" + sources."@fluentui/react-theme-provider-0.18.0" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.0" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -69172,10 +69208,11 @@ in sources."@types/body-parser-1.19.0" sources."@types/caseless-0.12.2" sources."@types/chart.js-2.9.24" + sources."@types/classnames-2.2.11" sources."@types/connect-3.4.33" sources."@types/engine.io-3.1.4" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.13" + sources."@types/express-serve-static-core-4.17.14" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" @@ -69454,6 +69491,7 @@ in sources."kind-of-5.1.0" ]; }) + sources."classnames-2.2.6" sources."clean-css-4.2.3" sources."clean-stack-2.2.0" sources."cli-cursor-2.1.0" @@ -69512,7 +69550,7 @@ in }) sources."copy-descriptor-0.1.1" sources."copy-props-2.0.4" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."create-ecdh-4.0.4" // { @@ -69532,7 +69570,7 @@ in sources."debug-2.6.9" (sources."debug-fabulous-1.1.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" ]; }) @@ -69883,7 +69921,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -69957,7 +69995,7 @@ in sources."lodash.some-4.6.0" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -70106,7 +70144,7 @@ in sources."nanomatch-1.2.13" (sources."needle-2.5.2" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" ]; }) @@ -70179,7 +70217,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.150.1" + sources."office-ui-fabric-react-7.153.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70213,7 +70251,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" @@ -70515,7 +70553,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."ms-2.1.2" @@ -70549,7 +70587,7 @@ in sources."mkdirp-0.5.5" ]; }) - (sources."terser-5.4.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -70746,6 +70784,7 @@ in }) sources."yargs-parser-5.0.0-security.0" sources."yeast-0.1.2" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -70778,10 +70817,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.13.0"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz"; - sha512 = "uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz"; + sha512 = "5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -70816,7 +70855,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" @@ -70967,13 +71006,13 @@ in sources."concat-map-0.0.1" sources."core_d-2.0.0" sources."cross-spawn-7.0.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.13.0" + sources."eslint-7.14.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -71081,14 +71120,14 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "3.28.5"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.5.tgz"; - sha512 = "Lam0JkBx57gs1xhlI+rXx3aJqOebIPBPf9sWAvUpTFDSVkyZN86rFXJWud6QnAFBLGqUgGFZJDC1tMq+l7Mgng=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.3.tgz"; + sha512 = "yoPZo7QCrjJY08r0YQtNQ+FzfTI0+PCoDf6Uqk/cLxLfTVc/LwXAn2RNXdjmz6+MnCtowjciYYrcuqaizDPOdg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.5" + sources."@babel/compat-data-7.12.7" sources."@babel/core-7.9.0" sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" @@ -71097,7 +71136,7 @@ in sources."@babel/helper-builder-react-jsx-experimental-7.12.4" sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ sources."lodash-4.17.20" @@ -71107,20 +71146,15 @@ in sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ sources."lodash-4.17.20" ]; }) - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-plugin-utils-7.10.4" - (sources."@babel/helper-regex-7.10.5" // { - dependencies = [ - sources."lodash-4.17.20" - ]; - }) sources."@babel/helper-remap-async-to-generator-7.12.1" sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" @@ -71135,7 +71169,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -71144,10 +71178,10 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.5" + sources."@babel/plugin-proposal-numeric-separator-7.12.7" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.7" sources."@babel/plugin-proposal-private-methods-7.12.1" sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -71192,7 +71226,7 @@ in sources."@babel/plugin-transform-parameters-7.12.1" sources."@babel/plugin-transform-property-literals-7.12.1" sources."@babel/plugin-transform-react-display-name-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.5" + sources."@babel/plugin-transform-react-jsx-7.12.7" sources."@babel/plugin-transform-react-jsx-source-7.12.1" sources."@babel/plugin-transform-regenerator-7.12.1" sources."@babel/plugin-transform-reserved-words-7.12.1" @@ -71203,36 +71237,36 @@ in }) sources."@babel/plugin-transform-shorthand-properties-7.12.1" sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" sources."@babel/plugin-transform-typeof-symbol-7.12.1" sources."@babel/plugin-transform-typescript-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.1" + sources."@babel/preset-env-7.12.7" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.1" + sources."@babel/preset-typescript-7.12.7" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.5" // { + sources."@babel/template-7.12.7" + (sources."@babel/traverse-7.12.9" // { dependencies = [ sources."lodash-4.17.20" ]; }) - (sources."@babel/types-7.12.6" // { + (sources."@babel/types-7.12.7" // { dependencies = [ sources."lodash-4.17.20" ]; }) sources."@expo/babel-preset-cli-0.2.18" - (sources."@expo/bunyan-3.0.2" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."@expo/config-3.3.14" // { + sources."@expo/bunyan-4.0.0" + (sources."@expo/config-3.3.16" // { dependencies = [ sources."semver-7.3.2" + ]; + }) + (sources."@expo/config-plugins-1.0.3" // { + dependencies = [ sources."slash-3.0.0" sources."uuid-3.4.0" sources."xcode-2.1.0" @@ -71245,7 +71279,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.39" // { + (sources."@expo/dev-server-0.1.41" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -71262,20 +71296,20 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.58" + sources."@expo/dev-tools-0.13.62" sources."@expo/eas-build-job-0.1.2" - (sources."@expo/image-utils-0.3.7" // { + (sources."@expo/image-utils-0.3.9" // { dependencies = [ sources."semver-6.1.1" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.24" // { + (sources."@expo/json-file-8.2.25" // { dependencies = [ sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.39" + sources."@expo/metro-config-0.1.41" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -71294,7 +71328,7 @@ in sources."@expo/ngrok-bin-win32-ia32-2.2.8-beta.1" sources."@expo/ngrok-bin-win32-x64-2.2.8-beta.1" sources."@expo/osascript-2.0.24" - (sources."@expo/package-manager-0.0.33" // { + (sources."@expo/package-manager-0.0.34" // { dependencies = [ sources."ansi-regex-5.0.0" sources."npm-package-arg-7.0.0" @@ -71308,10 +71342,9 @@ in ]; }) sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.21" // { + (sources."@expo/schemer-1.3.22" // { dependencies = [ sources."ajv-5.5.2" - sources."es6-error-4.1.1" sources."fast-deep-equal-1.1.0" sources."get-stream-3.0.0" sources."got-6.7.1" @@ -71323,17 +71356,16 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.43" // { + (sources."@expo/webpack-config-0.12.46" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-58.0.19" // { + (sources."@expo/xdl-59.0.2" // { dependencies = [ sources."chownr-1.1.4" - sources."es6-error-4.1.1" (sources."fs-minipass-1.2.7" // { dependencies = [ sources."minipass-2.9.0" @@ -71393,38 +71425,37 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jimp/bmp-0.9.8" - sources."@jimp/core-0.9.8" - sources."@jimp/custom-0.9.8" - sources."@jimp/gif-0.9.8" - sources."@jimp/jpeg-0.9.8" - sources."@jimp/plugin-blit-0.9.8" - sources."@jimp/plugin-blur-0.9.8" - sources."@jimp/plugin-circle-0.9.8" - sources."@jimp/plugin-color-0.9.8" - sources."@jimp/plugin-contain-0.9.8" - sources."@jimp/plugin-cover-0.9.8" - sources."@jimp/plugin-crop-0.9.8" - sources."@jimp/plugin-displace-0.9.8" - sources."@jimp/plugin-dither-0.9.8" - sources."@jimp/plugin-fisheye-0.9.8" - sources."@jimp/plugin-flip-0.9.8" - sources."@jimp/plugin-gaussian-0.9.8" - sources."@jimp/plugin-invert-0.9.8" - sources."@jimp/plugin-mask-0.9.8" - sources."@jimp/plugin-normalize-0.9.8" - sources."@jimp/plugin-print-0.9.8" - sources."@jimp/plugin-resize-0.9.8" - sources."@jimp/plugin-rotate-0.9.8" - sources."@jimp/plugin-scale-0.9.8" - sources."@jimp/plugin-shadow-0.9.8" - sources."@jimp/plugin-threshold-0.9.8" - sources."@jimp/plugins-0.9.8" - sources."@jimp/png-0.9.8" - sources."@jimp/tiff-0.9.8" - sources."@jimp/types-0.9.8" - sources."@jimp/utils-0.9.8" - sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@jimp/bmp-0.12.1" + sources."@jimp/core-0.12.1" + sources."@jimp/custom-0.12.1" + sources."@jimp/gif-0.12.1" + sources."@jimp/jpeg-0.12.1" + sources."@jimp/plugin-blit-0.12.1" + sources."@jimp/plugin-blur-0.12.1" + sources."@jimp/plugin-circle-0.12.1" + sources."@jimp/plugin-color-0.12.1" + sources."@jimp/plugin-contain-0.12.1" + sources."@jimp/plugin-cover-0.12.1" + sources."@jimp/plugin-crop-0.12.1" + sources."@jimp/plugin-displace-0.12.1" + sources."@jimp/plugin-dither-0.12.1" + sources."@jimp/plugin-fisheye-0.12.1" + sources."@jimp/plugin-flip-0.12.1" + sources."@jimp/plugin-gaussian-0.12.1" + sources."@jimp/plugin-invert-0.12.1" + sources."@jimp/plugin-mask-0.12.1" + sources."@jimp/plugin-normalize-0.12.1" + sources."@jimp/plugin-print-0.12.1" + sources."@jimp/plugin-resize-0.12.1" + sources."@jimp/plugin-rotate-0.12.1" + sources."@jimp/plugin-scale-0.12.1" + sources."@jimp/plugin-shadow-0.12.1" + sources."@jimp/plugin-threshold-0.12.1" + sources."@jimp/plugins-0.12.1" + sources."@jimp/png-0.12.1" + sources."@jimp/tiff-0.12.1" + sources."@jimp/types-0.12.1" + sources."@jimp/utils-0.12.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -71444,9 +71475,9 @@ in }) sources."@npmcli/node-gyp-1.0.1" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.0" + sources."@npmcli/run-script-1.8.1" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" - sources."@react-native-community/cli-debugger-ui-4.9.0" + sources."@react-native-community/cli-debugger-ui-4.13.1" (sources."@react-native-community/cli-platform-android-4.13.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71600,7 +71631,6 @@ in sources."apollo-utilities-1.3.4" sources."application-config-path-0.1.0" sources."aproba-1.2.0" - sources."arch-2.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -71652,16 +71682,6 @@ in ]; }) sources."axios-retry-3.1.9" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) sources."babel-extract-comments-1.0.0" sources."babel-loader-8.1.0" sources."babel-plugin-dynamic-import-node-2.3.3" @@ -71671,7 +71691,7 @@ in sources."babel-preset-fbjs-3.3.0" (sources."babel-runtime-6.26.0" // { dependencies = [ - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."regenerator-runtime-0.11.1" ]; }) @@ -71757,7 +71777,6 @@ in ]; }) sources."call-bind-1.0.0" - sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsite-1.0.0" @@ -71769,7 +71788,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -71781,7 +71800,6 @@ in sources."supports-color-7.2.0" ]; }) - sources."chardet-0.4.2" sources."charenc-0.0.2" sources."chokidar-3.4.3" sources."chownr-2.0.0" @@ -71816,13 +71834,14 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" sources."cli-table3-0.6.0" - sources."cli-width-2.2.1" - (sources."clipboardy-2.3.0" // { + (sources."cliui-6.0.0" // { dependencies = [ - sources."is-wsl-2.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" ]; }) - sources."cliui-6.0.0" sources."clone-2.1.2" sources."clone-response-1.0.2" sources."co-4.6.0" @@ -71886,14 +71905,14 @@ in sources."globby-11.0.1" sources."loader-utils-2.0.0" sources."make-dir-3.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."slash-3.0.0" ]; }) - sources."core-js-3.7.0" - (sources."core-js-compat-3.7.0" // { + sources."core-js-3.8.0" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -71944,9 +71963,9 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.1.1" // { + (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.1.0" + sources."css-tree-1.1.2" sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; @@ -71956,7 +71975,7 @@ in sources."dashdash-1.14.1" sources."dateformat-3.0.3" sources."dayjs-1.9.6" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."debuglog-1.0.1" sources."decache-4.4.0" sources."decamelize-1.2.0" @@ -71999,7 +72018,7 @@ in dependencies = [ sources."@types/glob-5.0.36" sources."@types/node-8.10.66" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."rimraf-2.7.1" sources."sudo-prompt-8.2.5" ]; @@ -72028,7 +72047,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72065,7 +72084,6 @@ in sources."es-abstract-1.18.0-next.1" sources."es-get-iterator-1.1.1" sources."es-to-primitive-1.2.1" - sources."es6-error-3.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -72085,7 +72103,6 @@ in sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" sources."execa-1.0.0" - sources."exeunt-1.1.0" sources."exif-parser-0.1.12" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -72107,7 +72124,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.49" // { + (sources."expo-pwa-0.0.52" // { dependencies = [ sources."commander-2.20.0" ]; @@ -72124,7 +72141,6 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-2.2.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -72146,7 +72162,7 @@ in }) sources."file-type-9.0.0" sources."file-uri-to-path-1.0.0" - sources."filesize-6.0.1" + sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -72162,7 +72178,7 @@ in sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" - (sources."fork-ts-checker-webpack-plugin-3.1.1" // { + (sources."fork-ts-checker-webpack-plugin-4.1.6" // { dependencies = [ sources."braces-2.3.2" sources."chalk-2.4.2" @@ -72223,7 +72239,6 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."glob-to-regexp-0.3.0" sources."global-4.3.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -72262,11 +72277,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."has-flag-3.0.0" sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" @@ -72352,7 +72362,7 @@ in sources."iferr-0.1.5" sources."ignore-5.1.8" sources."ignore-walk-3.0.3" - sources."immer-1.10.0" + sources."immer-7.0.9" (sources."import-fresh-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -72366,16 +72376,6 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-5.2.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."chalk-2.4.2" - sources."figures-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) sources."internal-ip-4.3.0" sources."invariant-2.2.4" sources."ip-1.1.5" @@ -72391,7 +72391,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -72466,10 +72466,10 @@ in ]; }) sources."jetifier-1.6.6" - sources."jimp-0.9.8" + sources."jimp-0.12.1" sources."joi-11.4.0" sources."join-component-1.1.0" - sources."jpeg-js-0.3.7" + sources."jpeg-js-0.4.2" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" @@ -72496,7 +72496,6 @@ in sources."keyv-3.1.0" sources."killable-1.0.1" sources."kind-of-6.0.3" - sources."klaw-sync-6.0.0" sources."kleur-3.0.3" sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" @@ -72535,7 +72534,7 @@ in ]; }) sources."logkitty-0.7.1" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" sources."loose-envify-1.4.0" sources."lower-case-2.0.1" sources."lowercase-keys-1.0.1" @@ -72638,7 +72637,6 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.29.1" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -72647,7 +72645,6 @@ in sources."ms-2.1.2" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."mute-stream-0.0.7" sources."mv-2.1.1" sources."mz-2.7.0" sources."nan-2.14.2" @@ -72728,26 +72725,14 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.entries-1.1.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."object.getownpropertydescriptors-2.1.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.entries-1.1.3" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" - (sources."object.values-1.1.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.values-1.1.2" sources."obuf-1.1.2" sources."omggif-1.0.10" sources."on-finished-2.3.0" @@ -72871,7 +72856,7 @@ in (sources."portfinder-1.0.28" // { dependencies = [ sources."async-2.6.3" - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."posix-character-classes-0.1.1" @@ -73060,57 +73045,26 @@ in }) sources."raw-body-2.3.3" sources."rc-1.2.8" - (sources."react-dev-utils-10.2.1" // { + (sources."react-dev-utils-11.0.1" // { dependencies = [ - sources."@babel/code-frame-7.8.3" - sources."@nodelib/fs.stat-1.1.3" - sources."arrify-1.0.1" - sources."braces-2.3.2" - sources."browserslist-4.10.0" + sources."array-union-2.1.0" + sources."browserslist-4.14.2" (sources."chalk-2.4.2" // { dependencies = [ sources."escape-string-regexp-1.0.5" ]; }) - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cross-spawn-7.0.1" - sources."dir-glob-2.0.0" - sources."emojis-list-2.1.0" + sources."cross-spawn-7.0.3" sources."escape-string-regexp-2.0.0" - sources."extend-shallow-2.0.1" - sources."external-editor-3.1.0" - sources."fast-glob-2.2.7" - sources."fill-range-4.0.0" - sources."glob-parent-3.1.0" - sources."globby-8.0.2" - sources."iconv-lite-0.4.24" - sources."ignore-3.3.10" - (sources."inquirer-7.0.4" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) - sources."is-glob-3.1.0" - sources."is-number-3.0.0" + sources."globby-11.0.1" sources."is-wsl-2.2.0" - sources."json5-1.0.1" - sources."kind-of-3.2.2" - sources."loader-utils-1.2.3" - sources."micromatch-3.1.10" - sources."mimic-fn-2.1.0" - sources."mute-stream-0.0.8" - sources."onetime-5.1.2" + sources."loader-utils-2.0.0" sources."open-7.3.0" sources."path-key-3.1.1" - sources."path-type-3.0.0" - sources."pify-3.0.0" - sources."restore-cursor-3.1.0" - sources."rxjs-6.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.7.2" - sources."to-regex-range-2.1.1" + sources."slash-3.0.0" sources."which-2.0.2" ]; }) @@ -73204,14 +73158,8 @@ in }) sources."ripemd160-2.0.2" sources."router-ips-1.0.0" - sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."run-queue-1.0.3" - (sources."rxjs-5.5.12" // { - dependencies = [ - sources."symbol-observable-1.0.1" - ]; - }) sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" @@ -73308,7 +73256,7 @@ in }) (sources."sockjs-client-1.4.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."faye-websocket-0.11.3" ]; }) @@ -73372,8 +73320,8 @@ in sources."is-fullwidth-code-point-3.0.0" ]; }) - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -73459,7 +73407,7 @@ in dependencies = [ sources."find-cache-dir-3.3.1" sources."make-dir-3.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."source-map-0.6.1" @@ -73731,7 +73679,11 @@ in }) (sources."webpackbar-4.0.0" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-2.4.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" ]; }) sources."websocket-driver-0.6.5" @@ -73782,7 +73734,7 @@ in ]; }) sources."worker-rpc-0.1.1" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -73813,6 +73765,7 @@ in sources."yallist-4.0.0" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" + sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.21" ]; @@ -73895,7 +73848,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -74014,10 +73967,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.11.5"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.11.5.tgz"; - sha512 = "0/PujreRi2BsZoyvp5N48xaMWLow2GsNz7AY7bdW+0/DAj6F++7kQY7OotmiPlVX2idYL9QJswAcgy1ksRtF9A=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.1.tgz"; + sha512 = "3mI3r9pj/8XOKXlBd/pcSALey1/XJpa/YMluuJQtRI2vwpuAVRi0XdgRXiKzdA2CJFi0o3gZpqEgn7+TMJm8ZA=="; }; dependencies = [ (sources."@heroku-cli/color-1.1.14" // { @@ -74057,7 +74010,7 @@ in sources."@oclif/parser-3.8.5" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."fs-extra-6.0.1" ]; }) @@ -74074,6 +74027,7 @@ in }) sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" + sources."abort-controller-3.0.0" sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.0" @@ -74139,7 +74093,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."clean-stack-3.0.0" + sources."clean-stack-3.0.1" sources."cli-table-0.3.1" (sources."cli-ux-4.9.3" // { dependencies = [ @@ -74173,7 +74127,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.3" @@ -74189,6 +74143,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" + sources."event-target-shim-5.0.1" sources."execa-0.10.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -74229,7 +74184,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.9.0" - sources."faunadb-3.0.1" + sources."faunadb-git+https://github.com/fauna/faunadb-js.git#triage/bearer-to-basic" sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -74368,7 +74323,7 @@ in sources."nanomatch-1.2.13" (sources."netrc-parser-3.1.6" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."nice-try-1.0.5" @@ -74649,7 +74604,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -74769,10 +74724,10 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-3.0.2.tgz"; - sha512 = "GKZLVs3RQh52kF3kuCrlR1e5npaOqomQzTQryZOFJZ9GKNqLya75LSn1rdjFQ8XixwX3jT76pIJmtGN4XXv1aw=="; + url = "https://registry.npmjs.org/forever/-/forever-3.0.4.tgz"; + sha512 = "MZDQu9nxVavSOez+k0MGdoe9/0tGN/QfAj3Xn8OjJbRYlLghq/3isf5c2xt280x04EVKguU9/tmLE74259Xazw=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -74808,8 +74763,8 @@ in dependencies = [ sources."async-0.2.9" sources."cliff-0.1.9" + sources."eventemitter2-0.4.14" sources."nconf-0.6.9" - sources."utile-0.2.1" sources."winston-0.8.0" ]; }) @@ -74859,10 +74814,10 @@ in sources."defined-0.0.0" sources."director-1.2.7" sources."duplexer-0.1.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" - sources."eventemitter2-0.4.14" + sources."eventemitter2-6.4.3" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -74900,7 +74855,7 @@ in }) sources."flatiron-0.4.3" sources."for-in-1.0.2" - sources."forever-monitor-3.0.1" + sources."forever-monitor-3.0.3" sources."fragment-cache-0.2.1" sources."from-0.1.7" sources."fs.realpath-1.0.0" @@ -74940,7 +74895,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -74976,7 +74930,11 @@ in sources."nconf-0.10.0" sources."ncp-0.4.2" sources."normalize-path-3.0.0" - sources."nssocket-0.6.0" + (sources."nssocket-0.6.0" // { + dependencies = [ + sources."eventemitter2-0.4.14" + ]; + }) sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -74993,7 +74951,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" @@ -75014,22 +74972,13 @@ in ]; }) sources."process-nextick-args-2.0.1" - (sources."prompt-0.2.14" // { - dependencies = [ - sources."async-0.2.10" - sources."utile-0.2.1" - ]; - }) + sources."prompt-0.2.14" sources."ps-tree-1.2.0" sources."read-1.0.7" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -75102,8 +75051,8 @@ in }) sources."stream-combiner-0.0.4" sources."string-width-1.0.2" - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-0.1.3" @@ -75139,11 +75088,9 @@ in sources."urix-0.1.0" sources."use-3.1.1" sources."util-deprecate-1.0.2" - (sources."utile-0.3.0" // { + (sources."utile-0.2.1" // { dependencies = [ - sources."async-0.9.2" - sources."deep-equal-0.2.2" - sources."ncp-1.0.1" + sources."async-0.2.10" ]; }) sources."window-size-0.1.4" @@ -75243,7 +75190,7 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."lodash-4.17.20" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" @@ -75275,7 +75222,7 @@ in sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."commander-2.20.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -75288,7 +75235,7 @@ in sources."git-remote-ssb-2.0.4" sources."git-ssb-web-2.8.0" sources."hashlru-2.3.0" - sources."highlight.js-9.18.3" + sources."highlight.js-9.18.5" sources."increment-buffer-1.0.1" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -75320,7 +75267,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.1" - sources."nearley-2.19.7" + sources."nearley-2.19.8" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -75584,7 +75531,7 @@ in sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" @@ -75770,45 +75717,45 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) (sources."@graphql-tools/delegate-7.0.5" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) - (sources."@graphql-tools/graphql-file-loader-6.2.5" // { + (sources."@graphql-tools/graphql-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) - sources."@graphql-tools/import-6.2.4" - (sources."@graphql-tools/json-file-loader-6.2.5" // { + sources."@graphql-tools/import-6.2.5" + (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) sources."@graphql-tools/load-6.2.4" (sources."@graphql-tools/merge-6.2.5" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) - (sources."@graphql-tools/schema-7.0.0" // { + (sources."@graphql-tools/schema-7.1.0" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) (sources."@graphql-tools/url-loader-6.4.0" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) sources."@graphql-tools/utils-6.2.4" (sources."@graphql-tools/wrap-7.0.1" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) sources."@kwsites/file-exists-1.1.1" @@ -75818,7 +75765,7 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -75863,7 +75810,6 @@ in sources."tslib-1.14.1" ]; }) - sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."chardet-0.7.0" @@ -75872,7 +75818,7 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" sources."cli-width-3.0.0" - (sources."cliui-6.0.0" // { + (sources."cliui-7.0.4" // { dependencies = [ sources."ansi-regex-5.0.0" sources."strip-ansi-6.0.0" @@ -75902,8 +75848,7 @@ in sources."d-1.0.1" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.3.0" - sources."decamelize-1.2.0" + sources."debug-4.3.1" sources."decompress-response-3.3.0" sources."deep-equal-2.0.4" sources."deep-extend-0.6.0" @@ -75950,7 +75895,6 @@ in sources."figures-3.2.0" sources."fill-range-7.0.1" sources."filter-obj-2.0.1" - sources."find-up-4.1.0" sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -76065,7 +76009,6 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lines-and-columns-1.1.6" - sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" (sources."log-symbols-2.2.0" // { @@ -76120,16 +76063,16 @@ in sources."npm-run-path-2.0.2" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" - (sources."oas-resolver-2.5.2" // { + (sources."oas-resolver-2.5.3" // { dependencies = [ - sources."yargs-15.4.1" + sources."yargs-16.1.1" ]; }) sources."oas-schema-walker-1.1.5" - sources."oas-validator-5.0.3" + sources."oas-validator-5.0.4" sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -76154,11 +76097,6 @@ in sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-3.0.2" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) sources."p-some-4.1.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { @@ -76175,7 +76113,6 @@ in ]; }) sources."passwd-user-3.0.0" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-type-4.0.0" @@ -76188,7 +76125,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."reftools-1.1.6" + sources."reftools-1.1.7" (sources."regexp.prototype.flags-1.3.0" // { dependencies = [ sources."es-abstract-1.17.7" @@ -76199,7 +76136,6 @@ in sources."remove-trailing-separator-1.1.0" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -76215,7 +76151,6 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" - sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."should-13.2.3" @@ -76237,16 +76172,16 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."subscriptions-transport-ws-0.9.18" sources."supports-color-7.2.0" - (sources."swagger2openapi-7.0.3" // { + (sources."swagger2openapi-7.0.4" // { dependencies = [ - sources."yargs-15.4.1" + sources."yargs-16.1.1" ]; }) sources."symbol-observable-1.2.0" @@ -76281,13 +76216,12 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.1" sources."which-collection-1.0.1" - sources."which-module-2.0.0" (sources."which-typed-array-1.1.2" // { dependencies = [ sources."es-abstract-1.17.7" ]; }) - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."strip-ansi-6.0.0" @@ -76295,21 +76229,12 @@ in }) sources."wrappy-1.0.2" sources."ws-5.2.2" - sources."y18n-4.0.0" + sources."y18n-5.0.5" sources."yaeti-0.0.6" sources."yallist-4.0.0" sources."yaml-1.10.0" - (sources."yargs-16.0.3" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."cliui-7.0.4" - sources."strip-ansi-6.0.0" - sources."wrap-ansi-7.0.0" - sources."y18n-5.0.5" - sources."yargs-parser-20.2.4" - ]; - }) - sources."yargs-parser-18.1.3" + sources."yargs-16.0.3" + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -76434,7 +76359,7 @@ in sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -76608,6 +76533,50 @@ in bypassCache = true; reconstructLock = true; }; + gqlint = nodeEnv.buildNodePackage { + name = "gqlint"; + packageName = "gqlint"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gqlint/-/gqlint-1.8.0.tgz"; + sha512 = "X5tNjxscqbH8xHXubB8kY6yGt11krk+RuB6N/zI2B2RdRadzwavBRMAHkIJzp2RpFgliF08UqP/p+spS/aNd5w=="; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."babel-code-frame-6.26.0" + sources."chalk-1.1.3" + sources."commander-2.20.3" + sources."encoding-0.1.13" + sources."escape-string-regexp-1.0.5" + sources."esutils-2.0.3" + sources."graphql-14.7.0" + sources."has-ansi-2.0.0" + sources."iconv-lite-0.6.2" + sources."is-stream-1.1.0" + sources."iterall-1.3.0" + sources."js-tokens-3.0.2" + sources."lodash-4.17.20" + sources."node-fetch-1.7.3" + sources."pad-component-0.0.1" + sources."pluralize-5.1.0" + sources."prettier-1.19.1" + sources."safer-buffer-2.1.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."text-table-0.2.0" + sources."wordwrap-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "GraphQL Linter"; + homepage = "https://github.com/happylinks/gqlint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; gtop = nodeEnv.buildNodePackage { name = "gtop"; packageName = "gtop"; @@ -76680,7 +76649,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.30.1" + sources."systeminformation-4.30.6" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -76914,7 +76883,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -77307,7 +77276,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -77557,7 +77526,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -77677,7 +77646,7 @@ in sources."basic-auth-1.1.0" sources."colors-1.4.0" sources."corser-2.0.1" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" sources."follow-redirects-1.13.0" @@ -78212,7 +78181,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.19.2" + sources."jquery.terminal-2.20.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -78304,7 +78273,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-is-0.1.3" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" @@ -78502,7 +78471,7 @@ in sources."superagent-4.1.0" (sources."superagent-proxy-2.1.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."supports-color-7.2.0" @@ -78558,9 +78527,9 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-0.10.33" - sources."@ot-builder/bin-util-0.10.33" - (sources."@ot-builder/cli-help-shower-0.10.33" // { + sources."@ot-builder/bin-composite-types-0.10.34" + sources."@ot-builder/bin-util-0.10.34" + (sources."@ot-builder/cli-help-shower-0.10.34" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -78570,7 +78539,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-0.10.33" // { + (sources."@ot-builder/cli-proc-0.10.34" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -78580,7 +78549,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-0.10.33" // { + (sources."@ot-builder/cli-shared-0.10.34" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -78590,35 +78559,35 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-0.10.33" - sources."@ot-builder/errors-0.10.33" - sources."@ot-builder/io-bin-cff-0.10.33" - sources."@ot-builder/io-bin-encoding-0.10.33" - sources."@ot-builder/io-bin-ext-private-0.10.33" - sources."@ot-builder/io-bin-font-0.10.33" - sources."@ot-builder/io-bin-glyph-store-0.10.33" - sources."@ot-builder/io-bin-layout-0.10.33" - sources."@ot-builder/io-bin-metadata-0.10.33" - sources."@ot-builder/io-bin-metric-0.10.33" - sources."@ot-builder/io-bin-name-0.10.33" - sources."@ot-builder/io-bin-sfnt-0.10.33" - sources."@ot-builder/io-bin-ttf-0.10.33" - sources."@ot-builder/ot-0.10.33" - sources."@ot-builder/ot-encoding-0.10.33" - sources."@ot-builder/ot-ext-private-0.10.33" - sources."@ot-builder/ot-glyphs-0.10.33" - sources."@ot-builder/ot-layout-0.10.33" - sources."@ot-builder/ot-metadata-0.10.33" - sources."@ot-builder/ot-name-0.10.33" - sources."@ot-builder/ot-sfnt-0.10.33" - sources."@ot-builder/ot-standard-glyph-namer-0.10.33" - sources."@ot-builder/prelude-0.10.33" - sources."@ot-builder/primitive-0.10.33" - sources."@ot-builder/rectify-0.10.33" - sources."@ot-builder/stat-glyphs-0.10.33" - sources."@ot-builder/trace-0.10.33" - sources."@ot-builder/var-store-0.10.33" - sources."@ot-builder/variance-0.10.33" + sources."@ot-builder/common-impl-0.10.34" + sources."@ot-builder/errors-0.10.34" + sources."@ot-builder/io-bin-cff-0.10.34" + sources."@ot-builder/io-bin-encoding-0.10.34" + sources."@ot-builder/io-bin-ext-private-0.10.34" + sources."@ot-builder/io-bin-font-0.10.34" + sources."@ot-builder/io-bin-glyph-store-0.10.34" + sources."@ot-builder/io-bin-layout-0.10.34" + sources."@ot-builder/io-bin-metadata-0.10.34" + sources."@ot-builder/io-bin-metric-0.10.34" + sources."@ot-builder/io-bin-name-0.10.34" + sources."@ot-builder/io-bin-sfnt-0.10.34" + sources."@ot-builder/io-bin-ttf-0.10.34" + sources."@ot-builder/ot-0.10.34" + sources."@ot-builder/ot-encoding-0.10.34" + sources."@ot-builder/ot-ext-private-0.10.34" + sources."@ot-builder/ot-glyphs-0.10.34" + sources."@ot-builder/ot-layout-0.10.34" + sources."@ot-builder/ot-metadata-0.10.34" + sources."@ot-builder/ot-name-0.10.34" + sources."@ot-builder/ot-sfnt-0.10.34" + sources."@ot-builder/ot-standard-glyph-namer-0.10.34" + sources."@ot-builder/prelude-0.10.34" + sources."@ot-builder/primitive-0.10.34" + sources."@ot-builder/rectify-0.10.34" + sources."@ot-builder/stat-glyphs-0.10.34" + sources."@ot-builder/trace-0.10.34" + sources."@ot-builder/var-store-0.10.34" + sources."@ot-builder/variance-0.10.34" sources."@unicode/unicode-13.0.0-1.0.2" sources."abbrev-1.1.1" sources."ajv-6.12.6" @@ -78730,7 +78699,7 @@ in sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -78789,8 +78758,8 @@ in sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."ot-builder-0.10.33" - (sources."otb-ttc-bundle-0.10.33" // { + sources."ot-builder-0.10.34" + (sources."otb-ttc-bundle-0.10.34" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -79062,10 +79031,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.4.3"; + version = "1.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.4.3.tgz"; - sha512 = "29r23EaeUT0HupQVr5xNN1WuUpT+vn9agxrjbSwVJCYhV++kpkf2zvmuFe7fcTI3oAVu5yXLiK388DlJ7vaFPQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.4.9.tgz"; + sha512 = "4JjZOpv5WyJ3VbtcxrOf5FYQBYPjbBsrIGLG+DoYNFPLsOWEOJeZH24XO2UnNKb5YopcsCzR+iaTXVCPNQ2tAw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -79083,14 +79052,14 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.5" - sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.5" // { + sources."@babel/parser-7.12.7" + sources."@babel/template-7.12.7" + (sources."@babel/traverse-7.12.9" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" ]; }) - sources."@babel/types-7.12.6" + sources."@babel/types-7.12.7" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" sources."@joplinapp/fork-htmlparser2-4.1.8" @@ -79103,12 +79072,6 @@ in sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" ]; }) - (sources."@shiftkey/node-abi-2.19.2-pre" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."@shiftkey/prebuild-install-6.0.1-pre2" sources."abab-2.0.5" sources."abbrev-1.1.1" sources."acorn-7.4.1" @@ -79143,7 +79106,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.794.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -79251,7 +79214,7 @@ in sources."dagre-d3-0.6.4" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" @@ -79344,7 +79307,7 @@ in sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-10.3.2" + sources."highlight.js-10.4.0" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.3.1" sources."html-minifier-3.5.21" @@ -79410,7 +79373,7 @@ in sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -79453,7 +79416,7 @@ in sources."commander-2.20.3" ]; }) - sources."keytar-7.1.0" + sources."keytar-7.2.0" sources."khroma-1.1.0" sources."klaw-1.3.1" sources."lazyness-1.2.0" @@ -79497,7 +79460,7 @@ in }) sources."markdown-it-sub-1.0.0" sources."markdown-it-sup-1.0.0" - sources."markdown-it-toc-done-right-4.1.0" + sources."markdown-it-toc-done-right-4.2.0" sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" @@ -79508,9 +79471,9 @@ in (sources."minify-4.1.3" // { dependencies = [ sources."commander-2.20.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."html-minifier-4.0.0" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" ]; }) sources."minimatch-3.0.4" @@ -79525,7 +79488,7 @@ in sources."multiparty-4.2.2" sources."mustache-4.0.1" sources."nan-2.14.2" - sources."nanoid-3.1.16" + sources."nanoid-3.1.18" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -79641,7 +79604,7 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" - sources."seventh-0.7.36" + sources."seventh-0.7.38" (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.1.3" @@ -79881,7 +79844,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -80026,7 +79989,7 @@ in sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -80211,7 +80174,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.16" + sources."nanoid-3.1.18" sources."negotiator-0.6.2" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" @@ -80437,7 +80400,7 @@ in sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -80506,7 +80469,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -81038,7 +81001,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -81235,7 +81198,7 @@ in sources."envinfo-7.7.3" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -81448,7 +81411,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -81623,7 +81586,7 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" @@ -81817,16 +81780,8 @@ in sources."strip-ansi-4.0.0" ]; }) - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -81863,7 +81818,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -82848,25 +82803,24 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.5" - sources."@babel/core-7.12.3" + sources."@babel/compat-data-7.12.7" + sources."@babel/core-7.12.9" sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" @@ -82881,7 +82835,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" @@ -82890,10 +82844,10 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.5" + sources."@babel/plugin-proposal-numeric-separator-7.12.7" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.7" sources."@babel/plugin-proposal-private-methods-7.12.1" sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -82938,18 +82892,18 @@ in sources."@babel/plugin-transform-runtime-7.12.1" sources."@babel/plugin-transform-shorthand-properties-7.12.1" sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" sources."@babel/plugin-transform-typeof-symbol-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.1" + sources."@babel/preset-env-7.12.7" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -82963,14 +82917,14 @@ in sources."@types/babel__core-7.1.12" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" - sources."@types/babel__traverse-7.0.15" + sources."@types/babel__traverse-7.0.16" sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.4" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.10" @@ -83044,11 +82998,7 @@ in sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" sources."babel-jest-25.5.1" - (sources."babel-loader-8.2.1" // { - dependencies = [ - sources."make-dir-2.1.0" - ]; - }) + sources."babel-loader-8.2.2" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" sources."babel-plugin-jest-hoist-25.5.0" @@ -83144,7 +83094,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -83216,8 +83166,8 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" - (sources."core-js-compat-3.7.0" // { + sources."core-js-2.6.12" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -83248,7 +83198,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -83268,7 +83218,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83346,11 +83296,7 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."find-cache-dir-2.1.0" // { - dependencies = [ - sources."make-dir-2.1.0" - ]; - }) + sources."find-cache-dir-3.3.1" sources."find-up-4.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -83425,7 +83371,15 @@ in sources."https-browserify-1.0.0" sources."ieee754-1.2.1" sources."iferr-0.1.5" - sources."import-local-2.0.0" + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) sources."imurmurhash-0.1.4" sources."infer-owner-1.0.4" sources."inflight-1.0.6" @@ -83439,7 +83393,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -83626,14 +83580,7 @@ in sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" sources."pirates-4.0.1" - (sources."pkg-dir-3.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prettier-1.19.1" @@ -83842,6 +83789,13 @@ in }) (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."make-dir-2.1.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; @@ -84071,7 +84025,7 @@ in sources."link-check-4.5.2" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.4" + sources."marked-1.2.5" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" @@ -84106,10 +84060,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.0.4"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.0.4.tgz"; - sha512 = "gErqy0H3MtARqamwEvhTYfefesjgvDMohmrfF4PrOhh9iFa/LxKRoDJtpCEGWgcMnb+C1GlFRBzNkDJtwgUmyA=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.2.tgz"; + sha512 = "0egBr67f661HiYhCi0qGPt9RlMDownALwzGxIa5rfKncgcx16cIyy9Dm+LvN7vPaSwdJCwmrqVK+qXOHEzRJYQ=="; }; dependencies = [ sources."acorn-5.7.4" @@ -84137,7 +84091,7 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."beeper-1.1.1" - sources."bindings-1.2.1" + sources."bindings-1.5.0" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" sources."bufferstreams-1.1.3" @@ -84160,7 +84114,7 @@ in sources."d-1.0.1" sources."dashdash-1.14.1" sources."dateformat-2.2.0" - sources."deasync-0.1.15" + sources."deasync-0.1.20" sources."debug-2.6.9" sources."deep-extend-0.5.1" sources."deep-is-0.1.3" @@ -84217,6 +84171,7 @@ in sources."fast-levenshtein-2.0.6" sources."figures-1.7.0" sources."file-entry-cache-2.0.0" + sources."file-uri-to-path-1.0.0" sources."flat-cache-1.3.4" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -84252,7 +84207,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -84455,13 +84410,13 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.8.2-beta.8"; + version = "8.8.3-2"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.2-beta.8.tgz"; - sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.3-2.tgz"; + sha512 = "8tXy9R4hcUKgyRS2EOOZzQYlM3jDBIrC04w8YiiTBhTUpm0UuDYpzO+VDjFjxEGBj+KyAzEI3/7oAdV6kYHUMg=="; }; dependencies = [ - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -84477,7 +84432,7 @@ in sources."color-name-1.1.4" sources."commander-6.2.0" sources."concat-map-0.0.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."devtools-protocol-0.0.818844" sources."end-of-stream-1.4.4" sources."extract-zip-2.0.1" @@ -84545,13 +84500,17 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.150.1" - sources."@fluentui/react-focus-7.16.18" + sources."@fluentui/react-7.153.2" + sources."@fluentui/react-compose-0.19.12" + sources."@fluentui/react-focus-7.16.19" + sources."@fluentui/react-stylesheets-0.2.4" + sources."@fluentui/react-theme-provider-0.18.0" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.0" sources."@microsoft/load-themed-styles-1.10.136" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/classnames-2.2.11" sources."@uifabric/foundation-7.9.20" sources."@uifabric/icons-7.5.17" sources."@uifabric/merge-styles-7.19.1" @@ -84590,6 +84549,7 @@ in }) sources."chalk-1.1.3" sources."chardet-0.4.2" + sources."classnames-2.2.6" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" sources."clone-response-1.0.2" @@ -84599,7 +84559,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."crc-3.8.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -84684,7 +84644,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.150.1" + sources."office-ui-fabric-react-7.153.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -84783,7 +84743,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.36.2" + sources."swagger-ui-dist-3.37.2" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -84878,7 +84838,7 @@ in sources."nanoid-3.1.12" sources."normalize-path-3.0.0" sources."once-1.4.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" @@ -84932,6 +84892,7 @@ in sources."decamelize-4.0.0" ]; }) + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -84959,7 +84920,7 @@ in sources."component-emitter-1.3.0" sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."delayed-stream-1.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -85070,15 +85031,15 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.68.5"; + version = "2.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.5.tgz"; - sha512 = "QEvYSfvIvMMN1are5UdbkSD95w6UAnyvC6EavB5nvdgCF65SzyOTPhe8zTmGzAspfzFP5/GnHrDlAsWOEM9IVg=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.69.0.tgz"; + sha512 = "QFlOsS2wTEdAkFXMG5PWbR2SNALOv+n4z4+yQYFEt+TbAHn0NUwbpDT/UxR/NdQtwvzY0NpyjSZSQou5n4mpKg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.5" - (sources."@babel/core-7.12.3" // { + sources."@babel/compat-data-7.12.7" + (sources."@babel/core-7.12.9" // { dependencies = [ sources."semver-5.7.1" ]; @@ -85092,18 +85053,17 @@ in ]; }) sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" @@ -85114,7 +85074,7 @@ in sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -85122,10 +85082,10 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.5" + sources."@babel/plugin-proposal-numeric-separator-7.12.7" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.7" sources."@babel/plugin-proposal-private-methods-7.12.1" sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -85167,21 +85127,21 @@ in sources."@babel/plugin-transform-reserved-words-7.12.1" sources."@babel/plugin-transform-shorthand-properties-7.12.1" sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" sources."@babel/plugin-transform-typeof-symbol-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.1" // { + (sources."@babel/preset-env-7.12.7" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."@bugsnag/browser-7.5.1" sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" @@ -85191,7 +85151,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-5.3.1" // { + (sources."@netlify/build-5.3.3" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.2" @@ -85214,13 +85174,13 @@ in ]; }) sources."@netlify/open-api-0.18.1" - sources."@netlify/plugin-edge-handlers-1.9.0" + sources."@netlify/plugin-edge-handlers-1.10.0" sources."@netlify/run-utils-1.0.5" - sources."@netlify/traffic-mesh-agent-0.24.0" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0" - sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0" - sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0" - (sources."@netlify/zip-it-and-ship-it-1.4.0" // { + sources."@netlify/traffic-mesh-agent-0.27.0" + sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.0" + sources."@netlify/traffic-mesh-agent-linux-x64-0.27.0" + sources."@netlify/traffic-mesh-agent-win32-x64-0.27.0" + (sources."@netlify/zip-it-and-ship-it-1.4.2" // { dependencies = [ sources."resolve-2.0.0-next.2" ]; @@ -85248,37 +85208,39 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@oclif/command-1.6.1" // { + (sources."@oclif/command-1.8.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."is-fullwidth-code-point-2.0.0" - sources."semver-5.7.1" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."wrap-ansi-4.0.0" ]; }) - sources."@oclif/config-1.15.1" - (sources."@oclif/errors-1.2.2" // { + (sources."@oclif/config-1.17.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."clean-stack-1.3.0" - sources."indent-string-3.2.0" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - sources."strip-ansi-5.2.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-11.0.1" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + sources."tslib-2.0.3" + ]; + }) + (sources."@oclif/errors-1.3.4" // { + dependencies = [ + sources."clean-stack-3.0.1" + sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -85309,16 +85271,18 @@ in dependencies = [ sources."ansi-styles-3.2.1" sources."cli-ux-4.9.3" + sources."fs-extra-7.0.1" sources."has-flag-3.0.0" sources."indent-string-3.2.0" + sources."is-wsl-1.1.0" sources."semver-5.7.1" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" ]; }) - (sources."@oclif/plugin-plugins-1.9.0" // { + (sources."@oclif/plugin-plugins-1.9.4" // { dependencies = [ - sources."npm-run-path-3.1.0" + sources."npm-run-path-4.0.1" sources."path-key-3.1.1" sources."tslib-2.0.3" ]; @@ -85386,7 +85350,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -85456,7 +85420,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.794.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -85535,7 +85499,7 @@ in sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -85584,16 +85548,14 @@ in sources."cli-cursor-2.1.0" sources."cli-progress-3.8.2" sources."cli-spinners-2.5.0" - (sources."cli-ux-5.4.6" // { + (sources."cli-ux-5.5.1" // { dependencies = [ sources."ansi-escapes-4.3.1" - sources."emoji-regex-7.0.3" - sources."has-flag-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."semver-5.7.1" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."supports-color-5.5.0" + sources."chalk-4.1.0" + sources."clean-stack-3.0.1" + sources."extract-stack-2.0.0" + sources."supports-hyperlinks-2.1.0" + sources."tslib-2.0.3" sources."type-fest-0.11.0" ]; }) @@ -85645,7 +85607,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."core-js-compat-3.7.0" // { + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -85680,7 +85642,7 @@ in sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" - (sources."debug-4.3.0" // { + (sources."debug-4.3.1" // { dependencies = [ sources."ms-2.1.2" ]; @@ -85787,7 +85749,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -85928,7 +85890,7 @@ in sources."from2-2.3.0" sources."from2-array-0.0.4" sources."fs-constants-1.0.0" - sources."fs-extra-7.0.1" + sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" @@ -86102,7 +86064,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -86136,7 +86098,7 @@ in sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isbuffer-0.0.0" @@ -86229,7 +86191,6 @@ in sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" sources."lodash.deburr-4.1.0" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" @@ -86237,15 +86198,10 @@ in sources."lodash.flattendeep-4.4.0" sources."lodash.get-4.4.2" sources."lodash.isempty-4.4.0" - sources."lodash.isequal-4.5.0" sources."lodash.islength-4.0.1" - sources."lodash.isobject-3.0.2" sources."lodash.isplainobject-4.0.6" sources."lodash.merge-4.6.2" - sources."lodash.pick-4.4.0" - sources."lodash.sample-4.2.1" sources."lodash.set-4.3.2" - sources."lodash.snakecase-4.1.1" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.transform-4.6.0" @@ -86384,10 +86340,14 @@ in }) sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object-treeify-1.1.29" + sources."object-treeify-1.1.30" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + (sources."object.getownpropertydescriptors-2.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."object.pick-1.3.0" sources."octal-1.0.0" sources."octokit-pagination-methods-1.1.0" @@ -86401,12 +86361,12 @@ in sources."mimic-fn-2.1.0" ]; }) - (sources."open-7.3.0" // { + sources."open-7.3.0" + (sources."opn-5.5.0" // { dependencies = [ - sources."is-wsl-2.2.0" + sources."is-wsl-1.1.0" ]; }) - sources."opn-5.5.0" sources."optionator-0.8.3" (sources."ora-4.1.1" // { dependencies = [ @@ -86703,16 +86663,8 @@ in sources."strict-uri-encode-1.1.0" sources."string-range-1.2.2" sources."string-width-4.2.0" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -86761,7 +86713,7 @@ in ]; }) sources."term-size-2.2.1" - (sources."terser-5.4.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -87189,7 +87141,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -87395,7 +87347,7 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."deep-extend-0.6.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" @@ -87463,16 +87415,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.5.tgz"; - sha512 = "Z/f5ZjZVQgQSP+UU/RN5mJvTR875R3Fgb1lWd2kBxy44gVxxbtfN66ndgV9oV2S1h8nDTj0s+UhXvEXgo0PlqQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.6.tgz"; + sha512 = "Sy6ZNRFxN4KwT/eGFBt9L6aMXK0XGRwBNlhoFMPObSujLJVMUKHxirHAMst5CvUYigijFXM6ILRC6p/XqYHZRg=="; }; dependencies = [ sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.5" - sources."@node-red/editor-client-1.2.5" - (sources."@node-red/nodes-1.2.5" // { + sources."@node-red/editor-api-1.2.6" + sources."@node-red/editor-client-1.2.6" + (sources."@node-red/nodes-1.2.6" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -87486,14 +87438,14 @@ in }) ]; }) - sources."@node-red/registry-1.2.5" - sources."@node-red/runtime-1.2.5" - sources."@node-red/util-1.2.5" + sources."@node-red/registry-1.2.6" + sources."@node-red/runtime-1.2.6" + sources."@node-red/util-1.2.6" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -87677,7 +87629,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -87728,7 +87680,7 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.4" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -87752,10 +87704,10 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.32" - (sources."mqtt-4.2.5" // { + (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -87764,7 +87716,7 @@ in }) (sources."mqtt-packet-6.6.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -87775,7 +87727,7 @@ in sources."nan-2.14.0" (sources."needle-2.5.2" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" ]; }) @@ -88023,7 +87975,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -88190,7 +88142,7 @@ in sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."crypto-random-string-2.0.0" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" @@ -88309,10 +88261,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.8"; + version = "6.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.8.tgz"; - sha512 = "HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.9.tgz"; + sha512 = "yHi1+i9LyAZF1gAmgyYtVk+HdABlLy94PMIDoK1TRKWvmFQAt5z3bodqVwKvzY0s6dLqQPVsRLiwhJfNtiHeCg=="; }; buildInputs = globalBuildInputs; meta = { @@ -88327,10 +88279,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "10.2.1"; + version = "10.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.1.tgz"; - sha512 = "p6FM1JXDs2ZfYZ5pyOPkiIWHi+dldjS26QoVYcfaBgF/SmGBqyU3m0WW/y3PSPvOdb610cnI+wzQxzFxTSx+5Q=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-10.2.2.tgz"; + sha512 = "xyE1PUTu4xarVDRXCA0HYd92rT3zd87GIixczM/TCkwN12/31yVD/8dOyXtgNA8fpIuvhjrfX7n4cV0OTCa9hg=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -88339,7 +88291,7 @@ in sources."@npmcli/move-file-1.0.1" sources."@npmcli/node-gyp-1.0.1" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.0" + sources."@npmcli/run-script-1.8.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -88410,7 +88362,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -88437,7 +88389,7 @@ in sources."find-up-5.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fp-and-or-0.1.2" + sources."fp-and-or-0.1.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" @@ -88547,7 +88499,7 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-try-2.2.0" @@ -88643,6 +88595,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -88879,8 +88832,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.5" - (sources."@babel/core-7.12.3" // { + sources."@babel/compat-data-7.12.7" + (sources."@babel/core-7.12.9" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" @@ -88897,18 +88850,17 @@ in sources."@babel/helper-builder-react-jsx-experimental-7.12.4" sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.1" + sources."@babel/helper-create-regexp-features-plugin-7.12.7" sources."@babel/helper-define-map-7.10.5" sources."@babel/helper-explode-assignable-expression-7.12.1" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-member-expression-to-functions-7.12.7" sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.10.4" + sources."@babel/helper-optimise-call-expression-7.12.7" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" @@ -88919,7 +88871,7 @@ in sources."@babel/helper-wrap-function-7.12.3" sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -88927,10 +88879,10 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.5" + sources."@babel/plugin-proposal-numeric-separator-7.12.7" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.1" + sources."@babel/plugin-proposal-optional-chaining-7.12.7" sources."@babel/plugin-proposal-private-methods-7.12.1" sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -88971,22 +88923,22 @@ in sources."@babel/plugin-transform-object-super-7.12.1" sources."@babel/plugin-transform-parameters-7.12.1" sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.5" + sources."@babel/plugin-transform-react-jsx-7.12.7" sources."@babel/plugin-transform-regenerator-7.12.1" sources."@babel/plugin-transform-reserved-words-7.12.1" sources."@babel/plugin-transform-shorthand-properties-7.12.1" sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.1" + sources."@babel/plugin-transform-sticky-regex-7.12.7" sources."@babel/plugin-transform-template-literals-7.12.1" sources."@babel/plugin-transform-typeof-symbol-7.12.1" sources."@babel/plugin-transform-unicode-escapes-7.12.1" sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.1" + sources."@babel/preset-env-7.12.7" sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -89101,7 +89053,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -89127,8 +89079,8 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" - (sources."core-js-compat-3.7.0" // { + sources."core-js-2.6.12" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89174,9 +89126,9 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.1.1" // { + (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.1.0" + sources."css-tree-1.1.2" sources."mdn-data-2.0.14" ]; }) @@ -89185,7 +89137,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.21" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -89236,7 +89188,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.598" + sources."electron-to-chromium-1.3.610" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89246,7 +89198,7 @@ in sources."entities-1.1.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" - (sources."es-abstract-1.17.7" // { + (sources."es-abstract-1.18.0-next.1" // { dependencies = [ sources."object-inspect-1.8.0" ]; @@ -89372,7 +89324,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -89503,9 +89455,9 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" - sources."object.values-1.1.1" + sources."object.values-1.1.2" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -89732,18 +89684,8 @@ in sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object-inspect-1.8.0" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object-inspect-1.8.0" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" (sources."stylehacks-4.0.3" // { @@ -89819,7 +89761,12 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + sources."object-inspect-1.8.0" + ]; + }) sources."uuid-3.4.0" sources."v8-compile-cache-2.2.0" sources."vendors-1.0.4" @@ -89912,7 +89859,7 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" @@ -90100,7 +90047,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -90427,7 +90374,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."bep53-range-1.0.0" + sources."bep53-range-1.1.0" sources."big-integer-1.6.48" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { @@ -90487,7 +90434,7 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" @@ -90502,7 +90449,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-browser-rtc-1.0.2" + sources."get-browser-rtc-1.1.0" sources."get-intrinsic-1.0.1" sources."get-stdin-4.0.1" sources."glob-7.1.6" @@ -90539,11 +90486,10 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-callable-1.2.2" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" @@ -90581,7 +90527,7 @@ in sources."numeral-2.0.6" sources."object-assign-4.1.1" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -90635,11 +90581,7 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."redent-1.0.0" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."repeating-2.0.1" sources."resolve-1.19.0" sources."restore-cursor-2.0.0" @@ -90673,8 +90615,8 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" (sources."string2compact-1.3.0" // { dependencies = [ sources."ipaddr.js-1.9.1" @@ -90866,7 +90808,7 @@ in sources."fs-chunk-store-1.7.0" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."get-browser-rtc-1.0.2" + sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -91135,12 +91077,12 @@ in sources."debug-4.1.1" (sources."pm2-axon-3.3.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) (sources."pm2-axon-rpc-0.5.2" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."semver-7.2.3" @@ -91148,7 +91090,7 @@ in }) (sources."@pm2/agent-node-1.1.10" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ws-6.2.1" ]; }) @@ -91164,7 +91106,7 @@ in (sources."@pm2/js-api-0.6.1" // { dependencies = [ sources."async-2.6.3" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."eventemitter2-6.4.3" ]; }) @@ -91210,7 +91152,7 @@ in sources."cron-1.8.2" sources."data-uri-to-buffer-1.2.0" sources."dayjs-1.8.36" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-is-0.1.3" sources."degenerator-1.0.4" sources."depd-1.1.2" @@ -91267,7 +91209,7 @@ in }) (sources."https-proxy-agent-3.0.1" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."iconv-lite-0.4.24" @@ -91275,7 +91217,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -91294,7 +91236,7 @@ in sources."mute-stream-0.0.8" (sources."needle-2.4.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."netmask-1.0.6" @@ -91319,7 +91261,7 @@ in sources."pm2-axon-4.0.0" (sources."pm2-axon-rpc-0.6.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."pm2-deploy-1.0.2" @@ -91362,7 +91304,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.30.1" + sources."systeminformation-4.30.6" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91397,10 +91339,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.13.1"; + version = "5.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.1.tgz"; - sha512 = "FXdcPmd7hld2FrM+GvBwXH85T4iMQre0teZferGxm7xyzzfkCP0qkA/qaXqpCEJ4r3f24FyEgRl9WUvpxNHBEQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.4.tgz"; + sha512 = "Q/1SlzLitcrggjTJN7Ooiu2y5ty+yTaxJYb7xGt6QpNijsIhxkGK58pP8IZYh04C7+8aI9MxNgppOTOyQG7k5g=="; }; buildInputs = globalBuildInputs; meta = { @@ -91567,10 +91509,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.1.2"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz"; - sha512 = "16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz"; + sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -91748,7 +91690,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -91953,10 +91895,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.86"; + version = "1.1.88"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.86.tgz"; - sha512 = "/caEMnoD3tRPfrn/kVcZJ8gNV7NYnQEmnZYbzbVQlrdrbyMXNRXWOY/eDZizaMBYDm5FPV70A3hiA0BL9TqHdA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.88.tgz"; + sha512 = "1bjnvqNd5xlqTzlwr1W0/WLj+fKItMpQuBr2fvI3OPnWz5iRNcIdj30pR5yCP5ddThSW8xHjQmutf/aked2I8w=="; }; buildInputs = globalBuildInputs; meta = { @@ -92034,7 +91976,7 @@ in sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -92052,8 +91994,8 @@ in sources."semver-5.7.1" sources."side-channel-1.0.3" sources."stack-trace-0.0.10" - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."utile-0.2.1" @@ -92288,18 +92230,18 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.5" + sources."@babel/parser-7.12.7" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.5" - sources."@babel/types-7.12.6" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.31" + sources."@types/node-13.13.33" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -92315,7 +92257,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-1.11.1" + sources."babel-plugin-styled-components-1.12.0" sources."babel-plugin-syntax-jsx-6.18.0" sources."base64-js-1.5.1" sources."better-ajv-errors-0.6.7" @@ -92349,7 +92291,7 @@ in sources."cipher-base-1.0.4" sources."classnames-2.2.6" sources."clipboard-2.0.6" - sources."cliui-6.0.0" + sources."cliui-7.0.4" sources."clsx-1.1.1" sources."co-4.6.0" sources."code-error-fragment-0.0.230" @@ -92357,7 +92299,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -92369,7 +92311,7 @@ in sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" @@ -92388,6 +92330,7 @@ in }) sources."emoji-regex-8.0.0" sources."es6-promise-3.3.1" + sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."eventemitter3-4.0.7" @@ -92468,7 +92411,11 @@ in sources."normalize-path-3.0.0" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" - sources."oas-resolver-2.5.2" + (sources."oas-resolver-2.5.3" // { + dependencies = [ + sources."yargs-16.1.1" + ]; + }) sources."oas-schema-walker-1.1.5" sources."oas-validator-4.0.8" sources."object-assign-4.1.1" @@ -92515,7 +92462,7 @@ in }) sources."readdirp-3.5.0" sources."redoc-2.0.0-rc.47" - sources."reftools-1.1.6" + sources."reftools-1.1.7" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -92553,7 +92500,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" @@ -92569,7 +92516,7 @@ in sources."vm-browserify-1.1.2" sources."which-module-2.0.0" sources."wordwrap-1.0.0" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -92577,10 +92524,20 @@ in ]; }) sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-5.0.5" sources."yaml-1.10.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-20.2.4" ]; buildInputs = globalBuildInputs; meta = { @@ -92722,7 +92679,7 @@ in sources."cross-spawn-7.0.3" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" @@ -92746,7 +92703,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.13.0" // { + (sources."eslint-7.14.0" // { dependencies = [ sources."eslint-visitor-keys-2.0.0" sources."semver-7.3.2" @@ -92802,7 +92759,7 @@ in }) (sources."https-proxy-agent-2.2.4" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."ignore-4.0.6" @@ -92811,7 +92768,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -92865,7 +92822,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" @@ -92989,6 +92946,7 @@ in }) sources."yauzl-2.10.0" sources."yazl-2.5.1" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -93031,7 +92989,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -93291,16 +93249,16 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.11.1"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.11.1.tgz"; - sha512 = "BQN53zkm/HWh+QtzaR/uXHRAxAcabHkstyRMo4+9JJc+DM7cQM9cyRBm15BW9PKMO9c3aCKYNTJSb5cegn7qmw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.13.0.tgz"; + sha512 = "MOz0JYlPrWGwuyVUIncyaNRSlwOzVUFj5T/ITRjtO5PYXUWr+BB+yhZ97KoOhuL/hVnQ7ZjsmYgOvzo8hHwv9w=="; }; dependencies = [ sources."2-thenable-1.0.0" (sources."@kwsites/file-exists-1.1.1" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -93326,7 +93284,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.3.1" // { + (sources."@serverless/components-3.4.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ramda-0.27.1" @@ -93346,7 +93304,7 @@ in (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."https-proxy-agent-4.0.0" sources."is-docker-1.1.0" sources."ms-2.1.2" @@ -93371,7 +93329,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.165" sources."@types/long-4.0.1" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -93398,7 +93356,7 @@ in sources."file-type-4.4.0" ]; }) - (sources."archiver-5.0.2" // { + (sources."archiver-5.1.0" // { dependencies = [ sources."async-3.2.0" sources."bl-4.0.3" @@ -93428,7 +93386,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.794.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93538,7 +93496,7 @@ in sources."component-bind-1.0.0" sources."component-emitter-1.3.0" sources."component-inherit-0.0.3" - sources."compress-commons-4.0.1" + sources."compress-commons-4.0.2" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" (sources."content-disposition-0.5.3" // { @@ -93548,8 +93506,8 @@ in }) sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" - sources."crc-3.8.0" - sources."crc32-stream-4.0.0" + sources."crc-32-1.2.0" + sources."crc32-stream-4.0.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -93647,6 +93605,7 @@ in sources."essentials-1.1.1" sources."event-emitter-0.3.5" sources."events-1.1.1" + sources."exit-on-epipe-1.0.1" sources."expand-template-2.0.3" sources."ext-1.4.0" sources."ext-list-2.2.2" @@ -93695,7 +93654,7 @@ in }) sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."fs2-0.3.8" + sources."fs2-0.3.9" sources."fsevents-2.1.3" (sources."gauge-2.7.4" // { dependencies = [ @@ -93746,7 +93705,7 @@ in (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.2" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -93908,9 +93867,8 @@ in sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-timeout-2.0.1" - sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."got-9.6.0" @@ -93937,11 +93895,12 @@ in }) sources."prepend-http-2.0.0" sources."prettyoutput-1.2.0" + sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.31" + sources."@types/node-13.13.33" sources."long-4.0.0" ]; }) @@ -93991,9 +93950,9 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.22.0" // { + (sources."simple-git-2.24.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -94045,7 +94004,7 @@ in sources."chalk-2.4.2" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."figures-2.0.0" sources."inquirer-6.5.2" sources."is-fullwidth-code-point-2.0.0" @@ -94145,7 +94104,8 @@ in sources."yargs-parser-20.2.4" sources."yauzl-2.10.0" sources."yeast-0.1.2" - sources."zip-stream-4.0.2" + sources."yocto-queue-0.1.0" + sources."zip-stream-4.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -94784,10 +94744,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.428.0"; + version = "1.431.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.428.0.tgz"; - sha512 = "yV1f28PPVG7sJ0c4GAMO3nhuJMIJNDagYJRQVwA0zLCr5u3UraE0qK2wRxo2j53ICkMBslp0b073EIoaB0lVkA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.431.2.tgz"; + sha512 = "DGm/bxtCSI/ReGK0vMphicQyZtVXiLgLvWkdDbRmsMb4Q7VRylAq9z+5lursLriED7eTjxlkgFMjOdGOuIoxpg=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -94817,7 +94777,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -94900,7 +94860,7 @@ in }) sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.3.0" + sources."debug-4.3.1" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -94928,9 +94888,11 @@ in sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" + sources."elfy-1.0.0" sources."email-validator-2.0.4" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" + sources."endian-reader-0.3.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-goat-2.1.1" @@ -94986,7 +94948,7 @@ in sources."http2-wrapper-1.0.0-beta.5.2" (sources."https-proxy-agent-3.0.1" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."iconv-lite-0.4.24" @@ -95067,7 +95029,7 @@ in sources."mute-stream-0.0.8" (sources."needle-2.5.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."netmask-1.0.6" @@ -95156,7 +95118,7 @@ in sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" sources."snyk-config-4.0.0-rc.2" - (sources."snyk-cpp-plugin-2.1.0" // { + (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -95167,7 +95129,7 @@ in sources."tslib-2.0.3" ]; }) - (sources."snyk-docker-plugin-4.7.4" // { + (sources."snyk-docker-plugin-4.12.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -95200,10 +95162,20 @@ in ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.23.1" // { + (sources."snyk-mvn-plugin-2.23.4" // { dependencies = [ sources."@snyk/cli-interface-2.9.1" - sources."tmp-0.1.0" + (sources."@snyk/java-call-graph-builder-1.16.5" // { + dependencies = [ + sources."tmp-0.2.1" + ]; + }) + sources."rimraf-3.0.2" + (sources."tmp-0.1.0" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) sources."tslib-1.11.1" ]; }) @@ -95226,7 +95198,7 @@ in }) (sources."snyk-poetry-lockfile-parser-1.1.1" // { dependencies = [ - (sources."@snyk/dep-graph-1.20.0" // { + (sources."@snyk/dep-graph-1.21.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -95240,7 +95212,7 @@ in sources."hosted-git-info-2.8.8" (sources."snyk-module-2.1.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) ]; @@ -95248,13 +95220,13 @@ in sources."snyk-python-plugin-1.19.1" (sources."snyk-resolve-1.0.1" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ sources."@types/node-6.14.13" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."hosted-git-info-2.8.8" sources."lru-cache-4.1.5" sources."semver-5.7.1" @@ -95270,7 +95242,7 @@ in sources."snyk-tree-1.0.0" (sources."snyk-try-require-1.3.1" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; @@ -95383,20 +95355,21 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.2.tgz"; - sha512 = "CFnVFhzOy6eHOnZhElG5dtacsEC3jO45KfIWwDSoKavBuWmuK4k4j1eSMj0RymrTA9WuXG5+yD+sxxtMK8rCIA=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.3.tgz"; + sha512 = "TC1GnSXhDVmd3bHji5aG7AgWB8UL7E6quACbKra8uFXBqlMwEDbrJFK+tjuIY5Pe9N0L+MAPPDv3pycnn0000A=="; }; dependencies = [ sources."@types/body-parser-1.19.0" + sources."@types/component-emitter-1.2.10" sources."@types/connect-3.4.33" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.8" sources."@types/express-4.17.9" - sources."@types/express-serve-static-core-4.17.13" + sources."@types/express-serve-static-core-4.17.14" sources."@types/mime-2.0.3" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.8" @@ -95414,7 +95387,7 @@ in sources."negotiator-0.6.2" sources."object-assign-4.1.1" sources."socket.io-adapter-2.0.3" - sources."socket.io-parser-4.0.1" + sources."socket.io-parser-4.0.2" sources."vary-1.1.2" sources."ws-7.4.0" ]; @@ -95495,7 +95468,7 @@ in sources."ini-1.3.5" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -95717,7 +95690,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -95748,7 +95721,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" (sources."es-get-iterator-1.1.1" // { dependencies = [ sources."isarray-2.0.5" @@ -95783,6 +95756,7 @@ in (sources."flumeview-links-1.0.1" // { dependencies = [ sources."deep-equal-2.0.4" + sources."es-abstract-1.18.0-next.1" sources."isarray-2.0.5" sources."map-filter-reduce-3.2.2" ]; @@ -95905,11 +95879,7 @@ in sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.3" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."is-typed-array-1.1.3" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.17" sources."is-weakmap-2.0.1" @@ -95996,7 +95966,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.7" + sources."nearley-2.19.8" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -96018,7 +95988,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -96184,11 +96154,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -96228,7 +96194,11 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."side-channel-1.0.3" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -96333,9 +96303,13 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.2" - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + (sources."string.prototype.trim-1.2.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" @@ -96402,11 +96376,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.1" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."which-typed-array-1.1.2" sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -96510,7 +96480,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.794.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -96604,7 +96574,7 @@ in sources."depd-2.0.0" ]; }) - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."cross-spawn-4.0.2" @@ -96718,7 +96688,7 @@ in sources."glob-6.0.4" (sources."gm-1.23.1" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) sources."graceful-fs-4.2.4" @@ -96765,7 +96735,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -97107,7 +97077,7 @@ in sources."strip-eof-1.0.0" (sources."superagent-3.8.3" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."form-data-2.5.1" sources."qs-6.9.4" sources."readable-stream-2.3.7" @@ -97284,6 +97254,333 @@ in bypassCache = true; reconstructLock = true; }; + stylelint = nodeEnv.buildNodePackage { + name = "stylelint"; + packageName = "stylelint"; + version = "13.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz"; + sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; + }; + dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/core-7.12.9" + sources."@babel/generator-7.12.5" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.12.7" + sources."@babel/helper-module-imports-7.12.5" + sources."@babel/helper-module-transforms-7.12.1" + sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-split-export-declaration-7.11.0" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helpers-7.12.5" + (sources."@babel/highlight-7.10.4" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@babel/parser-7.12.7" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@stylelint/postcss-css-in-js-0.37.2" + sources."@stylelint/postcss-markdown-0.36.2" + sources."@types/mdast-3.0.3" + sources."@types/minimist-1.2.1" + sources."@types/normalize-package-data-2.4.0" + sources."@types/parse-json-4.0.0" + sources."@types/unist-2.0.3" + sources."ajv-6.12.6" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."array-union-2.1.0" + sources."arrify-1.0.1" + sources."astral-regex-2.0.0" + sources."autoprefixer-9.8.6" + sources."bail-1.0.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserslist-4.14.7" + sources."callsites-3.1.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."caniuse-lite-1.0.30001161" + (sources."chalk-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."character-entities-1.2.4" + sources."character-entities-legacy-1.1.4" + sources."character-reference-invalid-1.1.4" + sources."clone-regexp-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colorette-1.2.1" + sources."concat-map-0.0.1" + sources."convert-source-map-1.7.0" + sources."cosmiconfig-7.0.0" + sources."cssesc-3.0.0" + sources."debug-4.3.1" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."dir-glob-3.0.1" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.0.2" + sources."entities-2.1.0" + ]; + }) + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.7.0" + sources."electron-to-chromium-1.3.610" + sources."emoji-regex-8.0.0" + sources."entities-1.1.2" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."execall-2.0.0" + sources."extend-3.0.2" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" + sources."fast-json-stable-stringify-2.1.0" + sources."fastest-levenshtein-1.0.12" + sources."fastq-1.9.0" + sources."file-entry-cache-6.0.0" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + sources."flat-cache-3.0.4" + sources."flatted-3.1.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.2" + sources."get-stdin-8.0.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."global-modules-2.0.0" + sources."global-prefix-3.0.0" + sources."globals-11.12.0" + sources."globby-11.0.1" + sources."globjoin-0.1.4" + sources."gonzales-pe-4.3.0" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."hosted-git-info-3.0.7" + sources."html-tags-3.1.0" + sources."htmlparser2-3.10.1" + sources."ignore-5.1.8" + (sources."import-fresh-3.2.2" // { + dependencies = [ + sources."resolve-from-4.0.0" + ]; + }) + sources."import-lazy-4.0.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."indexes-of-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-alphabetical-1.0.4" + sources."is-alphanumerical-1.0.4" + sources."is-arrayish-0.2.1" + sources."is-buffer-2.0.5" + sources."is-core-module-2.2.0" + sources."is-decimal-1.0.4" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-hexadecimal-1.0.4" + sources."is-number-7.0.0" + sources."is-plain-obj-2.1.0" + sources."is-regexp-2.1.0" + sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-traverse-0.4.1" + sources."json5-2.1.3" + sources."kind-of-6.0.3" + sources."known-css-properties-0.20.0" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."log-symbols-4.0.0" + sources."longest-streak-2.0.4" + sources."lru-cache-6.0.0" + sources."map-obj-4.1.0" + sources."mathml-tag-names-2.1.3" + sources."mdast-util-from-markdown-0.8.1" + (sources."mdast-util-to-markdown-0.5.4" // { + dependencies = [ + sources."mdast-util-to-string-2.0.0" + ]; + }) + sources."mdast-util-to-string-1.1.0" + sources."meow-8.0.0" + sources."merge2-1.4.1" + sources."micromark-2.10.1" + sources."micromatch-4.0.2" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."ms-2.1.2" + sources."node-releases-1.1.67" + (sources."normalize-package-data-3.0.0" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."normalize-range-0.1.2" + sources."normalize-selector-0.2.0" + sources."num2fraction-1.2.2" + sources."once-1.4.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-entities-2.0.0" + sources."parse-json-5.1.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + (sources."postcss-7.0.35" // { + dependencies = [ + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-html-0.36.0" + sources."postcss-less-3.1.4" + sources."postcss-media-query-parser-0.2.3" + sources."postcss-resolve-nested-selector-0.1.1" + sources."postcss-safe-parser-4.0.2" + sources."postcss-sass-0.4.4" + sources."postcss-scss-2.1.1" + sources."postcss-selector-parser-6.0.4" + sources."postcss-syntax-0.36.2" + sources."postcss-value-parser-4.1.0" + sources."punycode-2.1.1" + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" + sources."remark-13.0.0" + sources."remark-parse-9.0.0" + sources."remark-stringify-9.0.0" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."resolve-1.19.0" + sources."resolve-from-5.0.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.1.10" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."source-map-0.5.7" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.6" + sources."specificity-0.4.1" + sources."string-width-4.2.0" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-indent-3.0.0" + sources."style-search-0.1.0" + sources."sugarss-2.0.0" + sources."supports-color-5.5.0" + sources."svg-tags-1.0.0" + sources."table-6.0.4" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."trim-newlines-3.0.0" + sources."trough-1.0.5" + sources."type-fest-0.18.1" + sources."typedarray-to-buffer-3.1.5" + sources."unified-9.2.0" + sources."uniq-1.0.1" + sources."unist-util-find-all-after-3.0.2" + sources."unist-util-is-4.0.3" + sources."unist-util-stringify-position-2.0.3" + sources."uri-js-4.4.0" + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.2.0" + sources."validate-npm-package-license-3.0.4" + sources."vfile-4.2.0" + sources."vfile-message-2.0.4" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."yallist-4.0.0" + sources."yaml-1.10.0" + sources."yargs-parser-20.2.4" + sources."zwitch-1.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A mighty, modern CSS linter."; + homepage = https://stylelint.io/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; @@ -97306,9 +97603,9 @@ in sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.37" sources."css-what-3.4.2" - (sources."csso-4.1.1" // { + (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.1.0" + sources."css-tree-1.1.2" sources."mdn-data-2.0.14" ]; }) @@ -97321,7 +97618,7 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."entities-2.1.0" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -97343,26 +97640,22 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" - sources."object.values-1.1.1" + sources."object.getownpropertydescriptors-2.1.1" + sources."object.values-1.1.2" sources."q-1.5.1" sources."sax-1.2.4" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stable-0.1.8" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."supports-color-5.5.0" sources."unquote-1.1.1" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -97488,7 +97781,7 @@ in sources."content-type-1.0.4" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-5.1.0" // { @@ -97729,7 +98022,7 @@ in sources."neo-async-2.6.2" (sources."nodemon-1.19.4" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" sources."supports-color-5.5.0" ]; @@ -97767,7 +98060,7 @@ in sources."path-key-2.0.1" (sources."path-loader-1.0.10" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" sources."qs-6.9.4" sources."superagent-3.8.3" @@ -97946,7 +98239,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -98036,7 +98329,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -98227,13 +98520,13 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."crypt-0.0.2" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."deep-equal-1.1.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" sources."diff-4.0.2" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -98263,13 +98556,12 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" - sources."is-negative-zero-2.0.0" sources."is-plain-obj-1.1.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -98297,7 +98589,7 @@ in sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -98331,11 +98623,7 @@ in ]; }) sources."readable-stream-2.3.7" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."remark-frontmatter-1.3.3" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" @@ -98357,8 +98645,8 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.0" // { dependencies = [ @@ -98455,7 +98743,6 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" - sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."match-index-1.0.3" @@ -98463,16 +98750,8 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."regexp.prototype.flags-1.3.0" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -98566,7 +98845,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -98636,7 +98915,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -99033,7 +99312,7 @@ in sources."call-bind-1.0.0" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.0.1" @@ -99049,20 +99328,12 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."object.values-1.1.1" + sources."object.values-1.1.2" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."sentence-splitter-3.2.0" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -99105,22 +99376,13 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" - sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -99201,10 +99463,10 @@ in sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ - sources."array-includes-3.1.1" + sources."array-includes-3.1.2" sources."call-bind-1.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.0.1" @@ -99220,16 +99482,8 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -99300,7 +99554,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -99308,7 +99562,7 @@ in sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -99376,7 +99630,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -99473,7 +99727,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -99533,7 +99787,7 @@ in sources."mute-stream-0.0.8" (sources."needle-2.5.2" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" ]; }) @@ -99734,10 +99988,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.122.0"; + version = "0.123.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.122.0.tgz"; - sha512 = "bgYMo0WdaQhf7DhLE8OSNN/rVFO5J4K1A2VeeKqoV4MjjuHjfCP6xLpg8Xedhns7NlEnN3sZ6VJROq19Qyl6Sg=="; + url = "https://registry.npmjs.org/three/-/three-0.123.0.tgz"; + sha512 = "KNnx/IbilvoHRkxOtL0ouozoDoElyuvAXhFB21RK7F5IPWSmqyFelICK6x3hJerLNSlAdHxR0hkuvMMhH9pqXg=="; }; buildInputs = globalBuildInputs; meta = { @@ -100164,10 +100418,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.0.5"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz"; - sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.1.2.tgz"; + sha512 = "thGloWsGH3SOxv1SoY7QojKi0tc+8FnOmiarEGMbd/lar7QOEd3hvlx3Fp5y6FlDUGl9L+pd4n2e+oToGMmhRQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -100218,10 +100472,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.6"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.6.tgz"; - sha512 = "oASI1FOJ7BBFkSCNDZ446EgkSuHkOZBuqRFrwXIKWCoXw8ZXQETooTQjkAcBS03Acab7ubCKsXnwuV2svy061g=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.0.tgz"; + sha512 = "8lBMSkFZuAK7gGF8LswsXmir8eX8d2AAMOnxSDWjKBx/fBR6MypQjs78m6ML9zQVp1/hD4TBdfeMZMC7nW1TAA=="; }; buildInputs = globalBuildInputs; meta = { @@ -100264,7 +100518,7 @@ in sources."@primer/octicons-11.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -100415,7 +100669,7 @@ in sources."media-typer-0.3.0" (sources."memorystore-1.6.4" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -100621,7 +100875,7 @@ in sources."d3-time-2.0.0" sources."d3-time-format-3.0.0" sources."d3-timer-2.0.0" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."delaunator-4.0.1" @@ -100642,7 +100896,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."mimic-response-2.1.0" @@ -100803,10 +101057,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.1.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.0.tgz"; - sha512 = "i0PTJh2XEPEUvRn78j1nxTlNVcTOKr4FLwIwhkjaC0ovGGViwnBgRd7StM0NS3UCvcVzLNy78Hu31S7RHkiHbw=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.2.tgz"; + sha512 = "i+IVvvla+7oyXU3Mb1Vc4hCymCEUbRRhJE7/So+wZNZZgtVH4SNWwhtjzNV2l9egYAyCqJnJKKtErwgJnfAHsA=="; }; buildInputs = globalBuildInputs; meta = { @@ -101184,7 +101438,7 @@ in sources."enhanced-resolve-4.3.0" sources."entities-1.1.2" sources."errno-0.1.7" - (sources."es-abstract-1.17.7" // { + (sources."es-abstract-1.18.0-next.1" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -101448,7 +101702,7 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-0.1.1" @@ -101617,18 +101871,8 @@ in sources."stream-shift-1.0.1" sources."string-argv-0.3.1" sources."string-width-2.1.1" - (sources."string.prototype.trimend-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object.assign-4.1.2" - ]; - }) - (sources."string.prototype.trimstart-1.0.2" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object.assign-4.1.2" - ]; - }) + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" @@ -102055,7 +102299,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.11.6" + sources."uglify-js-3.12.0" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -102114,7 +102358,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -102262,7 +102506,7 @@ in sources."config-chain-1.1.12" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -102273,7 +102517,7 @@ in }) sources."css-parse-2.0.0" sources."currently-unhandled-0.4.1" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -102302,14 +102546,14 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ignore-4.0.6" ]; }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.1" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."vue-eslint-parser-7.1.1" @@ -102463,7 +102707,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -102522,7 +102766,7 @@ in sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" sources."lodash.unescape-4.0.1" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -102975,7 +103219,7 @@ in sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -103022,10 +103266,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.3.0.tgz"; - sha512 = "LlOmVSddfBVHd9Liv3SL1Cvftr+YS6GNiKVIugDotUm3jVT9otHsw1SrCi11MGaGBw4g0s8ndjcbuttr1ZQjwg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.4.0.tgz"; + sha512 = "95MVrsCRtmmu7YNTA8OconwTB7Y7rS6T5ABpv9c90A5tLfDV1+6/dRn8JhAMAi/UfIq0ZT5wklHwvRzDmD6cBA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -103040,54 +103284,81 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/polyfill-7.11.5" - sources."@babel/runtime-7.11.2" + sources."@babel/polyfill-7.12.1" + sources."@babel/runtime-7.12.5" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-0.1.3" // { + (sources."@eslint/eslintrc-0.2.1" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@sindresorhus/is-0.14.0" + sources."@mdn/browser-compat-data-2.0.5" + sources."@sindresorhus/is-0.7.0" sources."@szmarczak/http-timer-1.1.2" + sources."@types/decompress-4.2.3" + sources."@types/download-6.2.4" + sources."@types/got-8.3.5" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" + sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" + sources."accepts-1.3.7" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."addons-linter-2.9.0" + (sources."addons-linter-2.12.0" // { + dependencies = [ + sources."yargs-16.1.0" + ]; + }) + (sources."addons-scanner-utils-3.0.0" // { + dependencies = [ + sources."upath-2.0.0" + ]; + }) sources."adm-zip-0.4.16" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" - sources."ansi-align-3.0.0" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."ansi-colors-4.1.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.1" + (sources."archive-type-4.0.0" // { + dependencies = [ + sources."file-type-4.4.0" + ]; + }) (sources."archiver-5.0.2" // { dependencies = [ sources."async-3.2.0" + sources."bl-4.0.3" + sources."inherits-2.0.4" + sources."readable-stream-3.6.0" + sources."tar-stream-2.1.4" ]; }) - (sources."archiver-utils-2.1.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."archiver-utils-2.1.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-differ-3.0.0" sources."array-filter-0.0.1" + sources."array-flatten-1.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" sources."array-union-2.1.0" @@ -103116,35 +103387,36 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.1.0" sources."bindings-1.5.0" - sources."bl-4.0.3" + sources."bl-1.2.3" sources."bluebird-2.9.34" + sources."body-parser-1.19.0" sources."boolbase-1.0.0" (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."camelcase-5.3.1" sources."chalk-3.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."braces-3.0.2" sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" + sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."bunyan-1.8.14" + sources."bytes-3.1.0" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) - (sources."cacheable-request-6.1.0" // { + (sources."cacheable-request-2.1.4" // { dependencies = [ - sources."lowercase-keys-2.0.0" + sources."get-stream-3.0.0" + sources."lowercase-keys-1.0.0" ]; }) sources."call-bind-1.0.0" @@ -103153,7 +103425,11 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" - sources."chokidar-3.4.3" + (sources."chokidar-3.4.3" // { + dependencies = [ + sources."fsevents-2.1.3" + ]; + }) (sources."chrome-launcher-0.13.4" // { dependencies = [ sources."mkdirp-0.5.5" @@ -103180,12 +103456,9 @@ in ]; }) sources."cli-boxes-2.2.1" - (sources."cliui-6.0.0" // { + (sources."cliui-7.0.4" // { 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" ]; }) @@ -103201,21 +103474,32 @@ in sources."commander-2.20.3" sources."common-tags-1.8.0" sources."component-emitter-1.3.0" - sources."compress-commons-4.0.1" - sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { + (sources."compress-commons-4.0.2" // { dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" ]; }) - sources."configstore-5.0.1" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + (sources."configstore-5.0.1" // { + dependencies = [ + sources."make-dir-3.1.0" + sources."semver-6.3.0" + ]; + }) + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" - sources."crc-3.8.0" - sources."crc32-stream-4.0.0" + sources."crc-32-1.2.0" + (sources."crc32-stream-4.0.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" @@ -103225,7 +103509,39 @@ in sources."debug-2.6.9" sources."decamelize-4.0.0" sources."decode-uri-component-0.2.0" + (sources."decompress-4.2.1" // { + dependencies = [ + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-2.3.0" + ]; + }) sources."decompress-response-3.3.0" + (sources."decompress-tar-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + ]; + }) + (sources."decompress-targz-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + ]; + }) + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + sources."pify-2.3.0" + ]; + }) sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" @@ -103240,10 +103556,12 @@ in ]; }) sources."delayed-stream-1.0.0" - (sources."dispensary-0.57.0" // { + sources."depd-1.1.2" + sources."destroy-1.0.4" + (sources."dispensary-0.59.0" // { dependencies = [ sources."async-3.2.0" - sources."pino-6.6.1" + sources."yargs-16.1.1" ]; }) sources."doctrine-3.0.0" @@ -103252,26 +103570,31 @@ in sources."domhandler-2.4.2" sources."domutils-1.5.1" sources."dot-prop-5.3.0" + sources."download-8.0.0" sources."dtrace-provider-0.8.8" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" - sources."emoji-regex-7.0.3" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" sources."es6-promise-2.3.0" sources."es6-promisify-6.1.1" + sources."escalade-3.1.1" sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.11.0" // { + (sources."eslint-7.13.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; @@ -103302,8 +103625,15 @@ in }) sources."estraverse-4.3.0" sources."esutils-2.0.3" + sources."etag-1.8.1" sources."event-to-promise-0.8.0" - sources."execa-4.1.0" + (sources."execa-4.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."is-stream-2.0.0" + ]; + }) + sources."exit-on-epipe-1.0.1" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -103322,6 +103652,9 @@ in sources."kind-of-5.1.0" ]; }) + sources."express-4.17.1" + sources."ext-list-2.2.2" + sources."ext-name-5.0.0" sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ @@ -103343,12 +103676,16 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-2.1.0" + sources."fast-redact-3.0.0" sources."fast-safe-stringify-2.0.7" sources."fd-slicer-1.1.0" sources."file-entry-cache-5.0.1" + sources."file-type-11.1.0" sources."file-uri-to-path-1.0.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-3.0.0" sources."fill-range-7.0.1" + sources."finalhandler-1.1.2" sources."find-up-4.1.0" (sources."firefox-profile-4.0.0" // { dependencies = [ @@ -103356,7 +103693,7 @@ in sources."fs-extra-4.0.3" ]; }) - sources."first-chunk-stream-4.0.0" + sources."first-chunk-stream-3.0.0" sources."flat-cache-2.0.1" sources."flatstr-1.0.12" sources."flatted-2.0.2" @@ -103364,7 +103701,10 @@ in sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" sources."fs-constants-1.0.0" (sources."fs-extra-9.0.1" // { dependencies = [ @@ -103377,7 +103717,7 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.2.1" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" (sources."fx-runner-1.0.13" // { @@ -103389,16 +103729,17 @@ in }) sources."get-caller-file-2.0.5" sources."get-intrinsic-1.0.1" - sources."get-stream-5.2.0" + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" sources."globals-12.4.0" - (sources."got-9.6.0" // { + (sources."got-8.3.2" // { dependencies = [ - sources."get-stream-4.1.0" + sources."get-stream-3.0.0" + sources."pify-3.0.0" ]; }) sources."graceful-fs-4.2.4" @@ -103408,7 +103749,9 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.1" + sources."has-to-string-tag-x-1.4.1" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -103425,19 +103768,27 @@ in ]; }) sources."has-yarn-2.1.0" - sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."http-cache-semantics-3.8.1" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."inherits-2.0.3" sources."ini-1.3.5" + sources."into-stream-3.1.0" sources."invert-kv-3.0.1" + sources."ipaddr.js-1.9.1" sources."is-absolute-0.1.7" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.0.4" @@ -103452,15 +103803,17 @@ in sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" - sources."is-negative-zero-2.0.0" + sources."is-natural-number-4.0.1" sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" + sources."is-object-1.0.1" sources."is-path-inside-3.0.2" + sources."is-plain-obj-1.1.0" (sources."is-plain-object-2.0.4" // { dependencies = [ sources."isobject-3.0.1" @@ -103468,7 +103821,8 @@ in }) sources."is-regex-1.1.1" sources."is-relative-0.1.3" - sources."is-stream-2.0.0" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -103479,6 +103833,7 @@ in sources."isexe-2.0.0" sources."isobject-2.1.0" sources."isstream-0.1.2" + sources."isurl-1.0.0" sources."jed-1.1.1" sources."jetpack-id-1.0.0" sources."js-select-0.6.0" @@ -103504,16 +103859,10 @@ in sources."jszip-2.6.1" sources."jwa-1.4.1" sources."jws-3.2.2" - sources."keyv-3.1.0" + sources."keyv-3.0.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lazystream-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."lazystream-1.0.0" sources."lcid-3.1.1" sources."levn-0.4.1" sources."lighthouse-logger-1.2.0" @@ -103534,18 +103883,24 @@ in sources."lodash.sortby-4.7.0" sources."lodash.union-4.6.0" sources."lowercase-keys-1.0.1" - (sources."make-dir-3.1.0" // { + (sources."make-dir-2.1.0" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-5.7.1" ]; }) sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.40" - sources."mem-5.1.1" + sources."media-typer-0.3.0" + (sources."mem-5.1.1" // { + dependencies = [ + sources."p-is-promise-2.1.0" + ]; + }) + sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" + sources."methods-1.1.2" (sources."micromatch-3.1.10" // { dependencies = [ (sources."braces-2.3.2" // { @@ -103567,6 +103922,7 @@ in sources."to-regex-range-2.1.1" ]; }) + sources."mime-1.6.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" @@ -103591,11 +103947,12 @@ in }) sources."mz-2.7.0" sources."nan-2.14.2" - sources."nanoid-3.1.16" + sources."nanoid-3.1.18" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" + sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."node-forge-0.10.0" @@ -103605,7 +103962,11 @@ in ]; }) sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + (sources."normalize-url-2.0.1" // { + dependencies = [ + sources."sort-keys-2.0.0" + ]; + }) sources."npm-run-path-4.0.1" sources."nth-check-1.0.2" sources."oauth-sign-0.9.0" @@ -103624,7 +103985,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -103637,20 +103998,32 @@ in sources."isobject-3.0.1" ]; }) + sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-7.3.0" sources."optionator-0.9.1" sources."os-locale-5.0.0" sources."os-shim-0.1.3" - sources."p-cancelable-1.1.0" + sources."p-cancelable-0.4.1" sources."p-defer-1.0.0" - sources."p-is-promise-2.1.0" + sources."p-event-2.3.1" + sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" + sources."p-timeout-2.0.1" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."cacheable-request-6.1.0" + sources."get-stream-5.2.0" + sources."got-9.6.0" + sources."http-cache-semantics-4.1.0" + sources."lowercase-keys-2.0.0" + sources."normalize-url-4.5.0" + sources."p-cancelable-1.1.0" sources."semver-6.3.0" ]; }) @@ -103658,48 +104031,50 @@ in sources."parent-module-1.0.1" sources."parse-json-5.0.1" sources."parse5-3.0.3" + sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-to-regexp-0.1.7" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - (sources."pino-6.7.0" // { - dependencies = [ - sources."fast-redact-3.0.0" - ]; - }) + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pino-6.7.0" sources."pino-std-serializers-2.5.0" sources."posix-character-classes-0.1.1" - sources."postcss-8.1.1" + sources."postcss-8.1.7" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" + sources."printj-1.1.2" sources."probe-image-size-5.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" + sources."proxy-addr-2.0.6" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" - sources."qs-6.5.2" + sources."qs-6.7.0" + sources."query-string-5.1.1" sources."quick-format-unescaped-4.0.1" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" (sources."rc-1.2.8" // { dependencies = [ sources."strip-json-comments-2.0.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.7" sources."readdir-glob-1.1.1" sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."regexpp-3.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -103716,7 +104091,11 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."request-2.88.2" + (sources."request-2.88.2" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-from-4.0.0" @@ -103724,23 +104103,32 @@ in sources."responselike-1.0.2" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" + sources."safe-compare-1.1.4" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" + sources."seek-bzip-1.0.6" sources."semver-7.3.2" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" ]; }) + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) + sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -103757,6 +104145,7 @@ in sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -103790,6 +104179,8 @@ in ]; }) sources."sonic-boom-1.3.0" + sources."sort-keys-1.1.2" + 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.19" @@ -103816,41 +104207,51 @@ in sources."kind-of-5.1.0" ]; }) + sources."statuses-1.5.0" sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" - (sources."string-width-3.1.0" // { + sources."strict-uri-encode-1.1.0" + (sources."string-width-4.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" - sources."string_decoder-1.3.0" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" + sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" sources."strip-bom-buf-2.0.0" - (sources."strip-bom-stream-4.0.0" // { - dependencies = [ - sources."first-chunk-stream-3.0.0" - ]; - }) + sources."strip-bom-stream-4.0.0" + sources."strip-dirs-2.1.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" + sources."strip-outer-1.0.1" sources."supports-color-7.2.0" - sources."table-5.4.6" - sources."tar-stream-2.1.4" + (sources."table-5.4.6" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."tar-stream-1.6.2" sources."term-size-2.2.1" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" + sources."timed-out-4.0.1" (sources."tmp-0.2.1" // { dependencies = [ sources."rimraf-3.0.2" ]; }) + sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -103859,20 +104260,25 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" sources."tosource-1.0.0" sources."tough-cookie-2.5.0" sources."tr46-2.0.2" sources."traverse-0.4.6" + sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" sources."type-fest-0.8.1" + sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" + sources."unbzip2-stream-1.4.3" sources."union-value-1.0.1" sources."unique-string-2.0.0" sources."universalify-0.1.2" + sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ (sources."has-value-0.3.1" // { @@ -103884,15 +104290,18 @@ in sources."isobject-3.0.1" ]; }) - sources."upath-2.0.0" + sources."upath-2.0.1" sources."update-notifier-5.0.0" sources."uri-js-4.4.0" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."v8-compile-cache-2.2.0" + sources."vary-1.1.2" sources."verror-1.10.0" sources."watchpack-1.7.4" (sources."watchpack-chokidar2-2.0.1" // { @@ -103911,10 +104320,7 @@ in sources."isobject-3.0.1" sources."kind-of-3.2.2" sources."normalize-path-2.1.1" - sources."readable-stream-2.3.7" sources."readdirp-2.2.1" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" sources."to-regex-range-2.1.1" sources."upath-1.2.0" ]; @@ -103925,23 +104331,12 @@ in sources."when-3.7.7" sources."which-2.0.2" sources."which-module-2.0.0" - (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."widest-line-3.1.0" sources."winreg-0.0.12" sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.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" ]; }) @@ -103956,30 +104351,32 @@ in sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."y18n-4.0.0" + sources."xtend-4.0.2" + sources."y18n-5.0.5" (sources."yargs-15.4.1" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."decamelize-1.2.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."yargs-parser-18.1.3" // { - dependencies = [ sources."camelcase-5.3.1" + sources."cliui-6.0.0" sources."decamelize-1.2.0" + sources."strip-ansi-6.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-parser-18.1.3" ]; }) + sources."yargs-parser-20.2.4" sources."yauzl-2.10.0" (sources."zip-dir-1.0.2" // { dependencies = [ sources."async-1.5.2" ]; }) - sources."zip-stream-4.0.2" + (sources."zip-stream-4.0.4" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -103994,17 +104391,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.5.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.5.0.tgz"; - sha512 = "gyr7VE8zXJP81ZvS8+5dDphS2kaE0r8bpVWX6SxkBlzlX3hYfBS96kaltuf2cYK/BKJlUw5Aex/fKC34HUn+hA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.8.0.tgz"; + sha512 = "X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA=="; }; dependencies = [ sources."@types/eslint-7.2.5" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -104030,12 +104427,12 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.14.7" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001159" + sources."caniuse-lite-1.0.30001161" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.598" - sources."enhanced-resolve-5.3.1" + sources."electron-to-chromium-1.3.610" + sources."enhanced-resolve-5.3.2" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -104076,20 +104473,21 @@ in sources."source-map-support-0.5.19" sources."supports-color-7.2.0" sources."tapable-2.1.1" - (sources."terser-5.4.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."source-map-0.7.3" ]; }) (sources."terser-webpack-plugin-5.0.3" // { dependencies = [ - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" ]; }) sources."tslib-1.14.1" sources."uri-js-4.4.0" sources."watchpack-2.0.1" sources."webpack-sources-2.2.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -104136,7 +104534,7 @@ in sources."human-signals-1.1.1" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."leven-3.1.0" @@ -104194,7 +104592,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -104300,7 +104698,7 @@ in sources."semver-5.7.1" ]; }) - (sources."debug-4.3.0" // { + (sources."debug-4.3.1" // { dependencies = [ sources."ms-2.1.2" ]; @@ -104323,7 +104721,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errno-0.1.7" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -104446,7 +104844,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -104470,7 +104867,7 @@ in sources."kind-of-6.0.3" sources."locate-path-3.0.0" sources."lodash-4.17.20" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" @@ -104511,7 +104908,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" @@ -104542,7 +104939,7 @@ in sources."pkg-dir-3.0.0" (sources."portfinder-1.0.28" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."ms-2.1.2" ]; }) @@ -104568,11 +104965,7 @@ in }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -104655,7 +105048,7 @@ in sources."sockjs-0.3.20" (sources."sockjs-client-1.4.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" sources."faye-websocket-0.11.3" sources."ms-2.1.2" ]; @@ -104694,8 +105087,8 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string.prototype.trimend-1.0.2" - sources."string.prototype.trimstart-1.0.2" + sources."string.prototype.trimend-1.0.3" + sources."string.prototype.trimstart-1.0.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -104780,10 +105173,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.1.tgz"; - sha512 = "SyIMdP6H3v+zPU+VIhKRsK0ZEF82KZ93JBlKOoIW8SkkuI84FSrHxG+aMTE1u4csbi9PLRqqWTIK+bfJ2xsFuQ=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz"; + sha512 = "MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -104845,7 +105238,7 @@ in sources."mkdirp-1.0.4" sources."normalize-path-3.0.0" sources."once-1.4.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" @@ -104880,6 +105273,7 @@ in sources."webpack-sources-1.4.3" sources."wrappy-1.0.2" sources."yallist-4.0.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -104894,10 +105288,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.0.tgz"; - sha512 = "7XNNVzaGIoUuPouqLYNji+59kmNZSqeN0uqla4Z/i0x5XqlhocRGcm7gfhvBLXShyVcxyveUNjTOz3Z5NTTQTg=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.2.1.tgz"; + sha512 = "DHUtDymD5ZGv/h35FY4n9YdlHoNOy07X7ibexi+19AL/+MFdGuIIQEEnJQT/wA05mrzR6ubeJmcLXXqZISwLFQ=="; }; dependencies = [ sources."@protobufjs/aspromise-1.1.2" @@ -104911,37 +105305,37 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.31" + sources."@types/node-13.13.33" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bencode-2.0.1" - sources."bep53-range-1.0.0" + sources."bep53-range-1.1.0" sources."binary-search-1.3.6" sources."bitfield-4.0.0" (sources."bittorrent-dht-10.0.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) (sources."bittorrent-lsd-1.1.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.3" (sources."bittorrent-protocol-3.2.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -104953,7 +105347,7 @@ in sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" - sources."buffer-6.0.2" + sources."buffer-6.0.3" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -104962,7 +105356,7 @@ in sources."bufferutil-4.0.2" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -105014,7 +105408,7 @@ in ]; }) sources."fs.realpath-1.0.0" - sources."get-browser-rtc-1.0.2" + sources."get-browser-rtc-1.1.0" sources."get-stdin-7.0.0" sources."glob-7.1.6" sources."he-1.2.0" @@ -105098,7 +105492,7 @@ in sources."protobufjs-6.10.2" sources."pump-3.0.0" sources."qap-3.3.1" - sources."queue-microtask-1.2.0" + sources."queue-microtask-1.2.2" sources."random-access-file-2.1.4" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -105107,9 +105501,9 @@ in sources."range-slice-stream-2.0.0" sources."readable-stream-3.6.0" sources."record-cache-1.1.0" - (sources."render-media-4.0.0" // { + (sources."render-media-4.1.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -105125,14 +105519,14 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.9.3" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" (sources."simple-websocket-8.1.1" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -105154,7 +105548,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.4.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -105169,7 +105563,7 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.2" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."ms-2.1.2" ]; }) @@ -105179,9 +105573,9 @@ in sources."utp-native-2.2.1" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.111.0" // { + (sources."webtorrent-0.112.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."decompress-response-6.0.0" sources."get-stdin-8.0.0" sources."magnet-uri-6.1.0" @@ -105256,10 +105650,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.12.0.tgz"; - sha512 = "EAr9fJi05wVWsFVgc4s0AI74nT6D2oN7xcy7W+7JCkvirbm0L7aPDRAjSz6z/dXVyYyFlEAgRWVThXzqguFyTw=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.13.0.tgz"; + sha512 = "5FHW7dUAyIjEM3mRzIplE0pZut2K30cA+K7coaOxFxi82LTk/oiVLS4/AQFnOtGicSyoi4YOiRqpMZ04vgtuew=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -105343,7 +105737,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.8" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -105463,7 +105857,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -105656,7 +106050,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" @@ -106117,7 +106511,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.15.3" + sources."twig-1.15.4" sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."union-value-1.0.1" @@ -106190,7 +106584,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-3.2.6" + sources."debug-3.2.7" sources."execa-4.1.0" sources."figures-3.2.0" sources."get-stream-5.2.0" @@ -106229,7 +106623,7 @@ in }) (sources."yeoman-generator-4.12.0" // { dependencies = [ - sources."debug-4.3.0" + sources."debug-4.3.1" sources."diff-4.0.2" sources."dir-glob-2.2.2" sources."ejs-3.1.5" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index 43fc0696e2..87622ab0fb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,22 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "3.1.0"; in +let version = "3.2.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "0bq1np3ai3r559s3vivn45yid25fwz76rvbmsg30j57j7cyr3jqm"; + sha256 = "0a77njgc6c6kz4rpwqgmnii7f1na6hzsa55nqqm3dndhq9xh628w"; }; - # Fix a test case - patches = [(fetchpatch { - url = "https://github.com/ocaml-batteries-team/batteries-included/commit/7cbd9617d4efa5b3d647b1cc99d9a25fa01ac6dd.patch"; - sha256 = "0q4kq10psr7n1xdv4rspk959n1a5mk9524pzm5v68ab2gkcgm8sk"; - - })]; - buildInputs = [ ocaml findlib ocamlbuild ]; checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index 27b2a329b2..b800d6b7ba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -6,6 +6,7 @@ buildDunePackage rec { pname = "conduit"; version = "2.2.2"; + useDune2 = true; minimumOCamlVersion = "4.07"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix index 9bcd98e06a..6514586f9d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "conduit-lwt"; - inherit (conduit) version src minimumOCamlVersion; + inherit (conduit) version src useDune2 minimumOCamlVersion; buildInputs = [ ppx_sexp_conv ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index 01a32fc09a..acd5d83e4f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,14 +1,20 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, bigarray-compat }: buildDunePackage rec { pname = "cstruct"; - version = "4.0.0"; + version = "5.0.0"; + + useDune2 = true; + + minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; - sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a"; + sha256 = "1z403q2nkgz5x07j0ypy6q0mk2yxgqbp1jlqkngbajna7124x2pb"; }; + propagatedBuildInputs = [ bigarray-compat ]; + meta = { description = "Access C-like structures directly from OCaml"; license = lib.licenses.isc; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix index 5a10d7cae4..f340bfcda2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -6,7 +6,7 @@ else buildDunePackage { pname = "cstruct-lwt"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.02"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index 22fe4ac47c..feb8feac6b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }: +{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned, ppxlib }: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct @@ -6,9 +6,9 @@ else buildDunePackage { pname = "ppx_cstruct"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.03"; - propagatedBuildInputs = [ cstruct ppx_tools_versioned sexplib ]; + propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix index d0df442013..04bb10d6f7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -6,7 +6,7 @@ else buildDunePackage rec { pname = "cstruct-sexp"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; doCheck = lib.versionAtLeast ocaml.version "4.03"; checkInputs = lib.optional doCheck alcotest; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix index 7cb5d66586..b7e0df0185 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -6,7 +6,7 @@ else buildDunePackage { pname = "cstruct-unix"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.06"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix index 1c6b59961e..8c9dad42fd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix @@ -7,6 +7,9 @@ buildDunePackage rec { pname = "duff"; version = "0.2"; + + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz"; sha256 = "0bi081w4349cqc1n9jsjh1lrcqlnv3nycmvh9fniscv8lz1c0gjq"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix index d86dc01dcb..a3f64cb7bd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "eqaf"; version = "0.7"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index 546fc904ff..5e04c73c30 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.6"; + name = "ocaml${ocaml.version}-extlib-1.7.7"; src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz"; - sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix index 31ae0cfc19..46908369e5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "io-page"; version = "2.3.0"; + useDune2 = true; minimumOCamlVersion = "4.02.3"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix index b3f7f878b2..843451b308 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "io-page-unix"; - inherit (io-page) version src minimumOCamlVersion; + inherit (io-page) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ cstruct io-page ]; checkInputs = [ ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index b6240d39eb..d138623045 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-cstruct"; - inherit (ipaddr) version src minimumOCamlVersion; + inherit (ipaddr) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ ipaddr cstruct ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix index a4a6f9fc7a..3090066c2f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "ipaddr"; - inherit (macaddr) version src minimumOCamlVersion; + inherit (macaddr) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 8d6186d633..1ede3c064a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-sexp"; - inherit (ipaddr) version src minimumOCamlVersion; + inherit (ipaddr) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ ipaddr ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix index 991a77a6ba..1432304089 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -7,6 +7,8 @@ buildDunePackage { inherit (macaddr) version src minimumOCamlVersion; + useDune2 = true; + propagatedBuildInputs = [ macaddr cstruct ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix index 08b486bb68..5552393b40 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "macaddr"; version = "5.0.1"; + useDune2 = true; + minimumOCamlVersion = "4.04"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix index 3d0305c4be..35cc7c6b44 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -7,6 +7,8 @@ buildDunePackage { inherit (macaddr) version src minimumOCamlVersion; + useDune2 = true; + propagatedBuildInputs = [ ppx_sexp_conv ]; checkInputs = [ macaddr-cstruct ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index 2ad6e5b0b9..d4904e7743 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "mirage-flow-combinators"; - inherit (mirage-flow) version src; + inherit (mirage-flow) version useDune2 src; propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix index 25bb5e0f32..d6ba660359 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "mirage-flow"; version = "2.0.1"; + useDune2 = true; minimumOCamlVersion = "4.05"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 7a20ca87f8..3bd676b45f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -4,7 +4,7 @@ buildDunePackage { pname = "mirage-flow-unix"; - inherit (mirage-flow) version src; + inherit (mirage-flow) version useDune2 src; propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix index 47a534c216..9f144bd2d7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix @@ -2,11 +2,13 @@ buildDunePackage rec { pname = "mirage-protocols"; - version = "4.0.1"; + version = "5.0.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-protocols/releases/download/v${version}/mirage-protocols-v${version}.tbz"; - sha256 = "188m8x6xdw1bllwrpa8f8bqbdqy20kjfk7q8p8jf8j0daf7kl3mi"; + sha256 = "1bd6zgxhq2qliyzzarfvaj3ksr20ryghxq6h24i2hha7rwim63bk"; }; propagatedBuildInputs = [ duration ipaddr mirage-device mirage-flow ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix index 535c928694..defde0ba89 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-random"; version = "2.0.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; sha256 = "0qj41d5smkkkbjwsnz71bhhj94d2cwv53rf3j4rhky0pqbkidnv1"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix index 57e0f99ab1..dbcba59c47 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "mirage-stack"; version = "2.2.0"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix similarity index 84% rename from third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix rename to third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index bcd0a51989..faadaf214f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx"; + sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"; }; propagatedBuildInputs = [ ppx_derivers result ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix new file mode 100644 index 0000000000..afe3d34963 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "ocaml-migrate-parsetree"; + version = "2.1.0"; + + minimumOCamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "07x7lm45kny0mi0fjvzw51445brm0dgy099cw0gpyly0wj77hyrq"; + }; + + meta = { + description = "Convert OCaml parsetrees between different major versions"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ vbgl sternenseemann ]; + homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 1ef7b6c2d4..5abb026032 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -1,35 +1,27 @@ -{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }: +{ lib, fetchFromGitHub, buildDunePackage +, stdlib-shims +}: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocaml-protoc-${version}"; - version = "1.2.0"; +buildDunePackage rec { + pname = "ocaml-protoc"; + version = "2.0.2"; + + useDune2 = true; minimumOCamlVersion = "4.02"; src = fetchFromGitHub { owner = "mransan"; repo = "ocaml-protoc"; - rev = "60d2d4dd55f73830e1bed603cc44d3420430632c"; - sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj"; + rev = version; + sha256 = "1vlnjqqpypmjhlyrxfzla79y4ilmc9ggz311giy6vmh4cyzl29h3"; }; - installPhase = '' - mkdir -p tmp/bin - export PREFIX=`pwd`/tmp - make all.install.build - make check_install - make lib.install - make bin.install - ''; - - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ ppx_deriving_protobuf ]; - - createFindlibDestdir = true; + buildInputs = [ stdlib-shims ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mransan/ocaml-protoc"; description = "A Protobuf Compiler for OCaml"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index 4af711ce39..f85e32d72c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cppo, ppx_tools, ppx_deriving +{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo, ppx_tools, ppx_deriving , ppxfind }: +if lib.versionAtLeast ocaml.version "4.11" +then throw "ppx_deriving_protobuf is not available for OCaml ${ocaml.version}" +else + buildDunePackage rec { pname = "ppx_deriving_protobuf"; version = "2.7"; @@ -14,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; description = "A Protocol Buffers codec generator for OCaml"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index 92d73e540f..b7d1986c30 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, rpclib, ppxlib, ppx_deriving }: +{ lib, buildDunePackage, rpclib, alcotest, ppxlib, ppx_deriving, yojson }: buildDunePackage rec { pname = "ppx_deriving_rpc"; - inherit (rpclib) version src; + inherit (rpclib) version useDune2 src; - buildInputs = [ ppxlib ]; + minimumOCamlVersion = "4.08"; - propagatedBuildInputs = [ rpclib ppx_deriving ]; + propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; + + checkInputs = [ alcotest yojson ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-rpc"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix index 7abb153b9b..078d50da89 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "randomconv"; version = "0.1.3"; + useDune2 = true; + src = fetchurl { url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; sha256 = "1iv3r0s5kqxs893b0d55f0r62k777haiahfkkvvfbqwgqsm6la4v"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix index 9216a48924..53b559257b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }: +{ lib, fetchurl, buildDunePackage +, alcotest +, base64, cmdliner, rresult, xmlm, yojson +}: buildDunePackage rec { pname = "rpclib"; - version = "7.0.0"; + version = "8.0.0"; - minimumOCamlVersion = "4.04"; + useDune2 = true; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-rpc"; - rev = "v${version}"; - sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz"; + sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz"; }; - buildInputs = [ alcotest cmdliner yojson ]; - propagatedBuildInputs = [ rresult result xmlm ]; + buildInputs = [ cmdliner yojson ]; + propagatedBuildInputs = [ base64 rresult xmlm ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix new file mode 100644 index 0000000000..49f7184749 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, rpclib +, lwt +, alcotest-lwt, ppx_deriving_rpc, yojson +}: + +buildDunePackage { + pname = "rpclib-lwt"; + inherit (rpclib) version useDune2 src; + + propagatedBuildInputs = [ lwt rpclib ]; + + checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; + doCheck = true; + + meta = rpclib.meta // { + description = "A library to deal with RPCs in OCaml - Lwt interface"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix index 863bd21c90..572ff59361 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -6,6 +6,8 @@ buildDunePackage { pname = "ppx_sqlexpr"; inherit (sqlexpr) version src meta; + minimumOCamlVersion = "4.06"; + postPatch = '' substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib ''; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix index a4536316ba..981f05b01e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "tuntap"; version = "2.0.0"; + useDune2 = true; + minimumOCamlVersion = "4.04.2"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index 852c3b63c4..2ebdaa2f57 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mongodb"; - version = "1.8.2"; - sha256 = "01l300204ph9nd7khd9qazpdbi1biqvmjqbxbngdfjk9n5d8vvzw"; + version = "1.9.0"; + sha256 = "16mbw3p80qxsj86nmjbfch8wv6jaq8wbz4rlpmixvhj9nwbp37hs"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 411c6353ea..1cbcdb9a73 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.55"; + version = "0.12.57"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "1qyywsivfal1d8485v2iyg5x3f9krnviv5nidgfv53ywrm9k4lgp"; + sha256 = "0i1ycfmi638myl9840k4rl0z9klk0q25l8ykkkfg20kx5mdidvgc"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix index 129fbaf4ed..272ed24f51 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psalm"; - version = "4.1.1"; + version = "4.2.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "05qjrg8wxlqxihv7xl31n73ygx7ykvcpbh2gq958iin4rr1bcy88"; + sha256 = "0g6s3bn8aaggpqjgr0bqchgkgb4my5ksfycyyqy7nrly2bgn1kbz"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index 76a55f70f0..53b0fe5e1c 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "2.9.8"; - sha256 = "12igfrdfisqfmfqpc321g93pm2w1y7h24bclmxjrjv6rb36bcmgm"; + version = "3.0.0"; + sha256 = "0qnaqgn2rdjxc70lyrm3nmy7cfma69c7zn6if23hhkhx5kl0fl44"; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix index f79e76b52c..d91bef07d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix @@ -1,24 +1,28 @@ -{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose }: +{ stdenv, buildPythonPackage, fetchPypi, dnspython, pycountry, nose, setuptools_scm, six, isPy27 }: buildPythonPackage rec { pname = "FormEncode"; - version = "1.3.1"; + version = "2.0.0"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1xm77h2mds2prlaz0z4nzkx13g61rx5c2v3vpgjq9d5ij8bzb8md"; + sha256 = "049pm276140h30xgzwylhpii24xcln1qfdlfmbj69sqpfhlr5szj"; }; - buildInputs = [ dnspython pycountry nose ]; - - patchPhase = '' - # dnspython3 has been superseded, see its PyPI page - substituteInPlace setup.py --replace dnspython3 dnspython + postPatch = '' + sed -i 's/setuptools_scm_git_archive//' setup.py + sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ six ]; + + checkInputs = [ dnspython pycountry nose ]; + preCheck = '' - # two tests require dns resolving - sed -i 's/test_cyrillic_email/noop/' formencode/tests/test_email.py + # requires dns resolving sed -i 's/test_unicode_ascii_subgroup/noop/' formencode/tests/test_email.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix index abb0c8520d..83263f734b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/HTSeq/default.nix @@ -1,18 +1,26 @@ -{ stdenv, buildPythonPackage, fetchPypi, cython, numpy, pysam, matplotlib -}: +{ stdenv, buildPythonPackage, fetchFromGitHub, cython, numpy, pysam, matplotlib, python, isPy27, isPy3k }: buildPythonPackage rec { version = "0.12.4"; pname = "HTSeq"; - src = fetchPypi { - inherit pname version; - sha256 = "e3980bb4f12899442b4fa6f24f0ba149090f71cedb1eaf7128249afe4eb921ff"; + src = fetchFromGitHub { + owner = "htseq"; + repo = "htseq"; + rev = "release_${version}"; + sha256 = "0y7vh249sljqjnv81060w4xkdx6f1y5zdqkh38yk926x6v9riijm"; }; - buildInputs = [ cython numpy pysam ]; + nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ numpy pysam matplotlib ]; + checkPhase = stdenv.lib.optionalString isPy27 '' + ${python.interpreter} python2/test/test_general.py + '' + stdenv.lib.optionalString isPy3k '' + ${python.interpreter} python3/test/test_general.py + ''; + meta = with stdenv.lib; { + homepage = "https://htseq.readthedocs.io/"; description = "A framework to work with high-throughput sequencing data"; maintainers = with maintainers; [ unode ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix index 4f4dbbc2fd..e82fd1d139 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "d21429288fe0de63d829dbbfb26736ebaed9fd0792c2a0dc5943c5cab803a708"; + sha256 = "6aeb0183d94762b37a8cdee97174f38ae21e626d44f62f1e2f0ab48a35026e98"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix index 00a08b3e7a..84aef2dfb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix @@ -1,32 +1,24 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch -, pep8, nose, unittest2, docutils, blockdiag, reportlab }: +{ stdenv, buildPythonPackage, fetchPypi +, nose, docutils, blockdiag, reportlab }: buildPythonPackage rec { pname = "actdiag"; - version = "0.5.4"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af"; + sha256 = "0g51v9dmdq18z33v332f1f0cmb3hqgaga5minj0mc2sglark1s7h"; }; - patches = fetchpatch { - name = "drop_test_pep8.py.patch"; - url = "https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw"; - sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4"; - }; + propagatedBuildInputs = [ blockdiag docutils ]; - buildInputs = [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = [ blockdiag ]; - - checkInputs = [ reportlab ]; + checkInputs = [ nose reportlab ]; meta = with stdenv.lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix index be51a1248a..f77c938b1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-common/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "1.1.25"; + version = "1.1.26"; pname = "azure-common"; disabled = isPyPy; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054"; + sha256 = "b2866238aea5d7492cfb0282fc8b8d5f6d06fb433872345864d45753c10b6e4f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 16fc468d04..0ad45dceb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.8.2"; + version = "1.9.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "621b53271f7988b766f8a7d7f7a2c44241e3d2c1d8db13e68089d6da6241748e"; + sha256 = "ef8ae93a2ce8b595f231395579be11aadc1838168cbc2582e2d0bbd8b15c461f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index 4cea19742b..e7d2d5c83a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.4.1"; + version = "1.5.0"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7b071089faf0789059ac24052e311e2b096a002c173d42b96896db09c6e2ba5d"; + sha256 = "872adfa760b2efdd62595659b283deba92d47b7a67557eb9ff48f0b5d04ee396"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix index 400d421ee0..a622c6a94c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-authorization/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-authorization"; - version = "0.61.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f5cceea3add04e9445ea88492f15eecf6c126f0406d967c95f6e48b79be8db75"; + sha256 = "9a9fc16866b46387853381ab4fa0f84c1765e0afea5b0124709ea9fae10ee752"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 8ce4201a2d..2aca8fdbd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "17.0.0"; + version = "18.0.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c7350b404e5d10a548ceddb034394c8fad6c852ce33a3d3b211065813c1da404"; + sha256 = "34815c91193640ad8ff0c4dad7f2d997548c853d2e8b10250329ed516e55879e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index a693820a14..7a4d8005c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "2.0.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "5ad247d186c3c040da7a1d40ad39c9881e99afc58271f673abb602abb0b6b85b"; + sha256 = "9f624df0664ba80ba886bc96ffe5e468c620eb5b681bc3bc2a28ce26042fd465"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 41089fdeae..8e93026b60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "10.0.0"; + version = "14.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "9b44b2d0b281fc1999324a715fb5cf4f47d392a35bc0a01f24bb8dbc4c123acd"; + sha256 = "fbb13448fb52a4090ee91940ae8676403dbe8ae81044b7a5cd3c9e58b47d66de"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix index e7e8c91acc..c824f3725a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.2.1"; + version = "1.2.2"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a3906fa77edfedfcc3229dc3b69489d5ed63b107c7eacbc50092e6cbfbfd83f0"; + sha256 = "4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index b91a9ea398..3814770b2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "1.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723"; + sha256 = "15e4140870f2756fbd43965ccceca55361a634a0504bbdb033a1909eff14dfb1"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix index 81b886bed2..fb43f130ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-redis"; - version = "6.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "db999e104edeee3a13a8ceb1881e15196fe03a02635e0e20855eb52c1e2ecca1"; + sha256 = "8ae563e3df82a2f206d0483ae6f05d93d0d1835111c0bbca7236932521eed356"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix index 5c437e472d..9de17636b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c0d232cdb5ad74f4590db2e44df74c0872fcb9fded7f03c7b57188a63b54ecfa"; + sha256 = "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 1c63c61e24..2deaf2b91d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "1.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bb37d97eb3798740a0bc1bfa37b04946a193a6d1a3b0849fdc5e1dc2a9f25d81"; + sha256 = "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 5fe942a220..60c1022e60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.24.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "da391ed00d82cd8e20ca50affdc43b99fd9a7919b54a3a0d53c73cb41eea09d3"; + sha256 = "c7904f8798fbb285a2160c41c8bd7a416c6bd987f5d36a9b98c16f41e24e9f47"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index 13369eb014..2135853ff9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.4.0"; + version = "0.5.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "ebd4dcb980a6425f4db7dd94225332b6bd74e1089b0c6e57af868d96ceab1d3c"; + sha256 = "4eb76230c38525b71eb1addefebd265bc3d9b68ba7ff60ce5356d39f68ed2837"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index 32c0542ca4..f02bee6bef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -4,24 +4,26 @@ , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , isPy3k }: buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.48.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "da0f9e3b57528c72a7bc92e3515413a4a4fdbc9626c26ac04b7551a7739a81ec"; + sha256 = "c4b218a5d1353cd7c55b39c9b2bd1b13bfbe3b8a71bc735122b171eab81670d1"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core ] ++ lib.optionals (!isPy3k) [ azure-mgmt-nspkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index 9c48f5b56c..2f61a2d9ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -3,6 +3,7 @@ , fetchPypi , uamqp , azure-common +, azure-core , msrestazure , futures , isPy3k @@ -10,17 +11,18 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "0.50.3"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2b1e60c81fcf5b6a5bb3ceddb27f24543f479912e39a4706a390a16d8c0a71f4"; + sha256 = "875527251c1fed99fcb90597c6abb7daa4bc0ed88e080b4c36f897b704668450"; }; buildInputs = [ uamqp azure-common + azure-core msrestazure ] ++ lib.optionals (!isPy3k) [ futures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix index dc955ff379..9ded3d5c76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.5.0"; + version = "12.6.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1469a5a0410296fb5ff96c326618d939c9cb0c0ea45eb931c89c98fa742d8daa"; + sha256 = "dc7832d48ae3f5b31a0b24191084ce6ef7d8dfbf73e553dfe34eaddcb6813be3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index b8a642f665..ad22804644 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.2.0"; + version = "12.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b649ed8afd67c10c9833f349a7c579d771a6425ad6b88027130a6b8cfa433ffb"; + sha256 = "9f24a0ab51fd7ad294353594660b21081233f68ed8ee7483cdca26a70ce0ccbc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 7dfce0d75c..f807c03539 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.1.4"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0g527qdda105r5g9yjh4lxzlmz34m2bdz8dydqqy09igdsmiyi9j"; + sha256 = "8e46ff9d47a9b90d8b9beab1969fcf4920300b02e20e6bf0745be04e09e8a6ff"; }; pythonImportsCheck = [ "b2sdk" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index b0c899cdd3..ab50a1acd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -5,14 +5,14 @@ let pname = "bellows"; - version = "0.20.3"; + version = "0.21.0"; in buildPythonPackage rec { inherit pname version; src = fetchPypi { inherit pname version; - sha256 = "9342b6b9423c818f99f7c6d9086fbb5e27d5c2efbb1f2a08f6f5a917c4991f86"; + sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index ceaa31874e..ff53884ef3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils -, pillow, webcolors, funcparserlib +{ stdenv, buildPythonPackage, fetchFromGitHub +, setuptools, funcparserlib, pillow, webcolors, reportlab, docutils }: buildPythonPackage rec { pname = "blockdiag"; - version = "1.5.3"; + version = "2.0.1"; - src = fetchurl { - url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2"; - sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f"; + src = fetchFromGitHub { + owner = "blockdiag"; + repo = "blockdiag"; + rev = version; + sha256 = "1cvcl66kf4wdh2n4fdk37zk59lp58wd2fhf84n7pbn0lilyksk5x"; }; - buildInputs = [ pep8 nose unittest2 docutils ]; + propagatedBuildInputs = [ setuptools funcparserlib pillow webcolors reportlab docutils ]; - propagatedBuildInputs = [ pillow webcolors funcparserlib ]; - - # One test fails: - # ... - # FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams) + # require network and fail doCheck = false; meta = with stdenv.lib; { @@ -25,6 +23,6 @@ buildPythonPackage rec { homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix deleted file mode 100644 index 6190adcba5..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, blockdiag -}: - -buildPythonPackage rec { - pname = "blockdiagcontrib-cisco"; - version = "0.1.8"; - - src = fetchPypi { - inherit pname version; - sha256 = "06iw3q1w4g3lbgcmyz8m93rv0pfnk2gp8k83rs9ir671ym99gwr2"; - }; - - buildInputs = [ blockdiag ]; - - meta = with stdenv.lib; { - description = "Noderenderer plugin for blockdiag containing Cisco networking symbols"; - homepage = "https://bitbucket.org/blockdiag/blockdiag-contrib/"; - maintainers = [ maintainers.bjornfor ]; - license = licenses.psfl; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 713b50c682..889d829bee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.15.18"; # N.B: if you change this, change botocore too + version = "1.16.25"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "f56148e2c6b9a2d704218da42f07d72f00270bfddb13bc1bdea20d3327daa51e"; + sha256 = "05qxcfis4rnkjxh8wyks3gcpg14cshpd2rrhb1adxd0hpq5aprhk"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index d896367c7c..35d8113e83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.18.18"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.19.25"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "e224754230e7e015836ba20037cac6321e8e2ce9b8627c14d579fcb37249decd"; + sha256 = "15hd5f2ars1hd3y2gh846fd0ydcgyjmkvncr6rdn4whbb5wkkbyc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix index 68668fce07..1c69d70a13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , requests +, urllib3 }: buildPythonPackage rec { @@ -13,7 +14,10 @@ buildPythonPackage rec { sha256 = "1bxvmghm834gsfz3pm69772wzhh15p8ci526b25dpk3z4315nd7v"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ (requests.override { urllib3 = urllib3.override { + pyopenssl = null; + cryptography = null; + };}) ]; meta = { description = "A library for interacting with Browsermob Proxy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix index 1a29e51b35..0fe692c902 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.2.1"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ab5d5076f7d3e699758a244ada7c66da96bae36e22b9e351ce0ececc36f0a57f"; + sha256 = "8d6a1144f43b9d7a180d7ceb3aa8015b7133c615fbac231bed184a91129f0207"; }; checkInputs = [ pytest coveralls pytestcov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliapp/default.nix index 233028235b..497306c293 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliapp/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = "http://liw.fi/cliapp/"; + homepage = "https://liw.fi/cliapp/"; description = "Python framework for Unix command line programs"; license = licenses.gpl2; maintainers = []; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix new file mode 100644 index 0000000000..04e97f4c66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, prompt_toolkit }: + +buildPythonApplication rec { + pname = "clintermission"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "sebageek"; + repo = pname; + rev = "v${version}"; + sha256 = "09wl0rpw6c9hab51rs957z64b0v9j4fcbqbn726wnapf4z5w6yxv"; + }; + + propagatedBuildInputs = [ prompt_toolkit ]; + + disabled = !isPy3k; + + # repo contains no tests + doCheck = false; + + pythonImportsCheck = [ "clintermission" ]; + + meta = with lib; { + description = "Non-fullscreen command-line selection menu"; + homepage = "https://github.com/sebageek/clintermission"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix index ca2402cff6..5c53cafdb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmdtest/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://liw.fi/cmdtest/"; + homepage = "https://liw.fi/cmdtest/"; description = "Black box tests Unix command line tools"; license = licenses.gpl3; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix index 6677ab0633..92af67fa18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -1,5 +1,6 @@ { lib -, fetchPypi +, fetchFromGitHub +, fetchpatch , rPackages , rWrapper , buildPythonPackage @@ -15,17 +16,29 @@ , pillow , pomegranate , pyfaidx +, python +, R }: buildPythonPackage rec { pname = "CNVkit"; version = "0.9.7"; - src = fetchPypi { - inherit pname version; - sha256 = "d68adc0121e17c61a3aa28c0a9ba6526510a5a0df0f0a6eb1818bab71b7e927a"; + src = fetchFromGitHub { + owner = "etal"; + repo = "cnvkit"; + rev = "v${version}"; + sha256 = "022zplgqil5l76vri647cyjx427vnbg5r2gw6lw712d2janvdjm7"; }; + patches = [ + # Fix: AttributeError: module 'pandas.io.common' has no attribute 'EmptyDataError' + (fetchpatch { + url = "https://github.com/etal/cnvkit/commit/392adfffedfa0415e635b72c5027835b0a8d7ab5.patch"; + sha256 = "0s0gwyy0hybmhc3jij2v9l44b6lkcmclii8bkwsazzj2kc24m2rh"; + }) + ]; + propagatedBuildInputs = [ biopython numpy @@ -39,6 +52,7 @@ buildPythonPackage rec { future pillow pomegranate + rPackages.DNAcopy ]; postPatch = '' @@ -46,7 +60,16 @@ buildPythonPackage rec { --replace "pandas >= 0.20.1, < 0.25.0" "pandas" ''; - pythonImportsCheck = [ "cnvlib" ]; + checkInputs = [ R ]; + + checkPhase = '' + pushd test/ + ${python.interpreter} test_io.py + ${python.interpreter} test_genome.py + ${python.interpreter} test_cnvlib.py + ${python.interpreter} test_commands.py + ${python.interpreter} test_r.py + ''; meta = with lib; { homepage = "https://cnvkit.readthedocs.io"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix new file mode 100644 index 0000000000..fbca43e4e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/coapthon3/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, cachetools, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "CoAPthon3"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1w6bwwd3qjp4b4fscagqg9wqxpdgvf4sxgzbk2d2rjqwlkyr1lnx"; + }; + + propagatedBuildInputs = [ cachetools ]; + + meta = with lib; { + description = "Python3 library to the CoAP protocol compliant with the RFC."; + homepage = "https://github.com/Tanganelli/${pname}"; + license = licenses.mit; + maintainers = with maintainers; [ urbas ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index dac3484e45..31616f015f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.4.1"; + version = "4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "8c3d9ec6502e2d8051dcdf2603cccb4a87da292a1770e9854814fe928fa4a9b1"; + sha256 = "1d5d42a3547a8a8d3b7aa8f4325e5042231bbc86718c89e123c0c62c103cd9d5"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix index fd31bb40a9..e2a4625c60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix @@ -5,12 +5,11 @@ , withVoice ? true, libopus , aiohttp , websockets -, pynacl }: buildPythonPackage rec { pname = "discord.py"; - version = "1.3.4"; + version = "1.5.1"; disabled = pythonOlder "3.5.3"; # only distributes wheels on pypi now @@ -18,7 +17,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "v${version}"; - sha256 = "1i4h6vq681x8s05wi0n3ykavsxjh9hxdxn6banwjcqzhxzkyhsxi"; + sha256 = "1bidyclwv20p1kfphj21r5gm3kr2vxx0zd151wg7fcngbbx7gmza"; }; propagatedBuildInputs = [ aiohttp websockets ]; @@ -31,7 +30,6 @@ buildPythonPackage rec { --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'" ''; - # only have integration tests with discord doCheck = false; @@ -46,9 +44,10 @@ buildPythonPackage rec { "discord.ext.commands.bot" ]; - meta = { + meta = with lib; { description = "A python wrapper for the Discord API"; - homepage = "https://discordpy.rtfd.org/"; - license = lib.licenses.mit; + homepage = "https://discordpy.rtfd.org/"; + maintainers = [ maintainers.ivar ]; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix index 1bbe6da3a9..f36e1347be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile.cache/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dogpile.cache"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eba3eb532be75a930f7a70c40c9a66829a3f7281650ad3cd3a786b2e4ba68e83"; + sha256 = "40147b19696f387415a7efaaa4cf8ea0b5d31bdd1b53e5187e75d48ddfee9f0e"; }; # Disable concurrency tests that often fail, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index 2225cccd6a..fb29133da0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -4,12 +4,12 @@ , git, glibcLocales }: buildPythonPackage rec { - version = "0.20.11"; + version = "0.20.14"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "0b142794fb72647673173b80ed8b75e1f56b42a0972c5b3c752d88766a659d53"; + sha256 = "21d6ee82708f7c67ce3fdcaf1f1407e524f7f4f7411a410a972faa2176baec0d"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecpy/default.nix index bb54fc6e73..37bbb183ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecpy/default.nix @@ -9,11 +9,17 @@ buildPythonPackage rec { sha256 = "9635cffb9b6ecf7fd7f72aea1665829ac74a1d272006d0057d45a621aae20228"; }; + prePatch = '' + sed -i "s|reqs.append('future')|pass|" setup.py + ''; + propagatedBuildInputs = lib.optional (!isPy3k) future; # No tests implemented doCheck = false; + pythonImportsCheck = [ "ecpy" ]; + meta = with lib; { description = "Pure Pyhton Elliptic Curve Library"; homepage = "https://github.com/ubinity/ECPy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix new file mode 100644 index 0000000000..6dfe39f8b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix @@ -0,0 +1,39 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub +, click, enum-compat, pyscard, pycountry, terminaltables +, pytestCheckHook, pythonOlder +}: + +buildPythonPackage rec { + pname = "emv"; + version = "1.0.11"; + disabled = pythonOlder "3.4"; + + src = fetchFromGitHub { + owner = "russss"; + repo = "python-emv"; + rev = "v${version}"; + hash = "sha256:1715hcba3fdi0i5awnrjdjnk74p66sxm9349pd8bb717zrh4gpj7"; + }; + + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + enum-compat + click + pyscard + pycountry + terminaltables + ]; + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py \ + --replace '"argparse==1.4.0",' "" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/russss/python-emv"; + description = "Implementation of the EMV chip-and-pin smartcard protocol"; + license = licenses.mit; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix index 3e14074f18..610d9b0b09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "executor"; - version = "23.1"; + version = "23.2"; disabled = isPy27; src = fetchFromGitHub { owner = "xolox"; repo = "python-executor"; rev = version; - sha256 = "1jfmagw126di0qd82bydwvryqcxc54pqja3rbx3ny3fv1ahi5s7k"; + sha256 = "1mr0662c5l5zx0wjapcprp8p2xawfd0im3616df5sgv79fqzwfqs"; }; propagatedBuildInputs = [ coloredlogs property-manager fasteners ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix index 201f7646e0..43fc1a0f7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/genanki/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "genanki"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "e8bd0d117b2ddfc6bfebe86344979134c7acbd9e4c6cd04578df2cd6077785c1"; + sha256 = "c944b74a5735e30ce098149788b89192fb3ba162fefb30f62105451a4a5b4c62"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix index 412b0c1594..14842541d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gin-config/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "gin-config"; - version = "0.3.0"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "6a83b7639ae76c276c0380d71d583f151b327a7c37978add314180ec1280a6cc"; + sha256 = "9499c060e1faa340959fc4ada7fe53f643d6f8996a80262b28a082c1ef6849de"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix index 0521b4a57d..14623ff625 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient_statsd/default.nix @@ -16,6 +16,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "gradient_statsd" ]; + # Pypi does not contain tests + doCheck = false; + meta = with stdenv.lib; { description = "Wrapper around the DogStatsd client"; homepage = "https://paperspace.com"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix index 280f4de1ac..8123f188d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "green"; - version = "3.2.4"; + version = "3.2.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3473abb4629c8c1af9f6b59a4f9c757315736580053a64bbfd91ff21ccad57a8"; + sha256 = "11d595d98afc3363d79e237141ad862c0574a62f92325d9e541ed1b1a54a72ae"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix index cf119c1dec..01d0343b17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "ha-ffmpeg"; - version = "2.0"; + version = "3.0.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "230f2fa990c9caaff1c67c2227b64756062248083849651a9bec7d599e519a42"; + sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1"; }; buildInputs = [ ffmpeg_3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hjson/default.nix new file mode 100644 index 0000000000..6a86a2000d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hjson/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "hjson"; + version = "3.0.2"; + + # N.B. pypi src tarball does not have tests + src = fetchFromGitHub { + owner = "hjson"; + repo = "hjson-py"; + rev = "v${version}"; + sha256 = "1jc7j790rcqnhbrfj4lhnz3f6768dc55aij840wmx16jylfqpc2n"; + }; + + meta = with stdenv.lib; { + description = "A user interface for JSON"; + homepage = "https://github.com/hjson/hjson-py"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix index cf937b6bae..cf5891ed0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix @@ -3,7 +3,6 @@ , fetchPypi , fetchpatch , flask -, flask-common , flask-limiter , markupsafe , decorator @@ -15,24 +14,14 @@ buildPythonPackage rec { pname = "httpbin"; - version = "0.6.2"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0afa0486a76305cac441b5cc80d5d4ccd82b20875da7c5119ecfe616cefef45f"; + sha256 = "1yldvf3585zcwj4vxvfm4yr9wwlz3pa2mx2pazqz8x8mr687gcyb"; }; - patches = [ - # https://github.com/kennethreitz/httpbin/issues/403 - # https://github.com/kennethreitz/flask-common/issues/7 - # https://github.com/evansd/whitenoise/issues/166 - (fetchpatch { - url = "https://github.com/javabrett/httpbin/commit/5735c888e1e51b369fcec41b91670a90535e661e.patch"; - sha256 = "167h8mscdjagml33dyqk8nziiz3dqbggnkl6agsirk5270nl5f7q"; - }) - ]; - - propagatedBuildInputs = [ brotlipy flask flask-common flask-limiter markupsafe decorator itsdangerous raven six ]; + propagatedBuildInputs = [ brotlipy flask flask-limiter markupsafe decorator itsdangerous raven six ]; # No tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 8369afc24a..833e1e3dd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.5.9"; + version = "1.5.10"; src = fetchPypi { inherit pname version; - sha256 = "c9504ba6a043ee2db0a9d69e43246bc138034895f6338d5aed1b41e4a73b1513"; + sha256 = "943cd299ac7f5715fcb3f684e2fc1594c1e0f22a90d15398e5888143bd4144b5"; }; # Tests not included in PyPI tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix new file mode 100644 index 0000000000..16ee8dcbac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, python +, gcc10 +, cmake +, boost172 +, icu +, swig +, pcre +, opencascade-occt +, opencollada +, libxml2 +}: + +buildPythonPackage rec { + pname = "ifcopenshell"; + version = "0.6.0b0"; + format = "other"; + + src = fetchFromGitHub { + owner = "IfcOpenShell"; + repo = "IfcOpenShell"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1ad1s9az41z2f46rbi1jnr46mgc0q4h5kz1jm9xdlwifqv9y04g1"; + }; + + patches = [ + (substituteAll { + name = "site-packages.patch"; + src = ./site-packages.patch; + site_packages = "lib/${python.libPrefix}/site-packages"; + }) + ]; + + nativeBuildInputs = [ gcc10 cmake ]; + + buildInputs = [ + boost172 + icu + pcre + libxml2 + ]; + + preConfigure = '' + cd cmake + ''; + + cmakeFlags = [ + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + "-DOCC_LIBRARY_DIR=${opencascade-occt}/lib" + "-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada" + "-DOPENCOLLADA_LIBRARY_DIR=${opencollada}/lib/opencollada" + "-DSWIG_EXECUTABLE=${swig}/bin/swig" + "-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2" + "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}" + ]; + + meta = with stdenv.lib; { + description = "Open source IFC library and geometry engine"; + homepage = http://ifcopenshell.org/; + license = licenses.lgpl3; + maintainers = with maintainers; [ fehnomenal ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/site-packages.patch b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/site-packages.patch new file mode 100644 index 0000000000..e61fe2056f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifcopenshell/site-packages.patch @@ -0,0 +1,32 @@ +--- a/src/ifcwrap/CMakeLists.txt ++++ b/src/ifcwrap/CMakeLists.txt +@@ -68,26 +68,17 @@ endif() + # directory in which the wrapper can be installed. + FIND_PACKAGE(PythonInterp) + IF(PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "") +- EXECUTE_PROCESS( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import get_python_lib; sys.stdout.write(get_python_lib(1))" +- OUTPUT_VARIABLE python_package_dir +- ) +- +- IF("${python_package_dir}" STREQUAL "") +- MESSAGE(WARNING "Unable to locate Python site-package directory, unable to install the Python wrapper") +- ELSE() + FILE(GLOB_RECURSE sourcefiles "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/*.py") + FOREACH(file ${sourcefiles}) + FILE(RELATIVE_PATH relative "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/" "${file}") + GET_FILENAME_COMPONENT(dir "${relative}" DIRECTORY) + INSTALL(FILES "${file}" +- DESTINATION "${python_package_dir}/ifcopenshell/${dir}") ++ DESTINATION "@site_packages@/ifcopenshell/${dir}") + ENDFOREACH() + INSTALL(FILES "${CMAKE_BINARY_DIR}/ifcwrap/ifcopenshell_wrapper.py" +- DESTINATION "${python_package_dir}/ifcopenshell") ++ DESTINATION "@site_packages@/ifcopenshell") + INSTALL(TARGETS _ifcopenshell_wrapper +- DESTINATION "${python_package_dir}/ifcopenshell") +- ENDIF() ++ DESTINATION "@site_packages@/ifcopenshell") + ELSE() + MESSAGE(WARNING "No Python interpreter found, unable to install the Python wrapper") + ENDIF() diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix index a09fb7b1ef..8dc22d20e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "3.1.2.post0"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "04fd8ebb8edb39db81f49b75b101d1e2a4d0728460e253fd9c98e3e17f9caa16"; + sha256 = "d29977f7235b5bf83c372825c6abd8640ba0e3a8e031d3ffc3b63deaf6ae1487"; }; doCheck = false; # something about yajl diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix new file mode 100644 index 0000000000..59eb3afaa0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix @@ -0,0 +1,46 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, numpy +, opencv3 +, sphinx_rtd_theme +, lxml +, xmljson +}: + +buildPythonPackage rec { + pname = "imantics"; + version = "0.1.12"; + + src = fetchFromGitHub { + owner = "jsbroks"; + repo = "imantics"; + rev = "76d81036d8f92854d63ad9938dd76c718f8b482e"; + sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8"; + }; + + propagatedBuildInputs = [ + numpy + opencv3 + sphinx_rtd_theme + lxml + xmljson + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'opencv-python>=3'," "" + ''; + + # failing on NixOS + doCheck = false; + + pythonImportsCheck = [ "imantics" ]; + + meta = with lib; { + description = "Convert and visualize many annotation formats for object dectection and localization"; + homepage = "https://github.com/jsbroks/imantics"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.rakesh4g ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix index b7fbe41f69..c0f6fe9205 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inflect"; - version = "4.1.0"; + version = "5.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "def6f3791be9181f0c01e0bf5949304007ec6e04c6674fbef7cc49c657b8a9a5"; + sha256 = "d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index b69572df74..d8ab5093ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , buildPythonPackage , fetchPypi , pythonOlder @@ -10,16 +10,19 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.22.3"; + version = "0.23.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "434ff9edd1190809e02e0cbf50090c28de48a51e151a1f904ac66e902244398d"; + sha256 = "2c4c55c5bc651a670b13e89064f7aba7422b72ad6b3f2b3890ac72cc9a2d4089"; }; propagatedBuildInputs = [ notebook nbdime git ]; + # all Tests on darwin fail or are skipped due to sandbox + doCheck = !stdenv.isDarwin; + checkInputs = [ pytest ]; checkPhase = '' @@ -28,7 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyterlab_git" ]; - meta = with lib; { + meta = with stdenv.lib; { description = "Jupyter lab extension for version control with Git."; license = with licenses; [ bsd3 ]; homepage = "https://github.com/jupyterlab/jupyterlab-git"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/larch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/larch/default.nix index a94b076ded..3be8b24041 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/larch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/larch/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://liw.fi/larch/"; + homepage = "https://liw.fi/larch/"; description = "Python B-tree library"; license = licenses.gpl3; maintainers = []; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix new file mode 100644 index 0000000000..9feb5b1d24 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchFromGitHub, libsass, six, pytest, werkzeug }: + +buildPythonPackage rec { + pname = "libsass"; + version = "0.20.1"; + + src = fetchFromGitHub { + owner = "sass"; + repo = "libsass-python"; + rev = version; + sha256 = "1r0kgl7i6nnhgjl44sjw57k08gh2qr7l8slqih550dyxbf1akbxh"; + }; + + buildInputs = [ libsass ]; + + propagatedBuildInputs = [ six ]; + + preBuild = '' + export SYSTEM_SASS=true; + ''; + + checkInputs = [ + pytest + werkzeug + ]; + + checkPhase = '' + pytest sasstests.py + ''; + + meta = with lib; { + description = "A straightforward binding of libsass for Python. Compile Sass/SCSS in Python with no Ruby stack at all!"; + homepage = "https://sass.github.io/libsass-python/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 59c3f47d2c..69774b58eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "127n4sqdcip1ld42w9wz49pxkpvi765qzvivvwl26720n11zq5cd"; + sha256 = "190xw3cvk4amr9pl8ip2i7k3xdjd0231kn2zl6chny5axx22p1dv"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 50b81cef94..66cb8ea774 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -1,19 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, future-fstrings, pythonOlder +{ lib, buildPythonPackage, fetchPypi, aiohttp, pythonOlder , sqlalchemy, ruamel_yaml, CommonMark, lxml, fetchpatch }: buildPythonPackage rec { pname = "mautrix"; - version = "0.5.8"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "1hqg32n7pmjhap0ybfcf05zgfcyyirb4fm1m7gf44dwh40da6qz0"; + sha256 = "0bnflaz0nkjvps3b87ig02d3pymnrgrwcd0p0s6qyzx9s08lcz5x"; }; propagatedBuildInputs = [ aiohttp - future-fstrings # defined in optional-requirements.txt sqlalchemy @@ -22,7 +21,7 @@ buildPythonPackage rec { lxml ]; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; # no tests available doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix new file mode 100644 index 0000000000..2bfd122491 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestCheckHook +, scipy +, numpy +, scikitlearn +, pandas +, matplotlib +, joblib +}: + +buildPythonPackage rec { + pname = "mlxtend"; + version = "0.17.3"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "rasbt"; + repo = pname; + rev = version; + sha256 = "1515wgmj5rhwpmky7apmmvys1630sfg534fai6559s13hp11pdcl"; + }; + + checkInputs = [ pytestCheckHook ]; + # image tests download files over the network + pytestFlagsArray = [ "-sv" "--ignore=mlxtend/image" ]; + # Fixed in master, but failing in release version + # see: https://github.com/rasbt/mlxtend/pull/721 + disabledTests = [ "test_variance_explained_ratio" ]; + + propagatedBuildInputs = [ + scipy + numpy + scikitlearn + pandas + matplotlib + joblib + ]; + + meta = with stdenv.lib; { + description = "A library of Python tools and extensions for data science"; + homepage = "https://github.com/rasbt/mlxtend"; + license= licenses.bsd3; + maintainers = with maintainers; [ evax ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix index 91f7ecf966..82ef6fc77f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal-extensions/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "msal-extensions"; - version = "0.2.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "31414753c484679bb3b6c6401623eb4c3ccab630af215f2f78c1d5c4f8e1d1a9"; + sha256 = "0qbq5qn46053aclpwyzac5zs2xgqirn4hwrf1plrg0m8bnhxy8sm"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix index e67868912f..6bbdc6f5e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.5.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7efb0256c96a7b2eadab49ce29ecdb91352a91440c12a40bed44303724b62fda"; + sha256 = "15mx1fakz9c5qrrspsckd3yr3l5lac0pbjq8v65r26n3203xx5f9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix index 1604a00656..a0d74719e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mss/default.nix @@ -2,16 +2,14 @@ buildPythonPackage rec { pname = "mss"; - version = "6.0.0"; + version = "6.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0dicp55adbqxb7hqlck95hngb1klv5s26lszw3xim30k18bwqaxl"; + sha256 = "aebd069f3e05667fe9c7b9fa4b1771fe42a4710ce1058ce0236936ce06fa5394"; }; - propagatedBuildInputs = [ ]; - # By default it attempts to build Windows-only functionality prePatch = '' rm mss/windows.py @@ -22,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cross-platform multiple screenshots module in pure Python"; - homepage = "https://github.com/BoboTiG/mss/"; + homepage = "https://github.com/BoboTiG/python-mss"; license = licenses.mit; maintainers = with maintainers; [ austinbutler ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index c01715470f..e1efdf26de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -1,26 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, nose -, nibabel, numpy, pandas, scikitlearn, scipy, matplotlib, joblib }: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib +, nibabel, numpy, pandas, scikitlearn, scipy, joblib, requests }: buildPythonPackage rec { pname = "nilearn"; - version = "0.6.2"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "cfc6cfda59a6f4247189f8ccf92e364de450460a15c0ec21bdb857c420dd198c"; + sha256 = "1rhpy6na7hkhc211ri14zghvmb2fxkh995wi09pkc68klf1dzjg7"; }; - postPatch = '' - substituteInPlace setup.py --replace "required_packages.append('sklearn')" "" - ''; - # https://github.com/nilearn/nilearn/issues/2288 - - # disable some failing tests - checkPhase = '' - pytest nilearn/tests -k 'not test_cache_mixin_with_expand_user' # accesses ~/ - ''; - - checkInputs = [ pytest nose ]; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 propagatedBuildInputs = [ joblib @@ -28,12 +19,13 @@ buildPythonPackage rec { nibabel numpy pandas + requests scikitlearn scipy ]; - meta = with stdenv.lib; { - homepage = "http://nilearn.github.io"; + meta = with lib; { + homepage = "https://nilearn.github.io"; description = "A module for statistical learning on neuroimaging data"; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 80ee7691a1..2d8eaecf77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -1,23 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k -, isPy38 +, isPy27 # python dependencies , click -, configparser ? null , dateutil , etelemetry , filelock , funcsigs , future -, futures , mock , networkx , nibabel , numpy , packaging -, pathlib2 , prov , psutil , pybids @@ -25,6 +21,7 @@ , pytest , pytest_xdist , pytest-forked +, rdflib , scipy , simplejson , traits @@ -37,10 +34,12 @@ , bash , glibcLocales , callPackage +# causes Python packaging conflict with any package requiring rdflib, +# so use the unpatched rdflib by default (disables Nipype provenance tracking); +# see https://github.com/nipy/nipype/issues/2888: +, useNeurdflib ? false }: -assert !isPy3k -> configparser != null; - let # This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo. @@ -51,6 +50,7 @@ in buildPythonPackage rec { pname = "nipype"; version = "1.5.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -74,7 +74,6 @@ buildPythonPackage rec { funcsigs future networkx - neurdflib nibabel numpy packaging @@ -85,11 +84,7 @@ buildPythonPackage rec { simplejson traits xvfbwrapper - ] ++ stdenv.lib.optionals (!isPy3k) [ - configparser - futures - pathlib2 # darwin doesn't receive this transitively, but it is in install_requires - ]; + ] ++ [ (if useNeurdflib then neurdflib else rdflib) ]; checkInputs = [ pybids diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix new file mode 100644 index 0000000000..db0359a1d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: + +buildPythonPackage rec { + pname = "phx-class-registry"; + version = "3.0.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "14iap8db2ldmnlf5kvxs52aps31rl98kpa5nq8wdm30a86n6457i"; + }; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_branding" + "test_happy_path" + "test_len" + ]; + + meta = with stdenv.lib; { + description = "Registry pattern for Python classes, with setuptools entry points integration"; + homepage = "https://github.com/todofixthis/class-registry"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pinboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pinboard/default.nix index af144e0a86..8f177dab8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pinboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pinboard/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "A Python wrapper for Pinboard.in"; maintainers = with maintainers; [ djanatyn ]; license = licenses.asl20; - homepage = "http://github.com/lionheart/pinboard.py"; + homepage = "https://github.com/lionheart/pinboard.py"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 96e7335604..6d9756d11f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "6.0.0"; + version = "7.1.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "0a0ay39k50hbxxaxz09m2azz5c08yqki2gincziv6g381yrlj68s"; + sha256 = "04mm1iqpmd6qwxmkm85k263avd42xvsmjsa24r8ggfjcw0w4lq6j"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 65325f70b4..5834dd7603 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -41,7 +41,10 @@ buildPythonPackage rec { install -m644 "font/PowerlineSymbols.otf" "$out/share/fonts/OTF/PowerlineSymbols.otf" install -m644 "font/10-powerline-symbols.conf" "$out/etc/fonts/conf.d/10-powerline-symbols.conf" - cp -ra powerline/bindings/{bash,fish,shell,tcsh,tmux,vim,zsh} $out/share/ + 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" + + cp -ra powerline/bindings/{bash,shell,tcsh,tmux,vim,zsh} $out/share/ rm $out/share/*/*.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix new file mode 100644 index 0000000000..3fd047402e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pandas +, scikitlearn +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ppscore"; + version = "1.1.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "8080labs"; + repo = pname; + rev = version; + sha256 = "11y6axhj0nlagf7ax6gas1g06krrmddb1jlmf0mmrmyi7z0vldk2"; + }; + + checkInputs = [ pytestCheckHook ]; + + propagatedBuildInputs = [ + pandas + scikitlearn + ]; + + meta = with stdenv.lib; { + description = "A Python implementation of the Predictive Power Score (PPS)"; + homepage = "https://github.com/8080labs/ppscore/"; + license = licenses.mit; + maintainers = with maintainers; [ evax ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix index 2807611f49..6e504951cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Safely evaluate AST nodes without side effects"; - homepage = "http://github.com/alexmojaki/pure_eval"; + homepage = "https://github.com/alexmojaki/pure_eval"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix index 71673da7ab..43d6244ebf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Python reimplementation of pcapy. This package is API compatible and a drop-in replacement."; - homepage = "http://bitbucket.org/viraptor/pure-pcapy"; + homepage = "https://bitbucket.org/viraptor/pure-pcapy"; license = licenses.bsd2; maintainers = with maintainers; [ etu ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix index fa4e4cc941..11c3f1dd8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pwntools/default.nix @@ -24,12 +24,12 @@ }: buildPythonPackage rec { - version = "4.2.2"; + version = "4.3.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "0iv802v67x2fy35q7m27j6xnz94l3w509z8c1286schgav1dw7f4"; + sha256 = "007xbm4pg28bhv7j7m8gmzsmr9x7pdb7rkm5y80mca8kb7gw59xv"; }; # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix new file mode 100644 index 0000000000..f1d92a63d4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, cffi, pytest }: + +buildPythonPackage rec { + pname = "pycmarkgfm"; + version = "1.0.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0wkbbma214f927ikn3cijxsrzkmm5cqz1x4fimrwx9s2wfphj250"; + }; + + propagatedBuildInputs = [ cffi ]; + + # I would gladly use pytestCheckHook, but pycmarkgfm relies on a native + # extension (cmark.so, built through setup.py), and pytestCheckHook runs + # pytest in an environment that does not contain this extension, which fails. + # cmarkgfm has virtually the same build setup as this package, and uses the + # same trick: pkgs/development/python-modules/cmarkgfm/default.nix + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://github.com/zopieux/pycmarkgfm"; + description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zopieux ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix index 2e6d7164b8..429f3a8ebb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "pyHS100"; - version = "0.3.5.1"; + version = "0.3.5.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "GadgetReactor"; repo = pname; rev = version; - sha256 = "1vddr9sjn6337i1vx0mm7pb3qibvl2gx6nx18vm4fajgv9vcjxny"; + sha256 = "0z98hzvkp6jmllyd4x4y0f5n6nnxrizw6g5l2clxdn93mifjavp0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index b4788999a3..3da9c3ae0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch , pandoc, haskellPackages, texlive }: buildPythonPackage rec { @@ -12,6 +12,14 @@ buildPythonPackage rec { sha256 = "1lpslfns6zxx7b0xr13bzg921lwrj5am8za0b2dviywk6iiib0ld"; }; + # https://github.com/bebraw/pypandoc/pull/204 + patches = [ + (fetchpatch { + url = "https://github.com/sternenseemann/pypandoc/commit/e422e277dd667c77dae11fad931dbb6015e9a784.patch"; + sha256 = "11l11kh2a4k0h1g4yvijb60076kzxlkrvda3x6dc1s8fz352bpg3"; + }) + ]; + postPatch = '' # set pandoc path statically sed -i '/^__pandoc_path = None$/c__pandoc_path = "${pandoc}/bin/pandoc"' pypandoc/__init__.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix index 593911c064..f30fddc1ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -49,7 +49,8 @@ buildPythonPackage rec { checkPhase = '' py.test -k "not test_load_extern_incommon \ and not test_load_remote_encoding \ - and not test_load_external" + and not test_load_external \ + and not test_conf_syslog" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix index fefeaf7ebb..9798d94900 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: +{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: let # Package does not support configuring the pcsc library. @@ -30,21 +30,6 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC) "-I ${getDev pcsclite}/include/PCSC"; - # The error message differs depending on the macOS host version. - # Since Nix reports a constant host version, but proxies to the - # underlying library, it's not possible to determine the correct - # expected error message. This patch allows both errors to be - # accepted. - # See: https://github.com/LudovicRousseau/pyscard/issues/77 - # Building with python from nix on macOS version 10.13 or - # greater still causes this issue to occur. - patches = optionals withApplePCSC [ - (fetchpatch { - url = "https://github.com/LudovicRousseau/pyscard/commit/945e9c4cd4036155691f6ce9706a84283206f2ef.patch"; - sha256 = "19n8w1wzn85zywr6xf04d8nfg7sgzjyvxp1ccp3rgfr4mcc36plc"; - }) - ]; - propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; nativeBuildInputs = [ swig ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix index 2c0c23ebdc..3ad238f553 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "2.1.1"; + version = "3.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1iap9rzxx9pkvz6im3px8xj37pb098lvvf9yiqh93qq5w68w6jka"; + sha256 = "407adfe8c748a6bb7e68a430ebe3766ffe51e43fc5442f78b261229c03078be4"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix index 53ab515e6f..f2191ab617 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-metadata"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0593jf8l30ayrqr9gkmwfbhz9h8cyqp7mgwp7ah1gjysbajf1rmp"; + sha256 = "71b506d49d34e539cc3cfdb7ce2c5f072bea5c953320002c95968e0238f8ecf1"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix new file mode 100644 index 0000000000..7923565c3f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, matplotlib +, networkx +, nose +, numpy +, scipy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "scikit-fuzzy"; + version = "unstable-2020-10-03"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "eecf303b701e3efacdc9b9066207ef605d4facaa"; + sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062"; + }; + + propagatedBuildInputs = [ networkx numpy scipy ]; + checkInputs = [ matplotlib nose pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy"; + description = "Fuzzy logic toolkit for scientific Python"; + license = licenses.bsd3; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix new file mode 100644 index 0000000000..deb6dcf2a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestCheckHook +, numpy +, scipy +, scikitlearn +, pandas +, tqdm +, slicer +, numba +, matplotlib +, nose +, ipython +}: + +buildPythonPackage rec { + pname = "shap"; + version = "0.36.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "slundberg"; + repo = pname; + rev = "v${version}"; + sha256 = "1wxnxvbz6avzzfqjfbcqd4v879hvpq4021v31fhdpccr2q317rr9"; + }; + + propagatedBuildInputs = [ + numpy + scipy + scikitlearn + pandas + tqdm + slicer + numba + ]; + + preCheck = '' + export HOME=$TMPDIR + # when importing the local copy the extension is not found + rm -r shap + ''; + checkInputs = [ pytestCheckHook matplotlib nose ipython ]; + # Those tests access the network + disabledTests = [ + "test_kernel_shap_with_a1a_sparse_zero_background" + "test_kernel_shap_with_a1a_sparse_nonzero_background" + "test_kernel_shap_with_high_dim_sparse" + "test_sklearn_random_forest_newsgroups" + "test_sum_match_random_forest" + "test_sum_match_extra_trees" + "test_single_row_random_forest" + "test_sum_match_gradient_boosting_classifier" + "test_single_row_gradient_boosting_classifier" + "test_HistGradientBoostingClassifier_proba" + "test_HistGradientBoostingClassifier_multidim" + "test_sum_match_gradient_boosting_regressor" + "test_single_row_gradient_boosting_regressor" + ]; + + meta = with stdenv.lib; { + description = "A unified approach to explain the output of any machine learning model"; + homepage = "https://github.com/slundberg/shap"; + license = licenses.mit; + maintainers = with maintainers; [ evax ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix new file mode 100644 index 0000000000..8278947717 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, pytestCheckHook +, pandas +, pytorch +}: + +buildPythonPackage rec { + pname = "slicer"; + version = "0.0.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "21d53aac4e78c93fd83c0fd2f8f9d8a2195ac079dffdc0da81cd749da0f2f355"; + }; + + checkInputs = [ pytestCheckHook pandas pytorch ]; + + meta = with stdenv.lib; { + description = "Wraps tensor-like objects and provides a uniform slicing interface via __getitem__"; + homepage = "https://github.com/interpretml/slicer"; + license = licenses.mit; + maintainers = with maintainers; [ evax ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix index d5177dfd2e..5486fb4195 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smart_open/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "smart_open"; - version = "3.0.0"; + version = "4.0.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7f4e85b71df5a3618f5447d0b417b7a3576308c839690a24a70338b8993684c3"; + sha256 = "2ce157700821e285bbacd8d01ec7a4f2582765460e541f55b216cb135db8be24"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index c8f874d4c1..3e958a3076 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'boto3>=1.4.4,<1.15'," "'boto3~=1.15'," \ + --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \ --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ --replace "'idna<2.10'," "'idna'," \ --replace "'requests<2.24.0'," "'requests'," diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 99c5822f35..bccca3ee6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { snowflake-connector-python ]; + # Pypi does not include tests + doCheck = false; pythonImportsCheck = [ "snowflake.sqlalchemy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 077aea4dc9..9b4f7cc927 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.3.2"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "07zf7kivj4r1n6xwisld7n90bpi095bqbc9xpv668grq1rpf53c1"; + sha256 = "a5c8805759114aac3a1db1b20f42af1124da5315be903ccb4c472cc8452393fb"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 6b366ee517..44e1999756 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "5.2.2"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c"; + sha256 = "5b4240808a6d21eab9c49e69ad5ac0cb3efb03fe2e94763d23c860f85ec6a799"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix index 9b1117a94a..f225dd431e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "07i9rwxphi4zgwc7y6f6qvq73iym2cx4k1bpd7rmd3wkpgrrfxqx"; + sha256 = "13fy25qxn4xwzlr2w35v6jhlpd70lv9r6srv4dizc4brj63hnw50"; }; postConfigure = '' @@ -28,7 +28,9 @@ buildPythonPackage rec { --replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython" ''; - buildInputs = [ cython cmake ]; + nativeBuildUnputs = [ cmake ]; + + buildInputs = [ cython ]; checkInputs = [ pytest sympy ]; @@ -48,6 +50,5 @@ buildPythonPackage rec { homepage = "https://github.com/symengine/symengine.py"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix index 7082ca5415..137759f5a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Package to parse logical tag expressions"; - homepage = "http://github.com/timofurrer/tag-expressions"; + homepage = "https://github.com/timofurrer/tag-expressions"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix index f8c0661f0c..4772c13d9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix @@ -2,16 +2,15 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.14.0"; + version = "1.17.5"; src = fetchPypi { inherit version; pname = "Telethon"; - sha256 = "1fg12gcg6ca7rjh7m3g48m30cx4aaw5g09855nlyz2sa1kw3gfyq"; + sha256 = "1v1rgr030z8s1ldv5lm1811znyd568c22pmlrzzf3ls972xk514m"; }; propagatedBuildInputs = [ - async_generator rsa pyaes ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index 5ac55f5f57..6e0fbcce37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.2"; + version = "7.4.3"; src = fetchPypi { inherit pname version; - sha256 = "772f1a27b9b31e51003d1d2a7476cc49cc81044dd87088112237f93bd2091f0b"; + sha256 = "c98491b083165f48bda95f5533f7d9dbd3980d32ad621bfe579ff08ef625a4d3"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix index bf37e671cd..d3b4a58c17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timeout-decorator/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "timeout-decorator"; - version = "0.4.1"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1inkf68i2s2x27arpqwkdxigiqbpbpjbbnfv7jzsrif1fmp2fphs"; + sha256 = "6a2f2f58db1c5b24a2cc79de6345760377ad8bdc13813f5265f6c3e63d16b3d7"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix index 47247c6911..36a88ea22e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tmdb3/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, isPy3k }: buildPythonPackage rec { pname = "tmdb3"; version = "0.7.2"; + disabled = isPy3k; # Upstream has not received any updates since 2015, and importing from python3 does not work. src = fetchPypi { inherit pname version; @@ -12,6 +13,8 @@ buildPythonPackage rec { # no tests implemented doCheck = false; + pythonImportsCheck = [ "tmdb3" ]; + meta = with lib; { description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; homepage = "https://pypi.python.org/pypi/tmdb3"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tracing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tracing/default.nix index 2d91ae6a13..6f9091d851 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tracing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tracing/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://liw.fi/tracing/"; + homepage = "https://liw.fi/tracing/"; description = "Python debug logging helper"; license = licenses.gpl3; maintainers = []; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index f5d6efff5e..2829c4e190 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.8.13"; + version = "3.8.14"; src = fetchPypi { inherit pname version; - sha256 = "b31dfd9d8cba0271a5a447250bc07cdb5c3b1fd21b76b88a63dcd4bcdcb80769"; + sha256 = "dba3d9fa1d9488053fc7504c141fbb2258cf5f37377a3824b20bd0a93f7240a0"; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix index 8cf8c426b3..a76a5f8df3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttystatus/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = "http://liw.fi/ttystatus/"; + homepage = "https://liw.fi/ttystatus/"; description = "Progress and status updates on terminals for Python"; license = licenses.gpl3; maintainers = []; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix index 02269cdbfb..2976425991 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , internetarchive , fetchPypi -, youtube-dl +, youtube-dlc , docopt , isPy27 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + propagatedBuildInputs = [ internetarchive docopt youtube-dlc ]; pythonImportsCheck = [ "tubeup" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index 6e1dc98256..b93050144e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -53,7 +53,10 @@ buildPythonPackage rec { export DETERMINISTIC_TESTS=true ''; - disabledTests = [ "test_verbosity" ]; + disabledTests = [ + "test_verbosity" + "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837 + ]; meta = with stdenv.lib; { homepage = "https://github.com/pimutils/vdirsyncer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmljson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmljson/default.nix new file mode 100644 index 0000000000..dd5d84afac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmljson/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage +, fetchPypi +, lib +, lxml +}: + +buildPythonPackage rec { + pname = "xmljson"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "b4158e66aa1e62ee39f7f80eb2fe4f767670ba3c0d5de9804420dc53427fdec8"; + }; + + checkInputs = [ + lxml + ]; + + meta = with lib; { + description = "Converts XML into dictionary structures and vice-versa"; + homepage = "https://github.com/sanand0/xmljson"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ rakesh4g ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix new file mode 100644 index 0000000000..9599828e65 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-dlc/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "youtube_dlc"; + version = "2020.11.11.post3"; + + src = fetchPypi { + inherit pname version; + sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM="; + }; + + # They are broken + doCheck = false; + + pythonImportsCheck = [ "youtube_dlc" ]; + + meta = with lib; { + homepage = "Media downloader supporting various sites such as youtube"; + description = "https://github.com/blackjack4494/yt-dlc"; + platforms = platforms.linux; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix index 697ae5bb92..1279bb804d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library which communicates with XBee radios for zigpy"; - homepage = "http://github.com/zigpy/zigpy-xbee"; + homepage = "https://github.com/zigpy/zigpy-xbee"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu mvnetbiz ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix index e07451c263..018017c89a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.7.2"; + version = "0.7.3"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,11 +21,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-zigate"; - rev = "v${version}"; - sha256 = "0ycrsmp3n3awiyj0gbq6xnaa2s9mpc5l7mlmfc00rfnx7rr2z4ha"; + rev = version; + sha256 = "068v8n8yimmpnwqcdz5m9g35z1x0dir478cbc1s1nyhw1xn50vg1"; }; - buildInputs = [ + propagatedBuildInputs = [ pyserial pyserial-asyncio pyusb diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix index acef337e78..1d86d6a8f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_interface/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope.Interface"; - homepage = "http://zope.org/Products/ZopeInterface"; + homepage = "https://zope.org/Products/ZopeInterface"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix index dad01337f4..292653d75e 100644 --- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix @@ -44,6 +44,7 @@ let deriveBioc = mkDerive { mkHomepage = {name, biocVersion, ...}: "https://bioconductor.org/packages/${biocVersion}/bioc/html/${name}.html"; mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/bioc/src/contrib/${name}_${version}.tar.gz" + "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}/${name}_${version}.tar.gz" "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; }; deriveBiocAnn = mkDerive { diff --git a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix index c3a578f18b..20b26437e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.2.0"; + version = "2.3.8"; src = fetchurl { url = @@ -23,7 +23,7 @@ let install -Dm755 $src $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm '' + optionalString (disableRemoteLogging) '' - sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm + sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm sed -i '1i #!/bin/sh' $out/bin/amm ''; @@ -75,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk="; + sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs"; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A="; + sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix index 4638427b3e..94012ce7ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/frama-c/default.nix @@ -7,7 +7,7 @@ let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; runtimeDeps = with ocamlPackages; [ - apron + apron.dev biniou camlzip easy-format @@ -24,12 +24,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "21.1"; - slang = "Scandium"; + version = "22.0"; + slang = "Titanium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - sha256 = "0qq0d08dzr0dmdjysiimdqmwlzgnn932vp5kf8lfn3nl45ai09dy"; + sha256 = "1mq1fijka95ydrla486yr4w6wdl9l7vmp512s1q00b0p6lmfwmkh"; }; preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index f91cdbead8..497a244f68 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.26.0"; + version = "6.29.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "1vlqwrbqk2cbp8kgxkm61c4blai81ib35yjf6wms16w0hvbqf2b4"; + sha256 = "08iibpf9jhkk7ihsmlm85wpjwy1bvznbvggvqyw6109f9gzlrvvq"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index adf17dabec..51b363c6be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "0gn68achvhyxljvhw5rwraxjcgdwrl1bwbsn596ka15nrk4lwb34"; + sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf"; }; - cargoSha256 = "0v94zsh4jhzjnqbkgwn8rjbs72i5cw2nmkwn7xhdbbwxh17a88x4"; + cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0"; meta = with lib; { description = "SystemVerilog linter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index f123aa79a1..52b1a26d81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,11 +1,11 @@ { fetchFromGitHub , lib -, python +, python3 , enableTelemetry ? false }: let - py = python.override { + py = python3.override { packageOverrides = self: super: { flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "1.0.2"; diff --git a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index 32161a4379..446d54f90c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -1,34 +1,29 @@ -{ - fetchFromGitHub, - lib, - python3Packages, -}: +{ fetchFromGitHub, lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; rev = "v${version}"; - sha256 = "00zs0a580vvfm2w4ja68mc46360p475wlgagjkq1hi4m8s4qwd75"; + sha256 = "1kkpvxqgh5pw4kr8lh5gy9d7960hv9zvajbjiqhj6xgykwbpbgmq"; }; propagatedBuildInputs = with python3Packages; [ b2sdk class-registry + phx-class-registry setuptools ]; - checkInputs = with python3Packages; [ - nose - ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; - # doCheck = false; - checkPhase = '' - nosetests - ''; + disabledTests = [ + "test_files_headers" + "test_integration" + ]; postInstall = '' mv "$out/bin/b2" "$out/bin/backblaze-b2" diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index 712778665d..756e68b567 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "0x1an9sxcr0f45c9kdpgpcrc773cc28zsffbxddpqp0h1qh9s4ns"; + sha256 = "1abx5h6xy0h3mz29ial5si8smkmjzla050d130pcc6dzr4ic642w"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 384385356d..a3865e2c52 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.8.0"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "04pf76iyrbq2h2hksx0r2fmnd0d9mi6an24zvfv7k79rch11cql1"; + sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix index ea417daa58..dbb45df40c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pack"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "0i3lzfn5m38f8aiwqydffdq2j8gfcnkmcgasfjxbn6rrs0hw5g92"; + sha256 = "026qy81hfblx98z9hip7gpqcfqgzfhm5bimg6p9gi5fd5wsbfs4c"; }; vendorSha256 = "0i6nplh1papcmdzas9f8pkccsx5csbxxkvy5a6130jjbwdm14jw7"; diff --git a/third_party/nixpkgs/pkgs/development/tools/cask/default.nix b/third_party/nixpkgs/pkgs/development/tools/cask/default.nix index 7105035606..925d10b23b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cask/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cask/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.flexw ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index e124f6c7ca..5fcaa35378 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.23"; + version = "0.1.24"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "0qqvjw6lqdrfg1mjfxljslcv9714cpxcnkf65wkf46r5g8fwzr1f"; + sha256 = "11d335lx6pa8pvsiv9m00ig8b8y203rzad4krr0p9c04ppw0c966"; }; - vendorSha256 = "0bw0xcbyns94vy1abr962876zr7aq6q9qq7y9vr1yqw4hqmi3ndi"; + vendorSha256 = "1dr1sql0ph3k6hylgikhiaaskxwnsynspp770p9i7y7fasmb53jw"; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 66fb878aa2..2a8e10008c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, buildGoModule }: -let version = "1.2.2"; +let version = "1.2.4"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "1ryh94cj37j8x6qwxr5ydyw6cnjppakg1w84sipm11d0vvv98bhi"; + vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "082yqm72y8s3v06gkcg947p62sd63y3r2bmdsrfgdrzb5w5a75bl"; + sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 4858b84abf..fe7721f5ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "09zb7r8f6m1w9ax9ayaxjzwmqcgx5f6x4lclfi1wdn6f6qaans4w"; + sha256 = "1q1hyrd1zlynyb0720fd1lwg22l3bwjbcak2aplh259p698gwyf5"; }; - vendorSha256 = "012kgdvw7hj3m40v3nnpg916n02nxv19zid07h8g4qwprzg49iq2"; + vendorSha256 = "197zpjvvv9xpfbw443kbxvhjmjqmx1h2bj1xl2vwgf0w64mkk84z"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix index 53d0f791a3..bca11130c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.52.0"; + version = "1.53.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "0x4ri36ivmhg42bvh62jvgawbwwypl3a4vr8m9gk19nndds9q5zv"; + sha256 = "1zw6gdmy1jlwi7rrbdxg7pkiq54ha0h1gmzphn3mflfk7lmgyikm"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index d394103cb7..48250d7ceb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -36,6 +36,7 @@ rec { i686-linux = "bf96b1736141737bb064e48bdb543302fd259de634b1790b7cf930525f47859f"; armv7l-linux = "2d970b3020627e5381fd4916dd8fa50ca9556202c118ab4cba09c293960689e9"; aarch64-linux = "938b7cc5f917247a120920df30374f86414b0c06f9f3dc7ab02be1cadc944e55"; + headers = "0943wc2874s58pkpzm1l55ycgbhv60m62r8aix88gl45i6zngb2g"; }; electron_5 = mkElectron "5.0.13" { @@ -44,6 +45,7 @@ rec { i686-linux = "ccf4a5ed226928a30bd3ea830913d99853abb089bd4a6299ffa9fa0daa8d026a"; armv7l-linux = "96ad83802bc61d87bb952027d49e5dd297f58e4493e66e393b26e51e09065add"; aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; + headers = "0najajj1kjj0rbqzjvk9ipq0pgympwad77hs019cz2m8ssaxqfrv"; }; electron_6 = mkElectron "6.1.12" { @@ -52,6 +54,7 @@ rec { i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; + headers = "0im694h8wqp31yzncwfnhz5g1ijrmqnypcakl0h7xcn7v25yp7s3"; }; electron_7 = mkElectron "7.3.3" { @@ -60,6 +63,7 @@ rec { i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; + headers = "0ink72nac345s54ws6vlij2mjixglyn5ygx14iizpskn4ka1vr4b"; }; electron_8 = mkElectron "8.5.5" { @@ -68,14 +72,16 @@ rec { i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74"; armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874"; aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; + headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; - electron_9 = mkElectron "9.3.4" { - x86_64-linux = "4791d854886cba4f461f37db41e6be1fbd8e41e7da01f215324f1fe19ad18ebf"; - x86_64-darwin = "d6878093683ef901727d3b557f1ac928de86b7fffd2abd2c8315d0a9cfe20375"; - i686-linux = "bd3cc9ddab3a9e54499f98e68b12f0aa30554c6527e1434b78743041aaae9417"; - armv7l-linux = "1b175fe3e83494015714afb298b756187053dd84604746c60649a2abbb49ee36"; - aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3"; + electron_9 = mkElectron "9.3.5" { + x86_64-linux = "9db6610289a4e0ce39c71501384baef5a58dde24d947fdead577f2a6b59123aa"; + x86_64-darwin = "d30aca66a0280a47284a3625d781c62fd0bb9b7f318bb05b8b34751ee14a3a78"; + i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61"; + armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f"; + aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30"; + headers = "10snhi8q0izd3aqdfymhidfja34n4xbmd7h3lzghcczp77is2i5b"; }; electron_10 = mkElectron "10.1.6" { @@ -84,13 +90,15 @@ rec { i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e"; armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951"; aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; + headers = "1qj6s0h612hwmh4nzafz406vybr1rhskal2mcm1ll62rnzf98k3z"; }; - electron_11 = mkElectron "11.0.2" { - x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636"; - x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516"; - i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8"; - armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d"; - aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0"; + electron_11 = mkElectron "11.0.3" { + x86_64-linux = "e2b397142ea10f494c9922ee0176fef1ea4a1899a3064feb038c9505e57fb1ff"; + x86_64-darwin = "32d5eeb03447203e1ae797bf273baf6fb7775ef0db9a3cfa875fdcddf7286027"; + i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729"; + armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e"; + aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0"; + headers = "1r2s7088g72nanjc0fqrz1gqrbf1akrq6b7a9w6x7wj95ysc85q0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index 4e3f3511b9..ee3609783c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -33,6 +33,11 @@ let sha256 = hash; }; + headersFetcher = vers: hash: fetchurl { + url = "https://atom.io/download/electron/v${vers}/node-v${vers}-headers.tar.gz"; + sha256 = hash; + }; + tags = { i686-linux = "linux-ia32"; x86_64-linux = "linux-x64"; @@ -47,6 +52,7 @@ let common = platform: { inherit name version meta; src = fetcher version (get tags platform) (get hashes platform); + passthru.headers = headersFetcher version hashes.headers; }; electronLibPath = with stdenv.lib; makeLibraryPath ( diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh b/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh index de380fd522..d6c5d94ec4 100755 --- a/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh +++ b/third_party/nixpkgs/pkgs/development/tools/electron/print-hashes.sh @@ -20,6 +20,7 @@ SYSTEMS=( ) hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" +headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node-v${VERSION}-headers.tar.gz")" # Entry similar to the following goes in default.nix: @@ -30,4 +31,6 @@ for S in "${!SYSTEMS[@]}"; do echo " $S = \"$hash\";" done +echo " headers = \"$headers\";" + echo " };" diff --git a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix index 2b96830b00..1b0c44f575 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fdroidserver/default.nix @@ -23,6 +23,7 @@ python.pkgs.buildPythonApplication rec { ${python.interpreter} setup.py compile_catalog ''; postInstall = '' + patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix index 7ff7af7d18..0d9bad0e41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fedora-coreos-config-transpiler/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "fcct"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "coreos"; repo = "fcct"; rev = "v${version}"; - sha256 = "18hmnip1s0smp58q500p8dfbrmi4i3nsyq22ri5cs53wbvz3ih1l"; + sha256 = "1ffjn0l38szpkgd11mfaiynf9n8ljndv122l8amwiwp5mrh3hsl6"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index e6338d3e3f..f6c7bef1dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.2.0"; + version = "7.2.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 = "1rqj2aq1cwh9rsnnlwvg0b5jpyqsij9jamd873i18rf87q6cdsk4"; + sha256 = "0b9pyy5avgr2wh3amnpwfc21i69mbw9a0xdxwg5wlrw83f5rx17w"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix index 4cc7dbd8a7..363e429b6b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glade/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glade/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kfgs2dpjd8dnnjkfc4xdy8yjjavlzimqzyfr1pq1m1h96z506hp"; + sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix index 96b66ebc0b..7cb95b326d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.12.2"; + version = "4.13.0"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6"; + sha256 = "0rzx974cxsipbnggl3n4q6zsvm313svrg718gscydygk41m9nql9"; }; - vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0"; + vendorSha256 = "1107syipynlfibzljyfgz81v1avi8axvsjpmrpj990pm83r9svc6"; subPackages = [ "cmd/migrate" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index 6cf97277bb..4c0ec3bc29 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.4"; + version = "2.0.5"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3"; + sha256 = "19xf79rbilslpibi1mi31jplrgf8anpm06s6sxqh8v1qs84vkxdm"; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix index 19d6fa392d..4040debf15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix @@ -4,10 +4,10 @@ let in buildPythonApplication rec { pname = "jira-cli"; - version = "2.2"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "314118d5d851394ebf910122fd7ce871f63581393968c71456441eb56be3b112"; + sha256 = "86f7d4ad7292c9a27bbc265d09e7bcd00ef8159f20172998d85f25aad53b0df6"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix index 8605ef398a..63c7e01a4b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, oniguruma }: +{ stdenv, nixosTests, fetchurl, oniguruma }: stdenv.mkDerivation rec { pname = "jq"; - version="1.6"; + version = "1.6"; src = fetchurl { - url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256="0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; + url = + "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + sha256 = "0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; }; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; buildInputs = [ oniguruma ]; - configureFlags = - [ + configureFlags = [ "--bindir=\${bin}/bin" "--sbindir=\${bin}/bin" "--datadir=\${doc}/share" "--mandir=\${man}/share/man" - ] - # jq is linked to libjq: + ] + # jq is linked to libjq: ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; @@ -30,8 +30,10 @@ stdenv.mkDerivation rec { $bin/bin/jq --help >/dev/null ''; + passthru.tests = { inherit (nixosTests) jq; }; + meta = with stdenv.lib; { - description = ''A lightweight and flexible command-line JSON processor''; + description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix b/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix new file mode 100644 index 0000000000..4286a454ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "jsonnet-bundler"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "jsonnet-bundler"; + repo = "jsonnet-bundler"; + rev = "v${version}"; + sha256 = "0pk6nf8r0wy7lnsnzyjd3vgq4b2kb3zl0xxn01ahpaqgmwpzajlk"; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/jb" ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + + meta = with lib; { + description = "A jsonnet package manager"; + homepage = "https://github.com/jsonnet-bundler/jsonnet-bundler"; + license = licenses.asl20; + maintainers = with maintainers; [ preisschild ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix new file mode 100644 index 0000000000..b826c1a58b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/genkfs/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc }: + +stdenv.mkDerivation rec { + pname = "genkfs"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "genkfs"; + rev = version; + sha256 = "0f50idd2bb73b05qjmwlirjnhr1bp43zhrgy6z949ab9a7hgaydp"; + }; + + nativeBuildInputs = [ asciidoc cmake ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Utility to write a KFS filesystem into a ROM file"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch b/third_party/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch new file mode 100644 index 0000000000..80b5c7d211 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/lc3tools/0001-mangle-configure.patch @@ -0,0 +1,29 @@ +diff --git a/configure b/configure +index 46f9af4..dfc1b3e 100755 +--- a/configure ++++ b/configure +@@ -17,10 +17,11 @@ esac + + # Some binaries that we'll need, and the places that we might find them. + +-binlist="uname flex gcc wish rm cp mkdir chmod sed" +-pathlist="/bin /usr/bin /usr/local/bin /sw/bin /usr/x116/bin /usr/X11R6/bin" +-libpathlist="/lib /usr/lib /usr/local/lib" +-incpathlist="/include /usr/include /usr/local/include" ++IFS=: ++binlist="uname:flex:gcc:wish:rm:cp:mkdir:chmod:sed" ++pathlist=$PATH ++libpathlist=$LIBS ++incpathlist=$INCLUDES + + + # Find the binaries (or die trying). +@@ -55,7 +56,7 @@ case `$uname -s` in + echo "Configuring for Cygwin..." + ;; + Linux*) echo "Configuring for Linux..." +- OS_SIM_LIBS="-lcurses" ++ # OS_SIM_LIBS="-lcurses" + ;; + SunOS*) echo "Configuring for Solaris..." + OS_SIM_LIBS="-lcurses -lsocket -lnsl" diff --git a/third_party/nixpkgs/pkgs/development/tools/lc3tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/lc3tools/default.nix new file mode 100644 index 0000000000..25b476f68c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/lc3tools/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, unzip, flex, tk, ncurses, readline }: + +stdenv.mkDerivation { + pname = "lc3tools"; + version = "0.12"; + + src = fetchurl { + url = "https://highered.mheducation.com/sites/dl/free/0072467509/104652/lc3tools_v12.zip"; + hash = "sha256-PTM0ole8pHiJmUaahjPwcBQY8/hVVgQhADZ4bSABt3I="; + }; + + patches = [ + # the original configure looks for things in the FHS path + # I have modified it to take environment vars + ./0001-mangle-configure.patch + ]; + + nativeBuildInputs = [ unzip ]; + buildInputs = [ flex tk ncurses readline ]; + + # lumetta published this a while ago but handrolled his configure + # jank in the original packaging makes this necessary: + LIBS = "${flex}/lib:${ncurses}/lib:${readline}/lib"; + INCLUDES = "${flex}/include:${ncurses}/include:${readline}/include"; + + # it doesn't take `--prefix` + prefixKey = "--installdir "; + + postInstall = '' + rm $out/{COPYING,NO_WARRANTY,README} + mkdir -p $out/{bin,share/lc3tools} + + mv -t $out/share/lc3tools $out/lc3os* + mv -t $out/bin $out/lc3* + ''; + + meta = with stdenv.lib; { + description = "Toolchain and emulator for the LC-3 architecture"; + license = licenses.gpl2; + maintainers = with maintainers; [ anna328p ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix index 2a0b188060..5c8924ee21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, intltool, pkgconfig, glib }: stdenv.mkDerivation { - name = "gnu-mdk-1.2.10"; + name = "gnu-mdk-1.3.0"; src = fetchurl { - url = "https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz"; - sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h"; + url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz"; + sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool glib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index 37c99eaca8..0d8911e5b2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.6"; + version = "0.9.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0cjivkrykvp2m8bj3x9fsk7nsr5vxf87jfh4rjn24kfliljwfh2w"; + outputHash = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix index ecd40f20fd..9af9ddc0df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dfu-util"; - version = "0.9"; + version = "0.10"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; + sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock index 04268d3306..0e5b7b0167 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -1,15 +1,24 @@ GEM remote: https://rubygems.org/ specs: - kramdown (1.17.0) - mdl (0.5.0) - kramdown (~> 1.12, >= 1.12.0) - mixlib-cli (~> 1.7, >= 1.7.0) - mixlib-config (~> 2.2, >= 2.2.1) - mixlib-cli (1.7.0) - mixlib-config (2.2.18) + chef-utils (16.7.61) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + mdl (0.11.0) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + mixlib-cli (~> 2.1, >= 2.1.1) + mixlib-config (>= 2.2.1, < 4) + mixlib-shellout + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb - tomlrb (1.2.8) + mixlib-shellout (3.2.2) + chef-utils + rexml (3.2.4) + tomlrb (2.0.0) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix index 6d48be1cbc..f2d332a95b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,34 +1,56 @@ { - kramdown = { + chef-utils = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; type = "gem"; }; - version = "1.17.0"; + version = "16.7.61"; + }; + kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + type = "gem"; + }; + version = "2.3.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; }; mdl = { - dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + dependencies = ["kramdown" "kramdown-parser-gfm" "mixlib-cli" "mixlib-config" "mixlib-shellout"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; type = "gem"; }; - version = "0.5.0"; + version = "0.11.0"; }; mixlib-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; type = "gem"; }; - version = "1.7.0"; + version = "2.1.8"; }; mixlib-config = { dependencies = ["tomlrb"]; @@ -36,19 +58,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; type = "gem"; }; - version = "2.2.18"; + version = "3.0.9"; + }; + mixlib-shellout = { + dependencies = ["chef-utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; + type = "gem"; + }; + version = "3.2.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; type = "gem"; }; - version = "1.2.8"; + version = "2.0.0"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index 5cb1d9a38a..0f110ae0b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mkcert"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; rev = "v${version}"; - sha256 = "0g85vpkfgkc7nzjl3asl2f4ncsh12naf2fkr0mvyihfmfy9fz0fw"; + sha256 = "0q0069ripnpb027krc4yk47552xl5rp0ymxf1j2mln9wdmfq65ba"; }; - vendorSha256 = "0b8ggdpbyxx5n2myhchhlwmm5nndwpykp1ylnzdyw12mdskfvn9h"; + vendorSha256 = "133vlx825g4zay88ppylsz93q4gnd9ari12x1h57qvk45rwxqx95"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix index 42faa33fbe..9b06a55f07 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; + homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 46a87dc3ff..49342d7b84 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; + homepage = "https://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 24631481fd..9dd085b421 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.37.3"; + version = "1.37.4"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "09h4yxswrpxw9w4wscarbv2gypk9bwwsmpqyjfp6b5bh1frx2i67"; + sha256 = "0pknphydf194n7rjyax4mh8n7j8679j0jflw63gfgh37daxry0r2"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cd .. - cp -r src $out/ + cp -r src $out/ ls -al $out/src makeWrapper ${mono5}/bin/mono $out/bin/omnisharp \ --add-flags "$out/src/OmniSharp.exe" diff --git a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix index 2472274118..e955a844dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.22.0-02"; + version = "3.28.1-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "12433fgva03gsgi37xqgkdnbglgq4b66lmzk5cyxfg22szl4xvwz"; + sha256 = "0qba2qaz85hf0vgix3qyqdl8yzdb6qr91sgdmxv3fgjhyvnvqyy8"; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix index 8c3da159d6..8beeccfa2f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rgp/default.nix @@ -7,6 +7,7 @@ , fontconfig , freetype , glib +, libGLU , libglvnd , libX11 , libxcb @@ -18,15 +19,15 @@ }: let - buildNum = "2020-09-11-26"; + buildNum = "2020-11-19-376"; in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.8"; + version = "1.9"; src = fetchurl { - url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonDeveloperTools-${buildNum}.tgz"; - sha256 = "1lpkh7sfpq697lm4xnkpjfchh8zpy49f4mb3c5qcn7brav5iqwfh"; + url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; + sha256 = "f71ibuMerd0SmXKSDjaTj7xtyy1dWzkZ5s0PlGtQ1+k="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { fontconfig freetype glib + libGLU libglvnd libX11 libxcb @@ -54,12 +56,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/opt/rgp $out/bin cp -r . $out/opt/rgp/ - # Breaks autoPatchelfHook and has no known usage - rm $out/opt/rgp/AMDToolsDownloader - for prog in RadeonGPUProfiler RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI; do + for prog in RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI RadeonGPUAnalyzer RadeonGPUProfiler rga rtda; do # makeWrapper is needed so that executables are started from the opt - # directory, where qt.conf is + # directory, where qt.conf and other tools are makeWrapper \ $out/opt/rgp/$prog \ $out/bin/$prog @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool from AMD that allows for deep inspection of GPU workloads"; - homepage = "https://gpuopen.com/gaming-product/radeon-gpu-profiler-rgp/"; + homepage = "https://gpuopen.com/rgp/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ Flakebi ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix index a9c18b021b..e4c5d8ab48 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; - homepage = "http://probe.rs/"; + homepage = "https://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index c32a87e783..09650e8a38 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "0bdv6h3mzmv46pdyvwl0v0bg719dlsxlx378ws6vgi1cga24g37i"; + sha256 = "09jdqf1f8kl2c3k4cp8j3qqb96gclhncvfdwg2l3bmh5r10id9b3"; }; - cargoSha256 = "0qpihfgfqxw5fyhn124c5lbfaxr717bqf8mrbagh3vdgvk75j0qz"; + cargoSha256 = "0mx01h2zv7mpyi8s1545b7hjxn9aslzpbngrq4ii9rfqznz3r8k9"; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index e5d23c9258..dbd79f179a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; - homepage = "http://probe.rs/"; + homepage = "https://probe.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix index fc743d5601..de1c9c9c11 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib -, glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf +{ stdenv, fetchurl, unzip, makeWrapper +, cairo, fontconfig, freetype, gdk-pixbuf, glib +, glibc, gtk2, libX11, nspr, nss, pango, gconf , libxcb, libXi, libXrender, libXext }: + let + upstream-info = (stdenv.lib.importJSON ../../../../applications/networking/browsers/chromium/upstream-info.json).stable.chromedriver; allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "0absr1fp2h87gpyw6jxj2f08sbhkkh3pf13145hfyzdvajj5rfjy"; + sha256 = upstream-info.sha256_linux; }; x86_64-darwin = { system = "mac64"; - sha256 = "1p9k92fgyx0xis6r50vhcpx3iws2gaspq3dnpigglv3bj9yg8zvi"; + sha256 = upstream-info.sha256_darwin; }; }; @@ -25,10 +28,10 @@ let libX11 nspr nss pango libXrender gconf libxcb libXext libXi ]; -in -stdenv.mkDerivation rec { + +in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "85.0.4183.87"; + version = upstream-info.version; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; @@ -47,10 +50,18 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "https://sites.google.com/a/chromium.org/chromedriver"; + homepage = "https://chromedriver.chromium.org/"; description = "A WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. + ''; license = licenses.bsd3; - maintainers = [ maintainers.goibhniu maintainers.marsam ]; + maintainers = with maintainers; [ goibhniu marsam primeos ]; + # Note from primeos: By updating Chromium I also update Google Chrome and + # ChromeDriver. platforms = attrNames allSpecs; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix index a93275f6e2..a6d60e33ee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix @@ -4,8 +4,8 @@ with stdenv.lib; let - minorVersion = "3.6"; - patchVersion = "0"; + minorVersion = "3.141"; + patchVersion = "59"; in stdenv.mkDerivation rec { pname = "selenium-server-standalone"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://selenium-release.storage.googleapis.com/${minorVersion}/selenium-server-standalone-${version}.jar"; - sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772"; + sha256 = "1jzkx0ahsb27zzzfvjqv660x9fz2pbcddgmhdzdmasxns5vipxxc"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index e00bed4511..6fa3b1b605 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.16.0"; + version = "1.17.0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "18v1s1k05bq38aljazvpxvp543xchy9h4n531pis4w4jl47n387f"; + sha256 = "0i86bymwfnqnvp6na6na5dmjzp3dp7l416irkllh3i5wgvppda7m"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix b/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix index f86e2857fe..e99f7dca9b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.14"; + version = "0.2.15"; src = fetchPypi { inherit pname version; - sha256 = "c51300f074ea9c5da162ed8f3bc354c3fd69564895fee90abf1e1bd525919f2b"; + sha256 = "b1fce6fcef7b117b245a72dc8658a128635749d01dc7e9d1316490f89f9c2fde"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index ef98d5603d..b3b3bd1b9f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "1604l36y6pggk72x4avdijq7c90w0as7xamh634a68ymjnd10jv4"; + sha256 = "05qxbqq9mlq2jmyj5m9vmgw6s6a3wj06hmxj74g9lgqg8xyfglnh"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index c3d1c07c2a..7802bd6ebc 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "5.3.0"; + version = "6.0.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0f3sw71ridpwcy0m8xl9gs76zl9zfsrfwzbqjidvlnszvx3177bl"; + sha256 = "0hii7kp48ba07gsd521wwl288p808xr2wqgk1iidxkzj2v6g71by"; }; # don't remove runtime deps diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix index c38944c5b5..8ce6518171 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.19.1"; - sha256 = "0zdis5wd84c57qjdiry8mmhpp009wqhb51f67iphl06vqc67w1vl"; + version = "12.20.0"; + sha256 = "12s2vjrlhgap2r12s7rqf0r2wzh9q2r5dkh3ak9fhrgmk9fgvqv1"; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix index 45e7b372e6..f5cd88c3d3 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.2.1"; - sha256 = "0gp8z68h888x2ql64aiicgs7k065lg755cbjlnkbzdih5bh32qjn"; + version = "15.3.0"; + sha256 = "0h625hhswwv5rpijacxiak28fy5br8kpxrihfcjdqwm3dvyvkc1v"; } diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index c12e0260fb..924f449369 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.34.0"; + version = "7.36.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "13d3wc49wp8rh8kxrn1krsyh24g5m6wl0mfhvbjylv0q6kp5jlan"; + sha256 = "1wdbwlli9lzxxcwbc94fybfq6ipzvsv0waqcr1mjqzlfjqaqgrsb"; name = "${pname}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/games/eduke32/default.nix b/third_party/nixpkgs/pkgs/games/eduke32/default.nix index 51d0c71375..df0950eb93 100644 --- a/third_party/nixpkgs/pkgs/games/eduke32/default.nix +++ b/third_party/nixpkgs/pkgs/games/eduke32/default.nix @@ -4,7 +4,7 @@ let version = "20200907"; - rev = "9527"; + rev = "9257"; revExtra = "93f62bbad"; desktopItem = makeDesktopItem { @@ -23,8 +23,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_20200907-9257-93f62bbad.tar.xz"; # Good - # url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; }; diff --git a/third_party/nixpkgs/pkgs/games/factorio/default.nix b/third_party/nixpkgs/pkgs/games/factorio/default.nix index 1b7769a566..4535f31f26 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/default.nix +++ b/third_party/nixpkgs/pkgs/games/factorio/default.nix @@ -13,6 +13,8 @@ assert releaseType == "alpha" let + inherit (stdenv.lib) importJSON; + helpMsg = '' ===FETCH FAILED=== @@ -59,67 +61,54 @@ let # NB `experimental` directs us to take the latest build, regardless of its branch; # hence the (stable, experimental) pairs may sometimes refer to the same distributable. - binDists = { - x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { - alpha = { - stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; }; - experimental = bdist { sha256 = "0cmia16d5dhy3f8mck926d7rrnavxmvb6a72ymjllxm37slsx60j"; version = "1.1.2"; withAuth = true; }; - }; - headless = { - stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; - experimental = bdist { sha256 = "0x3lwz11z8cczqr5i799m4yg8x3yk6h5qz48pfzw4l2ikrrwgahd"; version = "1.1.2"; }; - }; - demo = { - stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; }; - }; - }; - i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { - alpha = { - stable = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; withAuth = true; nameMut = asGz; }; - }; - }; - }; + versions = importJSON ./versions.json; + binDists = makeBinDists versions; actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); - bdistForArch = arch: { version - , sha256 - , withAuth ? false - , nameMut ? x: x - }: - let - url = "https://factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; - name = nameMut "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; - in { - inherit version arch; - src = - if withAuth then - (stdenv.lib.overrideDerivation - (fetchurl { - inherit name url sha256; - curlOpts = [ - "--get" - "--data-urlencode" "username@username" - "--data-urlencode" "token@token" - ]; - }) - (_: { # This preHook hides the credentials from /proc - preHook = '' + makeBinDists = versions: + let f = path: name: value: + if builtins.isAttrs value then + if value ? "name" then + makeBinDist value + else + builtins.mapAttrs (f (path ++ [ name ])) value + else + throw "expected attrset at ${toString path} - got ${toString value}"; + in + builtins.mapAttrs (f []) versions; + makeBinDist = { name, version, tarDirectory, url, sha256, needsAuth }: { + inherit version tarDirectory; + src = + if !needsAuth then + fetchurl { inherit name url sha256; } + else + (stdenv.lib.overrideDerivation + (fetchurl { + inherit name url sha256; + curlOpts = [ + "--get" + "--data-urlencode" "username@username" + "--data-urlencode" "token@token" + ]; + }) + (_: { # This preHook hides the credentials from /proc + preHook = + if username != "" && token != "" then '' echo -n "${username}" >username echo -n "${token}" >token + '' else '' + # Deliberately failing since username/token was not provided, so we can't fetch. + # We can't use builtins.throw since we want the result to be used if the tar is in the store already. + exit 1 ''; - failureHook = '' - cat < str: + if FLAGS.out: + return out + try_paths = ["pkgs/games/factorio/versions.json", "versions.json"] + for path in try_paths: + if os.path.exists(path): + return path + raise Exception("Couldn't figure out where to write versions.json; try specifying --out") + + +def fetch_versions() -> FactorioVersionsJSON: + return json.loads(requests.get("https://factorio.com/api/latest-releases").text) + + +def generate_our_versions(factorio_versions: FactorioVersionsJSON) -> OurVersionJSON: + rec_dd = lambda: defaultdict(rec_dd) + output = rec_dd() + for system in SYSTEMS: + for release_type in RELEASE_TYPES: + for release_channel in RELEASE_CHANNELS: + version = factorio_versions[release_channel.name][release_type.name] + this_release = { + "name": f"factorio_{release_type.name}_{system.tar_name}-{version}.tar.xz", + "url": f"https://factorio.com/get-download/{version}/{release_type.name}/{system.url_name}", + "version": version, + "needsAuth": release_type.needs_auth, + "tarDirectory": system.tar_name, + } + output[system.nix_name][release_type.name][release_channel.name] = this_release + return output + + +def iter_version(versions: OurVersionJSON, it: Callable[[str, str, str, Dict[str, str]], Dict[str, str]]) -> OurVersionJSON: + versions = copy.deepcopy(versions) + for system_name, system in versions.items(): + for release_type_name, release_type in system.items(): + for release_channel_name, release in release_type.items(): + release_type[release_channel_name] = it(system_name, release_type_name, release_channel_name, dict(release)) + return versions + + +def merge_versions(old: OurVersionJSON, new: OurVersionJSON) -> OurVersionJSON: + """Copies already-known hashes from version.json to avoid having to re-fetch.""" + def _merge_version(system_name: str, release_type_name: str, release_channel_name: str, release: Dict[str, str]) -> Dict[str, str]: + old_system = old.get(system_name, {}) + old_release_type = old_system.get(release_type_name, {}) + old_release = old_release_type.get(release_channel_name, {}) + if not "sha256" in old_release: + logging.info("%s/%s/%s: not copying sha256 since it's missing", system_name, release_type_name, release_channel_name) + return release + if not all(old_release.get(k, None) == release[k] for k in ['name', 'version', 'url']): + logging.info("%s/%s/%s: not copying sha256 due to mismatch", system_name, release_type_name, release_channel_name) + return release + release["sha256"] = old_release["sha256"] + return release + return iter_version(new, _merge_version) + + +def nix_prefetch_url(name: str, url: str, algo: str = 'sha256') -> str: + cmd = ['nix-prefetch-url', '--type', algo, '--name', name, url] + logging.info('running %s', cmd) + out = subprocess.check_output(cmd) + return out.decode('utf-8').strip() + + +def fill_in_hash(versions: OurVersionJSON) -> OurVersionJSON: + """Fill in sha256 hashes for anything missing them.""" + urls_to_hash = {} + def _fill_in_hash(system_name: str, release_type_name: str, release_channel_name: str, release: Dict[str, str]) -> Dict[str, str]: + if "sha256" in release: + logging.info("%s/%s/%s: skipping fetch, sha256 already present", system_name, release_type_name, release_channel_name) + return release + url = release["url"] + if url in urls_to_hash: + logging.info("%s/%s/%s: found url %s in cache", system_name, release_type_name, release_channel_name, url) + release["sha256"] = urls_to_hash[url] + return release + logging.info("%s/%s/%s: fetching %s", system_name, release_type_name, release_channel_name, url) + if release["needsAuth"]: + if not FLAGS.username or not FLAGS.token: + raise Exception("fetching %s/%s/%s from %s requires --username and --token" % (system_name, release_type_name, release_channel_name, url)) + url += f"?username={FLAGS.username}&token={FLAGS.token}" + release["sha256"] = nix_prefetch_url(release["name"], url) + urls_to_hash[url] = release["sha256"] + return release + return iter_version(versions, _fill_in_hash) + + +def main(argv): + factorio_versions = fetch_versions() + new_our_versions = generate_our_versions(factorio_versions) + old_our_versions = None + our_versions_path = find_versions_json() + if our_versions_path: + logging.info('Loading old versions.json from %s', our_versions_path) + with open(our_versions_path, 'r') as f: + old_our_versions = json.load(f) + if old_our_versions: + logging.info('Merging in old hashes') + new_our_versions = merge_versions(old_our_versions, new_our_versions) + logging.info('Fetching necessary tars to get hashes') + new_our_versions = fill_in_hash(new_our_versions) + with open(our_versions_path, 'w') as f: + logging.info('Writing versions.json to %s', our_versions_path) + json.dump(new_our_versions, f, sort_keys=True, indent=2) + f.write("\n") + +if __name__ == '__main__': + app.run(main) diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json new file mode 100644 index 0000000000..a76f5abc14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -0,0 +1,58 @@ +{ + "x86_64-linux": { + "alpha": { + "experimental": { + "name": "factorio_alpha_x64-1.1.3.tar.xz", + "needsAuth": true, + "sha256": "0lsgj7361bf9zhidp4hpdhb9jj7wgcw7s0q5bpqbigbnz848m3lm", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.3/alpha/linux64", + "version": "1.1.3" + }, + "stable": { + "name": "factorio_alpha_x64-1.0.0.tar.xz", + "needsAuth": true, + "sha256": "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.0.0/alpha/linux64", + "version": "1.0.0" + } + }, + "demo": { + "experimental": { + "name": "factorio_demo_x64-1.0.0.tar.xz", + "needsAuth": false, + "sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.0.0/demo/linux64", + "version": "1.0.0" + }, + "stable": { + "name": "factorio_demo_x64-1.0.0.tar.xz", + "needsAuth": false, + "sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.0.0/demo/linux64", + "version": "1.0.0" + } + }, + "headless": { + "experimental": { + "name": "factorio_headless_x64-1.1.3.tar.xz", + "needsAuth": false, + "sha256": "1164hbbd1b33hjnvjm079czjypj837gpjp2i4f23rkd4qmjpl0dj", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.1.3/headless/linux64", + "version": "1.1.3" + }, + "stable": { + "name": "factorio_headless_x64-1.0.0.tar.xz", + "needsAuth": false, + "sha256": "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1", + "tarDirectory": "x64", + "url": "https://factorio.com/get-download/1.0.0/headless/linux64", + "version": "1.0.0" + } + } + } +} diff --git a/third_party/nixpkgs/pkgs/games/frogatto/default.nix b/third_party/nixpkgs/pkgs/games/frogatto/default.nix index efcff024a5..f6d4789c30 100644 --- a/third_party/nixpkgs/pkgs/games/frogatto/default.nix +++ b/third_party/nixpkgs/pkgs/games/frogatto/default.nix @@ -34,6 +34,7 @@ in buildEnv { ''; meta = with stdenv.lib; { + broken = true; homepage = "https://frogatto.com"; description = description; license = with licenses; [ cc-by-30 unfree ]; diff --git a/third_party/nixpkgs/pkgs/games/gcompris/default.nix b/third_party/nixpkgs/pkgs/games/gcompris/default.nix index 67d52ac7bc..e4bc00793e 100644 --- a/third_party/nixpkgs/pkgs/games/gcompris/default.nix +++ b/third_party/nixpkgs/pkgs/games/gcompris/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "gcompris"; - version = "0.98"; + version = "1.0"; src = fetchurl { url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "1jmjykn0lpk0v6hs2flmch8v4da5bgxl891nav7szxw9l7aqnf4y"; + sha256 = "08dw1q0h4qz2q0ksa5pbmb9v60hr1zv9skx6z8dlq9b1i7harnds"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/games/julius/default.nix b/third_party/nixpkgs/pkgs/games/julius/default.nix index d1dad86e1c..435db5772b 100644 --- a/third_party/nixpkgs/pkgs/games/julius/default.nix +++ b/third_party/nixpkgs/pkgs/games/julius/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "julius"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "12hhnhdwgz7hd3hlndbnk15pxggm1375qs0764ija4nl1gbpb110"; + sha256 = "10d6py1cmkq8lnb5h3w8rdpp4fmpd1wgqkgiabdghqxi7b2s0g4b"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/bvschaik/julius"; license = licenses.agpl3; platforms = platforms.all; + broken = stdenv.isDarwin; maintainers = with maintainers; [ Thra11 ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix index 5cf39ec35b..77181692ec 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre_headless }: +{ stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; version = "1.16.4"; @@ -25,7 +25,10 @@ stdenv.mkDerivation { phases = "installPhase"; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) minecraft-server; }; + updateScript = ./update.sh; + }; meta = with stdenv.lib; { description = "Minecraft Server"; diff --git a/third_party/nixpkgs/pkgs/games/minecraft/default.nix b/third_party/nixpkgs/pkgs/games/minecraft/default.nix index 60f89bea0e..f419be8d63 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, nixosTests +, copyDesktopItems , makeDesktopItem , makeWrapper , wrapGAppsHook @@ -98,7 +100,7 @@ stdenv.mkDerivation rec { sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems ]; buildInputs = [ gobject-introspection ]; sourceRoot = "."; @@ -108,11 +110,14 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/opt mv minecraft-launcher $out/opt - ${desktopItem.buildCommand} install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg + + runHook postInstall ''; preFixup = '' @@ -138,6 +143,8 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; + desktopItems = [ desktopItem ]; + meta = with stdenv.lib; { description = "Official launcher for Minecraft, a sandbox-building game"; homepage = "https://minecraft.net"; @@ -146,5 +153,8 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) minecraft; }; + updateScript = ./update.sh; + }; } diff --git a/third_party/nixpkgs/pkgs/games/multimc/default.nix b/third_party/nixpkgs/pkgs/games/multimc/default.nix index 472a8b2966..c114afe9a8 100644 --- a/third_party/nixpkgs/pkgs/games/multimc/default.nix +++ b/third_party/nixpkgs/pkgs/games/multimc/default.nix @@ -25,7 +25,7 @@ in mkDerivation rec { install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapProgram $out/bin/multimc --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ + wrapProgram $out/bin/multimc --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/games/nudoku/default.nix b/third_party/nixpkgs/pkgs/games/nudoku/default.nix index b9e521bce3..0e1bd9eb4a 100644 --- a/third_party/nixpkgs/pkgs/games/nudoku/default.nix +++ b/third_party/nixpkgs/pkgs/games/nudoku/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nudoku"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jubalh"; repo = pname; rev = version; - sha256 = "0rj8ajni7gssj0qbf1jn51699sadxwsr6ca2718w74psv7acda8h"; + sha256 = "12v00z3p0ymi8f3w4b4bgl4c76irawn3kmd147r0ap6s9ssx2q6m"; }; # Allow gettext 0.20 @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "An ncurses based sudoku game"; homepage = "http://jubalh.github.io/nudoku/"; license = licenses.gpl3; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/openxray/default.nix b/third_party/nixpkgs/pkgs/games/openxray/default.nix index 13bc046e86..304a810c3d 100644 --- a/third_party/nixpkgs/pkgs/games/openxray/default.nix +++ b/third_party/nixpkgs/pkgs/games/openxray/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, glew, freeimage, liblockfile , openal, libtheora, SDL2, lzo, libjpeg, libogg, tbb -, pcre, makeWrapper }: +, pcre, makeWrapper, fetchpatch }: let version = "784-october-preview"; @@ -41,6 +41,13 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; + patches = [ + (fetchpatch { + url = "https://github.com/OpenXRay/xray-16/commit/4532cba11e98808c92e56e246188863261ef9201.patch"; + sha256 = "1hrm4rkkg946ai95krzpf3isryzbb2vips63gxf481plv4vlcfc9"; + }) + ]; + buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo libjpeg libogg tbb pcre @@ -50,10 +57,6 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/xrCore/xrCore.cpp \ --replace /usr/share $out/share - - # https://github.com/OpenXRay/xray-16/issues/667 - echo "inline const char* xr_sys_errlist[100] = {};" >> src/Common/PlatformLinux.inl - echo "#define _sys_errlist xr_sys_errlist" >> src/Common/PlatformLinux.inl ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/papermc/default.nix b/third_party/nixpkgs/pkgs/games/papermc/default.nix index c5f7dc3792..15b05b56d8 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/default.nix +++ b/third_party/nixpkgs/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, bash, jre }: let - mcVersion = "1.16.2"; - buildNum = "141"; + mcVersion = "1.16.4"; + buildNum = "296"; jar = fetchurl { url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "1qhhnaysw9r73fpvj9qcmjah722a6a4s6g4cblna56n1hpz4lw1s"; + sha256 = "0885417w7qahk2fwlzvggbwrhvwgpd7xas8lzzb7ar469vyvd9dz"; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/third_party/nixpkgs/pkgs/games/pentobi/default.nix b/third_party/nixpkgs/pkgs/games/pentobi/default.nix index b8a4935aa2..656bde2ac7 100644 --- a/third_party/nixpkgs/pkgs/games/pentobi/default.nix +++ b/third_party/nixpkgs/pkgs/games/pentobi/default.nix @@ -3,14 +3,14 @@ }: mkDerivation rec { - version = "18.3"; + version = "18.4"; pname = "pentobi"; src = fetchFromGitHub { owner = "enz"; repo = "pentobi"; rev = "v${version}"; - sha256 = "9AymvAlXi0zkkcakTR0mC4gmyrweZR4EwlhORkmVshw="; + sha256 = "1wawy6s3i4pcc6n6kfspn5b4g957ds0728mgwzw19agp5yyid73b"; }; nativeBuildInputs = [ cmake docbook_xsl qttools ]; diff --git a/third_party/nixpkgs/pkgs/games/tdm/default.nix b/third_party/nixpkgs/pkgs/games/tdm/default.nix index 055ab9d38e..98b7ecdc47 100644 --- a/third_party/nixpkgs/pkgs/games/tdm/default.nix +++ b/third_party/nixpkgs/pkgs/games/tdm/default.nix @@ -16,6 +16,7 @@ let type = "Application"; categories = "Game;"; genericName = pname; + fileValidation = false; }; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/third_party/nixpkgs/pkgs/games/tome2/default.nix b/third_party/nixpkgs/pkgs/games/tome2/default.nix index fa73697ab4..1fc80b1764 100644 --- a/third_party/nixpkgs/pkgs/games/tome2/default.nix +++ b/third_party/nixpkgs/pkgs/games/tome2/default.nix @@ -14,6 +14,7 @@ let type = "Application"; categories = "Game;RolePlaying;"; genericName = pname; + fileValidation = false; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/games/voxelands/default.nix b/third_party/nixpkgs/pkgs/games/voxelands/default.nix index 93f7e9bffa..5e52cba3b4 100644 --- a/third_party/nixpkgs/pkgs/games/voxelands/default.nix +++ b/third_party/nixpkgs/pkgs/games/voxelands/default.nix @@ -1,13 +1,30 @@ -{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, xlibsWrapper, pkgconfig }: +{ stdenv +, fetchFromGitLab +, bzip2 +, cmake +, expat +, irrlicht +, libGL +, libGLU +, libXxf86vm +, libjpeg +, libpng +, libvorbis +, openal +, pkg-config +, sqlite +, xlibsWrapper +}: stdenv.mkDerivation rec { pname = "voxelands"; - version = "1512.00"; + version = "1704.00"; - src = fetchurl { - url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2"; - sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw"; + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = version; + sha256 = "0yj9z9nygpn0z63y739v72l3kg81wd71xgix5k045vfzhqsam5m0"; }; cmakeFlags = [ @@ -16,16 +33,32 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm libGLU libGL openal libvorbis xlibsWrapper pkgconfig + bzip2 + expat + irrlicht + libGL + libGLU + libXxf86vm + libjpeg + libpng + libvorbis + openal + sqlite + xlibsWrapper ]; meta = with stdenv.lib; { - homepage = "http://voxelands.com/"; + homepage = "https://voxelands.net/"; description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ]; + broken = stdenv.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'" }; } diff --git a/third_party/nixpkgs/pkgs/games/xonotic/default.nix b/third_party/nixpkgs/pkgs/games/xonotic/default.nix index ab6ac022b6..60ebdcf8ee 100644 --- a/third_party/nixpkgs/pkgs/games/xonotic/default.nix +++ b/third_party/nixpkgs/pkgs/games/xonotic/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem -, xonotic-data +, xonotic-data, copyDesktopItems , # required for both unzip, libjpeg, zlib, libvorbis, curl , # glx @@ -131,7 +131,8 @@ in rec { xonotic = runCommandNoCC "xonotic${variant}-${version}" { inherit xonotic-unwrapped; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + desktopItems = [ desktopItem ]; passthru = { inherit version; meta = meta // { @@ -151,7 +152,7 @@ in rec { '' + lib.optionalString (withSDL || withGLX) '' mkdir -p $out/share ln -s ${xonotic-unwrapped}/share/icons $out/share/icons - ${desktopItem.buildCommand} + copyDesktopItems '' + '' for binary in $out/bin/xonotic-*; do wrapProgram $binary --add-flags "-basedir ${xonotic-data}" diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index d1fa038982..0e6784e69e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -13,13 +13,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5346"; + version = "1.0.5551"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "2ce59c44bcb2d789f4d6312b26cf41f36915d73c"; - sha256 = "0hk8jdacg8ryhh0mpnfjbzrrpy8gv87f4hp0hybyypglmaxz8grm"; + rev = "2dcc6333f8cbb959293832f52857bdaeab1918bf"; + sha256 = "1hfa498fr9mdxas9s02y25ncb982wa1sqhl06jpnkhqsiicbkgcf"; }; nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix index 94093e1e29..4f30b159a2 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix @@ -14,6 +14,11 @@ version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) + (fetchNuGet { + name = "Crc32.NET"; + version = "1.2.0"; + sha256 = "0qaj3192k1vfji87zf50rhydn5mrzyzybrs2k4v7ap29k8i0vi5h"; + }) (fetchNuGet { name = "DiscordRichPresence"; version = "1.0.150"; @@ -236,8 +241,8 @@ }) (fetchNuGet { name = "OpenTK.NetStandard"; - version = "1.0.5.12"; - sha256 = "1n8j6k47189l5b6rnhyq391d84v6zkpiiqq41cccb6qizvrcgl69"; + version = "1.0.5.22"; + sha256 = "10bdhc4qbffac862zg03ab5j3iqrr33bydxmnmrxn82brldahm23"; }) (fetchNuGet { name = "PangoSharp"; @@ -489,6 +494,11 @@ version = "4.3.0"; sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; }) + (fetchNuGet { + name = "SharpZipLib"; + version = "1.2.0"; + sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5"; + }) (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch index d25e22fbd3..7283ef9e7d 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch +++ b/third_party/nixpkgs/pkgs/misc/emulators/ryujinx/log.patch @@ -1,5 +1,5 @@ diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs -index 20c0fb46..ce933730 100644 +index 20c0fb46..534576bc 100644 --- a/Ryujinx.Common/Configuration/LoggerModule.cs +++ b/Ryujinx.Common/Configuration/LoggerModule.cs @@ -75,7 +75,7 @@ namespace Ryujinx.Configuration @@ -7,7 +7,7 @@ index 20c0fb46..ce933730 100644 { Logger.AddTarget(new AsyncLogTargetWrapper( - new FileLogTarget(AppDomain.CurrentDomain.BaseDirectory, "file"), -+ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"), ++ new FileLogTarget(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"), "file"), 1000, AsyncLogTargetOverflowAction.Block )); diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/base.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/base.nix index c4858c6c57..0be36daac9 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/base.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/base.nix @@ -2,6 +2,7 @@ name, version, src, mingwGccs, monos, geckos, platforms, pkgconfig, fontforge, makeWrapper, flex, bison, supportFlags, + patches, buildScript ? null, configureFlags ? [] }: @@ -9,6 +10,7 @@ with import ./util.nix { inherit lib; }; let vkd3d = callPackage ./vkd3d.nix {}; + patches' = patches; in stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; @@ -73,10 +75,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]) ++ [ pkgs.xorg.libX11 pkgs.perl ])); - patches = [ - # Also look for root certificates at $NIX_SSL_CERT_FILE - ./cert-path.patch - ]; + patches = [ ] ++ patches'; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch b/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch new file mode 100644 index 0000000000..da01a47781 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path-stable.patch @@ -0,0 +1,24 @@ +diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c +index f795181..fb4926a 100644 +--- a/dlls/crypt32/rootstore.c ++++ b/dlls/crypt32/rootstore.c +@@ -18,6 +18,7 @@ + #include "config.h" + #include + #include ++#include /* getenv */ + #include + #ifdef HAVE_SYS_STAT_H + #include +@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) + + for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) + ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); ++ ++ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); ++ if (nix_cert_file != NULL) ++ ret = import_certs_from_path(nix_cert_file, from, TRUE); ++ + check_and_store_certs(from, store); + } + CertCloseStore(from, 0); diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path.patch b/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path.patch index da01a47781..18a90e1a9a 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path.patch +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/cert-path.patch @@ -1,24 +1,23 @@ -diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c -index f795181..fb4926a 100644 ---- a/dlls/crypt32/rootstore.c -+++ b/dlls/crypt32/rootstore.c -@@ -18,6 +18,7 @@ - #include "config.h" - #include - #include -+#include /* getenv */ - #include - #ifdef HAVE_SYS_STAT_H - #include -@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) +diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c +index 035f2d936bb..959716d727a 100644 +--- a/dlls/crypt32/unixlib.c ++++ b/dlls/crypt32/unixlib.c +@@ -24,6 +24,7 @@ + #include "wine/port.h" - for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) - ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); + #include ++#include + #include + #include + #include +@@ -605,6 +606,10 @@ static void load_root_certs(void) + + for (i = 0; i < ARRAY_SIZE(CRYPT_knownLocations) && list_empty(&root_cert_list); i++) + import_certs_from_path( CRYPT_knownLocations[i], TRUE ); + -+ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); -+ if (nix_cert_file != NULL) -+ ret = import_certs_from_path(nix_cert_file, from, TRUE); -+ - check_and_store_certs(from, store); - } - CertCloseStore(from, 0); ++ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); ++ if (nix_cert_file != NULL) ++ import_certs_from_path(nix_cert_file, TRUE); + } + + static BOOL WINAPI enum_root_certs( void *buffer, SIZE_T size, SIZE_T *needed ) diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/packages.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/packages.nix index 31d21058e3..c4fec3360e 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/packages.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/packages.nix @@ -7,7 +7,7 @@ let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { name = "wine-${version}"; - inherit src version supportFlags; + inherit src version supportFlags patches; pkgArches = [ pkgsi686Linux ]; geckos = [ gecko32 ]; mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc ]; @@ -16,7 +16,7 @@ in with src; { }; wine64 = callPackage ./base.nix { name = "wine64-${version}"; - inherit src version supportFlags; + inherit src version supportFlags patches; pkgArches = [ pkgs ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; geckos = [ gecko64 ]; @@ -26,7 +26,7 @@ in with src; { }; wineWow = callPackage ./base.nix { name = "wine-wow-${version}"; - inherit src version supportFlags; + inherit src version supportFlags patches; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; geckos = [ gecko32 gecko64 ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix index c26b84ffa0..4b16e78cd7 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "5.0.2"; + version = "5.0.3"; url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "1g7c5djbi262h6zivmxbk26rsflwq8mrghr7hci3ajw7f3s89hn2"; + sha256 = "sha256-nBo1Ni/VE9/1yEW/dtpj6hBaeUrHFEqlA/cTYa820i8="; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -31,27 +31,45 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.9.4"; - url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "1p8g45xphxnns7dkg9rbaknarbjy5cjhrngaf0fsgk9z68wgz9ji"; + version = "5.1.1"; + url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; + sha256 = "09wjrfxbw0072iv6d2vqnkc3y7dzj15vp8mv4ay44n1qp5ji4m3l"; }; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path-stable.patch + ]; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.20"; + version = "5.22"; url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; - sha256 = "sha256-j1Ui+M6+vbqhL1jhumcaEfZjcuCu33T7kyz1qJOQhhw="; + sha256 = "sha256-Cb0GyHyMl05q00UHzsh11yF+tW/Anfg41UU+DrvOTSE="; inherit (stable) mono gecko32 gecko64; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + + # Hotfix picked from master for https://bugs.winehq.org/show_bug.cgi?id=50163 + (pkgs.fetchpatch { + url = "https://bugs.winehq.org/attachment.cgi?id=68680"; + sha256 = "sha256-GTPQhRWeu6DPadqgFiuVUjI6MzJPaTN4l//8DSG6hpo="; + }) + ]; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-1oWoLb5w9g3wDghpvHpNsJCws7QoZ/E2dqxLuaIgi6o="; + sha256 = "sha256-HzAKLPlybO1lrkHo4Q1Y9H0vmjiqo9HiT05TcX08Ubk="; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + #rev = "v${version}"; # revert back to this statement on next release + # Include hotfix for https://bugs.winehq.org/show_bug.cgi?id=50162 + rev = "f257f37b92041fc718de04aa83ec3139b748ffa2"; # Just keep list empty, if current release haven't broken patchsets disabledPatchsets = [ ]; diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index 5a7762640f..6f113bcd99 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -103,8 +103,20 @@ stdenv.mkDerivation rec { done ''; + # dynamic library name only contains maj.min, eg. '9.53' + dylib_version = lib.versions.majorMinor version; preFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs + install_name_tool -change libgs.dylib.$dylib_version $out/lib/libgs.dylib.$dylib_version $out/bin/gs + ''; + + # validate dynamic linkage + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/gs --version + + runHook postInstallCheck ''; meta = { diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix new file mode 100644 index 0000000000..3fa6dbc725 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/screensavers/multilockscreen/default.nix @@ -0,0 +1,47 @@ +{ + stdenv, makeWrapper, fetchFromGitHub, writeShellScriptBin, + imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb, xset, + gnused, gnugrep, coreutils +}: +let + i3lock = writeShellScriptBin "i3lock" '' + ${i3lock-color}/bin/i3lock-color "$@" + ''; + binPath = stdenv.lib.makeBinPath [ + imagemagick i3lock + xdpyinfo xrandr xset + bc feh procps xrdb + gnused gnugrep coreutils + ]; +in +stdenv.mkDerivation rec { + pname = "multilockscreen"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jeffmhubbard"; + repo = pname; + rev = "v${version}"; + sha256 = "0gmnrq7ibbhiwsn7mfi2r71fwm6nvhiwf4wsyz44cscm474z83p0"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp multilockscreen $out/bin/multilockscreen + wrapProgram "$out/bin/multilockscreen" --prefix PATH : "${binPath}" + ''; + + meta = with stdenv.lib; { + description = "Wrapper script for i3lock-color"; + longDescription = '' + multilockscreen is a wrapper script for i3lock-color. + It allows you to cache background images for i3lock-color with a variety of different effects and adds a stylish indicator. + ''; + homepage = "https://github.com/jeffmhubbard/multilockscreen"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ kylesferrazza ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index d47ab09e3c..de3c78cc52 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -180,6 +180,26 @@ in rec { }; }; + jump = mkDerivation { + pluginName = "jump"; + version = "2020-06-26"; + rtpFilePath = "tmux-jump.tmux"; + src = fetchFromGitHub { + owner = "schasse"; + repo = "tmux-jump"; + rev = "416f613d3eaadbe1f6f9eda77c49430527ebaffb"; + sha256 = "1xbzdyhsgaq2in0f8f491gwjmx6cxpkf2c35d2dk0kg4jfs505sz"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/schasse/tmux-jump"; + description = "Vimium/Easymotion like navigation for tmux"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ arnarg ]; + }; + }; + logging = mkDerivation { pluginName = "logging"; version = "unstable-2019-04-19"; @@ -246,6 +266,17 @@ in rec { }; }; + onedark-theme = mkDerivation { + pluginName = "onedark-theme"; + version = "unstable-2020-06-07"; + src = fetchFromGitHub { + owner = "odedlaz"; + repo = "tmux-onedark-theme"; + rev = "3607ef889a47dd3b4b31f66cda7f36da6f81b85c"; + sha256 = "19jljshwp2p83b634cd1mw69091x42jj0dg40ipw61qy6642h2m5"; + }; + }; + pain-control = mkDerivation { pluginName = "pain-control"; version = "unstable-2020-02-18"; @@ -366,6 +397,25 @@ in rec { }; }; + tilish = mkDerivation { + pluginName = "tilish"; + version = "2020-08-12"; + src = fetchFromGitHub { + owner = "jabirali"; + repo = "tmux-tilish"; + rev = "73d2404cdc0ef6bd7fbc8982edae0b0e2a4dd860"; + sha256 = "1x58h3bg9d69j40fh8rcjpxvg0i6j04pj8p3jk57l3cghxis5j05"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/jabirali/tmux-tilish"; + description = "Plugin which makes tmux work and feel like i3wm"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ arnarg ]; + }; + }; + tmux-colors-solarized = mkDerivation { pluginName = "tmuxcolors"; version = "unstable-2019-07-14"; @@ -392,6 +442,25 @@ in rec { dependencies = [ pkgs.urlview ]; }; + vim-tmux-focus-events = mkDerivation { + pluginName = "vim-tmux-focus-events"; + version = "unstable-2020-10-05"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "vim-tmux-focus-events"; + rev = "a568192ca0de4ca0bd7b3cd0249aad491625c941"; + sha256 = "130l73v18md95djkc4s9d0fr018f8f183sjcgy7dgldwdaxlqdi1"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events"; + description = "Makes FocusGained and FocusLost autocommand events work in vim when using tmux"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ronanmacf ]; + }; + }; + vim-tmux-navigator = mkDerivation { pluginName = "vim-tmux-navigator"; rtpFilePath = "vim-tmux-navigator.tmux"; diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix index c4b8eefcc2..7533707ccf 100644 --- a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "0ydd88jc4pyf1v7008h2gf0napv6xpw4jn5w87slj9fphjdkwjiz"; + sha256 = "12zj8jfm8jrwbqm3cnay8gx28ladmpyv5d29lp8qlfjqgflvhkwh"; }; patches = lib.singleton ( diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 51bf6876aa..c69fe3a2f9 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-07-26"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "3c92e212a05eb254849a597d8d002abf69699aa0"; - sha256 = "0m3kinhzjk0cky372j1kw6hhy14khshkh9jbw35a5q18c4xvy4pq"; + rev = "81b0a1a612621f3b8d9ce30c48527cc85a950f1c"; + sha256 = "1yqvcyw8zaryqy2hbbq4iaf5af0n4wpw07i8508z7dp9ib92w85v"; }; meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-11-14"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "48fe0dd4f629bb1282277ba8a6757a84c13a4dda"; - sha256 = "192wb50cv7yv6c4gmjmlmh8b5891v51xcxm396sm4d5y9pzw52mc"; + rev = "03b6978a270107b670b0363d50f3eed4b365ba26"; + sha256 = "093h23phmpn7c4w519klja7s8saa889y2r3i6rbxjzxg8qbqd44v"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -135,14 +135,26 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + async-vim = buildVimPluginFrom2Nix { + pname = "async-vim"; + version = "2020-06-20"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "async.vim"; + rev = "6102020b4690f05ab6509a37fa25bc53e2d799a9"; + sha256 = "1b39nnym8lwdwhpbrbl6438s7ragnfm3n2lbs8acp78jl4jraiwz"; + }; + meta.homepage = "https://github.com/prabirshrestha/async.vim/"; + }; + asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-11-04"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "ed75b1c92fb144bbe236bfb4d60a98dccf637c58"; - sha256 = "1szxam9hq3s1s542i5fk5pkr5kdpdlz5849yq68i2nnkkh8xwrar"; + rev = "c5f5808581bd3a41ee379836ebf804eb46a189a5"; + sha256 = "1izxr4lx6nncajaiszff3w38qc8c6hrpkd6rj8q7wasqcsxd3fcj"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -221,12 +233,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2020-11-14"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "2122af3641f138281a351611861900ca823a2324"; - sha256 = "1wqkq6cwhwbr6cypn05mbb2n7ry6b5b7ic7ad8s1hmc4gxgfxk6h"; + rev = "447a5863f91ac4e2b1e843829e3e200f59d687bb"; + sha256 = "1x7jjh444ddn1rxyvn5sn2cpm6xdag05x2kj4lm14q96przi5f90"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -305,12 +317,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-10-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "84335b66be1e323002380280f265983dc635fd99"; - sha256 = "0p9f7hy751ayjh6pna8gi0vi09lk0dwpi69rh21nidiqiph6n5l5"; + rev = "9eb05f05f11ce281bff8b2ee980e70244e29d7ae"; + sha256 = "15d763gv1939jhxg8431pxjxq8a86bfz898hdscakq7wf3wsc6kr"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -365,12 +377,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2020-11-07"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "8a53f6267dffd1dea3f50adc4b61653178c00115"; - sha256 = "1bwprg23d593pplm5cwfkg5yj0i8k2gqb3aj8yp8sdiccikfbswk"; + rev = "d105c5978eb983d44461f83fc3b1033eb11d1a55"; + sha256 = "1nbb8zq2nhsbxn3lzh9sdhds2hv4n91vxafia7ydmzmyz9gyh6qw"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -413,52 +425,40 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-09-10"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "8ff425faab53e8bb8c53eec1afdf19a29c8086f6"; - sha256 = "06ddv9brb4zy8ylas36dkmblr93n6c5dp6vpp3c7asxc1kx58gc5"; + rev = "ea22e4462f9ac77f9c0cf3b1413bcd4d3b86a135"; + sha256 = "15rx4ws7hvssi7z1fkh7mzadc9xifi4hzb9g91lbinds12v19gg9"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "654fe4ece0ff49b62d3f19d678436522f92c3a08"; - sha256 = "1j38g0c81rnk502vr6n7zf7r1v3p48mimsd13dc7cqsvnhrh34ix"; + rev = "942152abc7907a0a82ce364bc50a4a463a6e925c"; + sha256 = "15pzzv6s8vks6xdms3pz5mcd8qb0lv89wnnpbipsyxlkz393yj36"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-11-17"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "f3d792518982d58a7d7f846f31f01f0ef0c5434a"; - sha256 = "10xl2gx1n9c34amca7zq4chczfc126dwz7733fi55ks29fdl708c"; + rev = "ce0cdfd91b184da76874024265d6e7d1ac06e073"; + sha256 = "07v094rn7vh8sa5psw0cg47m5v2qypzndd4ddcpgmxdr64z8xqgs"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-markdownlint = buildVimPluginFrom2Nix { - pname = "coc-markdownlint"; - version = "2020-11-12"; - src = fetchFromGitHub { - owner = "fannheyward"; - repo = "coc-markdownlint"; - rev = "a9304f7b096871e15c2992d0d09e7c7f3a3675d4"; - sha256 = "0r7mr4qmw04hhxihfn4pndpv0dakwjcj6jf1jccgydxc35qv14vj"; - }; - meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; - }; - coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; @@ -483,26 +483,14 @@ let meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; - coc-vimlsp = buildVimPluginFrom2Nix { - pname = "coc-vimlsp"; - version = "2020-08-01"; - src = fetchFromGitHub { - owner = "iamcco"; - repo = "coc-vimlsp"; - rev = "efb672fe82d8619d83d3978714393e13aee8e296"; - sha256 = "16whzvyzbx8zh7z33w7pir264dmbapkanb15mkazfhkh0wm3sfvf"; - }; - meta.homepage = "https://github.com/iamcco/coc-vimlsp/"; - }; - coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-11-17"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "103d5e995127937bdeb42cf248c2325cce93b9eb"; - sha256 = "1llgy5m8smrvbsaafirx4a0sdzvia2rxwk57jylm5hh376kll6kl"; + rev = "708aaad11cb2b7a6473f2d527182647f889fee66"; + sha256 = "0z3si82c3kzvm1kc4a96nmcs77dyhv1ym1kqw86al5nlpz5iadvp"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -582,24 +570,24 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-11-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "8c028d007ca314d7734d83dcc05db1ed103db9b5"; - sha256 = "0ym17vamf5hk4lqmkfknkf0mm91vsjayhjnjyvnvc0qhyyhgsi67"; + rev = "936bbd17577101a4ffb07ea7f860f77dd8007d43"; + sha256 = "1z399q3v36hx2ipj1fhxcc051pi4q0lifyglmclxi5zkbmm0z6a7"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; completion-tabnine = buildVimPluginFrom2Nix { pname = "completion-tabnine"; - version = "2020-10-03"; + version = "2020-10-31"; src = fetchFromGitHub { owner = "aca"; repo = "completion-tabnine"; - rev = "a7e6e2e249fec79f4260f388cd0c8adb38c0b3ad"; - sha256 = "1hnbhr4sgl7a8mj2ygma9avc7hfsv18wxrxypik62x7vijsnv9aq"; + rev = "373b556ce383da4cd35eae87c615cc4806af96d8"; + sha256 = "05n1vlyjis6wr08k11zfbz6lic8c9gmplsfq8h0zskq01n7gs044"; }; meta.homepage = "https://github.com/aca/completion-tabnine/"; }; @@ -654,12 +642,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-11-13"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "5e40da6c7119bfc31b3737d7ced2b8098f56a99f"; - sha256 = "0ggp8sw1dym9zlr8q0qhshjdgh83wr91cv5yh9b6im08rf89ddxf"; + rev = "2556bf597c7230bf89fbe2c2d842192a212b05e2"; + sha256 = "1g5g74s6g90rard81h467wrs0piz0x5nin34z7pn5z04v6jv80mq"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -798,12 +786,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-11-16"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c5b0eaa606af67fccd0d0e972ae5e8f16678ef9e"; - sha256 = "0d54gg0brcflijv2xq3x06d561z9vj2b2y658pcv9bwjmbr3pwyy"; + rev = "c5f1a646122eb4f6048f97b1ef8a936ad49f18eb"; + sha256 = "08j9msy49i1lz12bg2z98r7226c1khdixnj81c0pfnq4m8mprfz5"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -834,12 +822,12 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-09-10"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "2c80ef41fa56bbb4a0d48c4153404be694368141"; - sha256 = "08kdhn4kry8sc8gyffp8zl609nlajhd1x6qi50n5216r9dk03jlk"; + rev = "df995dae2ea31a2af5df12e1d405d9f1cf702ab1"; + sha256 = "14fcr2i3nq1x6rcjw3bqd4qdxdns7z67q92pj4w349qnqzr8pd0m"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; @@ -1088,12 +1076,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-11-17"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "27c5ddba448e50e182985e1582dd519342986cef"; - sha256 = "09i3p0r4vjc5xipqrykm83wa9p96k609c1p1c2frakskhy7zkidz"; + rev = "a39f78f5e599ef29cc15c46c352ec5560e0f8e73"; + sha256 = "0g0n1xbz2429ghsys06ij4csd88y2nx0yz7lqpp8924nhzlw2355"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1136,12 +1124,12 @@ let direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; - version = "2020-11-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "def4982fa3a613cfb59a4cd8d35d4c99e4e1688c"; - sha256 = "1xrr8pdxmpxz79qgw1kl5wdb4i2afmvl5zjxhkjinvpqnmimx0xz"; + rev = "ff37d76da391e1ef299d2f5eb84006cb27a67799"; + sha256 = "136z8axjd66l4yy6rkjr6gqm86zxnqpbw9pzkvii0lsaz11w9wak"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1391,12 +1379,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-11-11"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "53b3aea0da5e3581e224c958dbc13558cbe5daee"; - sha256 = "0r19v3431ps7mmq2vb0vf1phwmgi1xp0n7z43wa68i4ilyjhbnr6"; + rev = "cabfd44a8b1666e9b0c1b18f55646dd8ec25d0d9"; + sha256 = "1wzh1jy4i86yyskmr3i600s6a20vs0dwxnyna8dy32jg8l962wkx"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1427,12 +1415,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-08-12"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "d6191a111a1160ddecb05292eefe28ae362ccbaa"; - sha256 = "17dp28a3ipbx8fwsj0h9imkrgd0nfjzpcsn1zjdbih1kfh494smf"; + rev = "2c82ecf78b709a60ce7b3023ff6f49e01fa4275d"; + sha256 = "0hfbz11g887kdn9zsry53gf5gfh0n84h3ww9bjn7fkq9qpkkq9mv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1485,6 +1473,18 @@ let meta.homepage = "https://github.com/gregsexton/gitv/"; }; + glow-nvim = buildVimPluginFrom2Nix { + pname = "glow-nvim"; + version = "2020-08-31"; + src = fetchFromGitHub { + owner = "npxbr"; + repo = "glow.nvim"; + rev = "21ed617b1a16997a02f54ae05c1a9dc3f3c503bf"; + sha256 = "0qkvxly52qdxw77mlrwzrjp8i6smzmsd6k4pd7qqq2w8s8y8rda3"; + }; + meta.homepage = "https://github.com/npxbr/glow.nvim/"; + }; + golden-ratio = buildVimPluginFrom2Nix { pname = "golden-ratio"; version = "2020-04-03"; @@ -1655,12 +1655,12 @@ let idris2-vim = buildVimPluginFrom2Nix { pname = "idris2-vim"; - version = "2020-05-25"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "edwinb"; repo = "idris2-vim"; - rev = "099129e08c89d9526ad092b7980afa355ddaa24c"; - sha256 = "1gip64ni2wdd5v4crl64f20pbrx24dmr3ci7w5c9da9hs85x1p29"; + rev = "964cebee493c85f75796e4f4e6bbb4ac54e2da9e"; + sha256 = "1hgil24c7zv7m1glzzm3an60pimd3l9dbma26xdxly7bv210ssmz"; }; meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; @@ -1715,12 +1715,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-11-11"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "9662ef8f0443211b11fd87919343d12179bca548"; - sha256 = "1mdbppz3xb8dzbw61fcv3gn3ad4hgia9i5s96vyw5frwxlkfyqpm"; + rev = "a03953d4e89ebc372674f88303c5d4933709fea6"; + sha256 = "0yxx925wrxf3hyllvqnbyiy39bw075vmzzys9jx0aimk7dmf1w9l"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1737,6 +1737,18 @@ let meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; + investigate-vim = buildVimPluginFrom2Nix { + pname = "investigate-vim"; + version = "2020-02-29"; + src = fetchFromGitHub { + owner = "keith"; + repo = "investigate.vim"; + rev = "aef9332ba3cfc070fb59fd7a4ac82bae2b42cd7b"; + sha256 = "1jiipch8jr66h1cywwj0zdlx45p70d359s8ljdwcndjwicrqslmk"; + }; + meta.homepage = "https://github.com/keith/investigate.vim/"; + }; + iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; version = "2020-06-18"; @@ -1956,36 +1968,36 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-10-13"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "e541328a67fe10f1323630a30a37b58c934d7819"; - sha256 = "09w33f4cyg9wdj8jas5h43cc7byqfmmm9wyc0xjaw9jxcp78ygg9"; + rev = "72c5c03ea2fa8e3f0003c3dbdd5d6431bb2cb863"; + sha256 = "1niswynnsnl2fhfy2hlvqngikm87i49il92vaj83hnkn93p7jc83"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-09-30"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "5b43087089798be70de0119e4f2476d2a2c0f6cb"; - sha256 = "04iw79ahfxm4ym5caj8iirs02l7qw9b49igzpg9vxs2ylqyfk3pn"; + rev = "16520df9bcb57a5c150efff5a8bf2cd64f659f07"; + sha256 = "0hnn7hw1a7a5ld742mlw070xnj2zyvyq2kzrzsp2ky7ir3lhn7x2"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-11-10"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "38a20127dc8aaf76f686b0b96023b51c466969b9"; - sha256 = "19pw4mmhp4cj2xjb6ygiahmix2wq123a738whjg5137zkrzfqz2j"; + rev = "0edb04acd77b9e5e498314b6345d422d93921ffa"; + sha256 = "1cndwbwx9pg6550k7j2z0pw91dll0idspd0jpd0kycpxm4330jy9"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2004,24 +2016,24 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-11-17"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "ad6f73578316dc6d1e016f9083ef35a4538c02d9"; - sha256 = "19496bhdzyrykxs8j2mx69ml9a8548jdz0s0n5qq72cxhm2b3p03"; + rev = "087893a9c67fb5f49ad209866194a128e00f95f1"; + sha256 = "0savwpgnff4sm7ij3ii2mkrd9lv4nmihyab7mcp9w66i8zdq1kyh"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-11-14"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "543ee323a4a63fd32cc17dc57edea9c00962bb12"; - sha256 = "1x75hd3ibnlrqnshhhrcg1z3i6z0gk58sfvjys22dvirv1r6lg37"; + rev = "709b2d8dc88fa622d6c076f34b05b58fcccf393f"; + sha256 = "08v68ymwj6rralfmjpjggd29sc2pvan4yg1y7sysylwlmwl7nhlp"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2074,6 +2086,18 @@ let meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; + MatchTagAlways = buildVimPluginFrom2Nix { + pname = "MatchTagAlways"; + version = "2017-05-20"; + src = fetchFromGitHub { + owner = "Valloric"; + repo = "MatchTagAlways"; + rev = "352eb479a4ad1608e0880b79ab2357aac2cf4bed"; + sha256 = "0y8gq4cs0wm2ijagc2frpmm664z355iridxyl5893576v5aqp8z1"; + }; + meta.homepage = "https://github.com/Valloric/MatchTagAlways/"; + }; + mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; version = "2019-11-24"; @@ -2508,12 +2532,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-10-30"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "85750560a680907c50c1545abc4dd0e0b2452ff4"; - sha256 = "1395m95ry4c52bj2zpxryks70c3abfwhb140kpx4rifl2ccpnwwp"; + rev = "253eafd3a71ce2a48306fe4a7bdfc4208d0c2eb5"; + sha256 = "1v6rwsndnl9g77vscxyy8lffb3viydk9r44vkikdrdqwl4h6h0n2"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2544,12 +2568,12 @@ let neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-11-17"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "neuron.vim"; - rev = "ccaf20fdd028f21cf7281e7b94a0687ecf4e203b"; - sha256 = "1c5dk3xr4lgnc8226rhjmz4c1wjv18p5iqbc4z4bk3m32bq7rhxp"; + rev = "853fbe273f9f40defe69a9d50d267fee1bbc6b5a"; + sha256 = "0l6qxmd1y67jam8np37ywks95nbs53bvmh51y4ak4078mz2n1nji"; }; meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; @@ -2604,12 +2628,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2020-11-15"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "de6b08e0e2f4dc8b8fd0c862a36cb17b9faecf14"; - sha256 = "1a7ygblpwgrnnwqjrwmc7ppgla22z1yr1n33qw5h2wp0hlvy7z3l"; + rev = "f94ec5a9259b4fd2deb495ead0341a38c19c2799"; + sha256 = "1f7z23dn7vnldc82d6x1j8wqvj9vsi169rbcg0scfphh79fq61pc"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -2640,12 +2664,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2020-11-15"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "52f38f925a3116c6bad0b7f4d54d5daa576a5cdf"; - sha256 = "0806zbrwc1la4k6nnwih5kx8zv97dw9p9hnpyxqd3s45rnb7izsa"; + rev = "07538909ab5934313d8bdb234481d05d6cefa565"; + sha256 = "0jvz0j0pp53r080cz4r2z81vx73czhis9a5yl7p3xaw88sr5s23g"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2676,12 +2700,12 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2020-11-18"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b8b78237b8002f6a1cda1a205db11770ca748777"; - sha256 = "136zd50kj3mzvh5m1f73spbfl7wsmac7676p8yhw4mhg9wv0vv7w"; + rev = "c4f98237c54bd2478bb3826500f9c9b654612801"; + sha256 = "0x82fsc9hvydyhi31wh7if2gdi8azgls88klc4hn476jx7rm5n58"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -2700,24 +2724,24 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2020-11-18"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4f19567fb76438d39ed196ae5b4e06b749e75e16"; - sha256 = "16iddpk10mgh4pah9lc35ijh7idinc7v37pkbyaixnljjm64jwqw"; + rev = "09fc9449e88b8a4f97d14e87af3685a48df2137f"; + sha256 = "0fygy2qnsk8kqlb5233hb16rq3xyqqr00nn5nxzrhbqsdwy2xw7r"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2020-11-13"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "6abfc5411c8292eea756816b2db9f0ee9ab344ff"; - sha256 = "07s3psv27nr99f6d6173cykvqqiv22dqljy89j8wnqkh2rskzfrq"; + rev = "7582dc5b176c8990d00d16a2d69b0555ead09051"; + sha256 = "0pwafd9hjkhxxn08nh2c1k01y67gdl3n2bx36k41452pkzxc8x9c"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -2736,36 +2760,36 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2020-10-31"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "ef893b523d366a0dde44b61d9cb327f2bea65f1d"; - sha256 = "0g4sz0q5mipa6f8hybbkd42jg6ayw3ih2lv1ml4pjyp378cqbkg6"; + rev = "9c3bc7d031527f0be6457c17215a131627ff6b9b"; + sha256 = "1q5gy8viw6jhs3dk0qplp1zp55si8zm0m4knsl3is5ab48hh9sry"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-11-18"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "289cdc9da8f7f21dcbf814032e9277ef0e9790a0"; - sha256 = "0fqsl6rva6rb0zdpkv8myn7x5frxg5nmjykhx0jxc23zx5q65nj3"; + rev = "7cea2981444841403a5b85838edd26c390adcdb3"; + sha256 = "1sqd4r3csaqafhsihfxap9ldzq7p0h4g5ysazgsq6ckcc7ksf0wq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2020-11-14"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "f70b9e30ff0b149c0eb2c1e4bdbdef594bdab30b"; - sha256 = "04mjl32gahaw2xky8yaghmgakiiy47dcjj6k4p793xfcs1kf4bsh"; + rev = "192baea80c5b1a98a267eb7f13769f33adab7de8"; + sha256 = "0bap7ckwha4halhdz0hv69iad0wrcdwd9843rnzvfkz3b1bdbvdn"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -2784,16 +2808,28 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2020-11-18"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "be31f77bcf66fdf07bef286382e7eb563c2643fc"; - sha256 = "02y4y4na91hjj6kw944wiww16xby7brd306jkhd5bzsb8asi223n"; + rev = "42bca9550fa6ad5389d6e95ba9876bf05a8d0406"; + sha256 = "0zvjjbffvpnmc9rgrkj8cx5jqbkw8yvjwnj0jk8ccxpl0s9v2yi6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; + nvim-ts-rainbow = buildVimPluginFrom2Nix { + pname = "nvim-ts-rainbow"; + version = "2020-11-25"; + src = fetchFromGitHub { + owner = "p00f"; + repo = "nvim-ts-rainbow"; + rev = "f8d1c895dfadb16f6ac61d5272098f2cd989e8aa"; + sha256 = "1gdblzlh5f8cnjwkszxsvv72ryqwywbb4i1hanv879l3ji857iqi"; + }; + meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; + }; + nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; version = "2020-11-08"; @@ -2832,12 +2868,12 @@ let oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2020-11-08"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "9fa644b0f545cad22ee28ee3dd9a719a9a6bf75b"; - sha256 = "0xxc6im5rvd2c14i0jpnsgjhcsc7l5zs30razc4gqvv753g663qs"; + rev = "29d694b9f6323c90fb0f3f54239090370caa99fb"; + sha256 = "0lwwzfayv7ql1qpydqgyr0g024shzck2m8d04dn5g0vf5qqf3qi6"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; @@ -2964,12 +3000,12 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2020-10-19"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "0cb0a18378db84c4c2bdb38c28e897958d2ec14d"; - sha256 = "1808kwf3ccrjaqxr43l23kfj8s0zijdk0rpriymqk143b29nk52c"; + rev = "86ad6e00dfbc80aeffa841043582f170c4c744ac"; + sha256 = "02ji6p77v85gq8df5fs9lnns6kyf41806iq38zd92y5blps04ihl"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -3000,12 +3036,12 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2020-11-16"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "f7bb13a4e22716154904f8417928cb91e4284f22"; - sha256 = "1xmqhryr1san24386fxd60j7qrjlqx6zka87x3bjgg66rq4wqcrh"; + rev = "b834b0165282f204f4047e675bc714455df3e5fb"; + sha256 = "05w7lcssrfadkjnc09ihg0srfl514banc4v9fhp4sx1zwkrqm60v"; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; }; @@ -3515,6 +3551,18 @@ let meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; + SudoEdit-vim = buildVimPluginFrom2Nix { + pname = "SudoEdit-vim"; + version = "2020-02-27"; + src = fetchFromGitHub { + owner = "chrisbra"; + repo = "SudoEdit.vim"; + rev = "e203eada5b563e9134ce2aae26b09edae0904fd7"; + sha256 = "0pf9iix50pw3p430ky51rv11ra1hppdpwa5flzcd5kciybr76n0n"; + }; + meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; + }; + supertab = buildVimPluginFrom2Nix { pname = "supertab"; version = "2020-10-01"; @@ -3601,12 +3649,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-11-13"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "68a77323cb707e227d16302d39d35949dbb0f85a"; - sha256 = "1038p1w7pfwg6ydqxbahb9plab8d40mdqmnbm6z36y7yrssmjhsj"; + rev = "ed1bbe554d7ce4d9b6286ee3514ed4d3021408ee"; + sha256 = "0h8ai0lhb52d279fw9fc06zmi5sxvjf468mwrbpfh0cq7fkb45yz"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3649,12 +3697,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-11-18"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "aff22f5bf107af69b0a6189debae613e36d3455f"; - sha256 = "1l1c8za5qffvz7klzmxbyk0sv6j0869cpq8njrqzgzzah301pmlq"; + rev = "07ce3c341a8c2824c44fcf50841917debf215058"; + sha256 = "0chb32kc4id419km7hakfdmq5fh4vbz82yvzmibnrgm70zwl8vrr"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3794,12 +3842,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-11-09"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b837416c1ffe39b168baee35c0938739e96211c5"; - sha256 = "1c1ahpdw0d18x5g5s5mpv7mcf0igrpla33k2khmk4q739ywb21qc"; + rev = "8554371b57c8989cf73f73f288c456fb3f2a3a3a"; + sha256 = "0v3gyql3br11rl6ycl7i3zkx8kkc5f2w075y6cm6cslb9v124h6q"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -3818,12 +3866,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-10-07"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "5f21e3e7e60f6d032daa4769e7ee84885fb0ce4d"; - sha256 = "0sfbv620zl8lqdzsypxcn9gasaaqpwarsynjxa25c4cd843cz3d2"; + rev = "631c0850dd0fa36d29c9cd20169735a60b41bd71"; + sha256 = "0ql1w6q8w48jxqf1fs1aphcjjfvh8br7sv26nk6kgsm9h4xamnp5"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -4142,12 +4190,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-11-14"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "536667191d5bdc0afa3a18d7df229731e778815e"; - sha256 = "0ay2bkqj92gzp2r36f5s92rb9gnhwkf09cx4y67gvd4b6rbqrkwi"; + rev = "06117a61e1218b2a866451d2ac4d8ddcd82c8543"; + sha256 = "0c3qgk248bkvmfh5rzhgnz0z0i1yxlmfcaz1bn91g41n9k1a50ab"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4166,12 +4214,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-11-08"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "cd6f16978d5af4b9fb861be9d728732d72789df3"; - sha256 = "0ifb43q053grj2fvjjw52xsr79xnpc00k9302xnx1x4li9s5l64d"; + rev = "5cf03c355b64836ebcb681136539f48ada34f363"; + sha256 = "1wjsmm0bf6714rxnrvfb9080ycgcy4x3vp3qs46nznxsxrxx935n"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4370,12 +4418,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-11-15"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "b2fe93fbee23c3dba24439e0e0bf8c5b77eb5447"; - sha256 = "03grw812c67m63gpdaayn7dfdlkzrhcki2fkcpfq3a80cwq1fvzf"; + rev = "4ca999b5c302610fb5de8ef8a74f77408a2c4a64"; + sha256 = "0as6mngcmn1g0d8lgrmrs1pazby31s5svydwr367ik0waqf9rl8s"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4778,12 +4826,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-09-27"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c0f7b40260d6733c2c283407bea02806e6acb9e5"; - sha256 = "0h1vpswfxvl6kwinn4hk01qzmjzbbinkn2fhw4i9j5bpq0z3w8wp"; + rev = "1ad996e64dadf0d2a65c8a079d55a0ad057c08b4"; + sha256 = "1f4g7m09x67xfajanm9aw4z6rl1hcp24c5a01m1avn9594qgnh2c"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -4934,12 +4982,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-11-18"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "be20785a72925df1ff19a54ce5259d006bc92598"; - sha256 = "1ns9za11w2b5xvcbd8kh4a5pasy3dd4qx7zs4k4f2ay49f98c7v1"; + rev = "60facc9c12049b16015490ecff61a0dd4e580ee9"; + sha256 = "0fm43d2m0s07y5b448drf6smb7fpz38vv1wvd5r0ch6ac53mc74m"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4982,12 +5030,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-10-27"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "1a77f1c00e12e8460f39098ec3289c5433d32512"; - sha256 = "14w43j0gnh10kyshikz4cl6m3f04a6hpiqasn2n71isvdd1p24kp"; + rev = "7bcfe539beee5fe8c542092732b6fd3786c6080e"; + sha256 = "06z5l59x30pqz5sqkrz1v9q739i48hahrxhqyfwvj4bydg52nv30"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5042,12 +5090,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-11-05"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "987a33355ef424161fdbc4e5d625b5b5aed9704c"; - sha256 = "1qg5ri74wipf0krnwgii2jqdzy36hpwnx8nvgf7vkw8a3l90rswj"; + rev = "dfe55e2b924b86c654b63edb9bedc42aa4e08048"; + sha256 = "1b725iv0d2bgd2dqfjb36ifv1y5q4kybz4sj7vm3arvyqr0ly5j1"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5078,12 +5126,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-11-17"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "baaf2d6ebcffd8d5674c9c5518cc0e2b5cdd0db4"; - sha256 = "1kbmncrny39v671czcy7mmr7ighmjhr27zajq01xadr6sdmrrbr0"; + rev = "069113c1c03ec9330fbcccb36f79b268f8b88c1d"; + sha256 = "10423k7rxs34qxb7nfdyfs0yjhgnkmlkd33bwrv2zrahp342kfwv"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5536,12 +5584,12 @@ let vim-jsx-typescript = buildVimPluginFrom2Nix { pname = "vim-jsx-typescript"; - version = "2020-07-08"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "peitalin"; repo = "vim-jsx-typescript"; - rev = "07370d48c605ec027543b52762930165b1b27779"; - sha256 = "190nyy7kr6i3xr6nrjlfv643s1c48kxlbh8ynk8p53yf32gcxwz7"; + rev = "b099549ffd1810eb6f7979202202406939abb77e"; + sha256 = "1jlifxhwjarxqn1i22q3r7rh5z5ianmay91rrazjkahhji2701yy"; }; meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; @@ -5632,12 +5680,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2020-06-08"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "d5f2af4883351aa437ca1c3157d21917dc2bb1b0"; - sha256 = "0bdyhbablays384gssfdfavkxcrwcj89y8vn5kdk11xs0r78b5wr"; + rev = "532979346087c029badd02c9605a4efa84ac032a"; + sha256 = "1hjhwaw5bl37a2c9s0wd16z3x9pf0d26dwbrh6s3jk6ivwiz0v7p"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -5704,12 +5752,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-11-15"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "b8c9256f61fd0e1e1256f7f03eda386ebcfb4c93"; - sha256 = "067pzkxxjna3775za58v7g7lvzw9ykxc9lpkjxh5l35xph0dhw64"; + rev = "a56304f238f5368ad6c1b3b14b96308edd25a1f9"; + sha256 = "164sbwv6y9sf3isxp08zz1w05nz6aas63z1ib146di2r6wkslx57"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5789,12 +5837,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-09-07"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "9e0b6f37113e21fecd42ef6b04762de4aafe2cf3"; - sha256 = "0cy7k96458qk5fn7fbvki42b2pgrrk803shixs4ww43iipya6m5b"; + rev = "ac1d0f73a0eee3d2597f09789d45d9d332c64be5"; + sha256 = "1zi16whmc21iwbkvax65a883ylphcdjjhagmxihp1i52vx90vz5i"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -5849,12 +5897,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-10-23"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "9f8d7de3848e32c592b168f898f82ec4356128af"; - sha256 = "1xrwx75dq46snjsrrv0yh4p409w1blmqpw4i5vlxwi5vn29qpnvs"; + rev = "5ad3f66370a3d77d1cde18d953446b34bfa9c96e"; + sha256 = "04lb05kn1i5qg48f98rp6am0ngaaa5psc0pxqzg7qlwrfby94j09"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -6281,12 +6329,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "c228e993ad6a8b79db5a5a77aecfdbd8e92ea31f"; - sha256 = "1cvdrisarw4yc4lwm80q99k7kb72zq9bd6w98786djas6asdfnll"; + rev = "73c518717741fb3ebb6822645d38f37ffae7c19b"; + sha256 = "08zwvnlg08v3h04iw754wl9wkirqcvqip86hh4m7bxxl0qkysnv6"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6353,12 +6401,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-07-31"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "21d8d9a9db864f230a2d12d5076351daf20d7a44"; - sha256 = "0s6mi1mzlk40sfdqghdsv709fs89hf9d6iqaw3arzs9lmin2i4ka"; + rev = "26a75886caef937bfad4201d5478571a992984c2"; + sha256 = "1qgwn57hs82a6pjilnqafd4c2za4r3vkys9i9apbxqhcxypx05hl"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -6497,12 +6545,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2019-11-12"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "5130596a65330a4e8523d3ac1582f6c31ea6bc63"; - sha256 = "1hpyxcmwrjxhkgkb0w2qpg8gh9bgiqwddyj4zx8hy2g8qnx7z5yj"; + rev = "857865bdab4bf134789484c36181346fdc29ccb9"; + sha256 = "1jwg3nij3skha4wspb833wqarqrmsxg6apry40m9s1l4gc1c3cz5"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -6725,12 +6773,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2019-12-02"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "d3de4fbd7a9331b3eb05fa632611ebd34882cc83"; - sha256 = "1bsqnz02jaydr92mmcrdlva4zxs28zgxwgznr2bwk4wnn26i54p6"; + rev = "f3120afee5ee7cca5f3ccc2bac0933125d0a1efc"; + sha256 = "0ndvs48g68ygminnrjis847qcf7zi7mafhnjzvdz9x8kly2jp7pc"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -6773,12 +6821,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-11-15"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e438b06d59115d4b491f7aa73d3140af44f86175"; - sha256 = "0z9c6rgix722d023jb53ynbns9zvibwaglzcb2q2h4jp1xbwq4qq"; + rev = "6fe515ee5778c4a704b581b2b9ad0f13dd803c25"; + sha256 = "1ikfkvh1jkijhzf12zaymzs67r6snadzsd5qjz9ws4pax84hi82g"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6809,12 +6857,12 @@ let vim-sourcetrail = buildVimPluginFrom2Nix { pname = "vim-sourcetrail"; - version = "2018-06-26"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "vim-sourcetrail"; - rev = "0fd679321ce51f65a37d04e4ea9031be6eaed85d"; - sha256 = "1xgvvmah3zn22rjaa093vghwrchmpm5wj30lwwl6h398dyywz8bg"; + rev = "103ad3f96ebf3518494350afaa72763e9e769eec"; + sha256 = "1hpin1x5l8k54qkckc8v3c2gkv1sbqj3hxikwa0vxr5mz0zaz2wc"; }; meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; @@ -6833,12 +6881,12 @@ let vim-spirv = buildVimPluginFrom2Nix { pname = "vim-spirv"; - version = "2020-06-12"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "9b005a0569fa5e18f71fcccbacda227c1cef7eaa"; - sha256 = "0qby4bfjav2xijh732l7d2jli0adnv6cc8kcalbh5315vi4mpnfk"; + rev = "50669efc68a0a8b455f12727753b2413dab96f07"; + sha256 = "19h3pavy65irchpy9xn3kkf3lb531479v6apfa5lg02c18gmxq1f"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -7074,12 +7122,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-11-18"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "5d65b4e4fba91b499dc3c7db47d2ca0491ae6084"; - sha256 = "0nv2a1wfykncyfr7k9whxybhi66v7y6f348jz4rjyvcl0996hzbb"; + rev = "01960ebe01e3999d2c5fc614cf85c1ec99d1cab1"; + sha256 = "0z1ypl4ks2wg3mh4fjvhz8984z7js2k9k2bgszd2n6jdma8xp4cw"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -7254,12 +7302,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-11-14"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "3b9c8c630daba920741f1fbf6696b7d32d020660"; - sha256 = "0hrsz624flscp8m6wjbr4sfqybw20ssbc78jdrh3q3n92gz1d50s"; + rev = "aa66db40e6c765fd6293c69e71b38b6a87dd3a08"; + sha256 = "048qir6djrbrpyg70b4scslc5scw3c3mxb1rvbmmnp4i3qmcmm4z"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7278,12 +7326,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-11-16"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "70af9531f131b2f1e6674780dfe1e81893de02ab"; - sha256 = "0gjcifybfjwa33njy2pkfcmblgna922c5hg1sf8kwyahmn4v5ix8"; + rev = "7983a425d676e79d7fbd8e8870ecee3b15f9a78c"; + sha256 = "0c3rh0vkg65n2d2kmqfizigwn9jkb8azjla1ymgc49yzmy49jghf"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7374,12 +7422,12 @@ let vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2020-10-07"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "8fb3d07e5c9809f292dddb034db2c02d649b29fb"; - sha256 = "08j0r68ps4jisgbx6lg2vz3wxyx7yzrklsi112bqjxizxjpjb132"; + rev = "02e9ffb1d83101eafe4d1115b26116e5f3c6ca3f"; + sha256 = "1kpfs1q6ikd0bbl89hi7m0359az03r1jw0aq1p5nmd96rfs2w9lw"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -7542,12 +7590,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-11-16"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "b7de25e3d1e9d003df63d85a8781e16cbc7635ee"; - sha256 = "06wk6hgpb2n83g3bpn7cwsyz06mpxgc0wyjwbmh2skac81piilrv"; + rev = "4ac9785217557bb8ba063aa8c7f8320ac7a452fa"; + sha256 = "1vyzf5pixiv0glq8asmg7qicspn527yxij5xicaaih1c3x3sawks"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7555,12 +7603,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-11-12"; + version = "2020-11-29"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "01762d18f86422ddc85361c86b849f9707f23ef3"; - sha256 = "0ncgfd23x8g5n568amzd9x7bvvm5mgjs7qqmr9qn7hjpprad5icq"; + rev = "6267c58c6bffdfd3ef67ac2b377377e4730d15d3"; + sha256 = "0fysk82rzp6p8n4bmp4x543ajfpyr1ry53xabs3d4hbdap5gp4c3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7603,12 +7651,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-11-10"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "bc3b2a74efb253be4b79cc7b70b192e1360f26c1"; - sha256 = "0qfdykp7sf4p2h8gfx40qmnfj94p4hksngqqkzrhzi9z3i6fqk2a"; + rev = "d77828b043d980b99e386840d57629f6499e9995"; + sha256 = "084sy17xlly63m06pxb926rs4j3r1vqij2q7r815daaclsapmvq3"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7723,12 +7771,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-11-16"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "9404065e3ba943a1204d11d333980c9ae7ab2a22"; - sha256 = "1pfkbmy38ppl1fw0fw4zh53f7dazflvzfyb02gsj6bpyg6jvjqdz"; + rev = "49c70e60159e9607f8c787f4105133353d020dc0"; + sha256 = "116c7lyl0jpfqpzrwdsbpranbiw61f4vpq8nvpik2yx1wizv77lx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7736,12 +7784,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-11-13"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "604a2a02e070bbd46f58c79a46f4df048e26a97c"; - sha256 = "0m9wfpm855cp9zzg0nsd6bb7ijmgj9vhfhm7x5nhmqjqjfyl8282"; + rev = "4496153a3efdb0891dac24510ac1ee519f1778a6"; + sha256 = "0j2mzq726fly457j8fjbvijgg50l497qbp6lq0vpfbiz4b3hm46k"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 0ee45658a2..379b0babae 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -273,6 +273,10 @@ self: super: { dependencies = with super; [ ultisnips ]; }); + nvim-lsputils = super.nvim-lsputils.overrideAttrs(old: { + dependencies = with super; [ popfix ]; + }); + fzf-vim = super.fzf-vim.overrideAttrs(old: { dependencies = [ self.fzfWrapper ]; }); @@ -648,12 +652,12 @@ self: super: { } // ( let nodePackageNames = [ - "coc-go" "coc-css" "coc-diagnostic" "coc-emmet" "coc-eslint" "coc-git" + "coc-go" "coc-highlight" "coc-html" "coc-imselect" @@ -661,6 +665,7 @@ self: super: { "coc-jest" "coc-json" "coc-lists" + "coc-markdownlint" "coc-metals" "coc-pairs" "coc-prettier" @@ -677,6 +682,7 @@ self: super: { "coc-tslint-plugin" "coc-tsserver" "coc-vetur" + "coc-vimlsp" "coc-vimtex" "coc-wxml" "coc-yaml" diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 06f5091064..a0c48d8f3a 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -48,6 +48,7 @@ chrisbra/CheckAttach chrisbra/csv.vim chrisbra/NrrwRgn chrisbra/Recover.vim +chrisbra/SudoEdit.vim chrisbra/unicode.vim chrisgeo/sparkup chriskempson/base16-vim @@ -108,7 +109,6 @@ ervandew/supertab esneider/YUNOcommit.vim euclidianAce/BetterLua.vim euclio/vim-markdown-composer -fannheyward/coc-markdownlint farmergreg/vim-lastplace fatih/vim-go fcpg/vim-osc52 @@ -161,7 +161,6 @@ hsanson/vim-android hsitz/VimOrganizer hugolgst/vimsence iamcco/coc-spell-checker -iamcco/coc-vimlsp ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim @@ -237,6 +236,7 @@ kassio/neoterm kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim +keith/investigate.vim keith/swift.vim kien/rainbow_parentheses.vim knubie/vim-kitty-navigator @@ -377,6 +377,7 @@ nixprime/cpsm NLKNguyen/papercolor-theme noc7c9/vim-iced-coffee-script norcalli/nvim-terminal.lua +npxbr/glow.nvim ntpeters/vim-better-whitespace numirias/semshi nvie/vim-flake8 @@ -401,6 +402,7 @@ osyo-manga/vim-over osyo-manga/vim-textobj-multiblock osyo-manga/vim-watchdogs overcache/NeoSolarized +p00f/nvim-ts-rainbow pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim @@ -413,6 +415,7 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +prabirshrestha/async.vim prabirshrestha/asyncomplete.vim prabirshrestha/vim-lsp preservim/nerdcommenter @@ -576,6 +579,7 @@ udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope urbit/hoon.vim +Valloric/MatchTagAlways Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim vigoux/LanguageTool.nvim diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 0228ee9a1e..bc00f82f19 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -10,7 +10,7 @@ let # So an extension's attribute name should be of the form: # "${mktplcRef.publisher}.${mktplcRef.name}". # - self = stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) + baseExtensions = self: stdenv.lib.mapAttrs (_n: stdenv.lib.recurseIntoAttrs) { alanz.vscode-hie-server = buildVscodeMarketplaceExtension { @@ -245,11 +245,19 @@ let llvm-org.lldb-vscode = llvmPackages_8.lldb; WakaTime.vscode-wakatime = callPackage ./wakatime {}; - } // lib.optionalAttrs (config.allowAliases or true) ( - with self; { + }; + + aliases = self: super: { # aliases - ms-vscode.Go = golang.Go; - } - ); + ms-vscode = lib.recursiveUpdate super.ms-vscode { inherit (super.golang) Go; }; + }; + + # TODO: add overrides overlay, so that we can have a generated.nix + # then apply extension specific modifcations to packages. + + # overlays will be applied left to right, overrides should come after aliases. + overlays = lib.optionals (config.allowAliases or true) [ aliases ]; + + toFix = lib.foldl' (lib.flip lib.extends) baseExtensions overlays; in -self + lib.fix toFix diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix new file mode 100644 index 0000000000..9e74507751 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, kernel, qmake }: + +stdenv.mkDerivation rec { + pname = "akvcam"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "webcamoid"; + repo = "akvcam"; + rev = version; + sha256 = "ULEhfF+uC/NcVUGAtmP1+BnrcgRgftNS97nLp81avQ8="; + }; + + nativeBuildInputs = [ qmake ]; + + qmakeFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko + ''; + + meta = with lib; { + description = "Virtual camera driver for Linux"; + homepage = "https://github.com/webcamoid/akvcam"; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix index baf3cc6ad5..ab78c59001 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/autofs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs -, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: +, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: let version = "5.1.6"; @@ -28,13 +28,16 @@ in stdenv.mkDerivation { unset STRIP # Makefile.rules defines a usable STRIP only without the env var. ''; + # configure script is not finding the right path + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + installPhase = '' make install SUBDIRS="lib daemon modules man" # all but samples #make install SUBDIRS="samples" # impure! ''; buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd - openssl cyrus_sasl ]; + openssl cyrus_sasl rpcsvc-proto ]; nativeBuildInputs = [ flex bison ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix index fc7c8ecba2..9fbeda708e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.11.0"; + version = "0.11.4"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y"; + sha256 = "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix new file mode 100644 index 0000000000..0ca585fab4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix @@ -0,0 +1,47 @@ +{ lib, rustPlatform, fetchFromGitHub +, fetchpatch +, fuse +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "catfs"; + version = "unstable-2020-03-21"; + + src = fetchFromGitHub { + owner = "kahing"; + repo = pname; + rev = "daa2b85798fa8ca38306242d51cbc39ed122e271"; + sha256 = "0zca0c4n2p9s5kn8c9f9lyxdf3df88a63nmhprpgflj86bh8wgf5"; + }; + + cargoSha256 = "0v6lxwj4vcph32np68awpncafvf1dwcik9a2asa0lkb7kmfdjsjk"; + + cargoPatches = [ + # update cargo lock + (fetchpatch { + url = "https://github.com/kahing/catfs/commit/f838c1cf862cec3f1d862492e5be82b6dbe16ac5.patch"; + sha256 = "1r1p0vbr3j9xyj9r1ahipg4acii3m4ni4m9mp3avbi1rfgzhblhw"; + }) + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ fuse ]; + + # require fuse module to be active to run tests + # instead, run command + doCheck = false; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/catfs --help > /dev/null + ''; + + meta = with lib; { + description = "Caching filesystem written in Rust"; + homepage = "https://github.com/kahing/catfs"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index fadf5df714..a3be5484a0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation { name = "${s.name}.tar.bz2"; }; + patches = [ + # Adds the /nix directory when using an overlay. + # Required to run any programs under this mode. + ./mount-nix-dir-on-overlay.patch + # By default fbuilder hardcodes the firejail binary to the install path. + # On NixOS the firejail binary is a setuid wrapper available in $PATH. + ./fbuilder-call-firejail-on-path.patch + ]; + prePatch = '' # Allow whitelisting ~/.nix-profile substituteInPlace etc/firejail.config --replace \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch new file mode 100644 index 0000000000..6016891655 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch @@ -0,0 +1,11 @@ +--- a/src/fbuilder/build_profile.c ++++ b/src/fbuilder/build_profile.c +@@ -67,7 +67,7 @@ + errExit("asprintf"); + + char *cmdlist[] = { +- BINDIR "/firejail", ++ "firejail", + "--quiet", + "--noprofile", + "--caps.drop=all", diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch new file mode 100644 index 0000000000..685314f907 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch @@ -0,0 +1,27 @@ +--- a/src/firejail/fs.c ++++ b/src/firejail/fs.c +@@ -1143,6 +1143,16 @@ + errExit("mounting /dev"); + fs_logger("whitelist /dev"); + ++ // mount-bind /nix ++ if (arg_debug) ++ printf("Mounting /nix\n"); ++ char *nix; ++ if (asprintf(&nix, "%s/nix", oroot) == -1) ++ errExit("asprintf"); ++ if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0) ++ errExit("mounting /nix"); ++ fs_logger("whitelist /nix"); ++ + // mount-bind run directory + if (arg_debug) + printf("Mounting /run\n"); +@@ -1201,6 +1211,7 @@ + free(odiff); + free(owork); + free(dev); ++ free(nix); + free(run); + free(tmp); + } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index f19af3d10f..3ca8f41be7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.18"; + version = "1.0.20"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "08y65ak3y08xcl1nprwraqv9l65yqnfllbgmxyd2bppjpprwq474"; + sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "00933zkhqd1l29ir2dgp5r1k7g24mlb2k8fmggwzplrwzw1al5h4"; + cargoSha256 = "1ivn3i6kpnswiipqw5s67p6gsz3y6an0ahf6vwz7dlw2xaha0xbx"; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix index 8d3a967d68..012cfb7e60 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.58"; + version = "9.60"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws"; + sha256 = "1k1mcv7naiacw1y6bdd1adnjfiq1kkx2ivsadjwmlkg4fff775w3"; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix index dada5c35f7..647e5e3597 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.7"; + version = "7.9"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "0ckc678l1431mb0q5ilfgy0ajjwi8n135c72h606imm43dc0v9a5"; + sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 94558b890d..47e49dbe01 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -775,6 +775,8 @@ let X86_CHECK_BIOS_CORRUPTION = yes; X86_MCE = yes; + RAS = yes; # Needed for EDAC support + # Our initrd init uses shebang scripts, so can't be modular. BINFMT_SCRIPT = yes; # For systemd-binfmt diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index cfeaa6d1ec..40d19d7237 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.9.6"; + version = "5.9.10"; in buildLinux (args // { @@ -13,7 +13,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "0v8nc2zy75ij4hn8js23998spadbiid8qc9cib5d0apmzkhilqwq"; + sha256 = "0836mclwr3r4hm4pn8hp21sk14avrfwiv2s8lqx3cjasgdbyi826"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/light/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/light/default.nix index 45af4e7ae8..b465b2243e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/light/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/light/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, coreutils }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; pname = "light"; src = fetchFromGitHub { owner = "haikarainen"; repo = "light"; rev = "v${version}"; - sha256 = "0zrjipd392bzjvxx0rjrb0cgi0ix1d83fwgw1mcy8kc4d16cgyjg"; + sha256 = "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s"; }; configureFlags = [ "--with-udev" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix index f0ef112615..2e97f9da1e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "169"; + version = "173"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0ghkwfaky026qwj6hmcvz2w2hm8qqj3ysbkxxi603vslmwj56chv"; + sha256 = "1ili11kqacn6jkjpk11vhycgygdl92mymgb1sx22lcwq2x0d248m"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix index 4bf318d743..22e70fc0b6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/powertop/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" + substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index bef9231385..0433715a5f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "0lpp271g0749sx7qgpwl6myi0kgfpsxk1kc4yp3r9k1pynv8bq1b"; + sha256 = "sha256-lYjMvxMIReANNwMr62u881Nugrs9piOaN3EmrvGzRns="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 13b52b86ff..478791bded 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -57,11 +57,12 @@ , withAnalyze ? true , withApparmor ? true -, withCoredump ? true , withCompression ? true # adds bzip2, lz4 and xz +, withCoredump ? true , withCryptsetup ? true , withDocumentation ? true , withEfi ? stdenv.hostPlatform.isEfi +, withHomed ? false , withHostnamed ? true , withHwdb ? true , withImportd ? true @@ -72,14 +73,15 @@ , withNss ? true , withPCRE2 ? true , withPolkit ? true +, withPortabled ? false , withRemote ? true , withResolved ? true , withShellCompletions ? true , withTimedated ? true , withTimesyncd ? true , withUserDb ? true -, withHomed ? false, p11-kit, libfido2 -# , withPortabled ? false TODO +, p11-kit +, libfido2 # name argument , pname ? "systemd" @@ -94,7 +96,7 @@ assert withResolved -> (libgcrypt != null && libgpgerror != null); assert withImportd -> (curl.dev != null && zlib != null && xz != null && libgcrypt != null - && gnutar != null && gnupg != null && withCompression ); + && gnutar != null && gnupg != null && withCompression); assert withEfi -> (gnu-efi != null); assert withRemote -> lib.getDev curl != null; @@ -104,7 +106,6 @@ assert withHomed -> withCryptsetup; assert withCryptsetup -> (cryptsetup != null); - let wantCurl = withRemote || withImportd; @@ -196,20 +197,20 @@ stdenv.mkDerivation { pam ] - ++ lib.optional withApparmor libapparmor - ++ lib.optional wantCurl (lib.getDev curl) + ++ lib.optional withApparmor libapparmor + ++ lib.optional wantCurl (lib.getDev curl) ++ lib.optionals withCompression [ bzip2 lz4 xz ] - ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) - ++ lib.optional withEfi gnu-efi - ++ lib.optional withKexectools kexectools - ++ lib.optional withLibseccomp libseccomp - ++ lib.optional withNetworkd iptables - ++ lib.optional withPCRE2 pcre2 - ++ lib.optional withResolved libgpgerror - ++ lib.optional withSelinux libselinux - ++ lib.optional withRemote libmicrohttpd + ++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev) + ++ lib.optional withEfi gnu-efi + ++ lib.optional withKexectools kexectools + ++ lib.optional withLibseccomp libseccomp + ++ lib.optional withNetworkd iptables + ++ lib.optional withPCRE2 pcre2 + ++ lib.optional withResolved libgpgerror + ++ lib.optional withSelinux libselinux + ++ lib.optional withRemote libmicrohttpd ++ lib.optionals withHomed [ p11-kit libfido2 ] - ; + ; #dontAddPrefix = true; @@ -240,7 +241,7 @@ stdenv.mkDerivation { "-Dnetworkd=${lib.boolToString withNetworkd}" "-Dpolkit=${lib.boolToString withPolkit}" "-Dcryptsetup=${lib.boolToString withCryptsetup}" - "-Dportabled=false" + "-Dportabled=${lib.boolToString withPortabled}" "-Dhwdb=${lib.boolToString withHwdb}" "-Dremote=${lib.boolToString withRemote}" "-Dsysusers=false" diff --git a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix index 2a835c346c..375f33e5d6 100644 --- a/third_party/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.0.6"; + version = "0.9.0.7"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "1mgvsi8y3camj215vnbw20f1z6jvpbyrj1hrcj4szxfcjkxdg2hv"; + sha256 = "1nskhdb1pcgwp39ld8zrnngzsq6g1pn59nb211qhf6rsj0nyahic"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix index 4fd5b6c475..8bb7aafc3c 100644 --- a/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/clickhouse/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TESTS=OFF" + "-DUSE_INTERNAL_LLVM_LIBRARY=OFF" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index 8912ce8478..eef9054ae7 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.8.5"; + version = "1.8.6"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1cf3zvb3xh97hz5hav9f1q3b22lwryw6a7gcmm7cphk6bdrdiva5"; + sha256 = "1jrvh4khxr12dzmsyfn8ch26rlk4cd65fqafsr7prjjbbjnpmgck"; }; passthru.tests.consul = nixosTests.consul; diff --git a/third_party/nixpkgs/pkgs/servers/corosync/default.nix b/third_party/nixpkgs/pkgs/servers/corosync/default.nix index 5a209549d3..693ab0042f 100644 --- a/third_party/nixpkgs/pkgs/servers/corosync/default.nix +++ b/third_party/nixpkgs/pkgs/servers/corosync/default.nix @@ -9,11 +9,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "corosync-2.4.3"; + pname = "corosync"; + version = "2.4.5"; src = fetchurl { - url = "http://build.clusterlabs.org/corosync/releases/${name}.tar.gz"; - sha256 = "15y5la04qn2lh1gabyifygzpa4dx3ndk5yhmaf7azxyjx0if9rxi"; + url = "http://build.clusterlabs.org/corosync/releases/${pname}-${version}.tar.gz"; + sha256 = "0pxs18vci9kq3qnqsg5i1h35jrxxiccwbm0mzja3g8j3izdsyvmb"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index df886ffe9d..8257d4ef25 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "12z59xf63iskid08c3y55h238ma2chgvcbks0zprag7i00p97g06"; + sha256 = "162nczipxnsbgg7clap697yikxjz1vdsjkaxxsn6hb6l6m3a6zzr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix index be52b1bf1a..dc9fc0898d 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.13"; + version = "3.4.14"; deleteVendor = true; vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc"; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "0bvky593241i60qf6793sxzsxwfl3f56cgscnva9f2jfhk157wmy"; + sha256 = "0s6xwc8yczjdf6xysb6m0pp31hxjqdqjw24bliq08094jprhj31f"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/gortr/default.nix b/third_party/nixpkgs/pkgs/servers/gortr/default.nix index 2af795b2ca..721570c5c0 100644 --- a/third_party/nixpkgs/pkgs/servers/gortr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gortr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.6"; + version = "0.14.7"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1z1z4xl39qmd7df1zb2wsd2ycxr4aa9g23sfgp3ws4lhy5d6hyxw"; + sha256 = "10dq42d3hb6a3ln3x1rag1lqzhwqb66xn4q8k4igjkn5my81nr6q"; }; vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 38b8cca170..f813af5ff6 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.118.1"; + version = "0.118.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 018cf82b96..565a353cdc 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -62,7 +62,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.118.1"; + hassVersion = "0.118.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1l2jqvq3amwdr4v6xq7df19bf75s1dpgcgnaacsx7k7pfwsyn63f"; + sha256 = "0b289ijxpay6yb2ahkfm7n9k423f8xlbwg8z903iwakiqg54ghip"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix b/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix index b8374d62dd..72e6c00278 100644 --- a/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.34.v20201102"; + version = "9.4.35.v20201120"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0c5zsnzcg2bz6z1s6hdzwzn813cgs26h1hwjjfhh1msfzyig30ma"; + sha256 = "1cpdrqz6wi7fd228lh4ijs82jq51qr5aym6vff464w3y2sd0jbav"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 7b7de1a00f..edb87258d6 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.4"; - sha256 = "03h0hhrbfy3asla9gki2cp97zjn7idxbp5lk9xi0snlh4xlm9pv1"; + version = "1.19.5"; + sha256 = "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw"; } diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index 318fcd498a..f4379aa6fa 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, nixosTests, which +, pcre2 , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses , withPHP73 ? false, php73 @@ -30,19 +31,19 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.21.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; - repo = "unit"; + repo = pname; rev = version; - sha256 = "1qmcz01ifmd80qgpvf1y8nhad6yk56772xdhqvwfxn3mdjfqvcs8"; + sha256 = "1jczdxixxyj16w10pkcplchbqvx3m32nkmcl0hqap5ffqj08mmf7"; }; nativeBuildInputs = [ which ]; - buildInputs = [ ] + buildInputs = [ pcre2.dev ] ++ optional withPython2 python2 ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP73 php73-unit diff --git a/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix b/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix index 8b65c7870f..582bf94b0d 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "ircd-hybrid-8.2.24"; + name = "ircd-hybrid-8.2.35"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; - sha256 = "03nmzrhqfsxwry316nm80m9p285v65fz75ns7fg623hcy65jv97a"; + sha256 = "045wd3wa4i1hl7i4faksaj8l5r70ld55bggryaf1ml28ijwjwpca"; }; buildInputs = [ openssl zlib ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "An IPv6-capable IRC server"; platforms = stdenv.lib.platforms.unix; - homepage = "http://www.ircd-hybrid.org/"; + homepage = "https://www.ircd-hybrid.org/"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index 497d1fa254..baa1e6c1c6 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.2152"; + version = "0.16.2236"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1q1bydyhddhz110xzbhhjj3gm0rwvjrjgc8j8wsj7xd9k0laygqd"; + sha256 = "1qra5qcm7bwplkrmy6haf1kk3gpj9jjvgl0y7rs81jn15cjp6fmq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index 0b4fa74546..9c44dabe3d 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { name = "klipper"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; rev = "v${version}"; - sha256 = "1ijy2ij9yii5hms10914i614wkjpsy0k4rbgnm6l594gphivdfm7"; + sha256 = "1wgklngsz6xxl25qxi9fkqhbyhwy61iyyk76ycq68b3miayrkgpj"; }; sourceRoot = "source/klippy"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix index 694d7044b8..0b6ed49737 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -12,7 +12,7 @@ let "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl.dev}/include/sasl" "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient}/include/mysql" "-L${libmysqlclient}/lib/mysql" ] + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysqlclient.dev}/include/mysql" "-L${libmysqlclient}/lib/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE" ++ lib.optionals withLDAP ["-DHAS_LDAP" "-DUSE_LDAP_SASL"]); auxlibs = lib.concatStringsSep " " ([ diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/0001-Re-add-entrypoint.patch b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/0001-Re-add-entrypoint.patch new file mode 100644 index 0000000000..448e7017a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/0001-Re-add-entrypoint.patch @@ -0,0 +1,29 @@ +From f4a612e1c8501d2a1683003bb121daa6d46155ca Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sun, 29 Nov 2020 20:45:16 +0100 +Subject: [PATCH 1/2] Re-add entrypoint + +--- + setup.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/setup.py b/setup.py +index 068c351..95dbf89 100644 +--- a/setup.py ++++ b/setup.py +@@ -51,6 +51,12 @@ setuptools.setup( + extras_require=extras_require, + python_requires="~=3.6", + ++ entry_points={ ++ 'console_scripts': [ ++ 'mautrix-telegram=mautrix_telegram.__main__:main' ++ ] ++ }, ++ + setup_requires=["pytest-runner"], + tests_require=["pytest", "pytest-asyncio", "pytest-mock"], + +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch new file mode 100644 index 0000000000..f1ec3e622c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch @@ -0,0 +1,24 @@ +From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sun, 29 Nov 2020 20:55:17 +0100 +Subject: [PATCH 2/2] Don't depend on pytest-runner + +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 95dbf89..89ea2a7 100644 +--- a/setup.py ++++ b/setup.py +@@ -57,7 +57,6 @@ setuptools.setup( + ] + }, + +- setup_requires=["pytest-runner"], + tests_require=["pytest", "pytest-asyncio", "pytest-mock"], + + classifiers=[ +-- +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index c39d4fc0d8..bf00462875 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -11,16 +11,17 @@ let in buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.8.2"; - disabled = pythonOlder "3.6"; + version = "0.9.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "0mhy9b933haz1bldkglvn81warjxdjdzgkviiv5k6fykghq473jf"; + sha256 = "1543ljjl3jg3ayid7ifi4bamqh4gq85pmlbs3m8i7phjbbm7g9dn"; }; + patches = [ ./0001-Re-add-entrypoint.patch ./0002-Don-t-depend-on-pytest-runner.patch ]; postPatch = '' sed -i -e '/alembic>/d' requirements.txt ''; @@ -32,7 +33,6 @@ in buildPythonPackage rec { sqlalchemy CommonMark ruamel_yaml - future-fstrings python_magic telethon telethon-session-sqlalchemy @@ -53,9 +53,14 @@ in buildPythonPackage rec { ]; }); + # Tests are broken and throw the following for every test: + # TypeError: 'Mock' object is not subscriptable + # + # The tests were touched the last time in 2019 and upstream CI doesn't even build + # those, so it's safe to assume that this part of the software is abandoned. + doCheck = false; checkInputs = [ pytest - pytestrunner pytest-mock pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index 182ca6bcd9..0435d0e1d4 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.8"; + version = "1.6.9"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "0fbrrn7mkhv5xci4cffxxb8qzr9c0n3y58jymq2aqlpzyq8klfz2"; + sha256 = "1lcjy1b9krnb2gk72qd1fvivlfiyfvknfi3wngyvyk9ifzijr9nm"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index fb86600eaa..fe16eae04c 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.1"; + version = "0.37.2"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1mqkaagd452kygch47jsqzcjcsian4pp5xcvr3nnm3p3mah79wyi"; + sha256 = "0rhwnma8p3lgdld9nslmnii2v83g8gac6ybgk58af9gpypivwpvr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/microserver/default.nix b/third_party/nixpkgs/pkgs/servers/microserver/default.nix index 9132ef9672..618b6f75e7 100644 --- a/third_party/nixpkgs/pkgs/servers/microserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/microserver/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "microserver"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "robertohuertasm"; repo = "microserver"; rev = "v${version}"; - sha256 = "1i9689ra5jnmhkxabrx4zcp5f422w9ql9m4xzldqwmpnckm736v6"; + sha256 = "1bbbdajh74wh2fbidasim2mzmzqjrgi02v8b0g7vbhpdnlim6ixz"; }; - cargoSha256 = "1yn3xmmhpixiviayicl2szlzfjx5crffp3pq75d5nz6ky3miai9l"; + cargoSha256 = "0cyxa200iz7knkma4zi3mzky3g0kibbxd5303psk2rl2rppir0f7"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); meta = with stdenv.lib; { homepage = "https://github.com/robertohuertasm/microserver"; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index c333450aac..32dee6460d 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2020-08-08T04-50-06Z"; + version = "2020-10-18T21-54-12Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0l5yd3k154h3q9sc5psv80n9wpnhpj5sb3r9v9gsqcam46ljwpna"; + sha256 = "0yva6hwfczq0apg8cl0xvm5xzyazxnic4bh2xxm1nq4iqw2p2177"; }; - vendorSha256 = "1xxhvgawkj2lq39cxgl4l5v41m6nsask79n2cxfpcgb00fqq147x"; + vendorSha256 = "185njxpaynnq8yydmkdh1sf6x924p69w7brqwl42ny1gylwv2chp"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix index c207a33848..7faf8a9cfe 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix @@ -12,7 +12,7 @@ , libopus , srtp , jemalloc -, ... }: +}: let ffmpeg = ffmpeg_3_4.overrideAttrs (super: { @@ -20,20 +20,20 @@ let src = fetchFromGitHub { owner = "Airensoft"; repo = "FFmpeg"; - rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # ome/3.4 + rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # on branch ome/3.4 sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11"; }; }); in stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.10.4"; + version = "0.10.8"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "15lrlynsldlpa21ryzccf5skgiih6y5fc9qg0bfqh557wnnmml6w"; + sha256 = "ec4yvS+4/rTBHGEx2OP0yoNGDtzPucFOcZJ0o0cCAHg="; }; sourceRoot = "source/src"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix index 22c741024b..b0ab129fc8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/bosun/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "bosun"; - version = "0.5.0"; + version = "0.8.0-preview"; src = fetchFromGitHub { owner = "bosun-monitor"; repo = "bosun"; rev = version; - sha256 = "1qj97wiqj6awivvac1n00k0x8wdv4ambzdj4502nmmnr5rdbqq88"; + sha256 = "172mm006jarc2zm2yq7970k2a9akmyzvsrr8aqym4wk5v9x8kk0r"; }; subPackages = [ "cmd/bosun" "cmd/scollector" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index f13759dcc0..ccd7428eef 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.3.3"; + version = "7.3.4"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1891whg244s1lj8lm3sxsxaimjb1yr1n4v7kgjjz7hi9fkscswbw"; + sha256 = "0vav3zhn4yw87z8xlcljs62xx4v3mxxvy0kgjh7w4njyqq1j3ayi"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0ybzlnaq7j1v6valyb997wiydpbsgb2ycb8r92wyb901hd4frj7h"; + sha256 = "1fmfscfbdg2wdzf5fbad83pln4azy2y3fcghcanafkvqr2vv4hwk"; }; - vendorSha256 = "09rb96fm7ij16r843lbwcxb26vmjyahs1bi5pnnqz0mnm0vvmsjb"; + vendorSha256 = "0rn1zqczqa44k6g8rm9xdrd6hw5rbbvihcbzcdx758gv2lpbikxq"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index 143db9e01b..6b8f01bad7 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.70.2"; + version = "0.70.3"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "1c0smbyzwc101v7akaj21r7w0jpf1xcbikf1ljfa8f515ql5hs9r"; + sha256 = "1i02qmjinnwyi4aqczflj7skfsixn25id7fm760vr2dl2gmlfydg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix new file mode 100644 index 0000000000..06cd0cf9b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub, python3Packages, lib }: + +python3Packages.buildPythonApplication rec { + pname = "check_systemd"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "Josef-Friedrich"; + repo = pname; + rev = "v${version}"; + sha256 = "04r14dhqzrdndn235dvr6afy4s4g4asynsgvj99cmyq55nah4asn"; + }; + + propagatedBuildInputs = with python3Packages; [ nagiosplugin ]; + + postInstall = '' + # check_systemd is only a broken stub calling check_systemd.py + mv $out/bin/check_systemd{.py,} + ''; + + # the test scripts run ./check_systemd.py and check_systemd. Patch to + # the installed, patchShebanged executable in $out/bin + preCheck = '' + find test -name "*.py" -execdir sed -i "s@./check_systemd.py@$out/bin/check_systemd@" '{}' ";" + export PATH=$PATH:$out/bin + ''; + checkInputs = [ python3Packages.pytestCheckHook ]; + + meta = with lib; { + description = "Nagios / Icinga monitoring plugin to check systemd for failed units"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ symphorien ]; + license = licenses.lgpl2Only; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix deleted file mode 100644 index 62f6bc96a5..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/pynagsystemd.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchFromGitHub, python3Packages, lib }: - -python3Packages.buildPythonApplication rec { - pname = "pynagsystemd"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "kbytesys"; - repo = pname; - rev = "v${version}"; - sha256 = "1xjhkhdpmqa7ngcpcfhrkmj4cid2wla3fzgr04wvw672ysffv2vz"; - }; - - propagatedBuildInputs = with python3Packages; [ nagiosplugin ]; - - meta = with lib; { - description = "Simple and easy nagios check for systemd status"; - homepage = "https://github.com/kbytesys/pynagsystemd"; - maintainers = with maintainers; [ symphorien ]; - license = licenses.gpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 68fb973038..7c2ac16399 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "0432pxpl071wjsijc5b7176mc4lr7sqdwyzqn7dvwkrvvq3n6g5k"; + sha256 = "06pr9zqfd7nq13pgg02px2d9rp7phxlmnirpkdfgbw799zrfvpag"; }; - vendorSha256 = "0pbnkqwpp74vanyk3cljj4kgbcid16y9mb5my3iiimbrziw2dkwr"; + vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix index e5bce49d05..0245f087c9 100644 --- a/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.16.2"; + version = "0.17.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "0xrgwsw4xrn6fjy1ra4ycam50kdhyqqsms4yxblj5c5z7w4hnlmk"; + sha256 = "1dla70k6rxg34qzspq0j12zcjk654jrf3gm7gd45w4qdg8h2fyyg"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix index a1aad75ce3..bb81d0ca79 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.17"; - sha256 = "0568r5xdy78pl29zby5g4m9qngf29cb9222sc1q1wisapb7zkl2p"; + version = "3.0.23"; + sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz"; }) diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index 2ca829b62b..38e12010f4 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd; + buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) systemd; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] - ++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"]; + ++ stdenv.lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) ["USE_SYSTEMD=yes"]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 925c220913..7ed3bf8bfe 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, rpmextract +, dpkg }: # The raw package that fetches and extracts the Plex RPM. Override the source @@ -12,19 +12,22 @@ stdenv.mkDerivation rec { pname = "plexmediaserver"; # Fetch the source - src = fetchurl { - url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0vqsmmgqcvvhxiqaw87qz9fdisyf9smp6ab069dz3nq39x7n9na0"; + src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { + url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; + sha256 = "18zj4baa085gbgc0y5gx7gnwzl131xyk34m5xcipfvfb434y98cp"; + } else fetchurl { + url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; + sha256 = "01rq2q6avjsvnns7jsd2a9vnmd4584fwdkp833gjgrrrqkf6h45y"; }; outputs = [ "out" "basedb" ]; - nativeBuildInputs = [ rpmextract ]; + nativeBuildInputs = [ dpkg ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; unpackPhase = '' - rpmextract $src + dpkg-deb -R $src . ''; installPhase = '' @@ -52,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://plex.tv/"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ badmutex colemickens diff --git a/third_party/nixpkgs/pkgs/servers/rainloop/default.nix b/third_party/nixpkgs/pkgs/servers/rainloop/default.nix index bff5d2ea30..42c68d5608 100644 --- a/third_party/nixpkgs/pkgs/servers/rainloop/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rainloop/default.nix @@ -24,7 +24,8 @@ */ function __get_custom_data_full_path() { - return '${dataPath}'; // custom data folder path + $v = getenv('RAINLOOP_DATA_DIR', TRUE); + return $v === FALSE ? '${dataPath}' : $v; } ''; @@ -33,6 +34,8 @@ cp -r rainloop/* $out rm -rf $out/data cp ${includeScript} $out/include.php + mkdir $out/data + chmod 700 $out/data ''; meta = with stdenv.lib; { @@ -44,13 +47,13 @@ maintainers = with maintainers; [ das_j ]; }; }); - in { - rainloop-community = common { - edition = "community"; - sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; - }; - rainloop-standard = common { - edition = ""; - sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; - }; - } +in { + rainloop-community = common { + edition = "community"; + sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; + }; + rainloop-standard = common { + edition = ""; + sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index c47980a577..1b75d5bfd7 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "1cn5335zpcqwra3widwnwqan2r1ardxc6ac7z5nn98r7kd3kll5v"; + sha256 = "1nv8qcw6pvsma8hdnagl5c8lzz3b09g8nzz83amn9jdcn3ynn0qg"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/slimserver/default.nix b/third_party/nixpkgs/pkgs/servers/slimserver/default.nix index 254825c862..8be2cc15d4 100644 --- a/third_party/nixpkgs/pkgs/servers/slimserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/slimserver/default.nix @@ -3,11 +3,11 @@ perlPackages.buildPerlPackage rec { pname = "slimserver"; - version = "7.9.1"; + version = "7.9.2"; src = fetchurl { url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz"; - sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp"; + sha256 = "1rn9y7xvg5aqmgcbfpi7lcqy8d7hgwqx8b2llzpzrv7854zm1wcw"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/smcroute/default.nix b/third_party/nixpkgs/pkgs/servers/smcroute/default.nix index e725e6243f..b881c60073 100644 --- a/third_party/nixpkgs/pkgs/servers/smcroute/default.nix +++ b/third_party/nixpkgs/pkgs/servers/smcroute/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Static multicast routing daemon"; - homepage = "http://troglobit.com/smcroute.html"; + homepage = "https://troglobit.com/smcroute.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd); diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 24406d1c5c..247fe588bf 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "14km34wjhijfwxvqcplf2jmh69zj7llsrimafmz94jy8cy85cpa1"; + sha256 = "1n0yxnjxlz2bvybdvba8cqqv702ry3crq114l2bni7q7llfs5y08"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "01lf5f2iigv8pihblwxyqx0pgj6gqir3b7rcna0xkirrfpvzd38c"; + vendorSha256 = "0avk20g7ic1gw1qr8bp4rbl7m822q2kphwc9f6ld6p5yl6pwqv3h"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix index 699fcf8569..04617943e2 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/monetdb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "monetdb"; - version = "11.39.5"; + version = "11.39.7"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2"; - sha256 = "1hdlab2gcj71yw6sb3yvl8s027blcsyvch3n5sgi0a2yz84wj765"; + sha256 = "0qb2hlz42400diahmsbflfjmfnzd5slm6761xhgvh8s4rjfqm21w"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix index e824298c48..d72a32746d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "1rzy06hqzhnijm32vah9icgrx95pmf9iglvyzwv7wmcg2h83vhd0"; + sha256 = "100ksf2wcdrsscaiq78s030mb48hscjr3kfbm9h6y9d6i8arwnp0"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 31c60303c0..9bfc4e7dca 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -41,6 +41,8 @@ let enableParallelBuilding = !stdenv.isDarwin; + separateDebugInfo = true; + buildFlags = [ "world" ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; @@ -54,6 +56,7 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" + "--enable-debug" (lib.optionalString enableSystemd "--with-systemd") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ]; @@ -162,6 +165,7 @@ let ]; buildInputs = [ makeWrapper ]; + # We include /bin to ensure the $out/bin directory is created, which is # needed because we'll be removing the files from that directory in postBuild # below. See #22653 @@ -230,5 +234,4 @@ in self: { this = self.postgresql_13; inherit self; }; - } diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix index 7630e2e32b..28e3947f4b 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_hll"; - version = "2.14"; + version = "2.15"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-hll"; rev = "refs/tags/v${version}"; - sha256 = "13vphxkc9pn4bkpgab560bgdbl99li2b3p1n2rm5a78wswlsbsps"; + sha256 = "19d50cvp3byjyr2dc5rjmyrlp97bb19mz0ykr3w4iyc6qi5d5qj2"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 0f8e2f61a6..03d571c03b 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_topn"; - version = "2.3.0"; + version = "2.3.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "05mjzm7rz5j7byzag23526hhsqsg4dsyxxsg8q9ray1rwxjbr392"; + sha256 = "0ai07an90ywhk10q52hajgb33va5q76j7h8vj1r0rvq6dyii0wal"; }; installPhase = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; + changelog = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.agpl3; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index b95ef73308..665cb1dc06 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.13.1"; + version = "1.15.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "19vcvfhxh0922qgibahmkyf7czniycqbzccxdw65j1ia7fd8yyc3"; + sha256 = "0rjbzcdvwx19ql0ilccr47inilf7kh5hn7aacjqs1nxk91g3x7yf"; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index 1fbf94beb1..c7e88eb0c4 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -1,54 +1,48 @@ -{stdenv, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python, buildPythonApplication, bash, setuptools, wrapPython, makeWrapper }: -stdenv.mkDerivation rec { - version = "2.2.4"; +buildPythonApplication rec { pname = "Tautulli"; + version = "2.6.1"; + format = "other"; - pythonPath = [ python.pkgs.setuptools ]; - buildInputs = [ python.pkgs.setuptools ]; - nativeBuildInputs = [ python.pkgs.wrapPython ]; + pythonPath = [ setuptools ]; + nativeBuildInputs = [ wrapPython makeWrapper ]; src = fetchFromGitHub { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0yg7r7yscx6jbs1lnl9nbax3v9r6ppvhr4igdm3gbvd2803j8fs7"; + sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34="; }; - buildPhase = ":"; + doBuild = false; installPhase = '' - mkdir -p $out - cp -R * $out/ + mkdir -p $out/bin $out/libexec/tautulli + cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli - # Remove the PlexPy.py compatibility file as it won't work after wrapping. - # We still have the plexpy executable in bin for compatibility. - rm $out/PlexPy.py - - # Remove superfluous Python checks from main script; - # prepend shebang - echo "#!${python.interpreter}" > $out/Tautulli.py - tail -n +7 Tautulli.py >> $out/Tautulli.py - - - mkdir $out/bin # Can't just symlink to the main script, since it uses __file__ to # import bundled packages and manage the service - echo "#!/bin/bash" > $out/bin/tautulli - echo "$out/Tautulli.py \$*" >> $out/bin/tautulli - chmod +x $out/bin/tautulli + makeWrapper $out/libexec/tautulli/Tautulli.py $out/bin/tautulli + wrapPythonProgramsIn "$out/libexec/tautulli" "$pythonPath" # Creat backwards compatibility symlink to bin/plexpy ln -s $out/bin/tautulli $out/bin/plexpy - - wrapPythonProgramsIn "$out" "$out $pythonPath" ''; - meta = with stdenv.lib; { + checkPhase = '' + runHook preCheck + + $out/bin/tautulli --help + + runHook postCheck + ''; + + meta = with lib; { description = "A Python based monitoring and tracking tool for Plex Media Server"; homepage = "https://tautulli.com/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ csingley ]; + maintainers = with maintainers; [ csingley ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index dbc59e982d..9c576dd2bd 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.3.3"; + version = "2.3.4"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "0hzw4ahwl8hjd1qzv8fzls9m8pivyzrdcmchbqpjlwn83r8ywm0l"; + sha256 = "1vdnd6nb8bfiwd51rrqhrc9p8lh3fhny49lapgbzk36ynqc97bi5"; stripRoot = false; }; - vendorSha256 = "0y0yw648a6wm0da5x58xwa7k95ff3iddqhfwshhlb5phlnsiqllj"; + vendorSha256 = "0h3j0b034yh70c9bscj1k1jy8igsr7p0i014yr0zl7wlc6s6c9bp"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/ursadb/default.nix b/third_party/nixpkgs/pkgs/servers/ursadb/default.nix index 8a2f768443..6a3a1cff5b 100644 --- a/third_party/nixpkgs/pkgs/servers/ursadb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ursadb/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ msm ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix index ad3a699580..92d50ff67c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix @@ -11,8 +11,6 @@ in stdenv.mkDerivation rec { url = "https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; - # This is needed, because the zip contains a directory with world write access, which is not allowed in nix - extraPostFetch = "chmod -R a-w $out"; }; buildInputs = [ phpExt ]; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index 411d6eba00..4496169619 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1nj8cjj5db5r4wnxbcsd5z9n5kqf2p1j54l5z0m650370z41df1f"; + sha256 = "0rbg0jchg59x0g4h0xahdm9qah8l8g4i2s8lkaqzdkm4yv29gqx4"; }; - cargoSha256 = "0sh6z8dclla3lrjzwfjb7avsbkagaq9d9q3d8ll8y0mahv1a135w"; + cargoSha256 = "1sbgn68n0rqh1m98dm3r2a3pqqqx4v7axw5djw8qlx4gv7xw1ql0"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 8a2a990259..8fbbfd47fb 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-22"; + version = "2020-11-26"; pname = "oh-my-zsh"; - rev = "7a76afd61e5daab6fb33f955930efa7f4cf16021"; + rev = "05e2956dc61198d4767b96d97c5d10c93cedd6e3"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0zcy8ydyk6ba497q7m0l24wqy8ri616304w76mcxmpv7hh6yfnqa"; + sha256 = "1Eh6L92hvSHcQeQL+1bCDrg/2FKaZshKTTF2PeVGhLs="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index a978ac93a9..c8e845eec9 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -7,25 +7,25 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec { - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s"; + sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf"; }; }); in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.13.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "0w5rv7z47nys3x113mdddpb2pf1d9pmz9myh4xjzrcy4hp4qv421"; + sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index 0ceb60535f..160ca5d4e0 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -49,6 +49,18 @@ let isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses; + hasUnfreeLicense = attrs: + hasLicense attrs && + isUnfree (lib.lists.toList attrs.meta.license); + + isMarkedBroken = attrs: attrs.meta.broken or false; + + hasUnsupportedPlatform = attrs: + (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || + lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])); + + isMarkedInsecure = attrs: (attrs.meta.knownVulnerabilities or []) != []; + # Alow granular checks to allow only some unfree packages # Example: # {pkgs, ...}: @@ -62,16 +74,15 @@ let # package has an unfree license and is not explicitely allowed by the # `allowUnfreePredicate` function. hasDeniedUnfreeLicense = attrs: + hasUnfreeLicense attrs && !allowUnfree && - hasLicense attrs && - isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; allowInsecureDefaultPredicate = x: builtins.elem (getName x) (config.permittedInsecurePackages or []); allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x; hasAllowedInsecure = attrs: - (attrs.meta.knownVulnerabilities or []) == [] || + !(isMarkedInsecure attrs) || allowInsecurePredicate attrs || builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; @@ -203,6 +214,9 @@ let platforms = listOf str; hydraPlatforms = listOf str; broken = bool; + unfree = bool; + unsupported = bool; + insecure = bool; # TODO: refactor once something like Profpatsch's types-simple will land # This is currently dead code due to https://github.com/NixOS/nix/issues/2532 tests = attrsOf (mkOptionType { @@ -254,17 +268,22 @@ let # # Return { valid: Bool } and additionally # { reason: String; errormsg: String } if it is not valid, where - # reason is one of "unfree", "blacklisted" or "broken". + # reason is one of "unfree", "blacklisted", "broken", "insecure", ... + # Along with a boolean flag for each reason checkValidity = attrs: - if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then + { + unfree = hasUnfreeLicense attrs; + broken = isMarkedBroken attrs; + unsupported = hasUnsupportedPlatform attrs; + insecure = isMarkedInsecure attrs; + } + // (if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } else if hasBlacklistedLicense attrs then { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowUnsupportedSystem && - (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || - lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])) then + else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } @@ -272,14 +291,14 @@ let { valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; } else let res = checkMeta (attrs.meta or {}); in if res != [] then { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } - else { valid = true; }; + else { valid = true; }); assertValidity = { meta, attrs }: let validity = checkValidity attrs; in validity // { # Throw an error if trying to evaluate an non-valid derivation handled = if !validity.valid - then handleEvalIssue { inherit meta attrs; } (removeAttrs validity ["valid"]) + then handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; } else true; }; diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index 491951e612..0eb799e452 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -328,8 +328,9 @@ in rec { # Fill `meta.position` to identify the source location of the package. // lib.optionalAttrs (pos != null) { position = pos.file + ":" + toString pos.line; - # Expose the result of the checks for everyone to see. } // { + # Expose the result of the checks for everyone to see. + inherit (validity) unfree broken unsupported insecure; available = validity.valid && (if config.checkMetaRecursively or false then lib.all (d: d.meta.available or true) references diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index 7ee7d21fd5..8746f065b1 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -38,6 +38,8 @@ with pkgs; cross = callPackage ./cross {}; + rustCustomSysroot = callPackage ./rust-sysroot {}; + nixos-functions = callPackage ./nixos-functions {}; patch-shebangs = callPackage ./patch-shebangs {}; diff --git a/third_party/nixpkgs/pkgs/test/rust-sysroot/default.nix b/third_party/nixpkgs/pkgs/test/rust-sysroot/default.nix new file mode 100644 index 0000000000..3a786ad6f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/rust-sysroot/default.nix @@ -0,0 +1,60 @@ +{ lib, rust, rustPlatform, fetchFromGitHub }: + +let + mkBlogOsTest = target: rustPlatform.buildRustPackage rec { + name = "blog_os-sysroot-test"; + + src = fetchFromGitHub { + owner = "phil-opp"; + repo = "blog_os"; + rev = "4e38e7ddf8dd021c3cd7e4609dfa01afb827797b"; + sha256 = "0k9ipm9ddm1bad7bs7368wzzp6xwrhyfzfpckdax54l4ffqwljcg"; + }; + + cargoSha256 = "1cbcplgz28yxshyrp2krp1jphbrcqdw6wxx3rry91p7hiqyibd30"; + + inherit target; + + RUSTFLAGS = "-C link-arg=-nostartfiles"; + + # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ + doCheck = false; + + meta = with lib; { + description = "Test for using custom sysroots with buildRustPackage"; + maintainers = with maintainers; [ aaronjanse ]; + platforms = lib.platforms.x86_64; + }; + }; + + # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. + # The justification in the book for using rust-lld suggests that gcc can still be used for testing: + # > Instead of using the platform's default linker (which might not support Linux targets), + # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. + # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 + targetContents = { + "llvm-target" = "x86_64-unknown-none"; + "data-layout" = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"; + "arch" = "x86_64"; + "target-endian" = "little"; + "target-pointer-width" = "64"; + "target-c-int-width" = "32"; + "os" = "none"; + "executables" = true; + "linker-flavor" = "gcc"; + "panic-strategy" = "abort"; + "disable-redzone" = true; + "features" = "-mmx,-sse,+soft-float"; + }; + +in { + blogOS-targetByFile = mkBlogOsTest (builtins.toFile "x86_64-blog_os.json" (builtins.toJSON targetContents)); + blogOS-targetByNix = let + plat = lib.systems.elaborate { config = "x86_64-none"; } // { + rustc = { + config = "x86_64-blog_os"; + platform = targetContents; + }; + }; + in mkBlogOsTest (rust.toRustTargetSpec plat); +} diff --git a/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix b/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix index a2a7e5e692..054e061c4a 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/virtualgl/lib.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake +, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, xorg +, opencl-headers, opencl-clhpp, ocl-icd +}: stdenv.mkDerivation rec { pname = "virtualgl-lib"; - version = "2.6.2"; + version = "2.6.5"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0ngqwsm9bml6lis0igq3bn92amh04rccd6jhjibj3418hrbzipvr"; + sha256 = "1giin3jmcs6y616bb44bpz30frsmj9f8pz2vg7jvb9vcfc9456rr"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; @@ -15,7 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo libGL libGLU fltk libX11 libXv libXtst ]; + buildInputs = [ libjpeg_turbo libGL libGLU fltk + libX11 libXv libXtst xorg.xcbutilkeysyms + opencl-headers opencl-clhpp ocl-icd + ]; + + fixupPhase = '' + substituteInPlace $out/bin/vglrun \ + --replace "LD_PRELOAD=libvglfaker" "LD_PRELOAD=$out/lib/libvglfaker" \ + --replace "LD_PRELOAD=libdlfaker" "LD_PRELOAD=$out/lib/libdlfaker" \ + --replace "LD_PRELOAD=libgefaker" "LD_PRELOAD=$out/lib/libgefaker" + ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/X11/x11vnc/default.nix b/third_party/nixpkgs/pkgs/tools/X11/x11vnc/default.nix index 2f7b0d7697..5ed827b5a5 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/x11vnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/x11vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, autoreconfHook, pkgconfig }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-29074.patch"; + url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch"; + sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 7c78587a05..8bf242561b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -1,4 +1,5 @@ { lib +, nixosTests , python3 , groff , less @@ -14,16 +15,24 @@ let sha256 = "25df4e10c263fb88b5ace923dd84bf9aa7f5019687b5e55382ffcdb8bede9db5"; }; }); + # TODO: https://github.com/aws/aws-cli/pull/5712 + colorama = super.colorama.overridePythonAttrs (oldAttrs: rec { + version = "0.4.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9"; + }; + }); }; }; in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.150"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.185"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "0jrxzr4dx2s6ychmrz19yz8i4kqcwj7f8ly82ydwvrr0ff62374g"; + sha256 = "0yf8dmjgiib5s4dimc1896zxrrj0sl5kzrp7x8spm6xkcvwb02l1"; }; postPatch = '' @@ -56,7 +65,11 @@ in with py.pkgs; buildPythonApplication rec { rm $out/bin/aws.cmd ''; - passthru.python = py; # for aws_shell + passthru = { + python = py; # for aws_shell + + tests = { inherit (nixosTests) awscli; }; + }; meta = with lib; { homepage = "https://aws.amazon.com/cli/"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 820fef1a74..81389f39dd 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,21 +1,23 @@ -{ stdenv, lib, python, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.14.2"; + version = "2.15.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "1d5qd39b0i5icg193ybr9gzl0axqw5ml5zjwqin1zxqj5y3r6sc2"; + sha256 = "05vwaafb6yzvrhig0gjkb4803yj6qr00gqh41rws9520899f2m9d"; }; # put packages that needs to be overriden in the py package scope - py = import ./python-packages.nix { inherit stdenv python lib src version; }; + py = import ./python-packages.nix { + inherit stdenv lib src version; + python = python3; + }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { pname = "azure-cli"; inherit version src; - disabled = python.isPy27; # namespacing assumes PEP420, which isn't compat with py2 sourceRoot = "source/src/azure-cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index ce3b3f657b..29787cfb17 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -83,6 +83,11 @@ let ++ lib.optionals isPy3k [ antlr4-python3-runtime ] ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "azure-mgmt-core==1.2.1" "azure-mgmt-core~=1.2" + ''; + doCheck = stdenv.isLinux; # ignore tests that does network call checkPhase = '' @@ -128,8 +133,8 @@ let azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; - azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "0.2.0" "zip" - "1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5"; + azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "1.0.0" "zip" + "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; @@ -191,8 +196,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.12.0" "zip" - "7d773119bc02e3d6f9d7cffb7effc17e85676d5c5b1f656d05abc4489e472c76"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.13.0" "zip" + "1fq3hgwwhba6vv07rciiibwmp2zlygz20zp1mzdxajqlfg838q78"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; @@ -248,8 +253,8 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "7.0.0b3" "zip" - "1w8kp4r8v54cr4sskkgv5mbqx2pisrly2066ma5msg6amy97jnr6"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "8.0.0" "zip" + "2c974c6114d8d27152642c82a975812790a5e86ccf609bf370a476d9ea0d2e7d"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; @@ -269,8 +274,8 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip" - "0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "16.0.0" "zip" + "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5"; azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; @@ -278,8 +283,8 @@ let azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" - "0nq9gbhc2qlllz6v6mdymw25acxpay9cxiafb63pss30jyyj04cx"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "2.0.0" "zip" + "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8"; azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz" "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 6de26c81e6..b6834551ce 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "08vdcbgi0s9rm8rh025yifacqma2c0dxf6jdfnacrz1gj2s7s4rd"; + sha256 = "0np11c4apyl7lmh4kjyi62bcf1kjf2fjjlli8aadvlli2ww8qrf2"; }; - vendorSha256 = "1lhs1h0x3ryq0bd5w9ny7i2j9d0x2904br1vlxy677w2xsa9213p"; + vendorSha256 = "19fk2lw7m8kqwwhv3sqr0iix90sjcnh2mqqvr5p87hfjars4c55v"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 9fbedcdbf4..36a1cf97a1 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.20.2"; + version = "1.21.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "1vawc3ba7p35gil57wz9s1mlp1x99imvwcxfzlkfhgizfa56vfrx"; + sha256 = "12z5mbw7yzhyhzl6499xlhzpgysarjql4qlrpmwfpb8ij1hk8q6i"; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix index 904cab3122..2959245173 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1lkmilj873ia8kigyfmqfjnlpi7jzq3q4m0ip3lr0a111nr3wi4m"; + sha256 = "0kldvy63gba5k6ymybnggw3q3rlav1gcbpxiwnv6670lk5qzqdsw"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0q20vaqr9rrzcp57jrskcmbdvqrfpr4lscki85824fdlpklc00ga"; + sha256 = "1ifl4skwqhkapfwhymyz7v4jpwpd01n4x3956w5ci8c3zvw8l118"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "315.0.0"; + version = "319.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index 4e0a093ad5..c8e8528cff 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.7"; + version = "0.10.9"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0aaspzx8sna1m5zldql0ps3sldazwr32q0md0p8z3nimww24i3b3"; + sha256 = "1bxzwcj7jxv1hkbq84wigshni1ivdga7g77k3h9fxzn7c223yccd"; }; - cargoSha256 = "1nb38nnmmc4hf8crp0bka029hlph15zm796nqziq25i26cgz4xvp"; + cargoSha256 = "1bf0r9kymc1w1rxpc0bjgj5faagmad9vh404n9860rpganrdjvkx"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix index 099ccc6f4c..5088cdeb96 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.9"; + version = "8.14.10"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7"; + sha256 = "0x20vmf94n9s4r2q45543yi39fkc0jg9wd1imihjcqmb2sz3x3vm"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix index 8b0580ba98..d80f1af418 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook -, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook +, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -17,12 +17,18 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701 ./fix-wayland.patch + + # https://github.com/christophgysin/pasystray/issues/98 + (fetchpatch { + url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch"; + sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw"; + }) ]; nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme - avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper + avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix index 43823e5b51..42853eb8ff 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } : +{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu, lzfse }: stdenv.mkDerivation rec { pname = "darling-dmg"; - version = "1.0.4+git20180914"; + version = "1.0.4+git20200427"; src = fetchFromGitHub { owner = "darlinghq"; repo = "darling-dmg"; - rev = "97a92a6930e43cdbc9dedaee62716e3223deb027"; - sha256 = "1bngr4827qnl4s2f7z39wjp13nfm3zzzykjshb43wvjz536bnqdj"; + rev = "71cc76c792db30328663272788c0b64aca27fdb0"; + sha256 = "08iphkxlmjddrxpbm13gxyqwcrd0k65z3l1944n4pccb6qbyj8gv"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse openssl zlib bzip2 libxml2 icu ]; + buildInputs = [ fuse openssl zlib bzip2 libxml2 icu lzfse ]; - # compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554 - CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; + CXXFLAGS = [ + "-DCOMPILE_WITH_LZFSE=1" + "-llzfse" + ]; - meta = { + meta = with stdenv.lib; { homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix index 10e6e2f9c8..e1f28a0f27 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dislocker"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "aorimn"; repo = "dislocker"; rev = "v${version}"; - sha256 = "1crh2sg5x1kgqmdrl1nmrqwxjykxa4zwnbggcpdn97mj2gvdw7sb"; + sha256 = "1ak68s1v5dwh8y2dy5zjybmrh0pnqralmyqzis67y21m87g47h2k"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 7e6bd7440b..4aafe8d6d6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1ihibhj48fk1c89yh7vyb44mkywxphxqqgz7xks9caw05qw5ac1y"; + sha256 = "00pzwxn5a7dwz9ngl98198lx1c3nlhalzajyqazw9ydjkxibfpay"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix index fb90c3b0ae..dfa7530ac6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/irods/common.nix @@ -51,6 +51,6 @@ with stdenv; homepage = "https://irods.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix new file mode 100644 index 0000000000..e89012b76f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sftpman/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "sftpman"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "spantaleev"; + repo = pname; + rev = version; + sha256 = "04awwwfw51fi1q18xdysp54jyhr0rhb4kfyrgv0vhhrlpwwyhnqy"; + }; + + checkPhase = '' + $out/bin/sftpman help + ''; + + meta = with lib; { + homepage = "https://github.com/spantaleev/sftpman"; + description = "Application that handles sshfs/sftp file systems mounting"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ contrun ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix new file mode 100644 index 0000000000..93a9be58b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "exifprobe"; + version = "unstable-2018-06-19"; + + src = fetchFromGitHub { + owner = "hfiguiere"; + repo = "exifprobe"; + rev = "ce1ea2bc3dbbe8092b26f41cd89831cafe633d69"; + sha256 = "1c1fhc0v1m452lgnfcijnvrc0by06qfbhn3zkliqi60kv8l2isbp"; + }; + + CFLAGS = [ "-O2" ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + mv $out/usr/bin $out/bin + mv $out/usr/share $out/share + rm -r $out/usr + ''; + + meta = with stdenv.lib; { + description = "Tool for reading EXIF data from image files produced by digital cameras"; + homepage = "https://github.com/hfiguiere/exifprobe"; + license = licenses.bsd2; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 6787ff2e8f..e8e9472cab 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.3"; + version = "2.9.4"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1pj3rwycwnspw2lm5j0w4647677y6s3446zsx9s6br9bc7v7w5s6"; + sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index cdb8a16708..6e63b57881 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "4.0.0"; + version = "4.0.1"; pname = "oxipng"; src = fetchCrate { inherit version pname; - sha256 = "0p9h006l75ci324lbcx496732pb77srcd46g6dnfw3mcrg33cspc"; + sha256 = "0mgd33cb112yg1bz8jhsbk2w8p2gdiw510bfv4z82b2mg6pl6b9r"; }; - cargoSha256 = "1r2zw7p95abxqc31b5gswdyhm4msxsiml34dsh9x8zydhqnwy17j"; + cargoSha256 = "01g3qansrvvv85b1kxg4609lnj3bizavg3r7651hn03cnlychj2n"; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index c85e895812..2e745fc1a7 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -13,6 +13,7 @@ , libgsf , libexif , libheif +, librsvg , ApplicationServices , python27 , libpng @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { libexif libheif libpng + librsvg python27 libpng expat diff --git a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 66c8b1d5cc..fa2088ca29 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,16 +1,16 @@ -{ cmake, fetchFromGitHub, opencv3, stdenv, opencl-headers +{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers , cudaSupport ? false, cudatoolkit ? null }: stdenv.mkDerivation rec { pname = "waifu2x-converter-cpp"; - version = "5.2.4"; + version = "5.3.3"; src = fetchFromGitHub { owner = "DeadSix27"; repo = pname; rev = "v${version}"; - sha256 = "0r7xcjqbyaa20gsgmjj7645640g3nb2bn1pc1nlfplwlzjxmz213"; + sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w"; }; patchPhase = '' @@ -19,10 +19,14 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - opencv3 opencl-headers + ocl-icd opencv3 opencl-headers ] ++ stdenv.lib.optional cudaSupport cudatoolkit; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" + ''; meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index 238e133495..32db485039 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -60,13 +60,13 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.22"; + version = "1.5.23"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "09ynn7gq84q18hhbg6wq2yrliwil42qbzxbwbpggry1s955jg5xb"; + sha256 = "0qnblqhz8wyhchnm36zrxhbvi9g4fcwcgmw7p60yjybdlhq4asc7"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/autojump/default.nix b/third_party/nixpkgs/pkgs/tools/misc/autojump/default.nix index 85e5003883..c1a55256b3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/autojump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/autojump/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, bash }: +{ stdenv, fetchFromGitHub, python3, bash }: stdenv.mkDerivation rec { pname = "autojump"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1rgpsh70manr2dydna9da4x7p8ahii7dgdgwir5fka340n1wrcws"; }; - buildInputs = [ python bash ]; + buildInputs = [ python3 bash ]; dontBuild = true; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix index 5a2387358d..376b661816 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -21,6 +21,8 @@ in --replace '["xrandr"]' '["${xrandr}/bin/xrandr"]' ''; + outputs = [ "out" "man" ]; + installPhase = '' runHook preInstall make install TARGETS='autorandr' PREFIX=$out @@ -29,6 +31,8 @@ in make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out + make install TARGETS='manpage' PREFIX=$man + ${if systemd != null then '' make install TARGETS='systemd udev' PREFIX=$out DESTDIR=$out \ SYSTEMD_UNIT_DIR=/lib/systemd/system \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index b5fea3cc3a..5c60305a2e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,5 @@ { stdenv +, nixosTests , rustPlatform , fetchFromGitHub , pkg-config @@ -11,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "118pqws32j2hx13vjda5wz1kfjfnb4h76wlj90q768na8b522kn0"; + sha256 = "1kbziqm00skj65gpjq6m83hmfk9g3xyx88gai1r80pzsx8g239w1"; }; - cargoSha256 = "1r1gxpb0qsbl4245sqw3gsi33pigsj16z4cxii3fmsnq0y77yd5r"; + cargoSha256 = "1pdja5jhk036hpgv77xc3fcvra1sw0z5jc1ry53i0r7362lnwapz"; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}" ''; + passthru.tests = { inherit (nixosTests) bat; }; + meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix index b46d6490c4..e5c528596b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.5"; + version = "1.0.6"; src = fetchCrate { inherit pname version; - sha256 = "0b28xdc3dwhr4vb3w19fsrbj2m82zwkg44l4an3r4mi2vgb25nv2"; + sha256 = "1yzj1k09yd3q2dff6a6m0xv2v6z681x25g0x5ak41lm5rn3hj8vl"; }; - cargoSha256 = "07gsga5hf4l64kyjadqvmbg5bay7mad9kg2pi4grjxdw6lsxky0f"; + cargoSha256 = "1axcnr7bzplchpz4cdy5872fmrnzrs1p665c0vmxzs9bgnml5sl8"; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix new file mode 100644 index 0000000000..1bafa4688a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, libedit, libsecret, ncurses, pkg-config, readline, Security }: + +stdenv.mkDerivation rec { + pname = "envchain"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "sorah"; + repo = pname; + rev = "v${version}"; + sha256 = "0qxwiqhb8cg0zbn5p0mvnbyxx1xwvgiricrkjlvxz13sf2ngq87p"; + }; + + postPatch = '' + sed -i -e "s|-ltermcap|-lncurses|" Makefile + ''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libsecret readline ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libedit ncurses Security ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = with stdenv.lib; { + description = "Set environment variables with macOS keychain or D-Bus secret service"; + homepage = "https://github.com/sorah/envchain"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix b/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix index dfc2b1756f..bf7853c117 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/execline/default.nix @@ -1,7 +1,4 @@ -{ lib, skawarePackages -# for execlineb-with-builtins -, coreutils, gnugrep, writeScriptBin, runCommand, runCommandCC -}: +{ skawarePackages }: with skawarePackages; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix index ee91c66cc8..9d5fbcba23 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "11cvpg7j2rvqri16cr3gb6dpm7dzgs3vywhdc91aa531f87qj16c"; + sha256 = "1gs9hmkc25013nk8b7d7pcxcp4jmk4pa4gcki3wgvlrzjl1av7w4"; }; - cargoSha256 = "0q9gkvbay6rnb0nd14z71h3506yzn9610zc6g8wbpgmw6cpwvbg9"; + cargoSha256 = "13lw7isg9lfn6dfngq15qbq619c644ixa5bvb1ja0l3hm3akrs5g"; meta = with lib; { description = "Arbitrary-precision unit-aware calculator"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix index 2f92dc6d9b..47d4fd1275 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flashrom/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; platforms = platforms.all; + broken = stdenv.isDarwin; # requires DirectHW }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix index f787ab1ef0..486bdfdaa8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1hfkix5pjcrm68bm4k71dlkkdlnwffzlw4kxhiq9pmg09z8s6kq3"; + sha256 = "0318fw04fman20hjdjsgix6fg4fp85mrsm3bb629kxn30xi6wsh3"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix new file mode 100644 index 0000000000..95944d566d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "goreleaser"; + version = "0.147.2"; + + src = fetchFromGitHub { + owner = "goreleaser"; + repo = pname; + rev = "v${version}"; + sha256 = "1pzbwjqnb2l1845dqmx5s2xyxv7088yz2888bjwm0qs8pm1l6spi"; + }; + + vendorSha256 = "1qwggbgfvgx1anh55jx2lj0x59h5j3wixb8r2ylaynrrxx1b167w"; + + buildFlagsArray = [ + "-ldflags=" + "-s" + "-w" + "-X main.version=${version}" + "-X main.builtBy=nixpkgs" + ]; + + # tests expect the source files to be a build repo + doCheck = false; + + meta = with lib; { + description = "Deliver Go binaries as fast and easily as possible"; + homepage = "https://goreleaser.com"; + maintainers = with maintainers; [ c0deaddict endocrimes sarcasticadmin ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix index 503b9bcd41..f6a48364bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.3.8"; + version = "3.3.9"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0y5c7sgdswh2p50plv78vkva0wwlyh2vh3qy3mymq48nqpzrbirp"; + sha256 = "1wl9j2jgjg5gwcsh92qr5f68wx12nvwadc9xkaa9wwd7x3z825jq"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix b/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix index 0499011cd1..5a9b692b1b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/graylog/plugins.nix @@ -64,10 +64,10 @@ in { enterprise-integrations = glPlugin rec { name = "graylog-enterprise-integrations-${version}"; pluginName = "graylog-plugin-enterprise-integrations"; - version = "3.3.8"; + version = "3.3.9"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-enterprise-integrations/graylog-enterprise-integrations-plugins-${version}.tgz"; - sha256 = "1567q2pwgcwxvaa0qmbhgvnr9f9v3w7vgvnv8kvfvjhxlvm78g1q"; + sha256 = "0yr2lmf50w8qw5amimmym6y4jxga4d7s7cbiqs5sqzvipgsknbwj"; }; installPhase = '' mkdir -p $out/bin @@ -96,10 +96,10 @@ in { integrations = glPlugin rec { name = "graylog-integrations-${version}"; pluginName = "graylog-plugin-integrations"; - version = "3.3.8"; + version = "3.3.9"; src = fetchurl { url = "https://downloads.graylog.org/releases/graylog-integrations/graylog-integrations-plugins-${version}.tgz"; - sha256 = "00ax3r24inzicak0dd77737qpfas455w5vmj980yfsz40vwnqlr2"; + sha256 = "0q858ffmkinngyqqsaszcrx93zc4fg43ny0xb7vm0p4wd48hjyqc"; }; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index 88e3eada91..243bf66e70 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.13.1) - html-proofer (3.17.2) + html-proofer (3.17.3) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -18,7 +18,7 @@ GEM mini_portile2 (2.4.0) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.3) + nokogumbo (2.0.4) nokogiri (~> 1.8, >= 1.8.4) parallel (1.20.1) public_suffix (4.0.6) diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index c4974af034..2aeb5bfd9c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05h3liirjx6wvh97vdl59hmwzgji1ih61xq1w5nl87cmhpsxaqsf"; + sha256 = "1i05vgyhyyps867zgpcd13wdidf0cpra39rhfff1jhkc1hn766lm"; type = "gem"; }; - version = "3.17.2"; + version = "3.17.3"; }; mercenary = { groups = ["default"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nif9bn7zlizfcsk464b8n5gvspdim34hl7ldw2y7w4lcnwgg4zg"; + sha256 = "0pxm7hx2lhmanm8kljd39f1j1742kl0a31zx98jsjiwrkfb5hhc6"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.4"; }; parallel = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix index 5e6c0bdd59..ae70e0f3e6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jre, makeDesktopItem }: +{ stdenv, fetchurl, unzip, jre, makeDesktopItem, copyDesktopItems }: let desktopItem = makeDesktopItem { @@ -18,11 +18,12 @@ stdenv.mkDerivation { sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; + nativeBuildInputs = [ copyDesktopItems ]; buildInputs = [ unzip ]; inherit jre; installPhase = '' - source $stdenv/setup + runHook preInstall unzip $src @@ -38,9 +39,11 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/jdiskreport - ${desktopItem.buildCommand} + runHook postInstall ''; + desktopItems = [ desktopItem ]; + meta = with stdenv.lib; { homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix index 7d559a1468..a22fcc77dd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.18.2"; + version = "1.19.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1gaqdcz0s31qncar9dzlr8izv50zlk4y6dgdm9xjk6as2g8b0fkk"; + sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index 52e74e5bab..b8008864bc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/logstash-plugin \ --set JAVA_HOME "${jre}" + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index e7872b0c40..cd554167dd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $out cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/logstash-plugin \ --set JAVA_HOME "${jre}" + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/contrib.nix index d03e031b7a..d4fb6532ef 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logstash/contrib.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logstash/contrib.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip }: # Note that plugins are supposed to be installed as: -# $path/logstash/{inputs,codecs,filters,outputs}/*.rb +# $path/logstash/{inputs,codecs,filters,outputs}/*.rb stdenv.mkDerivation rec { version = "1.4.2"; pname = "logstash-contrib"; @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; installPhase = '' + runHook preInstall mkdir -p $out/logstash cp -r lib/* $out + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index a823973bf9..ccf7a05907 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "0a3bah5xa2vmxgqkqihbvcc8rpl64yhw3i0c30lhfdfza0jisaql"; + sha256 = "1iizyr6bv17dpv05whcx34498wbrs0q3gn8s50srvdqrdk9hs4gj"; }; - vendorSha256 = "06y1v0v1kkbd5vxa8h0qvasm9ibwwhz0v4x03k3nb5xlwn0x9jx8"; + vendorSha256 = "17nykcx47h1q55msh43mmf092y5cigarz5486yp6sqp79p6lbjk3"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix index ea80a29951..2acd5a789a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lsd/default.nix @@ -1,4 +1,5 @@ { stdenv +, nixosTests , fetchFromGitHub , rustPlatform , installShellFiles @@ -26,6 +27,8 @@ rustPlatform.buildRustPackage rec { "--skip meta::filetype::test::test_socket_type" ]; + passthru.tests = { inherit (nixosTests) lsd; }; + meta = with stdenv.lib; { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 4bb8ff9ef3..165a49fad0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.7.1"; + version = "2.7.3"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "1l4acikxkxvmdqn10ck4w4f100vz7kfrzghz5h4haj7ycrr35j3l"; + sha256 = "0c56na9s3g7rdb4cc6ccsnfby2ihf5zrfs3lg9qxiqsfr7mcn4w9"; }; - cargoSha256 = "0rmy0jnf5rqd4dqyl6rinxb3n3rzqnixrybs4i27lcas9m753z40"; + cargoSha256 = "05rrww53g3k2c8mpxvyc067qsgs7w9sxnzdlvmca1idbqa0k9060"; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index 28ac3a82f0..e2cda521f0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -39,13 +39,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.7"; + version = "2020.8"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0clriq2ypz1fycd6mpjyrhzid44svzpzw0amnank593h69b216ax"; + sha256 = "16v73v63h16ika73kgh2cvgm0v27r2d48m932mbj3xm6s295kapx"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/page/default.nix b/third_party/nixpkgs/pkgs/tools/misc/page/default.nix index c93084a16d..b1042d3ae5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/page/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/page/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "page"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "I60R"; repo = pname; rev = "v${version}"; - sha256 = "0xcbnl8fbdfdmcbv5d7v830aa3vfhg7nlf768rbrfd5a0970pllh"; + sha256 = "1pk3iclmwbkg4nvsgarq4qjpzapjhsl7b7z6zw6havp1zmx9h806"; }; nativeBuildInputs = [ installShellFiles ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $completions_dir/_page ''; - cargoSha256 = "0ckfmqi6jvbvj99vbdp798mmy6gc54254n32br0ri842b04i26qf"; + cargoSha256 = "0s1iwli5h6qkibi24v80izr38z84zfx1dv71fv06lzq38b6s4nd5"; meta = with lib; { description = "Use neovim as pager"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 12b7dda0df..1d48ccce66 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.19"; + version = "1.2020.20"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0lb0gxww7fgbwazfj1z533crryvcgb5vdprpy8j9p6h6x929qaqi"; + sha256 = "0dzj3ab9g7lh5r0n876g5d8yq966f2zxvd8mwrbib43dzaxpd00w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix index 90c3c69652..d0266cf30e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sophisticated software modeler"; - homepage = "http://staruml.io/"; + homepage = "https://staruml.io/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix index 8df030eafa..3eccb48836 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }: +{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index a02c1d0f43..cc910c8b41 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.6.2"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "feec0be98a60c8cd8557bce388156202496dd9c8998e6913e595e939aeb0f735"; + sha256 = "4bc52d6683235307c92ddbb164c84e3e892ee2d00afa16ed89eca0fa7f85029e"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/ugtrain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ugtrain/default.nix new file mode 100644 index 0000000000..0645645ae2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/ugtrain/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, scanmem +}: + +stdenv.mkDerivation rec { + version = "0.4.1"; + pname = "ugtrain"; + + src = fetchFromGitHub { + owner = "ugtrain"; + repo = "ugtrain"; + rev = "v${version}"; + sha256 = "0pw9lm8y83mda7x39874ax2147818h1wcibi83pd2x4rp1hjbkkn"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config scanmem ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ugtrain/ugtrain"; + description = "The Universal Elite Game Trainer for CLI (Linux game trainer research project)"; + maintainers = with maintainers; [ mtrsk ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix index 6e6a985d44..7c8a723f41 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.3.2"; + version = "0.3.3"; pname = "vimwiki-markdown"; src = fetchPypi { inherit version pname; - sha256 = "e8dc7de7fc7f88480acb940aa51088464b9911c85cc3d5cca962a45e75ff9b81"; + sha256 = "ee4ef08f7e4df27f67ffebb5fa413a7cf4fad967a248c1c75d48b00122a5b945"; }; propagatedBuildInputs= [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix index c56862e5f0..8fa46a7869 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.11.21.1"; + version = "2020.11.29"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0a9livib328z5j3kfndxys2193dvfs4hh38krx0idg0k26xp7cfl"; + sha256 = "10px5wnsjw4lzdh75810q4sjbhnd7cjxwpa3crapd3yj0f3bwa76"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/axel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/axel/default.nix index 5cd8e41f70..baa498042f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/axel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.9"; + version = "2.17.10"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "1bhzgvvqcwa5bd487400hg1nycvw8qqxzbzvq5ywyz5d9j12hdrd"; + sha256 = "01mpfkz98r2fx4n0gyi3b4zvlyfd5bxydp2wh431lnj0ahrsiikp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 80b135e524..2c1732007b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8"; + sha256 = "0jyaxwgghvgd599acxr91hr2v4wyv3bd1j45k0gb4q2v58jz2fwd"; }; buildInputs = [ openssl zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix index 9add729cf2..edf91dd311 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/hey/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hey"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "rakyll"; repo = pname; rev = "v${version}"; - sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; + sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix index 29bd4c331e..e9987a51ea 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httpstat/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { pname = "httpstat"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "reorx"; repo = pname; rev = version; - sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6"; + sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"; }; doCheck = false; # No tests buildInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix new file mode 100644 index 0000000000..83b35c0986 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "igmpproxy"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pali"; + repo = "igmpproxy"; + rev = version; + sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A daemon that routes multicast using IGMP forwarding"; + homepage = "https://github.com/pali/igmpproxy/"; + changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sdier ]; + # The maintainer is using this on linux, but if you test it on other platforms + # please add them here! + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix index 2a551c5676..f01bffa76d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://troglobit.com/project/inadyn/"; + homepage = "https://troglobit.com/project/inadyn/"; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix index 6a14b5f1c8..d425e16782 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minidlna/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: -let version = "1.2.1"; in +let version = "1.3.0"; in stdenv.mkDerivation { pname = "minidlna"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; - sha256 = "1v1ffhmaqxpvf2vv4yyvjsks4skr9y088853awsh7ixh7ai8nf37"; + sha256 = "0qrw5ny82p5ybccw4pp9jma8nwl28z927v0j2561m0289imv1na7"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index ba71557100..2c626e81cd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-10-03T02-54-56Z"; + version = "2020-11-17T00-39-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "0pc08w0xdkk9w8xya0q7d1601wprshq852419pwpi8hd7y3q381h"; + sha256 = "122fb9ghxwjifhvwiw07pm3szqfj3pc55m4bhq3v8nshzwrbcjf4"; }; - vendorSha256 = "0bkidqcdfjyqjlzxy9w564c6s3vw850wgq6ksx5y1p8f5r4plzxs"; + vendorSha256 = "148fb86v059skcf8dgcrqibwkl1h4lbwi60qnwmdi03q6rvaw33m"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix index 26c9035cd7..dba75400f6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -3,10 +3,11 @@ , libutempter ? null, withUtempter ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "mosh-1.3.2"; + pname = "mosh"; + version = "1.3.2"; src = fetchurl { - url = "https://mosh.org/${name}.tar.gz"; + url = "https://mosh.org/mosh-${version}.tar.gz"; sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 2b09fe901d..4630342cf8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.3.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1pafv432ll3pp52580pbnk0gnrm6byl5fkrf1rarhxfkpkr82yif"; + sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l"; }; phases = [ "installPhase" ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.shou ]; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index 0a1680bfdb..a8ce80f983 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds"; + sha256 = "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2"; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxychains/default.nix b/third_party/nixpkgs/pkgs/tools/networking/proxychains/default.nix index 6f00c7fc8b..6ace8e139e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/proxychains/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/proxychains/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # Temporary work-around; most likely fixed by next upstream release sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' ''; + postInstall = '' + cp src/proxychains.conf $out/etc + ''; meta = { description = "Proxifier for SOCKS proxies"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 39b361bd30..143b25849d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "1nspvzcpwmaipdq49jm7z3ymdg95zqgcyv1cjfs1zb950knrrggr"; + sha256 = "1zvmsin7pgfwafj5qr8fcixg01xfq1xhjd93klyxhmacfxirhkgw"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix index 285a3764e0..a077ddb3de 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence/default.nix @@ -3,7 +3,7 @@ , iptables, bash }: let - sshuttle-telepresence = + sshuttle-telepresence = let sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; in @@ -22,13 +22,13 @@ let }); in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.105"; + version = "0.108"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = version; - sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg"; + sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g="; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 666b30d2c8..9d254a0551 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.4.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "1f8hh05wx59dc0fbzdzwq05x0gmrdfl4v103wbcyjmzsbazaw6p3"; + sha256 = "0zk1lvjramahjpq94axdic8sgvvmgyg1fmcb89lynqqvh66qsv12"; }; preConfigure = '' - substituteInPlace ./osdep/ManagedRoute.cpp \ - --replace '/usr/sbin/ip' '${iproute}/bin/ip' - - substituteInPlace ./osdep/ManagedRoute.cpp \ - --replace '/sbin/ip' '${iproute}/bin/ip' - patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ diff --git a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix index 2db9ee6d9b..0b40e2b714 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/cached-nix-shell/default.nix @@ -10,16 +10,16 @@ let in rustPlatform.buildRustPackage rec { pname = "cached-nix-shell"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "xzfc"; repo = pname; rev = "v${version}"; - sha256 = "1ni671wr2lrvyz6myaz3v4llrjvq4jc1ygw1m7rvnadzyf3va3lw"; + sha256 = "0w6khry1ncyqy5h6996xw1f6viw4wdrfji5m8lz9gm487xlq5v0b"; }; - cargoSha256 = "19i39b1yqdf81ql4psr3nfah6ci2mw3ljkv740clqmz088j2av8g"; + cargoSha256 = "0d4fz0rhqy1n30wfl2pmf76zpp21agr3h0hswp3r5bfnxqp6i54h"; # The BLAKE3 C library is intended to be built by the project depending on it # rather than as a standalone library. @@ -29,14 +29,11 @@ in rustPlatform.buildRustPackage rec { nativeBuildInputs = [ ronn ]; postBuild = '' - ronn -r cached-nix-shell.1.md + make -f nix/Makefile post-build ''; postInstall = '' - mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty - 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 + make -f nix/Makefile post-install ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/nix/dnadd/default.nix b/third_party/nixpkgs/pkgs/tools/nix/dnadd/default.nix new file mode 100644 index 0000000000..eff99743f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/dnadd/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dnadd"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "JoeLancaster"; + repo = pname; + rev = "v${version}"; + sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/joelancaster/dnadd"; + description = "Adds packages declaratively on the command line"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ joelancaster ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 5ede7af10b..b4cb6d0304 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.9"; + name = "DisnixWebService-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz"; - sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; + sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix index cc6072eb6d..f63c7dd737 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }: +{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: stdenv.mkDerivation { - name = "disnix-0.9.1"; + name = "disnix-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz"; - sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; + sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; }; - configureFlags = [ - " --with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = with stdenv.lib.maintainers; [ sander tomberek ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix index 709c5454e1..2fa7d3ed9d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.8"; - + name = "disnixos-0.9"; + src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz"; - sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; + sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix new file mode 100644 index 0000000000..552d2a106f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: + +stdenv.mkDerivation rec { + version="2020-07-04"; + name = "dydisnix-${version}"; + + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "dydisnix"; + rev = "e99091f1c2329d562097e35faedee80622d387f0"; + sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; + }; + + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; + preConfigure = '' + ./bootstrap + ''; + + meta = { + description = "A toolset enabling self-adaptive redeployment on top of Disnix"; + longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = [ stdenv.lib.maintainers.tomberek ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix index 2485becc9e..031e926e78 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null +{ stdenv, fetchurl, netcat +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -9,6 +9,9 @@ , enableTomcatWebApplication ? false , enableMongoDatabase ? false , enableInfluxDatabase ? false +, enableSupervisordProgram ? false +, enableDockerContainer ? true +, enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" , getopt @@ -20,12 +23,14 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; +assert enableSupervisordProgram -> supervisor != null; +assert enableDockerContainer -> docker != null; stdenv.mkDerivation { - name = "dysnomia-0.9.1"; + name = "dysnomia-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz"; - sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; + sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -40,17 +45,22 @@ stdenv.mkDerivation { (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") + (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") + (if enableDockerContainer then "--with-docker" else "--without-docker") "--with-job-template=${jobTemplate}" - ]; + ] ++ stdenv.lib.optional enableLegacy "--enable-legacy"; - buildInputs = [ getopt ] + buildInputs = [ getopt netcat ] + ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql.out ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb ++ stdenv.lib.optional enableMongoDatabase mongodb-tools - ++ stdenv.lib.optional enableInfluxDatabase influxdb; + ++ stdenv.lib.optional enableInfluxDatabase influxdb + ++ stdenv.lib.optional enableSupervisordProgram supervisor + ++ stdenv.lib.optional enableDockerContainer docker; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix index bd4ff86c99..54492d173e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-update/default.nix @@ -1,27 +1,27 @@ { lib , buildPythonApplication , fetchFromGitHub -, nix +, nixFlakes , nix-prefetch }: buildPythonApplication rec { pname = "nix-update"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "0mw31n7kqfr7fskkxp58b0wprxj1pj6n1zs6ymvvl548gs5rgn2s"; + sha256 = "12fsxy2rv2dgk8l10ymp10j01jkcbn9w0fv5iyb5db85q4xsrsm5"; }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes nix-prefetch ]) ]; checkPhase = '' - $out/bin/nix-update --help + $out/bin/nix-update --help >/dev/null ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix index 89be8b5842..c093b2fab0 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,24 +1,24 @@ { stdenv , python3 , fetchFromGitHub -, nix +, nixFlakes , git , lib }: python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0qc2m2nr7w7sgpg3yzwfxxpqi9acnw46kj2hlalg5ldjffiqdjxa"; + sha256 = "1k4i54j5if86qf9dmwm8ybfc4j7ap40y82f03hxfxb7lzq5cqmcv"; }; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nix git ]) + "--prefix" "PATH" ":" (lib.makeBinPath [ nixFlakes git ]) ]; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix index cce49acacd..9761bf112b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.4-1"; + version = "0.9.5-2"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1d5k7066hzc7j2nncrj6b85nklpjbn88izlyisznb3m1yxi8jm5i"; + sha256 = "1fj8gab5frxnzx6cafkcxmic9z1wvfqi4v511wsg9dy4mn5dc6qw"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix index fb523c5299..3c09951f24 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.102.4"; + version = "0.103.0"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "06rrzyrhnr0rswryijpbbzywr6387rv8qjq8sb8cl3h2d1m45ggf"; + sha256 = "0ih5x1rscg2m64y0z20njj7435q8k7ss575cfw7aipdzfx979a9j"; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 114807bf12..0822828eb9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.17.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "178kn9bn17xgv4vfg38mcb3gdnxxhjk09p8qywiwjypbjqg4zidi"; + sha256 = "049x8y7zjvpd1gvkrld69dffnf4pawjwm7by71r6z408hwvfqjpa"; }; vendorSha256 = "1s8zwjfk9kcddn8cywr7llh9v5m140kvmi5lmy2glvwh3rwccgxf"; diff --git a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix index 80634b7d1a..4963f57748 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ipscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipscan"; - version = "3.7.1"; + version = "3.7.3"; src = fetchurl { url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb"; - sha256 = "1l6l3nb1yq0f09ia3k9k1dcpzp9g1hxnf547pqmiyiqvd27n7shs"; + sha256 = "18vvjqsxkz9g503k983cxdzzz6sdkv6qg3nwf8af9k34ynhhh0m7"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix index c4b7706c26..91c092922f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jd-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, perl, writeText, runtimeShell }: +{ stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }: let pname = "jd-gui"; @@ -55,9 +55,9 @@ let } ''; - desktopItem = launcher: makeDesktopItem { + desktopItem = makeDesktopItem { name = "jd-gui"; - exec = "${launcher} %F"; + exec = "jd-gui %F"; icon = "jd-gui"; comment = "Java Decompiler JD-GUI"; desktopName = "JD-GUI"; @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { inherit pname version src; name = "${pname}-${version}"; - nativeBuildInputs = [ jdk gradle_5 ]; + nativeBuildInputs = [ jdk gradle_5 copyDesktopItems ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { installPhase = let jar = "$out/share/jd-gui/${name}.jar"; in '' + runHook preInstall + mkdir -p $out/bin $out/share/{jd-gui,icons/hicolor/128x128/apps} cp build/libs/${name}.jar ${jar} cp src/linux/resources/jd_icon_128.png $out/share/icons/hicolor/128x128/apps/jd-gui.png @@ -92,9 +94,11 @@ in stdenv.mkDerivation rec { EOF chmod +x $out/bin/jd-gui - ${(desktopItem "$out/bin/jd-gui").buildCommand} + runHook postInstall ''; + desktopItems = [ desktopItem ]; + meta = with stdenv.lib; { description = "Fast Java Decompiler with powerful GUI"; homepage = "https://java-decompiler.github.io/"; diff --git a/third_party/nixpkgs/pkgs/tools/security/keysmith/default.nix b/third_party/nixpkgs/pkgs/tools/security/keysmith/default.nix index b9ab7bb0b4..142e9c1e4a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keysmith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keysmith/default.nix @@ -10,30 +10,25 @@ , qtgraphicaleffects , kirigami2 , oathToolkit +, ki18n +, libsodium }: mkDerivation rec { pname = "keysmith"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "KDE"; repo = "keysmith"; rev = "v${version}"; - sha256 = "15fzf0bvarivm32zqa5w71mscpxdac64ykiawc5hx6kplz93bsgx"; + sha256 = "1gvzw23mly8cp7ag3xpbngpid9gqrfj8cyv9dar6i9j660bh03km"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; - buildInputs = [ oathToolkit kirigami2 qtquickcontrols2 qtbase ]; - - postInstall = '' - mv $out/bin/org.kde.keysmith $out/bin/.org.kde.keysmith-wrapped - makeWrapper $out/bin/.org.kde.keysmith-wrapped $out/bin/org.kde.keysmith \ - --set QML2_IMPORT_PATH "${lib.getLib kirigami2}/lib/qt-5.12.7/qml:${lib.getBin qtquickcontrols2}/lib/qt-5.12.7/qml:${lib.getBin qtdeclarative}/lib/qt-5.12.7/qml:${qtgraphicaleffects}/lib/qt-5.12.7/qml" \ - --set QT_PLUGIN_PATH "${lib.getBin qtbase}/lib/qt-5.12.7/plugins" - ln -s $out/bin/org.kde.keysmith $out/bin/keysmith - ''; + buildInputs = [ libsodium ki18n oathToolkit kirigami2 qtquickcontrols2 qtbase ]; + propagatedBuildInput = [ oathToolkit ]; meta = with lib; { description = "OTP client for Plasma Mobile and Desktop"; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index 457c6249ca..4df0d2235a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.90" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.12" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 7142983f98..8ef6d3b314 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,16 +1,16 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 592eedc5584953fb94b01a9aae48ec04d2cf153a - ref: refs/tags/5.0.90 + revision: 8ba313ed85b03ef54bec32086c2a8708a7e1df58 + ref: refs/tags/6.0.12 specs: - metasploit-framework (5.0.90) - actionpack (~> 4.2.6) - activerecord (~> 4.2.6) - activesupport (~> 4.2.6) + metasploit-framework (6.0.12) + actionpack (~> 5.2.2) + activerecord (~> 5.2.2) + activesupport (~> 5.2.2) aws-sdk-ec2 aws-sdk-iam aws-sdk-s3 - bcrypt (= 3.1.12) + bcrypt bcrypt_pbkdf bit-struct bson @@ -24,15 +24,16 @@ GIT faye-websocket filesize hrr_rb_ssh (= 0.3.0.pre2) + irb jsobfu json metasm - metasploit-concern (~> 2.0.0) - metasploit-credential (~> 3.0.0) - metasploit-model (~> 2.0.4) - metasploit-payloads (= 1.4.2) - metasploit_data_models (~> 3.0.10) - metasploit_payloads-mettle (= 0.5.21) + metasploit-concern + metasploit-credential + metasploit-model + metasploit-payloads (= 2.0.22) + metasploit_data_models + metasploit_payloads-mettle (= 1.0.2) mqtt msgpack nessus_rest @@ -48,7 +49,7 @@ GIT patch_finder pcaprub pdf-reader - pg (~> 0.20) + pg railties rb-readline recog @@ -72,7 +73,7 @@ GIT rex-text rex-zip ruby-macho - ruby_smb + ruby_smb (~> 2.0) rubyntlm rubyzip sinatra @@ -90,73 +91,72 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.3) - actionpack (4.2.11.3) - actionview (= 4.2.11.3) - activesupport (= 4.2.11.3) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (5.2.4.4) + actionview (= 5.2.4.4) + activesupport (= 5.2.4.4) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.3) - activesupport (= 4.2.11.3) + actionview (5.2.4.4) + activesupport (= 5.2.4.4) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (4.2.11.3) - activesupport (= 4.2.11.3) - builder (~> 3.1) - activerecord (4.2.11.3) - activemodel (= 4.2.11.3) - activesupport (= 4.2.11.3) - arel (~> 6.0) - activesupport (4.2.11.3) - i18n (~> 0.7) + activemodel (5.2.4.4) + activesupport (= 5.2.4.4) + activerecord (5.2.4.4) + activemodel (= 5.2.4.4) + activesupport (= 5.2.4.4) + arel (>= 9.0) + activesupport (5.2.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - arel (6.0.4) + arel (9.0.0) arel-helpers (2.11.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.319.0) - aws-sdk-core (3.96.1) + aws-partitions (1.385.0) + aws-sdk-core (3.109.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.162.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-ec2 (1.202.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.37.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-iam (1.46.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.31.0) - aws-sdk-core (~> 3, >= 3.71.0) + aws-sdk-kms (1.39.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.66.0) - aws-sdk-core (~> 3, >= 3.96.1) + aws-sdk-s3 (1.83.1) + aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.3) - aws-eventstream (~> 1.0, >= 1.0.2) - bcrypt (3.1.12) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + bcrypt (3.1.16) bcrypt_pbkdf (1.0.1) - bindata (2.4.7) + bindata (2.4.8) bit-struct (0.16) - bson (4.8.2) + bson (4.11.0) builder (3.2.4) concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) daemons (1.3.1) - dnsruby (1.61.3) - addressable (~> 2.5) + dnsruby (1.61.4) + simpleidn (~> 0.1) ed25519 (1.2.4) - em-http-request (1.1.5) + em-http-request (1.1.7) addressable (>= 2.3.4) cookiejar (!= 0.3.1) em-socksify (>= 0.3) @@ -164,13 +164,14 @@ GEM http_parser.rb (>= 0.6.0) em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) - erubis (2.7.0) + erubi (1.9.0) eventmachine (1.2.7) - faker (2.2.1) - i18n (>= 0.8) - faraday (1.0.1) + faker (2.14.0) + i18n (>= 1.6, < 2) + faraday (1.1.0) multipart-post (>= 1.2, < 3) - faye-websocket (0.10.9) + ruby2_keywords + faye-websocket (0.11.0) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) filesize (0.2.0) @@ -178,21 +179,24 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (0.9.5) + i18n (1.8.5) concurrent-ruby (~> 1.0) + io-console (0.5.6) + irb (1.2.7) + reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix - json (2.3.0) - loofah (2.5.0) + json (2.3.1) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.4) - metasploit-concern (2.0.5) - activemodel (~> 4.2.6) - activesupport (~> 4.2.6) - railties (~> 4.2.6) - metasploit-credential (3.0.4) + metasploit-concern (3.0.0) + activemodel (~> 5.2.2) + activesupport (~> 5.2.2) + railties (~> 5.2.2) + metasploit-credential (4.0.2) metasploit-concern metasploit-model metasploit_data_models (>= 3.0.0) @@ -202,79 +206,77 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (2.0.4) - activemodel (~> 4.2.6) - activesupport (~> 4.2.6) - railties (~> 4.2.6) - metasploit-payloads (1.4.2) - metasploit_data_models (3.0.10) - activerecord (~> 4.2.6) - activesupport (~> 4.2.6) + metasploit-model (3.1.2) + activemodel (~> 5.2.2) + activesupport (~> 5.2.2) + railties (~> 5.2.2) + metasploit-payloads (2.0.22) + metasploit_data_models (4.1.0) + activerecord (~> 5.2.2) + activesupport (~> 5.2.2) arel-helpers metasploit-concern - metasploit-model + metasploit-model (>= 3.1) pg - postgres_ext - railties (~> 4.2.6) + railties (~> 5.2.2) recog (~> 2.0) - metasploit_payloads-mettle (0.5.21) + metasploit_payloads-mettle (1.0.2) + method_source (1.0.0) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) mqtt (0.5.0) msgpack (1.3.3) multipart-post (2.1.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-ldap (0.16.2) - net-ssh (6.0.2) + net-ldap (0.16.3) + net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - octokit (4.18.0) + octokit (4.19.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) openssl-ccm (1.2.2) + openssl-cmac (2.0.1) openvas-omp (0.0.4) packetfu (1.1.13) pcaprub patch_finder (1.0.2) pcaprub (0.13.0) - pdf-reader (2.4.0) + pdf-reader (2.4.1) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (0.21.0) - pg_array_parser (0.0.9) - postgres_ext (3.0.1) - activerecord (~> 4.0) - arel (>= 4.0.1) - pg_array_parser (~> 0.0.9) - public_suffix (4.0.5) - rack (1.6.13) - rack-protection (1.5.5) + pg (1.2.3) + public_suffix (4.0.6) + rack (2.2.3) + rack-protection (2.1.0) rack - rack-test (0.6.3) - rack (>= 1.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (4.2.11.3) - actionpack (= 4.2.11.3) - activesupport (= 4.2.11.3) + railties (5.2.4.4) + actionpack (= 5.2.4.4) + activesupport (= 5.2.4.4) + method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) + thor (>= 0.19.0, < 2.0) rake (13.0.1) rb-readline (0.5.5) - recog (2.3.7) + recog (2.3.15) nokogiri redcarpet (3.5.0) + reline (0.1.6) + io-console (~> 0.5) rex-arch (0.1.13) rex-text rex-bin_tools (0.1.6) @@ -312,21 +314,24 @@ GEM metasm rex-core rex-text - rex-socket (0.1.23) + rex-socket (0.1.24) rex-core rex-sslscan (0.1.5) rex-core rex-socket rex-text rex-struct2 (0.1.2) - rex-text (0.2.26) + rex-text (0.2.28) rex-zip (0.1.3) rex-text rkelly-remix (0.0.7) - ruby-macho (2.2.0) + ruby-macho (2.3.0) ruby-rc4 (0.1.5) - ruby_smb (1.1.0) + ruby2_keywords (0.0.2) + ruby_smb (2.0.6) bindata + openssl-ccm + openssl-cmac rubyntlm windows_error rubyntlm (0.6.2) @@ -334,10 +339,13 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + simpleidn (0.1.1) + unf (~> 0.1.4) + sinatra (2.1.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.1.0) + tilt (~> 2.0) sqlite3 (1.4.2) sshkey (2.0.0) thin (1.7.2) @@ -350,17 +358,20 @@ GEM ttfunk (1.6.2.1) tzinfo (1.2.7) thread_safe (~> 0.1) - tzinfo-data (1.2020.1) + tzinfo-data (1.2020.4) tzinfo (>= 1.0.0) - warden (1.2.7) - rack (>= 1.0) - websocket-driver (0.7.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + warden (1.2.9) + rack (>= 2.0.9) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) windows_error (0.1.2) - xdr (2.0.0) - activemodel (>= 4.2.7) - activesupport (>= 4.2.7) + xdr (3.0.2) + activemodel (>= 4.2, < 7.0) + activesupport (>= 4.2, < 7.0) xmlrpc (0.3.0) PLATFORMS diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index cc3d26fbee..a2a0a28bbf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -1,14 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, ruby, bundlerEnv }: -# Maintainer notes for updating: -# 1. increment version number in expression and in Gemfile -# 2. run $ nix-shell --command "bundler install && bundix" -# in metasploit in nixpkgs -# 3. run $ sed -i '/[ ]*dependencies =/d' gemset.nix -# 4. run $ nix-build -A metasploit ../../../../ -# 5. update sha256sum in expression -# 6. run step 3 again - let env = bundlerEnv { inherit ruby; @@ -17,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "5.0.90"; + version = "6.0.12"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss"; + sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; }; buildInputs = [ makeWrapper ]; @@ -45,6 +36,9 @@ in stdenv.mkDerivation rec { ''; + # run with: nix-shell maintainers/scripts/update.nix --argstr path metasploit + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Metasploit Framework - a collection of exploits"; homepage = "https://github.com/rapid7/metasploit-framework/wiki"; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index cd3b2a336b..4879eb9228 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1955wx9m2g776sinamanzlk1jx2dzd34ci3sk22xicp0rmglps37"; + sha256 = "0d8gxymshjhva5fyv33iy2hzp4jm3i44asdbma9pv9wzpl5fwhn0"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0glnaq3jx4m9q6vn55xqlsg8dbflqzm99fgsl9fl267mc2mz3qrv"; + sha256 = "0k8dgkplqj76i3q1f8897m8svj2xggd1knhy3bcwfl4nh7998kw6"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z3777xsm82i7ggkg74mg21sqz8m5dfl8ykjm7xcrhd2nj843fcp"; + sha256 = "1g79l7v0ddpxcj5r2s9kii6h4r4nbpy5bksbqi5lxvivrb3pkz1m"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpw9vyf2frkxkc6jbq9g78lhhflwz04j89qxj4krvmlq12q8v6d"; + sha256 = "05b9l85a31cq6g7v4b4ifrj798q49rlidcvvfasmb3bk412wlp03"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wp36wi3r3dscmcr0q6sbz13hr5h911c24ar7zrmmcy7p32ial2i"; + sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; }; addressable = { groups = ["default"]; @@ -74,10 +74,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nfcrdiys6q6ylxiblky9jyssrw2xj96fmxmal7f4f0jj3417vj4"; + sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; type = "gem"; }; - version = "6.0.4"; + version = "9.0.0"; }; arel-helpers = { groups = ["default"]; @@ -114,80 +114,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11gr3pkd0cq034jdmvmi32sb99hkh91qjrpvc6jchi4lsaiaiqgc"; + sha256 = "04i4bry59c3g1anbjpsz9g1pz7yy23kh4vvhg7z611amlcr48zvb"; type = "gem"; }; - version = "1.319.0"; + version = "1.385.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jdnzynjrpp2jyg8vrbfbaad16k8ni1520xah1z2ckl5779x9fi6"; + sha256 = "0xmppcxq7jm8lffqibkhq257hfwfbv82zm2y1fbhwm3icgxzwlfx"; type = "gem"; }; - version = "3.96.1"; + version = "3.109.1"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp9kp90ixk1ywd0d8ssbk8dl5kxqnz942yr2qq00m7fd60pihh7"; + sha256 = "0fsf9qhlxczz8cz755xlcdpfqn384d4kr3ybx2p54n377wamdq08"; type = "gem"; }; - version = "1.162.0"; + version = "1.202.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l3g5a2r7gnc6pwln409b9ahwcs6xpnjx2qaj70cbllanyxbw0c"; + sha256 = "1j0llz7m9qymfn54vim99k0fjg6vsw71ylcagz1csay6qkjxipg7"; type = "gem"; }; - version = "1.37.0"; + version = "1.46.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czxr6yi8p9gma4dwgygp1jn0i289hwa2vw69kzfscgbn118c3mm"; + sha256 = "0ly1m631qm2ciif7sysbzrgczjvz95ga3g6w6vrzvfdv31jjnl9a"; type = "gem"; }; - version = "1.31.0"; + version = "1.39.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1d1azxwanvm0d7qppw41x5nx2zv0bcz41yk9vqi5lvr7apaq13"; + sha256 = "021yqghdb1i980vn249hv44jajr0v3hq4ik4r6fqh9kwp04fsbqv"; type = "gem"; }; - version = "1.66.0"; + version = "1.83.1"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kysxyw1zkvggbmcj4xnscdh15kxli8mx07hv447h74g9x02drsd"; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; type = "gem"; }; - version = "1.1.3"; + version = "1.2.2"; }; bcrypt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; + sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; type = "gem"; }; - version = "3.1.12"; + version = "3.1.16"; }; bcrypt_pbkdf = { groups = ["default"]; @@ -204,10 +204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033vd169q751qn3zrsv8j5f80k6wg5yhsy8z3clds6py4vqm6xl8"; + sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic"; type = "gem"; }; - version = "2.4.7"; + version = "2.4.8"; }; bit-struct = { groups = ["default"]; @@ -224,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06h8sk2wl7pgrwl15xb1bd6l9ws8sz006rf9cy6n6q7g0iwdalkh"; + sha256 = "1bm64q413wrrm3pda6ha2kn1yipyl0qp5240fwsdw1hkqhbjdnjm"; type = "gem"; }; - version = "4.8.2"; + version = "4.11.0"; }; builder = { groups = ["default"]; @@ -284,10 +284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "139cbl2k934q7d50g7hi8r4im69ca3iv16y9plq9yc6mgjq1cgfk"; + sha256 = "0i4mq4zm8bqd0ik908gnn8nm3kph268af7q173wlq4krg3nw562x"; type = "gem"; }; - version = "1.61.3"; + version = "1.61.4"; }; ed25519 = { groups = ["default"]; @@ -304,10 +304,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; + sha256 = "1azx5rgm1zvx7391sfwcxzyccs46x495vb34ql2ch83f58mwgyqn"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.7"; }; em-socksify = { groups = ["default"]; @@ -319,15 +319,15 @@ }; version = "0.3.2"; }; - erubis = { + erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; type = "gem"; }; - version = "2.7.0"; + version = "1.9.0"; }; eventmachine = { groups = ["default"]; @@ -344,30 +344,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpzpqzpqd9jjzm3ap8182sfbnhdahcxpbg0dssbwq13qdf1s5xs"; + sha256 = "06sh8492k03p9lsfzv5zifzn51ilb4734vrvwl30vzmzg1apzml6"; type = "gem"; }; - version = "2.2.1"; + version = "2.14.0"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; faye-websocket = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kbp3rjwm74zdj0wy2n1cyyvd7ak4k8i8zva6ib4vqfcv8d2j11a"; + sha256 = "1cwngdb41zh842y3nzz3cr7z2100pjsl7m3i05yjc1wlyrdk2sm3"; type = "gem"; }; - version = "0.10.9"; + version = "0.11.0"; }; filesize = { groups = ["default"]; @@ -414,10 +414,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "0.9.5"; + version = "1.8.5"; + }; + io-console = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp"; + type = "gem"; + }; + version = "0.5.6"; + }; + irb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10d9xr1hdpkqhljxhvdm44c2qbxdjfqm5x00d4v6aw0fym1w7r2g"; + type = "gem"; + }; + version = "1.2.7"; }; jmespath = { groups = ["default"]; @@ -444,20 +464,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; loofah = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; + sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.0"; }; metasm = { groups = ["default"]; @@ -474,72 +494,82 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9lm225fhzhnbjcc0vwb38ybikxwzlv8116rrrkndzs8qy79297"; + sha256 = "10a9dr0pi25vsnk7x1bavx2ja62lqswdkym0hvhjsds6awvx1cf2"; type = "gem"; }; - version = "2.0.5"; + version = "3.0.0"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jh1mzvjpsmqamhwjqs6x2bx550mxkqjvl0f1gl1g87w5qvg3w69"; + sha256 = "03339i3v6lgz0cymn2i7y0sylpw2nihsc8h75c4yn3bq9p6wk6sx"; type = "gem"; }; - version = "3.0.4"; + version = "4.0.2"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "592eedc5584953fb94b01a9aae48ec04d2cf153a"; - sha256 = "1z3m8pvf1r8rz0snfkr9svhgjl2xn2qjgf8qswszzplsccqx1rss"; + rev = "8ba313ed85b03ef54bec32086c2a8708a7e1df58"; + sha256 = "1kh5alvw68lxnm1wcwbka983b5ww7bqvbkih831mrf6sfmv4wkxs"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "5.0.90"; + version = "6.0.12"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05pnai1cv00xw87rrz38dz4s3ss45s90290d0knsy1mq6rp8yvmw"; + sha256 = "0szwqs6djh882alpnmnnkx46s548jg3vb0ya61hibw3kqcw3i1ig"; type = "gem"; }; - version = "2.0.4"; + version = "3.1.2"; }; metasploit-payloads = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kddir54jnzl64nsawnvkzdabnmqncq9vav49i1cfschnf4cxc4g"; + sha256 = "1yiwwyc12f9jln58l4j26yjbixij1v5h3spp4ci3ik4dxyk2r4zb"; type = "gem"; }; - version = "1.4.2"; + version = "2.0.22"; }; metasploit_data_models = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h59lblfrx8gsnqr10wk958zp6rsjy3qib3hb87s3nm6m1zhm2bc"; + sha256 = "1n7vb6pg446jadjsgrc29kxnc9b6ga29hw8pg52dnrzhp7rwhiyl"; type = "gem"; }; - version = "3.0.10"; + version = "4.1.0"; }; metasploit_payloads-mettle = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1419z6z0j69zdlkfx3kqgqygsm0ysigwccgn82z5lz82i16krhca"; + sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk"; type = "gem"; }; - version = "0.5.21"; + version = "1.0.2"; + }; + method_source = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; }; mini_portile2 = { groups = ["default"]; @@ -556,10 +586,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.1"; + version = "5.14.2"; }; mqtt = { groups = ["default"]; @@ -591,6 +621,16 @@ }; version = "2.1.1"; }; + mustermann = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + version = "1.1.1"; + }; nessus_rest = { groups = ["default"]; platforms = []; @@ -606,20 +646,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; type = "gem"; }; - version = "0.16.2"; + version = "0.16.3"; }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kf4am0mz8mwqhif4iqh5yz9pcbbmja5w707j00sfsgrq19nxqld"; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; type = "gem"; }; - version = "6.0.2"; + version = "6.1.0"; }; network_interface = { groups = ["default"]; @@ -646,20 +686,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.10.9"; + version = "1.10.10"; }; octokit = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; + sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24"; type = "gem"; }; - version = "4.18.0"; + version = "4.19.0"; }; openssl-ccm = { groups = ["default"]; @@ -671,6 +711,16 @@ }; version = "1.2.2"; }; + openssl-cmac = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k69p0p0ilvqnwskhc0bfax8rwvyk6n4wzarg8qsjdvm13xwx508"; + type = "gem"; + }; + version = "2.0.1"; + }; openvas-omp = { groups = ["default"]; platforms = []; @@ -716,100 +766,70 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy"; + sha256 = "0987glcd02mqglplmp1camivqx61jsyik21n99vrmi8s2p7h4mbh"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh"; + sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; type = "gem"; }; - version = "0.21.0"; - }; - pg_array_parser = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1034dhg8h53j48sfm373js54skg4vpndjga6hzn2zylflikrrf3s"; - type = "gem"; - }; - version = "0.0.9"; - }; - postgres_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ni1ajzxvc17ba4rgl27cd3645ddbpqpfckv7m08sfgk015hh7dq"; - type = "gem"; - }; - version = "3.0.1"; + version = "1.2.3"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.5"; + version = "4.0.6"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "1.6.13"; + version = "2.2.3"; }; rack-protection = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; type = "gem"; }; - version = "1.5.5"; + version = "2.1.0"; }; rack-test = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z"; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; type = "gem"; }; - version = "0.6.3"; - }; - rails-deprecated_sanitizer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj"; - type = "gem"; - }; - version = "1.0.3"; + version = "1.1.0"; }; rails-dom-testing = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; type = "gem"; }; - version = "1.0.9"; + version = "2.0.3"; }; rails-html-sanitizer = { groups = ["default"]; @@ -826,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12f7g5iw1gqjwl2rvfmbgxipds5c475ggalw6qskzzrx9vyc2fpk"; + sha256 = "089kiwmv8fxyfk0zp57q74nyd5i6d5x5ihlrzbzwl041v94s2zx9"; type = "gem"; }; - version = "4.2.11.3"; + version = "5.2.4.4"; }; rake = { groups = ["default"]; @@ -856,10 +876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j65iary8qkgyrjc3vnjd7dbyjs2bsz2hcg7ndibjk623faxb1wk"; + sha256 = "0vxnm9ld3rn8xxccq9jyhzz6558bqfxdb3sd4na20frg9f5pflb7"; type = "gem"; }; - version = "2.3.7"; + version = "2.3.15"; }; redcarpet = { groups = ["default"]; @@ -871,6 +891,16 @@ }; version = "3.5.0"; }; + reline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sspfd5x8aq80pmkdj0dzd20iclhrdjan1ibkrivgk7j8af23hbk"; + type = "gem"; + }; + version = "0.1.6"; + }; rex-arch = { groups = ["default"]; platforms = []; @@ -1006,10 +1036,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vm17w791vdpr23aqp45kqsjbqgwpqj92a535h6n4fckxgzhg94"; + sha256 = "1y6p1sw0wiw4x4dk89lwhf7vzsb0cjgpbr8hf7m119lg2kzm5g8y"; type = "gem"; }; - version = "0.1.23"; + version = "0.1.24"; }; rex-sslscan = { groups = ["default"]; @@ -1036,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17m5zwca15qsd7mqqhi2q530iwsrb7wkqh8qff7pxjxwlxbvsrxx"; + sha256 = "0wx8pncrk7yb2zxxqaycm4ikvb577zj7rma8jdfi74a0c5119c44"; type = "gem"; }; - version = "0.2.26"; + version = "0.2.28"; }; rex-zip = { groups = ["default"]; @@ -1066,10 +1096,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k5vvk9d13pixhbram6fs74ibgmr2dngv7bks13npcjb42q275if"; + sha256 = "12khgv5hx90a4dxqca2hzbksalx9czb51bsz0bhq0czsql9pwby8"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1081,15 +1111,25 @@ }; version = "0.1.5"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + type = "gem"; + }; + version = "0.0.2"; + }; ruby_smb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "125pimmaskp13nkk5j138nfk1kd8n91sfdlx4dhj2j9zk342wsf4"; + sha256 = "0fsdnvisswchk27knii6ijq8sjsc7qm9jiffdsf71q195ga2qi66"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.6"; }; rubyntlm = { groups = ["default"]; @@ -1121,15 +1161,25 @@ }; version = "0.8.2"; }; + simpleidn = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w"; + type = "gem"; + }; + version = "0.1.1"; + }; sinatra = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; type = "gem"; }; - version = "1.4.8"; + version = "2.1.0"; }; sqlite3 = { groups = ["default"]; @@ -1216,40 +1266,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kjywciambyhlkc8ijp3kkx4r24pi9zs7plmxw003mxr6mrhah1w"; + sha256 = "02anabncgfjwsqn07ra9jdqvmi0a4yngzp6dfiz2yxb1m9qpdm4a"; type = "gem"; }; - version = "1.2020.1"; + version = "1.2020.4"; + }; + unf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; }; warden = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12"; + sha256 = "1l7gl7vms023w4clg02pm4ky9j12la2vzsixi2xrv9imbn44ys26"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; websocket-driver = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; + sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.3"; }; websocket-extensions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; windows_error = { groups = ["default"]; @@ -1266,10 +1336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c5cp1k4ij3xq1q6fb0f6xv5b65wy18y7bhwvsdx8wd0zyg3x96m"; + sha256 = "019yzxddyndc7m7basars0m380m27sfcq99vr5hk1ag4ymayqkwr"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.2"; }; xmlrpc = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/update.sh b/third_party/nixpkgs/pkgs/tools/security/metasploit/update.sh new file mode 100755 index 0000000000..e4da457c6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl bundix git libiconv libpcap libxml2 libxslt pkg-config postgresql ruby.devEnv sqlite xmlstarlet nix-update + +set -eu -o pipefail +cd "$(dirname "$(readlink -f "$0")")" + +latest=$(curl https://github.com/rapid7/metasploit-framework/releases.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1) +echo "Updating metasploit to $latest" + +sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile + +bundler install +bundix +sed -i '/[ ]*dependencies =/d' gemset.nix + +cd "../../../../" +nix-update metasploit --version "$latest" diff --git a/third_party/nixpkgs/pkgs/tools/security/ncrack/default.nix b/third_party/nixpkgs/pkgs/tools/security/ncrack/default.nix new file mode 100644 index 0000000000..e377d97486 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/ncrack/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "ncrack"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "nmap"; + repo = "ncrack"; + rev = version; + sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g"; + }; + + buildInputs = [ openssl zlib ]; + + meta = with stdenv.lib; { + description = "Network authentication tool"; + homepage = "https://nmap.org/ncrack/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix index f03a794b68..bd54315449 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.90"; + version = "7.80"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm"; + sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw"; }; patches = [ ./zenmap.patch ] diff --git a/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix b/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix index a9eea81c4e..735f7558e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/opensc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl -, libiconv, pcsclite, libassuan, libXt, fetchpatch +, libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin @@ -7,30 +7,15 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "0mg8qmhww3li1isfgvn5hang1hq58zra057ilvgci88csfziv5lv"; + sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o="; }; - patches = [ - (fetchpatch { - # https://nvd.nist.gov/vuln/detail/CVE-2020-26570 - name = "CVE-2020-26570.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/6903aebfddc466d966c7b865fae34572bf3ed23e.patch"; - sha256 = "sha256-aB9iCVcdp9zFhZiSv5A399Ttj7NUHRVgXr0EfmMwKN4="; - }) - (fetchpatch { - # https://nvd.nist.gov/vuln/detail/CVE-2020-26572 - name = "CVE-2020-26572.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/9d294de90d1cc66956389856e60b6944b27b4817.patch"; - sha256 = "sha256-gKJaR5K+NaXh4NeTkGpzHzHCdpt6n54Hnt1GAq0tA9o="; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix index 76b90d5b88..9ba03fc74a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix @@ -3,7 +3,7 @@ , qrencode , makeWrapper, pass, symlinkJoin , xclip ? null, xdotool ? null, dmenu ? null -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.isDarwin , dmenuSupport ? x11Support , waylandSupport ? false, wl-clipboard ? null # For backwards-compatibility @@ -12,9 +12,11 @@ with lib; -assert x11Support -> xclip != null - && xdotool != null - && dmenu != null; +assert x11Support -> xclip != null; + +assert dmenuSupport -> dmenu != null + && xdotool != null + && x11Support; assert waylandSupport -> wl-clipboard != null; @@ -72,7 +74,7 @@ stdenv.mkDerivation rec { # himself. mkdir -p "$out/share/emacs/site-lisp" cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString x11Support '' + '' + optionalString dmenuSupport '' cp "contrib/dmenu/passmenu" "$out/bin/" ''; @@ -87,7 +89,8 @@ stdenv.mkDerivation rec { qrencode procps ] ++ optional stdenv.isDarwin openssl - ++ ifEnable x11Support [ dmenu xclip xdotool ] + ++ optional x11Support xclip + ++ optionals dmenuSupport [ xdotool dmenu ] ++ optional waylandSupport wl-clipboard); postFixup = '' @@ -98,7 +101,7 @@ stdenv.mkDerivation rec { # Ensure all dependencies are in PATH wrapProgram $out/bin/pass \ --prefix PATH : "${wrapperPath}" - '' + stdenv.lib.optionalString x11Support '' + '' + stdenv.lib.optionalString dmenuSupport '' # We just wrap passmenu with the same PATH as pass. It doesn't # need all the tools in there but it doesn't hurt either. wrapProgram $out/bin/passmenu \ diff --git a/third_party/nixpkgs/pkgs/tools/security/snow/default.nix b/third_party/nixpkgs/pkgs/tools/security/snow/default.nix new file mode 100644 index 0000000000..db52d853b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/snow/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "snow"; + version = "20130616"; + + src = fetchurl { + url = "https://web.archive.org/web/20200304125913if_/http://darkside.com.au/snow/snow-${version}.tar.gz"; + sha256 = "0r9q45y55z4i0askkxmxrx0jr1620ypd870vz0hx2a6n9skimdy0"; + }; + + makeFlags = [ "CFLAGS=-O2" ]; + + installPhase = '' + install -Dm755 snow -t $out/bin + ''; + + meta = with stdenv.lib; { + description = "Conceal messages in ASCII text by appending whitespace to the end of lines"; + homepage = "http://www.darkside.com.au/snow/"; + license = licenses.apsl20; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix index 498ab1136f..8c5e283321 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.4.7"; + version = "0.5.3"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "rDcJ5XF7L13MKZ8/J4sYD+UqC+HkZvxRtDkY9IVLH50="; + sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk="; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "XeX6QM0a628mcaptNZkKAvDnGfW5tx+aWNBpMyjz44M="; + cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0="; doCheck = false; + postInstall = '' + installShellCompletion $releaseDir/build/bottom-*/out/btm.{bash,fish} --zsh $releaseDir/build/bottom-*/out/_btm + ''; + meta = with stdenv.lib; { description = "A cross-platform graphical process/system monitor with a customizable interface"; homepage = "https://github.com/ClementTsang/bottom"; @@ -25,4 +31,3 @@ rustPlatform.buildRustPackage rec { platforms = platforms.unix; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 6b6aa40a0f..7a212f5bbe 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.70"; + version = "21.71"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z"; + sha256 = "1g671fvkg6r30n9vwwlqpdd6yn6jf7n9ynjmslblk7kbnabzayby"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix b/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix index a9fc44e8b4..c188f066d1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.12"; src = fetchgit { - url = "https://gitorious.org/safe-rm/mainline.git"; + url = "https://git.launchpad.net/safe-rm"; rev = "refs/tags/${pname}-${version}"; sha256 = "0zkmwxyl1870ar6jr9h537vmqgkckqs9jd1yv6m4qqzdsmg5gdbq"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix b/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix index abfc8ae5ac..213a79fe27 100644 --- a/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "rfrail3"; repo = "tuptime"; rev = version; - sha256 = "0izps85p8pxidfrzp7l4hp221fx3dcgapapsix1zavq6jrsl2qyh"; + sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Total uptime & downtime statistics utility"; homepage = "https://github.com/rfrail3/tuptime"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.evils ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/amber/default.nix b/third_party/nixpkgs/pkgs/tools/text/amber/default.nix index c6ba6f98da..205efc414d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/amber/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.5"; + version = "0.5.8"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "083gpssnhjxp1gr5rn27k9j4pm42wqz76llrn5yh91rwcwvlg1l8"; + sha256 = "0j9h9zzg6n4mhq2bqj71k5db595ilbgd9dn6ygmzsm74619q4454"; }; - cargoSha256 = "199wfc98vq6vgrz8xqqh8lz4j3ig7w66mrk1am9x0viyhj92fvx0"; + cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix index a918770aa7..e4e80e694f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.57"; + version = "3.59"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf"; + sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/uwc/default.nix b/third_party/nixpkgs/pkgs/tools/text/uwc/default.nix new file mode 100644 index 0000000000..cf8e5658f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/uwc/default.nix @@ -0,0 +1,24 @@ +{ rustPlatform, lib, fetchFromGitLab }: + +rustPlatform.buildRustPackage rec { + pname = "uwc"; + version = "1.0.4"; + + src = fetchFromGitLab { + owner = "dead10ck"; + repo = pname; + rev = "v${version}"; + sha256 = "1ywqq9hrrm3frvd2sswknxygjlxi195kcy7g7phwq63j7hkyrn50"; + }; + + cargoSha256 = "0ra62cf75b1c4knxxpbdg8m0sy2k02r52j606fp5l9crp0fml8l0"; + + doCheck = true; + + meta = with lib; { + description = "Like wc, but unicode-aware, and with per-line mode"; + homepage = "https://gitlab.com/dead10ck/uwc"; + license = licenses.mit; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 9a394a9869..0a9ec734e3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.6.2"; + version = "2.6.3"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0hsazxspszljf34i1v247ll8144dq7s1mfs67w8ppscs575ndf05"; + sha256 = "1svzsm40jm694s5gxg807k0jib8pl5vk2rb2ih8qr9bb23a4h95x"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh b/third_party/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh index 7a5767f9c0..3f8a16580e 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -41,7 +41,11 @@ showError() { exit 1 } +pass=0 + runLaTeX() { + ((pass=pass+1)) + echo "PASS $pass..." if ! $latex $latexFlags $rootName >$tmpFile 2>&1; then showError; fi runNeeded= if fgrep -q \ @@ -51,6 +55,7 @@ runLaTeX() { "$tmpFile"; then runNeeded=1 fi + echo } echo @@ -61,10 +66,7 @@ if test -n "$copySources"; then fi -echo "PASS 1..." runLaTeX -echo - for auxFile in $(find . -name "*.aux"); do # Run bibtex to process all bibliographies. There may be several @@ -89,11 +91,8 @@ for auxFile in $(find . -name "*.aux"); do fi done - if test "$runNeeded"; then - echo "PASS 2..." runLaTeX - echo fi @@ -105,20 +104,18 @@ if test -f $rootNameBase.idx; then makeindex $makeindexFlags $rootNameBase.idx runNeeded=1 echo -fi - - -if test "$runNeeded"; then - echo "PASS 3..." - runLaTeX - echo fi +# We check that pass is less than 2 to catch situations where the document is +# simple enough (no bibtex, etc.) so that it would otherwise require only one +# pass but also contains a ToC. +# In essence this check ensures that we do at least two passes on all documents. +if test "$runNeeded" = 1 -o "$pass" -lt 2 ; then + runLaTeX +fi if test "$runNeeded"; then - echo "PASS 4..." runLaTeX - echo fi diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 9187b127c9..b7cc306776 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -307,7 +307,7 @@ mapAliases ({ 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 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 - mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained"; # added 2019-12-10 + mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 mirage = throw "mirage has been femoved from nixpkgs, as it's unmaintained"; # added 2019-12-10 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. It's functionality has been merged into the mopidy-local extension."; # added 2020-10-18 @@ -470,6 +470,7 @@ mapAliases ({ phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 + pynagsystemd = throw "pynagsystemd was removed as it was unmaintained and incompatible with recent systemd versions. Instead use its fork check_systemd."; # added 2020-10-24 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05 quake3game = ioquake3; # added 2016-01-14 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 1e3f0eaf06..3fc30afcfb 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -210,7 +210,7 @@ in hobbes = callPackage ../development/tools/hobbes { }; - html5validator = python36Packages.callPackage ../applications/misc/html5validator { }; + html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; proto-contrib = callPackage ../development/tools/proto-contrib {}; @@ -240,6 +240,8 @@ in digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; + gretl = callPackage ../applications/science/math/gretl { }; + grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { @@ -461,6 +463,8 @@ in madonctl = callPackage ../applications/misc/madonctl { }; + copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; + makeDesktopItem = callPackage ../build-support/make-desktopitem { }; makeAutostartItem = callPackage ../build-support/make-startupitem { }; @@ -938,13 +942,13 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; + aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; aws-vault = callPackage ../tools/admin/aws-vault { }; iamy = callPackage ../tools/admin/iamy { }; - azure-cli = callPackage ../tools/admin/azure-cli { python = python37; }; + azure-cli = callPackage ../tools/admin/azure-cli { }; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; @@ -1260,6 +1264,11 @@ in pass = callPackage ../tools/security/pass { }; + pass-nodmenu = callPackage ../tools/security/pass { + dmenuSupport = false; + pass = pass-nodmenu; + }; + pass-wayland = callPackage ../tools/security/pass { waylandSupport = true; pass = pass-wayland; @@ -2489,6 +2498,8 @@ in pev = callPackage ../development/tools/analysis/pev { }; + phd2 = callPackage ../applications/science/astronomy/phd2 { }; + phoronix-test-suite = callPackage ../tools/misc/phoronix-test-suite { }; photon = callPackage ../tools/networking/photon { }; @@ -2501,7 +2512,7 @@ in psstop = callPackage ../tools/system/psstop { }; - precice = callPackage ../development/libraries/precice { python3 = python37; }; + precice = callPackage ../development/libraries/precice { }; pueue = callPackage ../applications/misc/pueue { }; @@ -3423,7 +3434,7 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; @@ -3692,6 +3703,8 @@ in entr = callPackage ../tools/misc/entr { }; + envchain = callPackage ../tools/misc/envchain { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + eot_utilities = callPackage ../tools/misc/eot-utilities { }; eplot = callPackage ../tools/graphics/eplot { }; @@ -3732,6 +3745,8 @@ in exif = callPackage ../tools/graphics/exif { }; + exifprobe = callPackage ../tools/graphics/exifprobe { }; + exiftags = callPackage ../tools/graphics/exiftags { }; exiftool = perlPackages.ImageExifTool; @@ -4055,7 +4070,7 @@ in galen = callPackage ../development/tools/galen {}; - gallery-dl = callPackage ../applications/misc/gallery-dl { }; + gallery-dl = python3Packages.callPackage ../applications/misc/gallery-dl { }; gandi-cli = callPackage ../tools/networking/gandi-cli { }; @@ -4310,6 +4325,8 @@ in gopro = callPackage ../tools/video/gopro { }; + goreleaser = callPackage ../tools/misc/goreleaser { }; + goreplay = callPackage ../tools/networking/goreplay { }; gource = callPackage ../applications/version-management/gource { }; @@ -4603,7 +4620,7 @@ in hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; @@ -4732,6 +4749,8 @@ in irods irods-icommands; + igmpproxy = callPackage ../tools/networking/igmpproxy { }; + ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix { inherit (haskellPackages) ghcWithPackages; @@ -5038,7 +5057,7 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; @@ -5241,6 +5260,8 @@ in nbench = callPackage ../tools/misc/nbench { }; + ncrack = callPackage ../tools/security/ncrack { }; + netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; @@ -5418,6 +5439,8 @@ in libngspice = callPackage ../development/libraries/libngspice { }; + libnixxml = callPackage ../development/libraries/libnixxml { }; + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libportal = callPackage ../development/libraries/libportal { }; @@ -6516,7 +6539,7 @@ in tab = callPackage ../tools/text/tab { }; - tautulli = callPackage ../servers/tautulli { python = python2; }; + tautulli = python3Packages.callPackage ../servers/tautulli { }; ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; @@ -7128,6 +7151,8 @@ in sewer = callPackage ../tools/admin/sewer { }; + sftpman = callPackage ../tools/filesystems/sftpman { }; + screenfetch = callPackage ../tools/misc/screenfetch { }; sg3_utils = callPackage ../tools/system/sg3_utils { }; @@ -7888,6 +7913,8 @@ in usync = callPackage ../applications/misc/usync { }; + uwc = callPackage ../tools/text/uwc { }; + uwsgi = callPackage ../servers/uwsgi { }; v2ray = callPackage ../tools/networking/v2ray { }; @@ -7926,6 +7953,8 @@ in verilog = callPackage ../applications/science/electronics/verilog {}; + versus = callPackage ../applications/networking/versus { }; + vgrep = callPackage ../tools/text/vgrep { }; vhd2vl = callPackage ../applications/science/electronics/vhd2vl { }; @@ -8721,7 +8750,9 @@ in binaryen = callPackage ../development/compilers/binaryen { }; - bluespec = callPackage ../development/compilers/bluespec { }; + bluespec = callPackage ../development/compilers/bluespec { + gmp-static = gmp.override { withStatic = true; }; + }; ciao = callPackage ../development/compilers/ciao { }; @@ -8872,6 +8903,8 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; + fasmg = callPackage ../development/compilers/fasmg { }; + flyctl = callPackage ../development/web/flyctl { }; flutterPackages = @@ -9574,6 +9607,10 @@ in jwasm = callPackage ../development/compilers/jwasm { }; + knightos-genkfs = callPackage ../development/tools/knightos/genkfs { + asciidoc = asciidoc-full; + }; + knightos-kcc = callPackage ../development/tools/knightos/kcc { }; knightos-kimg = callPackage ../development/tools/knightos/kimg { @@ -9769,8 +9806,11 @@ in mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; + muon = callPackage ../development/compilers/muon { }; + nim = callPackage ../development/compilers/nim { }; nim-unwrapped = nim.unwrapped; + nimble-unwrapped = nim.nimble-unwrapped; nrpl = callPackage ../development/tools/nrpl { }; @@ -13475,6 +13515,8 @@ in jsonnet = callPackage ../development/compilers/jsonnet { }; + jsonnet-bundler = callPackage ../development/tools/jsonnet-bundler { }; + go-jsonnet = callPackage ../development/compilers/go-jsonnet { }; jsonrpc-glib = callPackage ../development/libraries/jsonrpc-glib { }; @@ -13970,6 +14012,8 @@ in libfixposix = callPackage ../development/libraries/libfixposix {}; + libff = callPackage ../development/libraries/libff { }; + libffcall = callPackage ../development/libraries/libffcall { }; libffi = callPackage ../development/libraries/libffi { }; @@ -14933,8 +14977,6 @@ in non = callPackage ../applications/audio/non { }; - noise-suppression-for-voice = callPackage ../development/libraries/noise-suppression-for-voice { }; - ntl = callPackage ../development/libraries/ntl { }; nspr = callPackage ../development/libraries/nspr { @@ -15557,6 +15599,8 @@ in quicksynergy = callPackage ../applications/misc/quicksynergy { }; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; + qwt = callPackage ../development/libraries/qwt {}; qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { @@ -15810,6 +15854,8 @@ in snappy = callPackage ../development/libraries/snappy { }; + snow = callPackage ../tools/security/snow { }; + soapyairspy = callPackage ../applications/radio/soapyairspy { }; soapybladerf = callPackage ../applications/radio/soapybladerf { }; @@ -17287,7 +17333,7 @@ in checkSSLCert = callPackage ../servers/monitoring/nagios/plugins/check_ssl_cert.nix { }; - pynagsystemd = callPackage ../servers/monitoring/nagios/plugins/pynagsystemd.nix { }; + check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { }; neo4j = callPackage ../servers/nosql/neo4j { }; @@ -18245,6 +18291,10 @@ in acpi_call = callPackage ../os-specific/linux/acpi-call {}; + akvcam = callPackage ../os-specific/linux/akvcam { + inherit (qt5) qmake; + }; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; @@ -18864,8 +18914,6 @@ in # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_8 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-slim; }); - qemu_xen_4_8-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-light; }); qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; }); qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; }); @@ -19093,6 +19141,8 @@ in udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; + ugtrain = callPackage ../tools/misc/ugtrain { }; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { }; @@ -20333,6 +20383,8 @@ in blugon = callPackage ../applications/misc/blugon { }; + bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; + bombono = callPackage ../applications/video/bombono {}; bomi = libsForQt5.callPackage ../applications/video/bomi { @@ -20412,6 +20464,8 @@ in castor = callPackage ../applications/networking/browsers/castor { }; + catfs = callPackage ../os-specific/linux/catfs { }; + catimg = callPackage ../tools/misc/catimg { }; catt = callPackage ../applications/video/catt { }; @@ -20710,10 +20764,12 @@ in buildServerGui = false; }; - droopy = python37Packages.callPackage ../applications/networking/droopy { }; + droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; + dsf2flac = callPackage ../applications/audio/dsf2flac { }; + dunst = callPackage ../applications/misc/dunst { }; du-dust = callPackage ../tools/misc/dust { }; @@ -21382,8 +21438,8 @@ in m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manim = python37Packages.callPackage ../applications/video/manim { - opencv = python37Packages.opencv3; + manim = python3Packages.callPackage ../applications/video/manim { + opencv = python3Packages.opencv3; }; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; @@ -21744,6 +21800,8 @@ in inherit (xorg) xrdb; }; + multilockscreen = callPackage ../misc/screensavers/multilockscreen { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; @@ -21775,6 +21833,7 @@ in ike = callPackage ../applications/networking/ike { }; ikiwiki = callPackage ../applications/misc/ikiwiki { + python = python3; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; @@ -22248,7 +22307,7 @@ in loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { }; + lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; lrzsz = callPackage ../tools/misc/lrzsz { }; @@ -22355,6 +22414,8 @@ in mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; + mcomix3 = callPackage ../applications/graphics/mcomix3 {}; + mcpp = callPackage ../development/compilers/mcpp { }; mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; @@ -22747,9 +22808,7 @@ in scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt514.callPackage ../applications/video/shotcut { - libmlt = mlt; - }; + shotcut = libsForQt5.callPackage ../applications/video/shotcut { }; shogun = callPackage ../applications/science/machine-learning/shogun { stdenv = gcc8Stdenv; @@ -23057,6 +23116,8 @@ in pbrt = callPackage ../applications/graphics/pbrt { }; + pcloud = callPackage ../applications/networking/pcloud { }; + pcsxr = callPackage ../misc/emulators/pcsxr { ffmpeg = ffmpeg_2; }; @@ -23239,7 +23300,7 @@ in properties-cpp = callPackage ../development/libraries/properties-cpp { }; - protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { }; + protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; @@ -23323,7 +23384,7 @@ in garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { }; + qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { boost = boost17x; @@ -23887,8 +23948,7 @@ in symlinks = callPackage ../tools/system/symlinks { }; - # this can be changed to python3 once pyside2 is updated to support the latest python version - syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; + syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; inherit (callPackages ../applications/networking/syncthing { }) syncthing @@ -24038,6 +24098,8 @@ in ticpp = callPackage ../development/libraries/ticpp { }; + tickrs = callPackage ../applications/misc/tickrs { }; + tig = gitAndTools.tig; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { @@ -24767,9 +24829,6 @@ in xen-slim = xenPackages.xen-slim; xen-light = xenPackages.xen-light; - xen_4_8 = xenPackages.xen_4_8-vanilla; - xen_4_8-slim = xenPackages.xen_4_8-slim; - xen_4_8-light = xenPackages.xen_4_8-light; xen_4_10 = xenPackages.xen_4_10-vanilla; xen_4_10-slim = xenPackages.xen_4_10-slim; xen_4_10-light = xenPackages.xen_4_10-light; @@ -24830,6 +24889,8 @@ in xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; + xlife = callPackage ../applications/graphics/xlife { }; + xmobar = haskellPackages.xmobar; xmonad-log = callPackage ../tools/misc/xmonad-log { }; @@ -24981,7 +25042,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zombietrackergps = libsForQt514.callPackage ../applications/gis/zombietrackergps { }; + zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; @@ -26773,6 +26834,8 @@ in else smlnj; }; + key = callPackage ../applications/science/logic/key { }; + lean = callPackage ../applications/science/logic/lean {}; lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; @@ -27672,6 +27735,8 @@ in nixdoc = callPackage ../tools/nix/nixdoc {}; + dnadd = callPackage ../tools/nix/dnadd { }; + nix-doc = callPackage ../tools/package-management/nix-doc { }; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; @@ -27758,7 +27823,11 @@ in disnix = callPackage ../tools/package-management/disnix { }; - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {}); + dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { + inherit (pythonPackages) supervisor; + }); + + dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; disnixos = callPackage ../tools/package-management/disnix/disnixos { }; @@ -28621,4 +28690,5 @@ in psftools = callPackage ../os-specific/linux/psftools {}; + lc3tools = callPackage ../development/tools/lc3tools {}; } diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index e613b931d6..2d25ea149a 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -96,7 +96,7 @@ in { }; ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 then + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then packages.ghc8102BinaryMinimal else packages.ghc865Binary; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 235ffb67c9..c7d805d4c7 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -493,7 +493,9 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; - lwt = callPackage ../development/ocaml-modules/lwt { }; + lwt = callPackage ../development/ocaml-modules/lwt { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_lwt = lwt; @@ -662,11 +664,17 @@ let ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; - ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8; + + ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { }; + + ocaml-migrate-parsetree-2-1 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; @@ -812,7 +820,9 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; + sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; tsort = callPackage ../development/ocaml-modules/tsort { }; @@ -874,9 +884,7 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { - ppxlib = ppxlib.override { legacy = true; }; - }; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; @@ -934,6 +942,8 @@ let rpclib = callPackage ../development/ocaml-modules/rpclib { }; + rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; safepass = callPackage ../development/ocaml-modules/safepass { }; @@ -1257,6 +1267,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); + ocamlPackages_4_12 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.12.nix { }); + ocamlPackages_latest = ocamlPackages_4_11; ocamlPackages = ocamlPackages_4_10; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 7df0d7add3..1863ae0b36 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -596,6 +596,27 @@ let }; }; + Appcpm = buildPerlModule { + pname = "App-cpm"; + version = "0.994"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.994.tar.gz"; + sha256 = "4242ecb64aaae09034eddb1b338e005567ace29f2ac2d1bca4d4bcf4e15d21c4"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy ModuleCPANfile ParallelPipes locallib ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/cpm + ''; + meta = { + homepage = "https://github.com/skaji/cpm"; + description = "A fast CPAN module installer"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + Applify = buildPerlPackage { pname = "Applify"; version = "0.21"; @@ -861,7 +882,7 @@ let sha256 = "530d59ef0c0935f9862d187187a2d7583b12c639bb67db14f983322b161892d9"; }; meta = { - homepage = "http://github.com/timj/perl-Astro-FITS-Header/tree/master"; + homepage = "https://github.com/timj/perl-Astro-FITS-Header/tree/master"; description = "Object-oriented interface to FITS HDUs"; license = stdenv.lib.licenses.free; }; @@ -1314,7 +1335,7 @@ let buildInputs = [ FileSlurp ]; propagatedBuildInputs = [ ClassLoad DirSelf FileShareDir ModulePluggable MooseXGetopt namespaceclean ]; meta = { - homepage = "http://metacpan.org/release/Bot-Training"; + homepage = "https://metacpan.org/release/Bot-Training"; description = "Plain text training material for bots like Hailo and AI::MegaHAL"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1330,7 +1351,7 @@ let buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ BotTraining ]; meta = { - homepage = "http://metacpan.org/release/Bot-Training-MegaHAL"; + homepage = "https://metacpan.org/release/Bot-Training-MegaHAL"; description = "Provide megahal.trn via Bot::Training"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1346,7 +1367,7 @@ let buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ BotTraining ]; meta = { - homepage = "http://metacpan.org/release/Bot-Training-StarCraft"; + homepage = "https://metacpan.org/release/Bot-Training-StarCraft"; description = "Provide starcraft.trn via Bot::Training"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1463,6 +1484,20 @@ let }; }; + BytesRandomSecureTiny = buildPerlPackage { + pname = "Bytes-Random-Secure-Tiny"; + version = "1.011"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-Tiny-1.011.tar.gz"; + sha256 = "03d967b5f82846909137d5ab9984ac570ac10a4401e0c602f3d2208c465ac982"; + }; + meta = { + description = "A tiny Perl extension to generate cryptographically-secure random bytes"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CacheCache = buildPerlPackage { pname = "Cache-Cache"; version = "1.08"; @@ -1577,6 +1612,20 @@ let propagatedBuildInputs = [ Cairo Glib ]; }; + CallContext = buildPerlPackage { + pname = "Call-Context"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Call-Context-0.03.tar.gz"; + sha256 = "0ee6bf46bc72755adb7a6b08e79d12e207de5f7809707b3c353b58cb2f0b5a26"; + }; + meta = { + description = "Sanity-check calling context"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + cam_pdf = buildPerlModule { pname = "CAM-PDF"; version = "1.60"; @@ -3134,6 +3183,23 @@ let }; }; + CommandRunner = buildPerlModule { + pname = "Command-Runner"; + version = "0.103"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz"; + sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ]; + meta = { + homepage = "https://github.com/skaji/Command-Runner"; + description = "Run external commands and Perl code refs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + commonsense = buildPerlPackage { pname = "common-sense"; version = "3.75"; @@ -3961,6 +4027,21 @@ let perlPreHook = stdenv.lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; }; + CryptFormat = buildPerlPackage { + pname = "Crypt-Format"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Format-0.10.tar.gz"; + sha256 = "89ddc010a6c91d5be7a1874a528eed6eda39f2c401c18e63d80ddfbf7127e2dd"; + }; + buildInputs = [ TestException TestFailWarnings ]; + meta = { + description = "Conversion utilities for encryption applications"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptIDEA = buildPerlPackage { pname = "Crypt-IDEA"; version = "1.10"; @@ -4326,6 +4407,23 @@ let }; }; + CryptPerl = buildPerlPackage { + pname = "Crypt-Perl"; + version = "0.34"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.34.tar.gz"; + sha256 = "0e1cb223df0041f6d9b010f11e6f97a97ab55a118a273938eb4fe85d403f1b11"; + }; + checkInputs = [ pkgs.openssl MathBigIntGMP ]; + buildInputs = [ CallContext FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; + propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ]; + meta = { + description = "Cryptography in pure Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptEd25519 = buildPerlPackage { pname = "Crypt-Ed25519"; version = "1.04"; @@ -10665,21 +10763,25 @@ let }; }; - LaTeXML = buildPerlPackage { + LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz"; - sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; + url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; + sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; - propagatedBuildInputs = [ shortenPerlShebang ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; - doCheck = false; # epub test fails - postInstall = '' - shortenPerlShebang $out/bin/latexml - shortenPerlShebang $out/bin/latexmlc - shortenPerlShebang $out/bin/latexmlfind - shortenPerlShebang $out/bin/latexmlmath - shortenPerlShebang $out/bin/latexmlpost + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; + preCheck = '' + rm t/931_epub.t # epub test fails + ''; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + # shebangs need to be patched before executables are copied to $out + preBuild = '' + patchShebangs bin/ + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for file in bin/*; do + shortenPerlShebang "$file" + done ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; @@ -12192,6 +12294,22 @@ let }; }; + MathProvablePrime = buildPerlPackage { + pname = "Math-ProvablePrime"; + version = "0.045"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Math-ProvablePrime-0.045.tar.gz"; + sha256 = "32dce42861ce065a875a91ec14c6557e89af07df10cc450d1c4ded13dcbe3dd5"; + }; + buildInputs = [ FileWhich TestClass TestDeep TestException TestNoWarnings ]; + propagatedBuildInputs = [ BytesRandomSecureTiny ]; + meta = { + description = "Generate a provable prime number, in pure Perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + MathRandom = buildPerlPackage { pname = "Math-Random"; version = "0.72"; @@ -15706,6 +15824,22 @@ let propagatedBuildInputs = [ Moo ]; }; + ParallelPipes = buildPerlModule { + pname = "Parallel-Pipes"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.005.tar.gz"; + sha256 = "44bd9e2be33d7b314f81c9b886a95d53514689090635f9fad53181f2d3051fd5"; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + homepage = "https://github.com/skaji/Parallel-Pipes"; + description = "Parallel processing using pipe(2) for communication and synchronization"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + ParallelPrefork = buildPerlPackage { pname = "Parallel-Prefork"; version = "0.18"; @@ -18783,6 +18917,22 @@ let doCheck = false; # FIXME: 2/293 test failures }; + SymbolGet = buildPerlPackage { + pname = "Symbol-Get"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FE/FELIPE/Symbol-Get-0.10.tar.gz"; + sha256 = "0ee5568c5ae3573ca874e09e4d0524466cfc1ad9a2c24d0bc91d4c7b06f21d9c"; + }; + buildInputs = [ TestDeep TestException ]; + propagatedBuildInputs = [ CallContext ]; + meta = { + description = "Read Perl's symbol table programmatically"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + SymbolGlobalName = buildPerlPackage { pname = "Symbol-Global-Name"; version = "0.05"; @@ -19278,6 +19428,22 @@ let }; }; + TermReadPassword = buildPerlPackage rec { + pname = "Term-ReadPassword"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PH/PHOENIX/${pname}-${version}.tar.gz"; + sha256 = "08s3zdqbr01qf4h8ryc900qq1cjcdlyy2dq0gppzzy9mbcs6da71"; + }; + + outputs = [ "out" ]; + + meta = { + description = "This module lets you ask the user for a password in the traditional way, from the keyboard, without echoing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TermShell = buildPerlModule { pname = "Term-Shell"; version = "0.11"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index be000ecff0..30c845e2ef 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -910,7 +910,7 @@ in { blockdiag = callPackage ../development/python-modules/blockdiag { }; - blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 block-io = callPackage ../development/python-modules/block-io { }; @@ -1227,6 +1227,8 @@ in { clint = callPackage ../development/python-modules/clint { }; + clintermission = callPackage ../development/python-modules/clintermission { }; + clize = callPackage ../development/python-modules/clize { }; clldutils = callPackage ../development/python-modules/clldutils { }; @@ -1253,6 +1255,8 @@ in { cnvkit = callPackage ../development/python-modules/cnvkit { }; + coapthon3 = callPackage ../development/python-modules/coapthon3 { }; + coconut = callPackage ../development/python-modules/coconut { }; cocotb = callPackage ../development/python-modules/cocotb { }; @@ -1907,6 +1911,8 @@ in { emcee = callPackage ../development/python-modules/emcee { }; + emv = callPackage ../development/python-modules/emv { }; + emoji = callPackage ../development/python-modules/emoji { }; enaml = callPackage ../development/python-modules/enaml { }; @@ -2751,6 +2757,8 @@ in { hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + hjson = callPackage ../development/python-modules/hjson { }; + hkdf = callPackage ../development/python-modules/hkdf { }; hmmlearn = callPackage ../development/python-modules/hmmlearn { }; @@ -2890,6 +2898,8 @@ in { ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + ifcopenshell = callPackage ../development/python-modules/ifcopenshell { }; + ignite = callPackage ../development/python-modules/ignite { }; ihatemoney = callPackage ../development/python-modules/ihatemoney { }; @@ -2908,6 +2918,8 @@ in { imagesize = callPackage ../development/python-modules/imagesize { }; + imantics = callPackage ../development/python-modules/imantics { }; + IMAPClient = callPackage ../development/python-modules/imapclient { }; imaplib2 = callPackage ../development/python-modules/imaplib2 { }; @@ -3443,6 +3455,8 @@ in { librosa = callPackage ../development/python-modules/librosa { }; + libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }); + libsavitar = callPackage ../development/python-modules/libsavitar { }; libselinux = pipe pkgs.libselinux [ @@ -3791,6 +3805,8 @@ in { mlrose = callPackage ../development/python-modules/mlrose { }; + mlxtend = callPackage ../development/python-modules/mlxtend { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; mmpython = callPackage ../development/python-modules/mmpython { }; @@ -4532,6 +4548,8 @@ in { phpserialize = callPackage ../development/python-modules/phpserialize { }; + phx-class-registry = callPackage ../development/python-modules/phx-class-registry { }; + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { }; @@ -4695,6 +4713,8 @@ in { pproxy = callPackage ../development/python-modules/pproxy { }; + ppscore = callPackage ../development/python-modules/ppscore { }; + pq = callPackage ../development/python-modules/pq { }; prance = callPackage ../development/python-modules/prance { }; @@ -4933,6 +4953,8 @@ in { pycm = callPackage ../development/python-modules/pycm { }; + pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { }; + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; pycognito = callPackage ../development/python-modules/pycognito { }; @@ -6472,6 +6494,8 @@ in { scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; @@ -6620,6 +6644,8 @@ in { shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; + shap = callPackage ../development/python-modules/shap { }; + shapely = callPackage ../development/python-modules/shapely { }; sharedmem = callPackage ../development/python-modules/sharedmem { }; @@ -6701,6 +6727,8 @@ in { slicedimage = callPackage ../development/python-modules/slicedimage { }; + slicer = callPackage ../development/python-modules/slicer { }; + slicerator = callPackage ../development/python-modules/slicerator { }; slimit = callPackage ../development/python-modules/slimit { }; @@ -7796,6 +7824,8 @@ in { xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + xmljson = callPackage ../development/python-modules/xmljson { }; + xmlschema = callPackage ../development/python-modules/xmlschema { }; xmltodict = callPackage ../development/python-modules/xmltodict { }; @@ -7867,6 +7897,8 @@ in { phantomjsSupport = false; }; + youtube-dlc = callPackage ../development/python-modules/youtube-dlc { }; + yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { };