diff --git a/.github/workflows/merge-staging.yml b/.github/workflows/merge-staging.yml index 1aadef16328..f28c2ddfc78 100644 --- a/.github/workflows/merge-staging.yml +++ b/.github/workflows/merge-staging.yml @@ -14,6 +14,7 @@ jobs: - uses: actions/checkout@v2 - name: Merge master into staging-next + id: staging_next uses: devmasx/merge-branch@v1.3.1 with: type: now @@ -22,6 +23,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Merge staging-next into staging + id: staging uses: devmasx/merge-branch@v1.3.1 with: type: now @@ -35,5 +37,5 @@ jobs: with: issue-number: 105153 body: | - An automatic merge [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). + An automatic merge${{ (steps.staging_next.outcome == 'failure' && ' from master to staging-next') || ((steps.staging.outcome == 'failure' && ' from staging-next to staging') || '') }} [failed](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}). diff --git a/doc/builders/special/mkshell.section.md b/doc/builders/special/mkshell.section.md index 1feb75cbd6f..8a62c50e17d 100644 --- a/doc/builders/special/mkshell.section.md +++ b/doc/builders/special/mkshell.section.md @@ -1,15 +1,17 @@ # pkgs.mkShell {#sec-pkgs-mkShell} -`pkgs.mkShell` is a special kind of derivation that is only useful when using it combined with `nix-shell`. It will in fact fail to instantiate when invoked with `nix-build`. +`pkgs.mkShell` is a special kind of derivation that is only useful when using +it combined with `nix-shell`. It will in fact fail to instantiate when invoked +with `nix-build`. ## Usage {#sec-pkgs-mkShell-usage} ```nix { pkgs ? import {} }: pkgs.mkShell { - # this will make all the build inputs from hello and gnutar - # available to the shell environment + # specify which packages to add to the shell environment + packages = [ pkgs.gnumake ]; + # add all the dependencies, of the given packages, to the shell environment inputsFrom = with pkgs; [ hello gnutar ]; - buildInputs = [ pkgs.gnumake ]; } ``` diff --git a/doc/languages-frameworks/dhall.section.md b/doc/languages-frameworks/dhall.section.md new file mode 100644 index 00000000000..6ff397237a8 --- /dev/null +++ b/doc/languages-frameworks/dhall.section.md @@ -0,0 +1,432 @@ +# Dhall {#sec-language-dhall} + +The Nixpkgs support for Dhall assumes some familiarity with Dhall's language +support for importing Dhall expressions, which is documented here: + +* [`dhall-lang.org` - Installing packages](https://docs.dhall-lang.org/tutorials/Language-Tour.html#installing-packages) + +## Remote imports + +Nixpkgs bypasses Dhall's support for remote imports using Dhall's +semantic integrity checks. Specifically, any Dhall import can be protected by +an integrity check like: + +```dhall +https://prelude.dhall-lang.org/v20.1.0/package.dhall + sha256:26b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 +``` + +… and if the import is cached then the interpreter will load the import from +cache instead of fetching the URL. + +Nixpkgs uses this trick to add all of a Dhall expression's dependencies into the +cache so that the Dhall interpreter never needs to resolve any remote URLs. In +fact, Nixpkgs uses a Dhall interpreter with remote imports disabled when +packaging Dhall expressions to enforce that the interpreter never resolves a +remote import. This means that Nixpkgs only supports building Dhall expressions +if all of their remote imports are protected by semantic integrity checks. + +Instead of remote imports, Nixpkgs uses Nix to fetch remote Dhall code. For +example, the Prelude Dhall package uses `pkgs.fetchFromGitHub` to fetch the +`dhall-lang` repository containing the Prelude. Relying exclusively on Nix +to fetch Dhall code ensures that Dhall packages built using Nix remain pure and +also behave well when built within a sandbox. + +## Packaging a Dhall expression from scratch + +We can illustrate how Nixpkgs integrates Dhall by beginning from the following +trivial Dhall expression with one dependency (the Prelude): + +```dhall +-- ./true.dhall + +let Prelude = https://prelude.dhall-lang.org/v20.1.0/package.dhall + +in Prelude.Bool.not False +``` + +As written, this expression cannot be built using Nixpkgs because the +expression does not protect the Prelude import with a semantic integrity +check, so the first step is to freeze the expression using `dhall freeze`, +like this: + +```bash +$ dhall freeze --inplace ./true.dhall +``` + +… which gives us: + +```dhall +-- ./true.dhall + +let Prelude = + https://prelude.dhall-lang.org/v20.1.0/package.dhall + sha256:26b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 + +in Prelude.Bool.not False +``` + +To package that expression, we create a `./true.nix` file containing the +following specification for the Dhall package: + +```nix +# ./true.nix + +{ buildDhallPackage, Prelude }: + +buildDhallPackage { + name = "true"; + code = ./true.dhall; + dependencies = [ Prelude ]; + source = true; +} +``` + +… and we complete the build by incorporating that Dhall package into the +`pkgs.dhallPackages` hierarchy using an overlay, like this: + +```nix +# ./example.nix + +let + nixpkgs = builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; + sha256 = "1pbl4c2dsaz2lximgd31m96jwbps6apn3anx8cvvhk1gl9rkg107"; + }; + + dhallOverlay = self: super: { + true = self.callPackage ./true.nix { }; + }; + + overlay = self: super: { + dhallPackages = super.dhallPackages.override (old: { + overrides = + self.lib.composeExtensions (old.overrides or (_: _: {})) dhallOverlay; + }); + }; + + pkgs = import nixpkgs { config = {}; overlays = [ overlay ]; }; + +in + pkgs +``` + +… which we can then build using this command: + +```bash +$ nix build --file ./example.nix dhallPackages.true +``` + +## Contents of a Dhall package + +The above package produces the following directory tree: + +```bash +$ tree -a ./result +result +├── .cache +│   └── dhall +│   └── 122027abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70 +├── binary.dhall +└── source.dhall +``` + +… where: + +* `source.dhall` contains the result of interpreting our Dhall package: + + ```bash + $ cat ./result/source.dhall + True + ``` + +* The `.cache` subdirectory contains one binary cache product encoding the + same result as `source.dhall`: + + ```bash + $ dhall decode < ./result/.cache/dhall/122027abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70 + True + ``` + +* `binary.dhall` contains a Dhall expression which handles fetching and decoding + the same cache product: + + ```bash + $ cat ./result/binary.dhall + missing sha256:27abdeddfe8503496adeb623466caa47da5f63abd2bc6fa19f6cfcb73ecfed70 + $ cp -r ./result/.cache .cache + + $ chmod -R u+w .cache + + $ XDG_CACHE_HOME=.cache dhall --file ./result/binary.dhall + True + ``` + +The `source.dhall` file is only present for packages that specify +`source = true;`. By default, Dhall packages omit the `source.dhall` in order +to conserve disk space when they are used exclusively as dependencies. For +example, if we build the Prelude package it will only contain the binary +encoding of the expression: + +```bash +$ nix build --file ./example.nix dhallPackages.Prelude + +$ tree -a result +result +├── .cache +│   └── dhall +│   └── 122026b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 +└── binary.dhall + +2 directories, 2 files +``` + +Typically, you only specify `source = true;` for the top-level Dhall expression +of interest (such as our example `true.nix` Dhall package). However, if you +wish to specify `source = true` for all Dhall packages, then you can amend the +Dhall overlay like this: + +```nix + dhallOverrides = self: super: { + # Enable source for all Dhall packages + buildDhallPackage = + args: super.buildDhallPackage (args // { source = true; }); + + true = self.callPackage ./true.nix { }; + }; +``` + +… and now the Prelude will contain the fully decoded result of interpreting +the Prelude: + +```bash +$ nix build --file ./example.nix dhallPackages.Prelude + +$ tree -a result +result +├── .cache +│   └── dhall +│   └── 122026b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98 +├── binary.dhall +└── source.dhall + +$ cat ./result/source.dhall +{ Bool = + { and = + \(_ : List Bool) -> + List/fold Bool _ Bool (\(_ : Bool) -> \(_ : Bool) -> _@1 && _) True + , build = \(_ : Type -> _ -> _@1 -> _@2) -> _ Bool True False + , even = + \(_ : List Bool) -> + List/fold Bool _ Bool (\(_ : Bool) -> \(_ : Bool) -> _@1 == _) True + , fold = + \(_ : Bool) -> +… +``` + +## Packaging functions + +We already saw an example of using `buildDhallPackage` to create a Dhall +package from a single file, but most Dhall packages consist of more than one +file and there are two derived utilities that you may find more useful when +packaging multiple files: + +* `buildDhallDirectoryPackage` - build a Dhall package from a local directory + +* `buildDhallGitHubPackage` - build a Dhall package from a GitHub repository + +The `buildDhallPackage` is the lowest-level function and accepts the following +arguments: + +* `name`: The name of the derivation + +* `dependencies`: Dhall dependencies to build and cache ahead of time + +* `code`: The top-level expression to build for this package + + Note that the `code` field accepts an arbitrary Dhall expression. You're + not limited to just a file. + +* `source`: Set to `true` to include the decoded result as `source.dhall` in the + build product, at the expense of requiring more disk space + +* `documentationRoot`: Set to the root directory of the package if you want + `dhall-docs` to generate documentation underneath the `docs` subdirectory of + the build product + +The `buildDhallDirectoryPackage` is a higher-level function implemented in terms +of `buildDhallPackage` that accepts the following arguments: + +* `name`: Same as `buildDhallPackage` + +* `dependencies`: Same as `buildDhallPackage` + +* `source`: Same as `buildDhallPackage` + +* `src`: The directory containing Dhall code that you want to turn into a Dhall + package + +* `file`: The top-level file (`package.dhall` by default) that is the entrypoint + to the rest of the package + +* `document`: Set to `true` to generate documentation for the package + +The `buildDhallGitHubPackage` is another higher-level function implemented in +terms of `buildDhallPackage` that accepts the following arguments: + +* `name`: Same as `buildDhallPackage` + +* `dependencies`: Same as `buildDhallPackage` + +* `source`: Same as `buildDhallPackage` + +* `owner`: The owner of the repository + +* `repo`: The repository name + +* `rev`: The desired revision (or branch, or tag) + +* `directory`: The subdirectory of the Git repository to package (if a + directory other than the root of the repository) + +* `file`: The top-level file (`${directory}/package.dhall` by default) that is + the entrypoint to the rest of the package + +* `document`: Set to `true` to generate documentation for the package + +Additionally, `buildDhallGitHubPackage` accepts the same arguments as +`fetchFromGitHub`, such as `sha256` or `fetchSubmodules`. + +## `dhall-to-nixpkgs` + +You can use the `dhall-to-nixpkgs` command-line utility to automate +packaging Dhall code. For example: + +```bash +$ nix-env --install --attr haskellPackages.dhall-nixpkgs + +$ nix-env --install --attr nix-prefetch-git # Used by dhall-to-nixpkgs + +$ dhall-to-nixpkgs github https://github.com/Gabriel439/dhall-semver.git +{ buildDhallGitHubPackage, Prelude }: + buildDhallGitHubPackage { + name = "dhall-semver"; + githubBase = "github.com"; + owner = "Gabriel439"; + repo = "dhall-semver"; + rev = "2d44ae605302ce5dc6c657a1216887fbb96392a4"; + fetchSubmodules = false; + sha256 = "0y8shvp8srzbjjpmnsvz9c12ciihnx1szs0yzyi9ashmrjvd0jcz"; + directory = ""; + file = "package.dhall"; + source = false; + document = false; + dependencies = [ (Prelude.overridePackage { file = "package.dhall"; }) ]; + } +``` + +The utility takes care of automatically detecting remote imports and converting +them to package dependencies. You can also use the utility on local +Dhall directories, too: + +```bash +$ dhall-to-nixpkgs directory ~/proj/dhall-semver +{ buildDhallDirectoryPackage, Prelude }: + buildDhallDirectoryPackage { + name = "proj"; + src = /Users/gabriel/proj/dhall-semver; + file = "package.dhall"; + source = false; + document = false; + dependencies = [ (Prelude.overridePackage { file = "package.dhall"; }) ]; + } +``` + +## Overriding dependency versions + +Suppose that we change our `true.dhall` example expression to depend on an older +version of the Prelude (19.0.0): + +```dhall +-- ./true.dhall + +let Prelude = + https://prelude.dhall-lang.org/v19.0.0/package.dhall + sha256:eb693342eb769f782174157eba9b5924cf8ac6793897fc36a31ccbd6f56dafe2 + +in Prelude.Bool.not False +``` + +If we try to rebuild that expression the build will fail: + +``` +$ nix build --file ./example.nix dhallPackages.true +builder for '/nix/store/0f1hla7ff1wiaqyk1r2ky4wnhnw114fi-true.drv' failed with exit code 1; last 10 log lines: + + Dhall was compiled without the 'with-http' flag. + + The requested URL was: https://prelude.dhall-lang.org/v19.0.0/package.dhall + + + 4│ https://prelude.dhall-lang.org/v19.0.0/package.dhall + 5│ sha256:eb693342eb769f782174157eba9b5924cf8ac6793897fc36a31ccbd6f56dafe2 + + /nix/store/rsab4y99h14912h4zplqx2iizr5n4rc2-true.dhall:4:7 +[1 built (1 failed), 0.0 MiB DL] +error: build of '/nix/store/0f1hla7ff1wiaqyk1r2ky4wnhnw114fi-true.drv' failed +``` + +… because the default Prelude selected by Nixpkgs revision +`94b2848559b12a8ed1fe433084686b2a81123c99is` is version 20.1.0, which doesn't +have the same integrity check as version 19.0.0. This means that version +19.0.0 is not cached and the interpreter is not allowed to fall back to +importing the URL. + +However, we can override the default Prelude version by using `dhall-to-nixpkgs` +to create a Dhall package for our desired Prelude: + +```bash +$ dhall-to-nixpkgs github https://github.com/dhall-lang/dhall-lang.git \ + --name Prelude \ + --directory Prelude \ + --rev v19.0.0 \ + > Prelude.nix +``` + +… and then referencing that package in our Dhall overlay, by either overriding +the Prelude globally for all packages, like this: + +```bash + dhallOverrides = self: super: { + true = self.callPackage ./true.nix { }; + + Prelude = self.callPackage ./Prelude.nix { }; + }; +``` + +… or selectively overriding the Prelude dependency for just the `true` package, +like this: + +```bash + dhallOverrides = self: super: { + true = self.callPackage ./true.nix { + Prelude = self.callPackage ./Prelude.nix { }; + }; + }; +``` + +## Overrides + +You can override any of the arguments to `buildDhallGitHubPackage` or +`buildDhallDirectoryPackage` using the `overridePackage` attribute of a package. +For example, suppose we wanted to selectively enable `source = true` just for the Prelude. We can do that like this: + +```nix + dhallOverrides = self: super: { + Prelude = super.Prelude.overridePackage { source = true; }; + + … + }; +``` + +[semantic-integrity-checks]: https://docs.dhall-lang.org/tutorials/Language-Tour.html#installing-packages diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 36369fd4e63..725ffd4becc 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -10,7 +10,7 @@ with import {}; mkShell { name = "dotnet-env"; - buildInputs = [ + packages = [ dotnet-sdk_3 ]; } @@ -25,7 +25,7 @@ with import {}; mkShell { name = "dotnet-env"; - buildInputs = [ + packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_3_0 diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 4d07d2b524d..791afce6f5c 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -11,6 +11,7 @@ + diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 96ac61ab54c..b466748f548 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -245,7 +245,7 @@ let ps.toolz ]); in mkShell { - buildInputs = [ + packages = [ pythonEnv black diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index c519d79d3da..b8fc19eb6b0 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -106,7 +106,7 @@ let name = "gems-for-some-project"; gemdir = ./.; }; -in mkShell { buildInputs = [ gems gems.wrappedRuby ]; } +in mkShell { packages = [ 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`. diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index a06ac0d11f7..accaeb652d0 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -121,15 +121,20 @@ rec { js = { bits = 32; significantByte = littleEndian; family = "js"; }; }; - # Determine where two CPUs are compatible with each other. That is, - # can we run code built for system b on system a? For that to - # happen, then the set of all possible possible programs that system - # b accepts must be a subset of the set of all programs that system - # a accepts. This compatibility relation forms a category where each - # CPU is an object and each arrow from a to b represents - # compatibility. CPUs with multiple modes of Endianness are - # isomorphic while all CPUs are endomorphic because any program - # built for a CPU can run on that CPU. + # Determine when two CPUs are compatible with each other. That is, + # can code built for system B run on system A? For that to happen, + # the programs that system B accepts must be a subset of the + # programs that system A accepts. + # + # We have the following properties of the compatibility relation, + # which must be preserved when adding compatibility information for + # additional CPUs. + # - (reflexivity) + # Every CPU is compatible with itself. + # - (transitivity) + # If A is compatible with B and B is compatible with C then A is compatible with C. + # - (compatible under multiple endianness) + # CPUs with multiple modes of endianness are pairwise compatible. isCompatible = a: b: with cpuTypes; lib.any lib.id [ # x86 (b == i386 && isCompatible a i486) diff --git a/maintainers/scripts/update-luarocks-shell.nix b/maintainers/scripts/update-luarocks-shell.nix index 23a940b3691..d3f342b07a9 100644 --- a/maintainers/scripts/update-luarocks-shell.nix +++ b/maintainers/scripts/update-luarocks-shell.nix @@ -2,8 +2,11 @@ }: with nixpkgs; mkShell { - buildInputs = [ - bash luarocks-nix nix-prefetch-scripts parallel + packages = [ + bash + luarocks-nix + nix-prefetch-scripts + parallel ]; LUAROCKS_NIXPKGS_PATH = toString nixpkgs.path; } diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 924fe7ae038..a57ba2c8d36 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -78,7 +78,7 @@ - Kodi has been updated to version 19.0 "Matrix". See + Kodi has been updated to version 19.1 "Matrix". See the announcement for further details. @@ -715,6 +715,20 @@ environment.systemPackages = [ The yadm dotfile manager has been updated from 2.x to 3.x, which has new (XDG) default locations for some data/state files. Most yadm commands will fail and print a legacy path warning (which describes how to upgrade/migrate your repository). If you have scripts, daemons, scheduled jobs, shell profiles, etc. that invoke yadm, expect them to fail or misbehave until you perform this migration and prepare accordingly. + + + Instead of determining + automatically based on , the latest + version is always used because old versions are not officially supported. + + + Furthermore, Radicale's systemd unit was hardened which might break some + deployments. In particular, a non-default + filesystem_folder has to be added to + if + the deprecated is used. + + diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix index cc3609d750e..e5ec9b8f97f 100644 --- a/nixos/doc/manual/shell.nix +++ b/nixos/doc/manual/shell.nix @@ -4,5 +4,5 @@ in pkgs.mkShell { name = "nixos-manual"; - buildInputs = with pkgs; [ xmlformat jing xmloscopy ruby ]; + packages = with pkgs; [ xmlformat jing xmloscopy ruby ]; } diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 6b1f54beee2..801e28cec44 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/iwfs2bfcy7lqwhri94p2i6jc87ih55zk-nix-2.3.10"; - i686-linux = "/nix/store/a3ccfvy9i5n418d5v0bir330kbcz3vj8-nix-2.3.10"; - aarch64-linux = "/nix/store/bh5g6cv7bv35iz853d3xv2sphn51ybmb-nix-2.3.10"; - x86_64-darwin = "/nix/store/8c98r6zlwn2d40qm7jnnrr2rdlqviszr-nix-2.3.10"; + x86_64-linux = "/nix/store/d1ppfhjhdwcsb4npfzyifv5z8i00fzsk-nix-2.3.11"; + i686-linux = "/nix/store/c6ikndcrzwpfn2sb5b9xb1f17p9b8iga-nix-2.3.11"; + aarch64-linux = "/nix/store/fb0lfrn0m8s197d264jzd64vhz9c8zbx-nix-2.3.11"; + x86_64-darwin = "/nix/store/qvb86ffv08q3r66qbd6nqifz425lyyhf-nix-2.3.11"; } diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index c7a13974a51..797fcddb8c9 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -37,6 +37,9 @@ in # drives. "uas" + # SD cards. + "sdhci_pci" + # Firewire support. Not tested. "ohci1394" "sbp2" diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 107e783c0c2..de0b234a631 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -31,6 +31,7 @@ let extraOptions = cfg.extraOptions; withBaseWrapper = cfg.wrapperFeatures.base; withGtkWrapper = cfg.wrapperFeatures.gtk; + isNixOS = true; }; in { options.programs.sway = { @@ -38,9 +39,8 @@ in { Sway, the i3-compatible tiling Wayland compositor. You can manually launch Sway by executing "exec sway" on a TTY. Copy /etc/sway/config to ~/.config/sway/config to modify the default configuration. See - https://github.com/swaywm/sway/wiki and "man 5 sway" for more information. - Please have a look at the "extraSessionCommands" example for running - programs natively under Wayland''; + and + "man 5 sway" for more information''; wrapperFeatures = mkOption { type = wrapperOptions; @@ -55,16 +55,20 @@ in { type = types.lines; default = ""; example = '' + # SDL: export SDL_VIDEODRIVER=wayland - # needs qt5.qtwayland in systemPackages - export QT_QPA_PLATFORM=wayland + # QT (needs qt5.qtwayland in systemPackages): + export QT_QPA_PLATFORM=wayland-egl export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" # Fix for some Java AWT applications (e.g. Android Studio), # use this if they aren't displayed properly: export _JAVA_AWT_WM_NONREPARENTING=1 ''; description = '' - Shell commands executed just before Sway is started. + Shell commands executed just before Sway is started. See + + and + for some useful environment variables. ''; }; @@ -94,13 +98,15 @@ in { ''; example = literalExample '' with pkgs; [ - xwayland i3status i3status-rust termite rofi light ] ''; description = '' - Extra packages to be installed system wide. + Extra packages to be installed system wide. See + and + + for a list of useful software. ''; }; @@ -120,8 +126,11 @@ in { systemPackages = [ swayPackage ] ++ cfg.extraPackages; etc = { "sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config"; - #"sway/security.d".source = mkOptionDefault "${swayPackage}/etc/sway/security.d/"; - #"sway/config.d".source = mkOptionDefault "${swayPackage}/etc/sway/config.d/"; + "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" '' + # Import the most important environment variables into the D-Bus and systemd + # user environments (e.g. required for screen sharing and Pinentry prompts): + exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP + ''; }; }; security.pam.services.swaylock = {}; @@ -131,6 +140,8 @@ in { # To make a Sway session available if a display manager like SDDM is enabled: services.xserver.displayManager.sessionPackages = [ swayPackage ]; programs.xwayland.enable = mkDefault true; + # For screen sharing (this option only has an effect with xdg.portal.enable): + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; }; meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index a1aa5739d06..3cb14275792 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -35,10 +35,10 @@ let auto_pause = true; only_admins_can_pause_the_game = true; autosave_only_on_server = true; - admins = []; non_blocking_saving = cfg.nonBlockingSaving; } // cfg.extraSettings; serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings)); + serverAdminsFile = pkgs.writeText "server-adminlist.json" (builtins.toJSON cfg.admins); modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; in { @@ -52,6 +52,16 @@ in The port to which the service should bind. ''; }; + + admins = mkOption { + type = types.listOf types.str; + default = []; + example = [ "username" ]; + description = '' + List of player names which will be admin. + ''; + }; + openFirewall = mkOption { type = types.bool; default = false; @@ -234,6 +244,7 @@ in "--start-server=${mkSavePath cfg.saveName}" "--server-settings=${serverSettingsFile}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") + (optionalString (cfg.admins != []) "--server-adminlist=${serverAdminsFile}") ]; # Sandboxing diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index ce7c215fd14..8e8999e5155 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -34,6 +34,7 @@ let "fritzbox" "json" "jitsi" + "kea" "keylight" "knot" "lnd" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix index 972632b5a24..16c2920751d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix @@ -41,12 +41,12 @@ in serviceConfig = { ExecStart = '' ${pkgs.prometheus-bind-exporter}/bin/bind_exporter \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - -bind.pid-file /var/run/named/named.pid \ - -bind.timeout ${toString cfg.bindTimeout} \ - -bind.stats-url ${cfg.bindURI} \ - -bind.stats-version ${cfg.bindVersion} \ - -bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --bind.pid-file /var/run/named/named.pid \ + --bind.timeout ${toString cfg.bindTimeout} \ + --bind.stats-url ${cfg.bindURI} \ + --bind.stats-version ${cfg.bindVersion} \ + --bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index a3b2b92bc34..a7f4d3e096f 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -41,11 +41,11 @@ in }; logFormat = mkOption { - type = types.str; - default = "logger:stderr"; - example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true"; + type = types.enum [ "logfmt" "json" ]; + default = "logfmt"; + example = "json"; description = '' - Set the log target and format. + Set the log format. ''; }; @@ -59,16 +59,16 @@ in }; serviceOpts = let collectSettingsArgs = if (cfg.collectdBinary.enable) then '' - -collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ - -collectd.security-level ${cfg.collectdBinary.securityLevel} \ + --collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ + --collectd.security-level ${cfg.collectdBinary.securityLevel} \ '' else ""; in { serviceConfig = { ExecStart = '' ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ - -log.format ${escapeShellArg cfg.logFormat} \ - -log.level ${cfg.logLevel} \ - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --log.format ${escapeShellArg cfg.logFormat} \ + --log.level ${cfg.logLevel} \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ ${collectSettingsArgs} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/nixos/modules/services/monitoring/prometheus/exporters/kea.nix new file mode 100644 index 00000000000..b6cd89c3866 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -0,0 +1,38 @@ +{ config +, lib +, pkgs +, options +}: + +with lib; + +let + cfg = config.services.prometheus.exporters.kea; +in { + port = 9547; + extraOpts = { + controlSocketPaths = mkOption { + type = types.listOf types.str; + example = literalExample '' + [ + "/run/kea/kea-dhcp4.socket" + "/run/kea/kea-dhcp6.socket" + ] + ''; + description = '' + Paths to kea control sockets + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-kea-exporter}/bin/kea-exporter \ + --address ${cfg.listenAddress} \ + --port ${toString cfg.port} \ + ${concatStringsSep " \\n" cfg.controlSocketPaths} + ''; + SupplementaryGroups = [ "kea" ]; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix index 78fe120e4d9..d95e5ed9e83 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/rspamd.nix @@ -13,7 +13,7 @@ let generateConfig = extraLabels: { metrics = (map (path: { name = "rspamd_${replaceStrings [ "." " " ] [ "_" "_" ] path}"; - path = "$.${path}"; + path = "{ .${path} }"; labels = extraLabels; }) [ "actions.'add header'" diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index 5af035fd59e..8c632c319d3 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -3,56 +3,103 @@ with lib; let - cfg = config.services.radicale; - confFile = pkgs.writeText "radicale.conf" cfg.config; - - defaultPackage = if versionAtLeast config.system.stateVersion "20.09" then { - pkg = pkgs.radicale3; - text = "pkgs.radicale3"; - } else if versionAtLeast config.system.stateVersion "17.09" then { - pkg = pkgs.radicale2; - text = "pkgs.radicale2"; - } else { - pkg = pkgs.radicale1; - text = "pkgs.radicale1"; + format = pkgs.formats.ini { + listToValue = concatMapStringsSep ", " (generators.mkValueStringDefault { }); }; -in -{ + pkg = if isNull cfg.package then + pkgs.radicale + else + cfg.package; - options = { - services.radicale.enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable Radicale CalDAV and CardDAV server. - ''; + confFile = if cfg.settings == { } then + pkgs.writeText "radicale.conf" cfg.config + else + format.generate "radicale.conf" cfg.settings; + + rightsFile = format.generate "radicale.rights" cfg.rights; + + bindLocalhost = cfg.settings != { } && !hasAttrByPath [ "server" "hosts" ] cfg.settings; + +in { + options.services.radicale = { + enable = mkEnableOption "Radicale CalDAV and CardDAV server"; + + package = mkOption { + description = "Radicale package to use."; + # Default cannot be pkgs.radicale because non-null values suppress + # warnings about incompatible configuration and storage formats. + type = with types; nullOr package // { inherit (package) description; }; + default = null; + defaultText = "pkgs.radicale"; }; - services.radicale.package = mkOption { - type = types.package; - default = defaultPackage.pkg; - defaultText = defaultPackage.text; - description = '' - Radicale package to use. This defaults to version 1.x if - system.stateVersion < 17.09, version 2.x if - 17.09 ≤ system.stateVersion < 20.09, and - version 3.x otherwise. - ''; - }; - - services.radicale.config = mkOption { + config = mkOption { type = types.str; default = ""; description = '' Radicale configuration, this will set the service configuration file. + This option is mutually exclusive with . + This option is deprecated. Use instead. ''; }; - services.radicale.extraArgs = mkOption { + settings = mkOption { + type = format.type; + default = { }; + description = '' + Configuration for Radicale. See + . + This option is mutually exclusive with . + ''; + example = literalExample '' + server = { + hosts = [ "0.0.0.0:5232" "[::]:5232" ]; + }; + auth = { + type = "htpasswd"; + htpasswd_filename = "/etc/radicale/users"; + htpasswd_encryption = "bcrypt"; + }; + storage = { + filesystem_folder = "/var/lib/radicale/collections"; + }; + ''; + }; + + rights = mkOption { + type = format.type; + description = '' + Configuration for Radicale's rights file. See + . + This option only works in conjunction with . + Setting this will also set and + to approriate values. + ''; + default = { }; + example = literalExample '' + root = { + user = ".+"; + collection = ""; + permissions = "R"; + }; + principal = { + user = ".+"; + collection = "{user}"; + permissions = "RW"; + }; + calendars = { + user = ".+"; + collection = "{user}/[^/]+"; + permissions = "rw"; + }; + ''; + }; + + extraArgs = mkOption { type = types.listOf types.str; default = []; description = "Extra arguments passed to the Radicale daemon."; @@ -60,33 +107,94 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + assertions = [ + { + assertion = cfg.settings == { } || cfg.config == ""; + message = '' + The options services.radicale.config and services.radicale.settings + are mutually exclusive. + ''; + } + ]; - users.users.radicale = - { uid = config.ids.uids.radicale; - description = "radicale user"; - home = "/var/lib/radicale"; - createHome = true; - }; + warnings = optional (isNull cfg.package && versionOlder config.system.stateVersion "17.09") '' + The configuration and storage formats of your existing Radicale + installation might be incompatible with the newest version. + For upgrade instructions see + https://radicale.org/2.1.html#documentation/migration-from-1xx-to-2xx. + Set services.radicale.package to suppress this warning. + '' ++ optional (isNull cfg.package && versionOlder config.system.stateVersion "20.09") '' + The configuration format of your existing Radicale installation might be + incompatible with the newest version. For upgrade instructions see + https://github.com/Kozea/Radicale/blob/3.0.6/NEWS.md#upgrade-checklist. + Set services.radicale.package to suppress this warning. + '' ++ optional (cfg.config != "") '' + The option services.radicale.config is deprecated. + Use services.radicale.settings instead. + ''; - users.groups.radicale = - { gid = config.ids.gids.radicale; }; + services.radicale.settings.rights = mkIf (cfg.rights != { }) { + type = "from_file"; + file = toString rightsFile; + }; + + environment.systemPackages = [ pkg ]; + + users.users.radicale.uid = config.ids.uids.radicale; + + users.groups.radicale.gid = config.ids.gids.radicale; systemd.services.radicale = { description = "A Simple Calendar and Contact Server"; after = [ "network.target" ]; + requires = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = concatStringsSep " " ([ - "${cfg.package}/bin/radicale" "-C" confFile + "${pkg}/bin/radicale" "-C" confFile ] ++ ( map escapeShellArg cfg.extraArgs )); User = "radicale"; Group = "radicale"; + StateDirectory = "radicale/collections"; + StateDirectoryMode = "0750"; + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "/dev/stdin" ]; + DevicePolicy = "strict"; + IPAddressAllow = mkIf bindLocalhost "localhost"; + IPAddressDeny = mkIf bindLocalhost "any"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = lib.optional + (hasAttrByPath [ "storage" "filesystem_folder" ] cfg.settings) + cfg.settings.storage.filesystem_folder; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0027"; }; }; }; - meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; + meta.maintainers = with lib.maintainers; [ aneeshusa infinisil dotlambda ]; } diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index b2bb5055cd4..a7b93c9c459 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -15,11 +15,9 @@ let apachectl = pkgs.runCommand "apachectl" { meta.priority = -1; } '' mkdir -p $out/bin cp ${pkg}/bin/apachectl $out/bin/apachectl - sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f ${httpdConf}|' + sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|' ''; - httpdConf = cfg.configFile; - php = cfg.phpPackage.override { apacheHttpd = pkg; }; phpModuleName = let @@ -682,6 +680,8 @@ in }) (filter (hostOpts: hostOpts.useACMEHost == null) acmeEnabledVhosts); in listToAttrs acmePairs; + # httpd requires a stable path to the configuration file for reloads + environment.etc."httpd/httpd.conf".source = cfg.configFile; environment.systemPackages = [ apachectl pkg @@ -753,6 +753,7 @@ in wants = concatLists (map (certName: [ "acme-finished-${certName}.target" ]) dependentCertNames); after = [ "network.target" ] ++ map (certName: "acme-selfsigned-${certName}.service") dependentCertNames; before = map (certName: "acme-${certName}.service") dependentCertNames; + restartTriggers = [ cfg.configFile ]; path = [ pkg pkgs.coreutils pkgs.gnugrep ]; @@ -771,9 +772,9 @@ in ''; serviceConfig = { - ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}"; - ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop"; - ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful"; + ExecStart = "@${pkg}/bin/httpd httpd -f /etc/httpd/httpd.conf"; + ExecStop = "${pkg}/bin/httpd -f /etc/httpd/httpd.conf -k graceful-stop"; + ExecReload = "${pkg}/bin/httpd -f /etc/httpd/httpd.conf -k graceful"; User = cfg.user; Group = cfg.group; Type = "forking"; @@ -800,6 +801,7 @@ in # certs are updated _after_ config has been reloaded. before = sslTargets; after = sslServices; + restartTriggers = [ cfg.configFile ]; # Block reloading if not all certs exist yet. # Happens when config changes add new vhosts/certs. unitConfig.ConditionPathExists = map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames; @@ -807,7 +809,7 @@ in Type = "oneshot"; TimeoutSec = 60; ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active httpd.service"; - ExecStartPre = "${pkg}/bin/httpd -f ${httpdConf} -t"; + ExecStartPre = "${pkg}/bin/httpd -f /etc/httpd/httpd.conf -t"; ExecStart = "/run/current-system/systemd/bin/systemctl reload httpd.service"; }; }; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 21c30305188..376d6530f36 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -103,6 +103,7 @@ in readOnly = true; type = types.package; default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; + defaultText = "if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs"; description = "Configured ZFS userland tools package."; }; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 954e33ff24a..29f133786d8 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -151,8 +151,8 @@ in config = mkIf cfg.enable (mkMerge [{ boot.kernelModules = [ "bridge" "veth" ]; boot.kernel.sysctl = { - "net.ipv4.conf.all.forwarding" = mkOverride 99 true; - "net.ipv4.conf.default.forwarding" = mkOverride 99 true; + "net.ipv4.conf.all.forwarding" = mkOverride 98 true; + "net.ipv4.conf.default.forwarding" = mkOverride 98 true; }; environment.systemPackages = [ cfg.package ] ++ optional cfg.enableNvidia pkgs.nvidia-docker; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1173a177c3c..232d89052d4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -90,6 +90,7 @@ in custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; deluge = handleTest ./deluge.nix {}; + dendrite = handleTest ./dendrite.nix {}; dhparams = handleTest ./dhparams.nix {}; discourse = handleTest ./discourse.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; diff --git a/nixos/tests/dendrite.nix b/nixos/tests/dendrite.nix new file mode 100644 index 00000000000..a444c9b2001 --- /dev/null +++ b/nixos/tests/dendrite.nix @@ -0,0 +1,99 @@ +import ./make-test-python.nix ( + { pkgs, ... }: + let + homeserverUrl = "http://homeserver:8008"; + + private_key = pkgs.runCommand "matrix_key.pem" { + buildInputs = [ pkgs.dendrite ]; + } "generate-keys --private-key $out"; + in + { + name = "dendrite"; + meta = with pkgs.lib; { + maintainers = teams.matrix.members; + }; + + nodes = { + homeserver = { pkgs, ... }: { + services.dendrite = { + enable = true; + settings = { + global.server_name = "test-dendrite-server.com"; + global.private_key = private_key; + client_api.registration_disabled = false; + }; + }; + + networking.firewall.allowedTCPPorts = [ 8008 ]; + }; + + client = { pkgs, ... }: { + environment.systemPackages = [ + ( + pkgs.writers.writePython3Bin "do_test" + { libraries = [ pkgs.python3Packages.matrix-nio ]; } '' + import asyncio + + from nio import AsyncClient + + + async def main() -> None: + # Connect to dendrite + client = AsyncClient("http://homeserver:8008", "alice") + + # Register as user alice + response = await client.register("alice", "my-secret-password") + + # Log in as user alice + response = await client.login("my-secret-password") + + # Create a new room + response = await client.room_create(federate=False) + room_id = response.room_id + + # Join the room + response = await client.join(room_id) + + # Send a message to the room + response = await client.room_send( + room_id=room_id, + message_type="m.room.message", + content={ + "msgtype": "m.text", + "body": "Hello world!" + } + ) + + # Sync responses + response = await client.sync(timeout=30000) + + # Check the message was received by dendrite + last_message = response.rooms.join[room_id].timeline.events[-1].body + assert last_message == "Hello world!" + + # Leave the room + response = await client.room_leave(room_id) + + # Close the client + await client.close() + + asyncio.get_event_loop().run_until_complete(main()) + '' + ) + ]; + }; + }; + + testScript = '' + start_all() + + with subtest("start the homeserver"): + homeserver.wait_for_unit("dendrite.service") + homeserver.wait_for_open_port(8008) + + with subtest("ensure messages can be exchanged"): + client.succeed("do_test") + ''; + + } +) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 2b17d0ff78f..e3bfff218ad 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -302,7 +302,7 @@ let url = "http://localhost"; configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON { metrics = [ - { name = "json_test_metric"; path = "$.test"; } + { name = "json_test_metric"; path = "{ .test }"; } ]; }); }; @@ -326,6 +326,57 @@ let ''; }; + kea = { + exporterConfig = { + enable = true; + controlSocketPaths = [ + "/run/kea/kea-dhcp6.sock" + ]; + }; + metricProvider = { + users.users.kea = { + isSystemUser = true; + }; + users.groups.kea = {}; + + systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6.service" ]; + + systemd.services.kea-dhcp6 = let + configFile = pkgs.writeText "kea-dhcp6.conf" (builtins.toJSON { + Dhcp6 = { + "control-socket" = { + "socket-type" = "unix"; + "socket-name" = "/run/kea/kea-dhcp6.sock"; + }; + }; + }); + in + { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = false; + User = "kea"; + Group = "kea"; + ExecStart = "${pkgs.kea}/bin/kea-dhcp6 -c ${configFile}"; + StateDirectory = "kea"; + RuntimeDirectory = "kea"; + UMask = "0007"; + }; + }; + }; + exporterTest = '' + wait_for_unit("kea-dhcp6.service") + wait_for_file("/run/kea/kea-dhcp6.sock") + wait_for_unit("prometheus-kea-exporter.service") + wait_for_open_port(9547) + succeed( + "curl --fail localhost:9547/metrics | grep 'packets_received_total'" + ) + ''; + }; + knot = { exporterConfig = { enable = true; @@ -406,8 +457,8 @@ let }; metricProvider = { systemd.services.prometheus-lnd-exporter.serviceConfig.DynamicUser = false; - services.bitcoind.enable = true; - services.bitcoind.extraConfig = '' + services.bitcoind.main.enable = true; + services.bitcoind.main.extraConfig = '' rpcauth=bitcoinrpc:e8fe33f797e698ac258c16c8d7aadfbe$872bdb8f4d787367c26bcfd75e6c23c4f19d44a69f5d1ad329e5adf3f82710f7 bitcoind.zmqpubrawblock=tcp://127.0.0.1:28332 bitcoind.zmqpubrawtx=tcp://127.0.0.1:28333 @@ -1021,7 +1072,7 @@ let # Note: this does not connect the test environment to the Tor network. # Client, relay, bridge or exit connectivity are disabled by default. services.tor.enable = true; - services.tor.controlPort = 9051; + services.tor.settings.ControlPort = 9051; }; exporterTest = '' wait_for_unit("tor.service") diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index 1d3679c82a2..5101628a682 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -1,140 +1,95 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: + let user = "someuser"; password = "some_password"; - port = builtins.toString 5232; + port = "5232"; + filesystem_folder = "/data/radicale"; - common = { pkgs, ... }: { + cli = "${pkgs.calendar-cli}/bin/calendar-cli --caldav-user ${user} --caldav-pass ${password}"; +in { + name = "radicale3"; + meta.maintainers = with lib.maintainers; [ dotlambda ]; + + machine = { pkgs, ... }: { services.radicale = { enable = true; - config = '' - [auth] - type = htpasswd - htpasswd_filename = /etc/radicale/htpasswd - htpasswd_encryption = bcrypt - - [storage] - filesystem_folder = /tmp/collections - ''; + settings = { + auth = { + type = "htpasswd"; + htpasswd_filename = "/etc/radicale/users"; + htpasswd_encryption = "bcrypt"; + }; + storage = { + inherit filesystem_folder; + hook = "git add -A && (git diff --cached --quiet || git commit -m 'Changes by '%(user)s)"; + }; + logging.level = "info"; + }; + rights = { + principal = { + user = ".+"; + collection = "{user}"; + permissions = "RW"; + }; + calendars = { + user = ".+"; + collection = "{user}/[^/]+"; + permissions = "rw"; + }; + }; }; + systemd.services.radicale.path = [ pkgs.git ]; + environment.systemPackages = [ pkgs.git ]; + systemd.tmpfiles.rules = [ "d ${filesystem_folder} 0750 radicale radicale -" ]; # WARNING: DON'T DO THIS IN PRODUCTION! # This puts unhashed secrets directly into the Nix store for ease of testing. - environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} '' + environment.etc."radicale/users".source = pkgs.runCommand "htpasswd" {} '' ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password} ''; }; + testScript = '' + machine.wait_for_unit("radicale.service") + machine.wait_for_open_port(${port}) -in + machine.succeed("sudo -u radicale git -C ${filesystem_folder} init") + machine.succeed( + "sudo -u radicale git -C ${filesystem_folder} config --local user.email radicale@example.com" + ) + machine.succeed( + "sudo -u radicale git -C ${filesystem_folder} config --local user.name radicale" + ) - import ./make-test-python.nix ({ lib, ... }@args: { - name = "radicale"; - meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; + with subtest("Test calendar and event creation"): + machine.succeed( + "${cli} --caldav-url http://localhost:${port}/${user} calendar create cal" + ) + machine.succeed("test -d ${filesystem_folder}/collection-root/${user}/cal") + machine.succeed('test -z "$(ls ${filesystem_folder}/collection-root/${user}/cal)"') + machine.succeed( + "${cli} --caldav-url http://localhost:${port}/${user}/cal calendar add 2021-04-23 testevent" + ) + machine.succeed('test -n "$(ls ${filesystem_folder}/collection-root/${user}/cal)"') + (status, stdout) = machine.execute( + "sudo -u radicale git -C ${filesystem_folder} log --format=oneline | wc -l" + ) + assert status == 0, "git log failed" + assert stdout == "3\n", "there should be exactly 3 commits" - nodes = rec { - radicale = radicale1; # Make the test script read more nicely - radicale1 = lib.recursiveUpdate (common args) { - nixpkgs.overlays = [ - (self: super: { - radicale1 = super.radicale1.overrideAttrs (oldAttrs: { - propagatedBuildInputs = with self.pythonPackages; - (oldAttrs.propagatedBuildInputs or []) ++ [ passlib ]; - }); - }) - ]; - system.stateVersion = "17.03"; - }; - radicale1_export = lib.recursiveUpdate radicale1 { - services.radicale.extraArgs = [ - "--export-storage" "/tmp/collections-new" - ]; - system.stateVersion = "17.03"; - }; - radicale2_verify = lib.recursiveUpdate radicale2 { - services.radicale.extraArgs = [ "--debug" "--verify-storage" ]; - system.stateVersion = "17.09"; - }; - radicale2 = lib.recursiveUpdate (common args) { - system.stateVersion = "17.09"; - }; - radicale3 = lib.recursiveUpdate (common args) { - system.stateVersion = "20.09"; - }; - }; + with subtest("Test rights file"): + machine.fail( + "${cli} --caldav-url http://localhost:${port}/${user} calendar create sub/cal" + ) + machine.fail( + "${cli} --caldav-url http://localhost:${port}/otheruser calendar create cal" + ) - # This tests whether the web interface is accessible to an authenticated user - testScript = { nodes }: let - switchToConfig = nodeName: let - newSystem = nodes.${nodeName}.config.system.build.toplevel; - in "${newSystem}/bin/switch-to-configuration test"; - in '' - with subtest("Check Radicale 1 functionality"): - radicale.succeed( - "${switchToConfig "radicale1"} >&2" - ) - radicale.wait_for_unit("radicale.service") - radicale.wait_for_open_port(${port}) - radicale.succeed( - "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" - ) + with subtest("Test web interface"): + machine.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") - with subtest("Export data in Radicale 2 format"): - radicale.succeed("systemctl stop radicale") - radicale.succeed("ls -al /tmp/collections") - radicale.fail("ls -al /tmp/collections-new") - - with subtest("Radicale exits immediately after exporting storage"): - radicale.succeed( - "${switchToConfig "radicale1_export"} >&2" - ) - radicale.wait_until_fails("systemctl status radicale") - radicale.succeed("ls -al /tmp/collections") - radicale.succeed("ls -al /tmp/collections-new") - - with subtest("Verify data in Radicale 2 format"): - radicale.succeed("rm -r /tmp/collections/${user}") - radicale.succeed("mv /tmp/collections-new/collection-root /tmp/collections") - radicale.succeed( - "${switchToConfig "radicale2_verify"} >&2" - ) - radicale.wait_until_fails("systemctl status radicale") - - (retcode, logs) = radicale.execute("journalctl -u radicale -n 10") - assert ( - retcode == 0 and "Verifying storage" in logs - ), "Radicale 2 didn't verify storage" - assert ( - "failed" not in logs and "exception" not in logs - ), "storage verification failed" - - with subtest("Check Radicale 2 functionality"): - radicale.succeed( - "${switchToConfig "radicale2"} >&2" - ) - radicale.wait_for_unit("radicale.service") - radicale.wait_for_open_port(${port}) - - (retcode, output) = radicale.execute( - "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" - ) - assert ( - retcode == 0 and "VCALENDAR" in output - ), "Could not read calendar from Radicale 2" - - radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") - - with subtest("Check Radicale 3 functionality"): - radicale.succeed( - "${switchToConfig "radicale3"} >&2" - ) - radicale.wait_for_unit("radicale.service") - radicale.wait_for_open_port(${port}) - - (retcode, output) = radicale.execute( - "curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/" - ) - assert ( - retcode == 0 and "VCALENDAR" in output - ), "Could not read calendar from Radicale 3" - - radicale.succeed("curl --fail http://${user}:${password}@localhost:${port}/.web/") - ''; + with subtest("Test security"): + output = machine.succeed("systemd-analyze security radicale.service") + machine.log(output) + assert output[-9:-1] == "SAFE :-}" + ''; }) diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index c424288e00a..deddb9d0834 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "signal-desktop"; meta = with pkgs.lib.maintainers; { - maintainers = [ flokli ]; + maintainers = [ flokli primeos ]; }; machine = { ... }: @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; test-support.displayManager.auto.user = "alice"; - environment.systemPackages = [ pkgs.signal-desktop ]; + environment.systemPackages = with pkgs; [ signal-desktop file ]; virtualisation.memorySize = 1024; }; @@ -39,5 +39,17 @@ import ./make-test-python.nix ({ pkgs, ...} : machine.wait_for_text("Signal") machine.wait_for_text("File Edit View Window Help") machine.screenshot("signal_desktop") + + # Test if the database is encrypted to prevent these issues: + # - https://github.com/NixOS/nixpkgs/issues/108772 + # - https://github.com/NixOS/nixpkgs/pull/117555 + print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'")) + # TODO: The DB should be encrypted and the following should be machine.fail + # instead of machine.succeed but the DB is currently unencrypted and we + # want to notice if this isn't the case anymore as the transition to a + # encrypted DB can cause data loss!: + machine.succeed( + "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -i sqlite" + ) ''; }) diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index fad7f7dc4e6..1d23b0e9431 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -38,6 +38,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : programs.sway.enable = true; + # To test pinentry via gpg-agent: + programs.gnupg.agent.enable = true; + virtualisation.memorySize = 1024; # Need to switch to a different VGA card / GPU driver than the default one (std) so that Sway can launch: virtualisation.qemu.options = [ "-vga virtio" ]; @@ -80,6 +83,17 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.send_key("alt-shift-q") machine.wait_until_fails("pgrep alacritty") + # Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if + # $WAYLAND_DISPLAY is correctly imported into the D-Bus user env): + machine.succeed( + "su - alice -c 'swaymsg -- exec gpg --no-tty --yes --quick-generate-key test'" + ) + machine.wait_until_succeeds("pgrep --exact gpg") + machine.wait_for_text("Passphrase") + machine.screenshot("gpg_pinentry") + machine.send_key("alt-shift-q") + machine.wait_until_fails("pgrep --exact gpg") + # Test swaynag: machine.send_key("alt-shift-e") machine.wait_for_text("You pressed the exit shortcut.") diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 76ed0e9cc1f..c8ffba2c2a7 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -82,10 +82,6 @@ mkDerivation rec { util-linux ]; - cmakeFlags = [ - "-DUSE_SYSTEM_TAGLIB=ON" - ]; - postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index d4210c83bb2..c9761542da0 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.9"; + version = "4.0.10"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-FstAKUZVKW9U6QTqqCEDybvbBl+0H9qVHqFMPubdDpk="; + sha256 = "sha256-o3+yL81WO5/UGh0gl4MOewPHTDch/Vij8mzZWOlEkjg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/ethabi/default.nix b/pkgs/applications/blockchains/ethabi/default.nix index 14f83539d70..e2598ba22db 100644 --- a/pkgs/applications/blockchains/ethabi/default.nix +++ b/pkgs/applications/blockchains/ethabi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "ethabi"; @@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./add-Cargo-lock.patch ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Ethereum function call encoding (ABI) utility"; homepage = "https://github.com/rust-ethereum/ethabi"; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index d5c6a1a8795..63ae8042da4 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-Y52VFTjRFyC38ZNt6NMtVRA2pn6Y4B/NC4EEuDvIFQQ="; + sha256 = "sha256-Ryo7Ln9nh6rlla4jnhSgqiIqHciGBTDxAjuRzE7BhDs="; }; - cargoSha256 = "sha256-0GrExza6uPF/eFWrXlM4MpCD7TMk2y+uEc5SDj/UQkg="; + cargoSha256 = "sha256-PpFphsSfVTENp1TsnQRuAqKK0hcqFLXp/tDrVSz5mIQ="; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 76ca43aac8d..fbaa8aa2ec7 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -655,10 +655,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.4"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.4.tar"; - sha256 = "0yaspx58w02n3liqy5i4lm6lk5f1fm6v5lfrzp7xaqnngq1f4gbj"; + url = "https://elpa.gnu.org/packages/corfu-0.6.tar"; + sha256 = "0zl769l3mmy4b0pj70dwjllq0224r2w4l45xvaqbj75qfqclj6cj"; }; packageRequires = [ emacs ]; meta = { @@ -1045,10 +1045,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210102"; + version = "20210512"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210102.tar"; - sha256 = "14vpgcncmzzbv8v78v221hdhigvk00vqiizwd8dy0b7hqz6gl0rq"; + url = "https://elpa.gnu.org/packages/eev-20210512.tar"; + sha256 = "0dj49lpqv5vsx02h8mla8cmv5cr5f2qbz74f9dn8q4adpzxsajin"; }; packageRequires = [ emacs ]; meta = { @@ -1148,10 +1148,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.11.tar"; - sha256 = "0s1mpapvcivy25zbhw6ghpg0ym23vb4dsrz876rl4z2rfyckxral"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.12.tar"; + sha256 = "0jzpzif4vrjg5hl0hxg4aqvi6nv56cxa1w0amnkgcz4hsscxkvwm"; }; packageRequires = []; meta = { @@ -1159,16 +1159,21 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: + emms = callPackage ({ cl-lib ? null + , elpaBuild + , fetchurl + , lib + , nadvice + , seq }: elpaBuild { pname = "emms"; ename = "emms"; - version = "7.1"; + version = "7.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.1.tar"; - sha256 = "1dng8dy0w0wsdvvnjnrllwv5a8wq3kj20jik994b7prdx5dn6y52"; + url = "https://elpa.gnu.org/packages/emms-7.2.tar"; + sha256 = "11vqqh9rnzibsfw7wx62rgzl8i8ldpf0hv1sj43nhl5c6dlc8d5z"; }; - packageRequires = [ cl-lib seq ]; + packageRequires = [ cl-lib nadvice seq ]; meta = { homepage = "https://elpa.gnu.org/packages/emms.html"; license = lib.licenses.free; @@ -2824,10 +2829,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.7.1"; + version = "3.7.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.7.1.tar"; - sha256 = "0k73f1qdl51qshnvycjassdh70id5gp5qi5wz7k4zyl8pbampiyd"; + url = "https://elpa.gnu.org/packages/pyim-3.7.5.tar"; + sha256 = "09f34wgzckbxgr5xvaqrj0wdcmnfsb31a6m460f5g0acys20ams5"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3950,10 +3955,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.6"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.6.tar"; - sha256 = "19f6ffljraikz83nc2y9q83zjc4cfyzn9rnwm18lwh6sjsydz6kk"; + url = "https://elpa.gnu.org/packages/vertico-0.8.tar"; + sha256 = "1cdq49csd57vqhrs1nbif79yw4s8c0p2i2ww5n5znzj7rnxwpva4"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index cc82646870c..658756250a0 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -7,10 +7,10 @@ let rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923"; sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df"; }; +in +pkgs.mkShell { -in pkgs.mkShell { - - buildInputs = [ + packages = [ pkgs.bash ]; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 40ff42e9fae..46b20e38529 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210503"; + version = "20210510"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210503.tar"; - sha256 = "0j9p834c67qzxbxz8s1n8l5blylrpb3jh9wywphlb6jgbgl0mw09"; + url = "https://orgmode.org/elpa/org-20210510.tar"; + sha256 = "015c68pk52vksar7kpyb0nkcyjihlczmpq4h5vdv8xayas2qlzc7"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210503"; + version = "20210510"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210503.tar"; - sha256 = "0k0wmnx2g919h3s9ynv1cvdlyxvydglslamlwph4xng4kzcr5lrk"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210510.tar"; + sha256 = "0pdwjnpcsk75jv4qs8n4xia6vspwn6dndbdx9z7kq5vqz7w4ykmw"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index 974b4aa1a41..325b8d2f5ee 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,20 +31,20 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20201121, - 1210 + 20210512, + 1001 ], - "commit": "eb4d1ec4b667040429aa496838f758823dc55788", - "sha256": "0llngx5ccy2v2ppbydg8nmkz4fpv5vz8knj5i7bq2mvf6rsid8jx" + "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", + "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "996f822a7c6a7ff7caf49ee537e92c0d01be1f9c", - "sha256": "0fij6gz4188g7dr3gip1w5bc1947j45gf2xc2xl8gyg6hb9c7ycq" + "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", + "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" } }, { @@ -221,11 +221,11 @@ "repo": "mkjunker/abc-mode", "unstable": { "version": [ - 20171020, - 1019 + 20210508, + 1552 ], - "commit": "15691b32431b50f9106cb9fa50ee7244957a8ac8", - "sha256": "089l4rmxrnm4fmrbgw98rjigy3hzkx4lkw9hv8gn36cv2fp61h71" + "commit": "80fa954787b57d14e21e19bd65e52abab1686f4a", + "sha256": "0x7y2r5kijzg33jqlwym8lw1ivx00j3g7lzbl171wzyy3qn15bk5" }, "stable": { "version": [ @@ -1786,11 +1786,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20210219, - 1548 + 20210510, + 1902 ], - "commit": "438e2b9ca1ce9fd1043998359dfe5a32a0ddb6d0", - "sha256": "1fpk7lc5z9v8an9x8j1v3l2pkbg93368qv23jzsqs84r3ndw5b7k" + "commit": "4832a51c2e94e969a99817ccdd13d656344d0afc", + "sha256": "0iyijlyj1d7k5m9mk3blb4wlam652487jhayrmgfy25snqd8b0sm" }, "stable": { "version": [ @@ -1911,15 +1911,15 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210220, - 2039 + 20210505, + 1142 ], "deps": [ "annotation", "eri" ], - "commit": "26d473648853255a6a46d9dedff66df7f644c42f", - "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6" + "commit": "82abfa4cfbfe7ebdfa818e526d03a1e2d9de5175", + "sha256": "0hxa4mxzxld8rjxydqrygcrdc8pf19jh9l5rbngls1h3knh9b9df" }, "stable": { "version": [ @@ -2504,15 +2504,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210405, - 1824 + 20210505, + 840 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "e7775f85a2bb9c13a4c55417ae8d6f16477e3ca0", - "sha256": "0jys6kvwgkf04cyzxh5r2g38qfcpqas4qqyqqkmp8z8vc68fnwz0" + "commit": "0138c7e7f3b7a6c09665e45a6dd2168359efd47c", + "sha256": "0nbbkasbklxf62rx9mc5w37r014vdbbg3vm5dy03hxzvq3y1yrpn" }, "stable": { "version": [ @@ -3104,11 +3104,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210429, - 1258 + 20210506, + 1306 ], - "commit": "ff3a0089e0a2d64803a152bdb126fd7d3de5dbc9", - "sha256": "0c54yjrf33fx9v0m2gh67gjnwzjb5s7b5s3f4g6aic7s052ywmix" + "commit": "bd12129213f5b87aaffc6a6dca25c3c2e4b68301", + "sha256": "18fji3c9ggzw9iyqz3yzxxpkzxr2mndph1cpxcfg5aapfcb5h11l" }, "stable": { "version": [ @@ -3146,8 +3146,8 @@ 20200914, 644 ], - "commit": "26d473648853255a6a46d9dedff66df7f644c42f", - "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6" + "commit": "82abfa4cfbfe7ebdfa818e526d03a1e2d9de5175", + "sha256": "0hxa4mxzxld8rjxydqrygcrdc8pf19jh9l5rbngls1h3knh9b9df" }, "stable": { "version": [ @@ -3644,11 +3644,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210408, - 1935 + 20210512, + 1544 ], - "commit": "a21c143b7cc92a0d8402955d079fc78c4140c2ff", - "sha256": "04zs9785b7j16gcgbi26xcl6bhmclprz5pj1jzb40igy7f2kwyqs" + "commit": "12e010d9f10924056035733d5d773281413dc15b", + "sha256": "1n99k5dr9gdgxhaqnzv695q4zsgk5wvahigzcll2k4jbnhja31q2" }, "stable": { "version": [ @@ -3775,11 +3775,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20210321, - 1641 + 20210511, + 653 ], - "commit": "1724860a6a930a539472bb56bc3cae0e317dc055", - "sha256": "184phkylr4ax586glx7qx2f8yfdbbjx94vwq698z2yxs4jphni91" + "commit": "a93de7e8fef202163df4657f2ab522b57f70f202", + "sha256": "1jmwjz1ldr0lgh3vvpn8y6qzpqzavmdqcgf9jz4sx0v8nd5hr4pn" } }, { @@ -4517,26 +4517,26 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20201122, - 1157 + 20210503, + 2047 ], "deps": [ "packed" ], - "commit": "4952a1a1cadf1bdf7018610a71f8c3acb67962c2", - "sha256": "17p7jmr8qd3hgx79iiljsi2kpy24g8v2ynxiz023wanasxr6bdc6" + "commit": "ec4c700f5a7d6af6992b50d7b309c8d9a7c07a7c", + "sha256": "0b3g81hwaz0qjlzfhqfx0k60injbfka965mc5y4dzlrph00x7slm" }, "stable": { "version": [ 1, 6, - 1 + 2 ], "deps": [ "packed" ], - "commit": "f8619d1616b523918323914ec77bfbee2c559781", - "sha256": "1qcszjjqkq811p8pafjx0knm4giv7dls4x1xamhzbndjz0d022kz" + "commit": "ec4c700f5a7d6af6992b50d7b309c8d9a7c07a7c", + "sha256": "0b3g81hwaz0qjlzfhqfx0k60injbfka965mc5y4dzlrph00x7slm" } }, { @@ -5335,8 +5335,8 @@ "cl-lib", "dash" ], - "commit": "69488c71dfc182cf2e7be2d745037f230ade678e", - "sha256": "0l3xsnp5j46jcjc1nkfbfg0pyzdi94rn0h5idfpqikj6f3ralh10" + "commit": "8ec0c27a73b2d0a335eda63fde695a101e2956b2", + "sha256": "1m2r5fg5r4gqhim5l1g5937ngkc2hvidb5kr8r4pffcg8xv8djgn" }, "stable": { "version": [ @@ -5390,11 +5390,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20201223, - 750 + 20210507, + 1127 ], - "commit": "d5471776c01a2bdf2a1fa255a79447489cf68e65", - "sha256": "1m1s7fzl8hxzkx0672l62jpkak0v8vdyb7l6nmw9648rww78gzyl" + "commit": "2da6de854b07f696da0cbc9e6961b3d228295f5e", + "sha256": "14rqaf6gaxabz92s9cv9fm7pjhc2vm154yjyvj3phaj188nn298x" } }, { @@ -5442,8 +5442,8 @@ "avy", "embark" ], - "commit": "05aa11bca37db1751c86fe78f784741be5b1a066", - "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9" + "commit": "d82f8c73fae4d2d7283838cf5111366384775977", + "sha256": "0268sdajb0213ggcshx6grwqx776qdi246nklhyxavxcyg4hw567" }, "stable": { "version": [ @@ -5760,11 +5760,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20200813, - 1839 + 20210513, + 129 ], - "commit": "38fcb9256c3bf7300a41332fa7f9feffc4e2db9a", - "sha256": "0982il82v10yclm87b06ghwv4cglw03ia0zs4m838ag6zg8a08jg" + "commit": "b6826a60440d8bf440618e3cdafb40158de920e6", + "sha256": "0nj5l0wwza1j908n9k0896b972b84s401szkgb0acf4fs834vc0w" } }, { @@ -6028,11 +6028,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20210406, - 1956 + 20210506, + 1530 ], - "commit": "b35d21ae0d46856416b64851ccbb5e44ee9498d0", - "sha256": "04vs50a5wh0ziq34hh9li5d84nv39p3akaync1i9sbmr4kxkhr1l" + "commit": "59692942f34b9be0447a7766ad03115d04e79874", + "sha256": "1la7671sz666in8zx35j517sbj2y4jyasnj0x9yxh5n4g5qdrnbp" }, "stable": { "version": [ @@ -6502,11 +6502,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20210320, - 1115 + 20210504, + 341 ], - "commit": "18d0bbde367dfe259d697d1c589e3040d69797ee", - "sha256": "13gdlaiqi3jnavwrwj5ic9aqycfvbzw8d4v0413nwzag35bz4mpl" + "commit": "4b4e4808dc3248ea61b3d8bdd7c6b73edd3b6902", + "sha256": "0cx8k5vvqkhkaa9ay4cnb2gshi8118zq87ddbxmffai6ryj2lg7b" }, "stable": { "version": [ @@ -6951,14 +6951,14 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210503, - 1214 + 20210511, + 12 ], "deps": [ "bibtex-completion" ], - "commit": "149f9aefd2fc90e32f25a0b290e975da55ab8fe6", - "sha256": "16264is954pdh0jvnjw057sdccl297w1v8r9wg39raljl44vzr44" + "commit": "d994b7e34e39adcc069685220c7c3cb7516625b9", + "sha256": "1jxdfyf68d1gc240kzvllzlk7wzhsdg4m50r8g6m6a9xnyzi68ad" }, "stable": { "version": [ @@ -7836,8 +7836,8 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20210413, - 1322 + 20210509, + 1905 ], "deps": [ "dash", @@ -7845,8 +7845,8 @@ "multiple-cursors", "pcre2el" ], - "commit": "a4f2d2caaf2d7a0adf36c19ea20a79dcfa129cad", - "sha256": "1m3yw1i6c5j3fswbcyrk95qa7azq26bgzc7zcmjncx23idijhfpf" + "commit": "f1fba331e1941d9cc805e5636c1475665d81c9f6", + "sha256": "1b022y4rd2i2i934bihpjwpm90jac842c2jd3q6qm66k0f588bqc" }, "stable": { "version": [ @@ -10118,15 +10118,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20210420, - 1415 + 20210507, + 1633 ], "deps": [ "cl-lib", "powerline" ], - "commit": "51f28d03936aef5237f14bc08b2ae26949ecef0f", - "sha256": "13cg8ds0dkrw26ln4qi7yfb4gdbcavky6ykyhx49ph0gzinjhd3b" + "commit": "9c7c936e4e1de6f4f4095d70e43c9ae738d05086", + "sha256": "0h0v3yiz9qis99l83x588b94va13jzanfwacmgvq29ygp0a87n65" }, "stable": { "version": [ @@ -10253,8 +10253,8 @@ 20171115, 2108 ], - "commit": "0c75766aa79f1f744011a1bddd8659e3631177dc", - "sha256": "1crww8asa1cxknmbdf46xjm7rlxzss5wqzn5bza5f2wwj5mw9gpj" + "commit": "794e723a8d4baf40bab11adcd22e3c7659f8e395", + "sha256": "055p90swfnvl2jp6kp22z5rgfmwwwmgiwq80n6pijgk43dxhwlh9" }, "stable": { "version": [ @@ -10688,6 +10688,21 @@ "sha256": "1niin51xwkd8q3wbwcgb0gyk3sw1829qj2p2zv7fm8ljy1jicn2d" } }, + { + "ename": "chembalance", + "commit": "780449de5166ddfc2a87ecaf4127f18bf4e7f81f", + "sha256": "14qqqzq5xj18f46pibdyfbypffd7xdimazcgv7mshbg5kyyryr73", + "fetcher": "github", + "repo": "sergiruiztrepat/chembalance", + "unstable": { + "version": [ + 20210504, + 1505 + ], + "commit": "a3e1b65ece2fd41540bb480b5c5ee5dd19d4b9dd", + "sha256": "1hd77h27hcb1fcca1x64rxl8jmvyr5zni3nfnpqm5cknkh9qr6ma" + } + }, { "ename": "cherry-blossom-theme", "commit": "401ae22f11f7ee808eb696a4c1f869cd824702c0", @@ -10864,59 +10879,57 @@ }, { "ename": "chronometrist", - "commit": "9031f880b8646bf9a4be61f3057dc6a3c50393e8", - "sha256": "1xjxq257iwjd3zzwqicjqs3mdrkg9x299sm7wfx53dac14d7sa9g", - "fetcher": "github", - "repo": "contrapunctus-1/chronometrist", + "commit": "df1ca228013952fbb6b5a4a032449e6709266b2f", + "sha256": "1054d9d7r1gb3y1pw6pj46lx0wcax2xrmb7qkpzj8kh26vcpydi7", + "fetcher": "git", + "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210211, - 601 + 20210507, + 923 ], "deps": [ - "anaphora", "dash", - "s", + "literate-elisp", "seq", "ts" ], - "commit": "d1b42bbf0d134ee6ed6f423956a355ba0a7ac968", - "sha256": "1k7r5rc6vzrnhp9j5bkv45yzqz7zbqrkiry4fzc8w6f36pcw862f" + "commit": "81b12053bc5c645ef27577cc9e6258c4cc8b3f33", + "sha256": "0s483ca4f8192gr9ix9jxjfcmxp30b7qk2jiaqzprkrn9kcgw544" }, "stable": { "version": [ 0, - 6, - 5 + 7, + 0 ], "deps": [ - "anaphora", "dash", - "s", + "literate-elisp", "seq", "ts" ], - "commit": "d1b42bbf0d134ee6ed6f423956a355ba0a7ac968", - "sha256": "1k7r5rc6vzrnhp9j5bkv45yzqz7zbqrkiry4fzc8w6f36pcw862f" + "commit": "81b12053bc5c645ef27577cc9e6258c4cc8b3f33", + "sha256": "0s483ca4f8192gr9ix9jxjfcmxp30b7qk2jiaqzprkrn9kcgw544" } }, { "ename": "chronometrist-goal", - "commit": "61031b9ab0c0dedf88e6947ae2ad8d4ad0351210", - "sha256": "0hcww5qy167fiwwkj33pj8fdc89b61mb767gz85ya5r6d5nd4si3", - "fetcher": "github", - "repo": "contrapunctus-1/chronometrist-goal", + "commit": "df1ca228013952fbb6b5a4a032449e6709266b2f", + "sha256": "05z9jwjf9py0bfxgilh2x05pqjyg9zamf4zl6s6fb7fiz7mfm9k5", + "fetcher": "git", + "url": "https://tildegit.org/contrapunctus/chronometrist-goal.git", "unstable": { "version": [ - 20210104, - 336 + 20210510, + 1831 ], "deps": [ "alert", "chronometrist" ], - "commit": "7a878bd3709b9638caff17b5f49b27c03b06862a", - "sha256": "1gyz0cfq7sqqrcj8d5ikm6xqmbg3njhmbi291fs5jr8bdqrcbbmg" + "commit": "6cb939d160f5d5966d7853aa23f3ed7c7ef9df44", + "sha256": "05jcn67fzf349h3vqvfrwhklan0i037mp0nq53wghfzapv1m7lv8" }, "stable": { "version": [ @@ -10988,8 +11001,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210422, - 802 + 20210508, + 948 ], "deps": [ "clojure-mode", @@ -11000,8 +11013,8 @@ "sesman", "spinner" ], - "commit": "68bc5e393929561a00e2d20e83fd01df37214af2", - "sha256": "0kyliz2vz240g381qkgkyjxh3i9f016a7x4plf2jcw2y5rmqspxl" + "commit": "6c876766776d69847ca0838a162da2b686add6e7", + "sha256": "0s59227hvc6pl0dcwrn39smysapf3mrnyj5mfq525v0dbsh6vik4" }, "stable": { "version": [ @@ -11193,14 +11206,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210423, - 746 + 20210508, + 1616 ], "deps": [ "cl-lib" ], - "commit": "2f70aa236878d9c3726c31d6ba922e2d7076951d", - "sha256": "1fi0qc8qbcgkjjvi5iysifammqcc6nwcrwjhwi713zykd5cir180" + "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", + "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" }, "stable": { "version": [ @@ -11540,6 +11553,21 @@ "sha256": "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx" } }, + { + "ename": "clhs", + "commit": "8db8f451b28ff1ff4bdab5883138a2bc8964973e", + "sha256": "0089c3p37dzf02sk3vwj11x6pyincqh4gil38g76i5p989vjrc50", + "fetcher": "gitlab", + "repo": "sam-s/clhs", + "unstable": { + "version": [ + 20210428, + 1911 + ], + "commit": "7b106c4fb5a6388ab753f94740f6dfadcdeedcbb", + "sha256": "06jwk5i445y800xizp7nv3yzxxfyll6485n4h6vd5xvrpnq3kqxa" + } + }, { "ename": "click-mode", "commit": "1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d", @@ -11962,20 +11990,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210502, - 824 + 20210505, + 712 ], - "commit": "8280e4479c89b0f7958d34febafd6932e5a2b3d3", - "sha256": "0w84cc0s8mgh7zx2qdi6csvxzq436p0cnmkbg8zfcwwpp4x6ncb8" + "commit": "33f267ac182afe8fa82cc321e9f515c0397e35f6", + "sha256": "1v5gqpkw63h4h1c5kyw8dwg08famp89vbgi789yb32md5819l52s" }, "stable": { "version": [ 5, - 12, + 13, 0 ], - "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", - "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" + "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", + "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" } }, { @@ -11992,20 +12020,20 @@ "deps": [ "clojure-mode" ], - "commit": "8280e4479c89b0f7958d34febafd6932e5a2b3d3", - "sha256": "0w84cc0s8mgh7zx2qdi6csvxzq436p0cnmkbg8zfcwwpp4x6ncb8" + "commit": "33f267ac182afe8fa82cc321e9f515c0397e35f6", + "sha256": "1v5gqpkw63h4h1c5kyw8dwg08famp89vbgi789yb32md5819l52s" }, "stable": { "version": [ 5, - 12, + 13, 0 ], "deps": [ "clojure-mode" ], - "commit": "3dc12d3a54ab17dee2db36c8fc48eb9598a17c5e", - "sha256": "14ipfy9ji39pnb9x7bzjp8lyqyxk168fx017m823j7a2g9i0sgp3" + "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", + "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" } }, { @@ -12258,8 +12286,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20201027, - 1947 + 20210512, + 630 ], "deps": [ "cl-lib", @@ -12267,8 +12295,8 @@ "s", "seq" ], - "commit": "2330f91e51e6cf8a46ce595be3deb0feda223f75", - "sha256": "0y5wbnf1pkzi7jvbvfhybwvbymg13fknpsyychb6f9mdkzcmik4j" + "commit": "89b03795a02dcbfb14046c97230e82736a02f874", + "sha256": "027j4dcvjvvnjh6aln8brmi8xny787n0y2ycrajx043zjmh6x0cg" }, "stable": { "version": [ @@ -12295,8 +12323,8 @@ 20210104, 1831 ], - "commit": "4e5893b658b1c360c1b2d9413dbd66b2b02dbacc", - "sha256": "0ywi74q3csqvn9pb53gcvz5bg9xc94nnq1nbmzsmhf8yj7lrlkcm" + "commit": "169d998bb8cb43e4f7793381fbd79781ffb1548e", + "sha256": "06mha58ld59yq3anh825f4zzdbplq1k71ygkcysh3blnlqzamkz4" }, "stable": { "version": [ @@ -13264,11 +13292,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210503, - 1211 + 20210510, + 2326 ], - "commit": "dbb5d8cac2d7b854e883b381c7504e227a7185eb", - "sha256": "0f31pjgnagq1jv557i0pifsjgp12zm7j2k2qjgf3j64j470ffr99" + "commit": "54fb45080755691793eefa2bd01539e0768c6f63", + "sha256": "0cvgln4vvssfjmhsyqhb1nz5q6jn7fl2bkpq6sm2zr7ga05389ka" }, "stable": { "version": [ @@ -14742,8 +14770,8 @@ "company", "solidity-mode" ], - "commit": "b83354943626ea7c50011d5806b17be17077d1c4", - "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" + "commit": "383ac144727c716c65989c079ae76127e25144c3", + "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" }, "stable": { "version": [ @@ -15459,11 +15487,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210503, - 1638 + 20210511, + 1023 ], - "commit": "665a3105d5cbe6c44a270c1009e74d4fcad9d6d4", - "sha256": "163kfs042gq9kisra23g27zwval6jyl8yanr7y2s1rx185m2z6yb" + "commit": "b873ceeefcb80ae0a00aa5e9ce7d70a71680aa4b", + "sha256": "1d0q8h6mdbmcgfqiz41rcmyrqmwyg1mq76lhp4f8gyxil7w4icb4" }, "stable": { "version": [ @@ -15489,8 +15517,8 @@ "consult", "flycheck" ], - "commit": "665a3105d5cbe6c44a270c1009e74d4fcad9d6d4", - "sha256": "163kfs042gq9kisra23g27zwval6jyl8yanr7y2s1rx185m2z6yb" + "commit": "b873ceeefcb80ae0a00aa5e9ce7d70a71680aa4b", + "sha256": "1d0q8h6mdbmcgfqiz41rcmyrqmwyg1mq76lhp4f8gyxil7w4icb4" }, "stable": { "version": [ @@ -15920,15 +15948,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210423, - 1127 + 20210509, + 830 ], "deps": [ "ivy", "swiper" ], - "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", - "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -16597,11 +16625,11 @@ "repo": "lassik/emacs-cowsay", "unstable": { "version": [ - 20210430, - 1625 + 20210510, + 1540 ], - "commit": "690b4d2c18bbe1a19169b03260b13c663f4f3d96", - "sha256": "0yhxmk07jnj0v40dxpywr1yhlj9srid0n6ds13y4zvih5prrmlms" + "commit": "d8a72a311c6875f1aef6a30b3d23a1b02df75941", + "sha256": "0sczdlhpqs0pgka426ngvvcf01c6lvgk2aykajc5b2zgxywkfg40" } }, { @@ -17590,26 +17618,26 @@ "repo": "tom-tan/cwl-mode", "unstable": { "version": [ - 20171205, - 945 + 20210510, + 1150 ], "deps": [ "yaml-mode" ], - "commit": "bdeb9c0734126f940db80bfb8b1dc735dab671c7", - "sha256": "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3" + "commit": "23a333119efaac78453cba95d316109805bd6aec", + "sha256": "0507acyr9h4646scx316niq27vir6hl2gsgz7wdbiw0cb2drfkd1" }, "stable": { "version": [ 0, 2, - 5 + 6 ], "deps": [ "yaml-mode" ], - "commit": "bdeb9c0734126f940db80bfb8b1dc735dab671c7", - "sha256": "0x9rvyhgy7ijq2r9pin94jz7nisrw6z91jch7d27lkhrmyb1rwk3" + "commit": "23a333119efaac78453cba95d316109805bd6aec", + "sha256": "0507acyr9h4646scx316niq27vir6hl2gsgz7wdbiw0cb2drfkd1" } }, { @@ -17748,8 +17776,8 @@ 20190111, 2150 ], - "commit": "2f493526d09ac8fa3d195bee14a3c9df5e649041", - "sha256": "03qrqppfv3hjabq3ycinkq8ngx5cdx0kixwygk2z9n6pc9n3gsfa" + "commit": "16aba7eb35b2a6f0c88b53da00539a5d875ebfdf", + "sha256": "1cfqwc3cchv10a33yw2hp6y1mb38s7djfbndqhwy32yv3ifsfgz3" }, "stable": { "version": [ @@ -17956,8 +17984,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210425, - 1933 + 20210506, + 1934 ], "deps": [ "bui", @@ -17969,8 +17997,8 @@ "posframe", "s" ], - "commit": "e8fe25768c44ba005e0ff51a0d781ba1693e60a0", - "sha256": "1xjv8fdm7byrwfzw45zhq33s8nbkh6ad1fj04506x2dyiklpp0n1" + "commit": "49af1b8cbd261a5f97e1b2886418dae5e51b452d", + "sha256": "0y1j9whxyvng9q61mmxydkp3ddi99akr9c8nzb1ghwh0cxckgp5m" }, "stable": { "version": [ @@ -18715,29 +18743,29 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20210219, - 748 + 20210510, + 416 ], "deps": [ "dash", "s", "spinner" ], - "commit": "ca16c37ffa5caa5f698bc049012489a2e3071bcc", - "sha256": "055yxchqbqp4pbw9w9phibnp0a2qw1jsb1a5xbfc558phi2vbxdd" + "commit": "83e7812cda2673884b3d4d218757c7489f817fbb", + "sha256": "1fiwr55s4aq38kyai9k77lb7j0kk53bcrrhd8sw0yqb65a1n363i" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ "dash", "s", "spinner" ], - "commit": "411a6973580b3503535ba58e405035bde2392903", - "sha256": "05xsf2axlxdsv8aivd7qyb0ipf9cp95y9f0sf0kaqpc1rn6i79ps" + "commit": "647523452d57e94cec6ebc28e35d3e88487d82dc", + "sha256": "1lb17pisy0zfz9ixawf8rld34m47zil96r3khlv32vzpi84f9x1a" } }, { @@ -20291,11 +20319,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20210416, - 1954 + 20210510, + 2137 ], - "commit": "2a946c72473b3d2e4a7c3827298f54c2b9f3edc2", - "sha256": "1l63il1a0x7clb44wgir8zig0g7acanq830721ss7c2qwzg69rl2" + "commit": "757c82e888d80e5746ccb8654ba58389fa7dc0eb", + "sha256": "0la6xgl3lr5pjs3x5y0l1g66cjdilnw6m0h526chgq140265yg3l" } }, { @@ -20669,15 +20697,15 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210430, - 156 + 20210510, + 931 ], "deps": [ "ess", "ess-view-data" ], - "commit": "3bb4e135486b2166b81fd4f5684bea27fd13081f", - "sha256": "08xsnsqjqxkx53j207hhxps3d9m9cq7d441yi7rpiq9qq7qkpy87" + "commit": "80a5f254fc9e0a8f022e429a53c3d8b1da26c4b8", + "sha256": "04jj3jpgvnvrn7r1z5y7ilh1hah2d6rb91m17ll45i20sakhp2xc" } }, { @@ -20882,11 +20910,11 @@ "repo": "purcell/disable-mouse", "unstable": { "version": [ - 20200304, - 2159 + 20210512, + 2114 ], - "commit": "a8318f5f21716316053cc092ab9abb43cb681fe0", - "sha256": "0z9749hd3x1z2sf3lyzx2rrcfarixmfg0hnc5xsckkgyb7gbn6hq" + "commit": "cae3be9dd012727b40ad3b511731191f79cebe42", + "sha256": "0zx3ihhxhjvhsi08khyx8fdhw2kg065zhhicqc587jsabk0wzj6f" }, "stable": { "version": [ @@ -21890,16 +21918,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210501, - 1628 + 20210511, + 1829 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "12f1ab19b9d1ad8bfea2986b60c527be0425c9f1", - "sha256": "01xh5jdy7csa09i0lz76xqh6x21dklhmmavvvwba9mzq387nijp3" + "commit": "a7f376d4bb591a5b7c6c1222e64b1d0f01c16b9b", + "sha256": "1csalihwn029mqmqgif39sl2wdyg6f6vgvdsh9plac3gp41mmqwp" }, "stable": { "version": [ @@ -21943,14 +21971,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210503, - 1730 + 20210507, + 620 ], "deps": [ "cl-lib" ], - "commit": "cdfbf878bae788b8d4a983c19e3ab3b1d39cfdea", - "sha256": "1swlfbsrmjjzfybl17jvnyqwcxdabqp33zda1cdsdy6hgrmrm9x3" + "commit": "4d24728f11853b5bd231687ac3f7a95108688313", + "sha256": "0kws2305asszwjcc28zsbb6xwg25pxwabm5vml9jqk9w5f3ajl33" }, "stable": { "version": [ @@ -22607,8 +22635,8 @@ 20210213, 757 ], - "commit": "07ca7ccf8ecaad2fb153fbd2ccfda3aeb9d3d5e2", - "sha256": "0kw3bvzvwn6hfa981qn13b3lmm74dwhrllssbs1wyf1fsx0x77ag" + "commit": "66c846e655c6b677963c03cefafa35e08bf0a79e", + "sha256": "1ggq3pd0asynq1fzixyi0i5m8b5z4msgkbw22q7ka48v2awygiil" }, "stable": { "version": [ @@ -22622,20 +22650,31 @@ }, { "ename": "dune-format", - "commit": "9158dc00e15f573e09d311f1389413d6168d7e07", - "sha256": "19kqy05hnzywc8hspv9vh5b7rcgv23rhzay5pcixsy464glxhnj6", + "commit": "82368b9bf29492002918a2d77023ff2ef0b9917c", + "sha256": "00fc7vbxqzx4q2azs26s2jyw3rhfwv3jplh3hk5fiqvrxd0krpix", "fetcher": "github", - "repo": "purcell/dune-format-el", + "repo": "purcell/emacs-dune-format", "unstable": { "version": [ - 20210411, - 2348 + 20210505, + 108 ], "deps": [ "reformatter" ], - "commit": "22af9fcf75eea577a39fc315fd9bcaa709fb4e1c", - "sha256": "0r0329x8r55ivnc6n16hi3rw3556xza5sdw2a06vk17pyiaskf1z" + "commit": "eda7a16ae378e7c482c11228c43ef32b893a1520", + "sha256": "0z39a1c227si435j3k8vkf4q6l01jdf70x69dywsmnrkcrcvrbf8" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "reformatter" + ], + "commit": "eda7a16ae378e7c482c11228c43ef32b893a1520", + "sha256": "0z39a1c227si435j3k8vkf4q6l01jdf70x69dywsmnrkcrcvrbf8" } }, { @@ -23314,14 +23353,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210503, - 1412 + 20210505, + 1914 ], "deps": [ "parsebib" ], - "commit": "3142de8d64789c611e553667cac3bb84428d004c", - "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr" + "commit": "0ed8c3cb1ccc130e9d4060d19e478474cdf3d6e0", + "sha256": "1i37hsgywhcrmsj0cmvs67hzknhx56wrs868k4rrs9cwgc2yf6j1" }, "stable": { "version": [ @@ -24323,8 +24362,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210429, - 1630 + 20210505, + 2237 ], "deps": [ "anaphora", @@ -24335,8 +24374,8 @@ "websocket", "with-editor" ], - "commit": "d33e04da06421813cdffed6af18e5379f7399c07", - "sha256": "0b365lx7sv95k52w8k6zyz5nbs7v7br04mhn9r5xm126a8gcb285" + "commit": "a9903b3b6df26eb5603aa38960c6bd9d826cecb8", + "sha256": "0di5275avxmd014zhwj420zapwdy0a00lkrl8j362f636kwp9lir" }, "stable": { "version": [ @@ -24705,36 +24744,6 @@ "sha256": "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn" } }, - { - "ename": "el-x", - "commit": "0346f6349cf39a0414cd055b06d8ed193f4972d4", - "sha256": "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g", - "fetcher": "github", - "repo": "sigma/el-x", - "unstable": { - "version": [ - 20140111, - 2201 - ], - "deps": [ - "cl-lib" - ], - "commit": "e7c333d4fc31a90f4dca951efe21129164b42605", - "sha256": "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh" - }, - "stable": { - "version": [ - 0, - 3, - 1 - ], - "deps": [ - "cl-lib" - ], - "commit": "e96541c1f32e0a3aca4ad0a0eb382bd898250163", - "sha256": "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5" - } - }, { "ename": "el2markdown", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -25244,8 +25253,8 @@ "repo": "remyhonig/elfeed-org", "unstable": { "version": [ - 20181015, - 1100 + 20210510, + 1219 ], "deps": [ "cl-lib", @@ -25254,8 +25263,8 @@ "org", "s" ], - "commit": "77b6bbf222487809813de260447d31c4c59902c9", - "sha256": "0a2ibka82xq1dhy2z7rd2y9zhcj8rna8357881yz49wf55ccgm53" + "commit": "268efdd0121fa61f63b722c30e0951c5d31224a4", + "sha256": "0krfklh3hyc72m9llz3j7pmf63n4spwlgi88b237vcml9rhlda5b" } }, { @@ -25604,14 +25613,14 @@ "repo": "purcell/elisp-slime-nav", "unstable": { "version": [ - 20200304, - 2201 + 20210510, + 528 ], "deps": [ "cl-lib" ], - "commit": "9ab52362600af9f97f1590f05a295538025170b3", - "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma" + "commit": "8588d80d414aee1fafce5b9da0e913612ee0bcdd", + "sha256": "0bpa0wv2qbll34bvdm31w541zavad6h344csa160z6da3ksihs2i" }, "stable": { "version": [ @@ -25633,14 +25642,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20210324, - 1605 + 20210509, + 2353 ], "deps": [ "pkg-info" ], - "commit": "0212b06f079f4965b6032bbbe7f86876575770de", - "sha256": "0n9b901kzk95r28a17amx25xyffvxbfrxw62sakrn0q3pbq988s2" + "commit": "6bbc1e5ac46064613c982cedc60566ed077e7a58", + "sha256": "051pxppp7bdxjjr56p48khi5vfwf5kj7vvyddr66pfw5fwdpd86m" }, "stable": { "version": [ @@ -26011,11 +26020,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210414, - 208 + 20210509, + 439 ], - "commit": "944c79d654739ae83c8003b2b483e393589eee3f", - "sha256": "1i1f8l66arwsl6yh9wfn63lnjnb4ifrqhhvnakrmhqckxrs009lm" + "commit": "193dd942cd74f71d94067f48249427676ba7dec8", + "sha256": "0hwsy780x1kw1c9k1xrbrbip6l62fa41czal0nnqr9li0brig7d7" }, "stable": { "version": [ @@ -26387,11 +26396,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210426, - 1933 + 20210504, + 1306 ], - "commit": "95fe33007c663bc22ac60b6969551e07ce6cfa10", - "sha256": "0b2757m8zgdnb8vr21593ih5bq0cz0asy0i1x6sjr6mpd3sgysf9" + "commit": "53d257db92fb72ade8ea1b91dc6839c21563119e", + "sha256": "1qccz8z0410xhygrfy62h1j3553avdcb7m61ps6b6y74nz615l1r" }, "stable": { "version": [ @@ -26708,11 +26717,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210430, - 1740 + 20210509, + 1849 ], - "commit": "05aa11bca37db1751c86fe78f784741be5b1a066", - "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9" + "commit": "d82f8c73fae4d2d7283838cf5111366384775977", + "sha256": "0268sdajb0213ggcshx6grwqx776qdi246nklhyxavxcyg4hw567" }, "stable": { "version": [ @@ -26738,8 +26747,8 @@ "consult", "embark" ], - "commit": "05aa11bca37db1751c86fe78f784741be5b1a066", - "sha256": "1nnrn6dd248l6ngvgjjniqkahlwz45y3n50nw555a67pmi88grh9" + "commit": "d82f8c73fae4d2d7283838cf5111366384775977", + "sha256": "0268sdajb0213ggcshx6grwqx776qdi246nklhyxavxcyg4hw567" }, "stable": { "version": [ @@ -26906,8 +26915,21 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210503, - 1629 + 20210512, + 1407 + ], + "deps": [ + "cl-lib", + "nadvice", + "seq" + ], + "commit": "a435df9461bd141848504418b4bc7bcea7cc881c", + "sha256": "1jkfgv02g4sixa85fzr1m61mac4rgn0059pnjkbdp8kvcqp38x54" + }, + "stable": { + "version": [ + 7, + 2 ], "deps": [ "cl-lib", @@ -26916,18 +26938,6 @@ ], "commit": "b0173b6b4c5b66a4706cb82c9b50a179bf159a0f", "sha256": "1scppj8wkiml4dgsg4540hdd8mv9ghcp2r17b647az0ccxwp73qm" - }, - "stable": { - "version": [ - 7, - 1 - ], - "deps": [ - "cl-lib", - "seq" - ], - "commit": "e1247af518d0d983d889d5ba60bbde38431d0c68", - "sha256": "17ny15p26nl29k2jis4kslh85cryljb151p71w5886rf3abr58pb" } }, { @@ -28293,8 +28303,8 @@ 20200914, 644 ], - "commit": "26d473648853255a6a46d9dedff66df7f644c42f", - "sha256": "18yz278724ydvkdpcwiszfx4lg40bqbwq78268pr5mg0wif0y4q6" + "commit": "82abfa4cfbfe7ebdfa818e526d03a1e2d9de5175", + "sha256": "0hxa4mxzxld8rjxydqrygcrdc8pf19jh9l5rbngls1h3knh9b9df" }, "stable": { "version": [ @@ -28318,18 +28328,16 @@ 20210315, 1640 ], - "commit": "ed2aee59bd43ff1cd0ac29a9b4bc2ecd5ba6ebdc", - "sha256": "1148di7jk8ayq07ck4zd0wxrw90iigrwzg2j9xmjh8skddh0yihd" + "commit": "3a8e65972ac1d0c4ae1412eae2dc2b3e5b3d758d", + "sha256": "02vgl6scx1mjmhknzdfwc4p8c8f1mj67hxn81kwkd7nhp0hz1fnj" }, "stable": { "version": [ 24, - 0, - -1, - 3 + 0 ], - "commit": "dd36117cca61bfd2554bf7980b170f76bbf92278", - "sha256": "0sq6kzs8zsvv9anmrjv85sy2m1yvysjfn9fmyf0m7ffx648lwv4n" + "commit": "583cba31eb09c14abd0b217fe7ac2e9a60425d51", + "sha256": "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w" } }, { @@ -29080,11 +29088,11 @@ "repo": "dgutov/espresso-theme", "unstable": { "version": [ - 20181025, - 826 + 20210505, + 1957 ], - "commit": "d2fa034eb833bf37cc6842017070725e0da9b046", - "sha256": "0fds36w6l2aaa88wjkd2ck561i0wwpxgz5ldadhbi5lvfwj9386m" + "commit": "580f673729f02aa07070c5300bedf24733d56e74", + "sha256": "1fxnsz0v7hizs7wf8pjfm7jwbrm9vg5gvxv1a6ixgfajka79amfw" } }, { @@ -29181,11 +29189,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210414, - 2354 + 20210510, + 2052 ], - "commit": "1782c6730a8fadcf4c162c7aac4329d4e28259b6", - "sha256": "0whjmvxxpx55cndngmky04kbfhcxamb7h3nhaclklm5sjlbc16qa" + "commit": "5b807fdc1e5b564e17753b84fc634c1fbd2bfe7f", + "sha256": "02g677f84l7hq5n86yiwn52q26mnpcvp1vn6ix7hhb6jigbgs32f" }, "stable": { "version": [ @@ -29775,15 +29783,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210424, - 1855 + 20210503, + 2034 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "adb551dc36492c74ea6c2a75a85465c6bbbc1cf2", - "sha256": "090q0dcy019clrs3nkp68ljcfk1dggzlhl7x8dsvd1bb6a8phn67" + "commit": "8dc0ccdc4c0246af87588a93812a23268f83ab94", + "sha256": "0h09jhq1fpy3qn9ngj04ndjx4r5gxiypwj38z1hmy69nwc9ng02i" }, "stable": { "version": [ @@ -29977,15 +29985,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210424, - 2326 + 20210507, + 1741 ], "deps": [ "annalist", "evil" ], - "commit": "09b165d4c2ecac66224f674966c920c25d20f3f6", - "sha256": "1gj4ds110kx10bgxxflin7ghj3bcyll8pv2h4cqkp9wv79f7plam" + "commit": "23c60d576cf2ca4e931ca43815ceccc3f98acec1", + "sha256": "1d4nbs64cl0pq48xvd4ylpn4rgjsl3k03pcdshlbw1ifqkh55i50" }, "stable": { "version": [ @@ -30678,11 +30686,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210311, - 37 + 20210512, + 1346 ], - "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c", - "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d" + "commit": "9e7e96971900a2840fe2f7e8d6774c92fed2ccba", + "sha256": "04wyz472g4dlyyj7415s8wp4djaizrh7ncngqx8bl6zanksqyv56" }, "stable": { "version": [ @@ -30711,17 +30719,17 @@ }, { "ename": "evil-numbers", - "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", - "sha256": "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2", + "commit": "00d26e91412c9132287ea0019afc29abfc4fb171", + "sha256": "0g02z6jp448lm7dyicxpm53k11f7wgjzn39zgla6p7gg6nmz5hpc", "fetcher": "github", - "repo": "cofi/evil-numbers", + "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20140606, - 1251 + 20210512, + 2158 ], - "commit": "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e", - "sha256": "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np" + "commit": "b54cc5ba35859df15ea9b0405314d9a8ab152743", + "sha256": "1w77ga0r5iwda7ccn7sywndmri4yrryxsb790absx98k69dsai5s" }, "stable": { "version": [ @@ -31300,8 +31308,8 @@ "deps": [ "evil" ], - "commit": "adb551dc36492c74ea6c2a75a85465c6bbbc1cf2", - "sha256": "090q0dcy019clrs3nkp68ljcfk1dggzlhl7x8dsvd1bb6a8phn67" + "commit": "8dc0ccdc4c0246af87588a93812a23268f83ab94", + "sha256": "0h09jhq1fpy3qn9ngj04ndjx4r5gxiypwj38z1hmy69nwc9ng02i" }, "stable": { "version": [ @@ -31324,15 +31332,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20201103, - 1410 + 20210510, + 1809 ], "deps": [ "auctex", "evil" ], - "commit": "c0b8a9215bba6844487f2a678ea85a0a6e1da825", - "sha256": "1vkdq4cf4q3ngdx0f6yx9mgrjm63i8bx7hxa73d9gkbbplkkkjw5" + "commit": "87445d4d2339436179e792609bfbff0eaf056a9c", + "sha256": "014bwsnry6v07n9cv194gsiwny0jp6rxs5gl4dhqfwq9hbj74p84" }, "stable": { "version": [ @@ -32089,11 +32097,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20210316, - 205 + 20210512, + 2350 ], - "commit": "81d79cb2f611aef10fd7b05f6d47977a66502a08", - "sha256": "0bmpmiaz32id2yplfp2vmg3bjbfypg8k0mac8m7v6jclaprw3mal" + "commit": "eb2dee8860f3d761e949d7c2ee8e2e469ac1cf51", + "sha256": "0ivb3c00jlqblzjxw36z3nmqqvv2djyzk69yhlzjw2nl2r2xmhnd" } }, { @@ -33208,15 +33216,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20210405, - 524 + 20210507, + 111 ], "deps": [ "dash", "helm" ], - "commit": "1328a624847886f8f92dfaf13fb6d73ba3d5d7a6", - "sha256": "1zvv3h6c488v8wqnw71inz4s6ag3bnpnsqm1k20n9kwsfqysr1rf" + "commit": "113aadfae8ec94fe4ba956dfa6f47fd35b971b3c", + "sha256": "09jddwh0qlawh9isahjw0bn4701j4plgy15j1f514h144chl9z5m" } }, { @@ -33639,11 +33647,11 @@ "url": "https://depp.brause.cc/firestarter.git", "unstable": { "version": [ - 20200506, - 1311 + 20210508, + 1626 ], - "commit": "d26bfaaf231a801f7bccf4c5edb51a521ddb7694", - "sha256": "19hmdfrdwiqpsamxsh0zixhgmbkm5pw7p4y4rn0z4k3k0spxajx5" + "commit": "76070c9074aa363350abe6ad06143e90b3e12ab1", + "sha256": "0agw50yrv2hylqqq8c4cjwl3hwfyfsbk74mpys8mi9lsycfw1sg9" }, "stable": { "version": [ @@ -35363,25 +35371,33 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20210106, - 1422 + 20210504, + 1852 ], "deps": [ "flycheck" ], - "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", - "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" + "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", + "error": [ + "exited abnormally with code 1\n", + "", + "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-CWrbtBP5/flycheck-grammalecte-f488739/.git/\nfatal: unable to access 'https://git.umaneti.net/flycheck-grammalecte/': OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to git.umaneti.net:443 \nerror: Unable to get pack file https://git.umaneti.net/flycheck-grammalecte/objects/pack/pack-242bc54824844c700bc4fe4a590b9082bf927286.pack\nOpenSSL SSL_read: Connection timed out, errno 110\nerror: Unable to find e9a9751059211e2725b4b68614a5f47ba34f0788 under https://git.umaneti.net/flycheck-grammalecte\nCannot obtain needed object e9a9751059211e2725b4b68614a5f47ba34f0788\nwhile processing commit af9a044c1efab8a9b315cad110b15e9e143a6642.\nerror: fetch failed.\nUnable to checkout f488739aea2ef5c8d39bd28083dd72fdfee46e02 from https://git.umaneti.net/flycheck-grammalecte/.\n" + ] }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "flycheck" ], - "commit": "69f1f276057dadc7aaa8d1669d68ab17986e5b37", - "sha256": "0ih0nakal36is0dci82gx4ijrvnpz9jpw1adprfara2cf8dx4rk6" + "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", + "error": [ + "exited abnormally with code 1\n", + "", + "Initialized empty Git repository in /run/user/1000/git-checkout-tmp-CWrbtBP5/flycheck-grammalecte-f488739/.git/\nfatal: unable to access 'https://git.umaneti.net/flycheck-grammalecte/': OpenSSL SSL_connect: SSL_ERROR_SYSCALL in connection to git.umaneti.net:443 \nerror: Unable to get pack file https://git.umaneti.net/flycheck-grammalecte/objects/pack/pack-242bc54824844c700bc4fe4a590b9082bf927286.pack\nOpenSSL SSL_read: Connection timed out, errno 110\nerror: Unable to find e9a9751059211e2725b4b68614a5f47ba34f0788 under https://git.umaneti.net/flycheck-grammalecte\nCannot obtain needed object e9a9751059211e2725b4b68614a5f47ba34f0788\nwhile processing commit af9a044c1efab8a9b315cad110b15e9e143a6642.\nerror: fetch failed.\nUnable to checkout f488739aea2ef5c8d39bd28083dd72fdfee46e02 from https://git.umaneti.net/flycheck-grammalecte/.\n" + ] } }, { @@ -36065,27 +36081,27 @@ "repo": "purcell/flycheck-package", "unstable": { "version": [ - 20200304, - 2151 + 20210509, + 2323 ], "deps": [ "flycheck", "package-lint" ], - "commit": "303f9e0708292937a668e1145f5eaa19d7d374e2", - "sha256": "0xav8x3vs7i8kvvhnq86scahjzv6m9mnpiibapflc995wqs4yq02" + "commit": "ecd03f83790611888d693c684d719e033f69cb40", + "sha256": "00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849" }, "stable": { "version": [ 0, - 13 + 14 ], "deps": [ "flycheck", "package-lint" ], - "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9", - "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq" + "commit": "ecd03f83790611888d693c684d719e033f69cb40", + "sha256": "00py39n1383761wq6wp194pvyk94ydqdbxj9kl64g9jnipkp7849" } }, { @@ -38079,8 +38095,8 @@ 20210124, 1143 ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38107,8 +38123,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38139,8 +38155,8 @@ "flyspell-correct", "helm" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38171,8 +38187,8 @@ "flyspell-correct", "ivy" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38203,8 +38219,8 @@ "flyspell-correct", "popup" ], - "commit": "d19a090b978a249fc8f6d8b14309a5705a6bb483", - "sha256": "1p9s1qcqk834r0lkqzch8gb7c8qrpvbhxfyb44bgjd9qcw0kzr3s" + "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", + "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" }, "stable": { "version": [ @@ -38571,11 +38587,11 @@ "repo": "Fuco1/fontify-face", "unstable": { "version": [ - 20180420, - 1624 + 20210503, + 1956 ], - "commit": "30ec0134f04d2b156bbc772e94edfa1a31ef0a58", - "sha256": "1i7hc436230dn68q2r7das7rgg8x0j3h43sv23krrg4qr0n0v07y" + "commit": "d1386c88ccc77ccfb40b888ff90d6181325d14f8", + "sha256": "1fi8sa7d6p6zgpvrnmpl85jfxqnl43053krb4h2lw0cgxd2wbd1v" }, "stable": { "version": [ @@ -38676,8 +38692,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210426, - 2126 + 20210507, + 1554 ], "deps": [ "closql", @@ -38689,8 +38705,8 @@ "markdown-mode", "transient" ], - "commit": "aa5891178aa67d61ec17069375c07ca989f5741e", - "sha256": "07rxs00kk3xmk97i24rf7nbmcfdpa949j351ijcp3pdadinlijzw" + "commit": "37aa4e4b82a99246b3551daee6104dc1d192174a", + "sha256": "01z6mnl68lwm0nj0mbvns6xacfydadwcmjzfy3vnmj7hkcd9nynd" }, "stable": { "version": [ @@ -38721,11 +38737,11 @@ "url": "https://depp.brause.cc/form-feed.git", "unstable": { "version": [ - 20201116, - 1108 + 20210508, + 1627 ], - "commit": "26a52410db56fab9888b24b7622d74a2779c719d", - "sha256": "17xg7l6d509ngpdmx56z7mqr2iiyslyb3fhhlccifmnlxbvcr15g" + "commit": "ac1f0ef30a11979f5dfe12d8c05a666739e486ff", + "sha256": "1rrsnc6qwbqk091v1xinfn48fc0gbi3l5fy9hyafgl4zdx5ia2bg" }, "stable": { "version": [ @@ -38890,14 +38906,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210425, - 335 + 20210508, + 938 ], "deps": [ "seq" ], - "commit": "7bee756bab352ecd93253343988bb274645cd10b", - "sha256": "062kp05x2iy0i5ni1viz2r26dnnvlh7wr7lk7pz1qrjh0qqqzi58" + "commit": "d8c0a9b842f332c2b781a1cae03777ef193929c3", + "sha256": "0dya3idd0livajb9xx8fhdaplsv5avr97iqb3jjzkxn367i9dnnj" }, "stable": { "version": [ @@ -39393,8 +39409,8 @@ "repo": "thefrontside/frontmacs", "unstable": { "version": [ - 20210206, - 2008 + 20210512, + 2338 ], "deps": [ "add-node-modules-path", @@ -39406,8 +39422,8 @@ "tide", "web-mode" ], - "commit": "2b0e27a2f5fa18079b00753b3bf9635818e11f71", - "sha256": "0cv0vrz8mv7b8hm3ac8l7zjscavsxix0wiv646n5vx03282zfgpk" + "commit": "dbd6f8845376a0e1de252751206a6cfc7d0ec3ff", + "sha256": "0m7slls2mwvx5jars0fvxvs3x12nhjnmcl0njj03aw02lxb4wh17" } }, { @@ -39508,14 +39524,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20210323, - 1426 + 20210506, + 1352 ], "deps": [ "cl-lib" ], - "commit": "ee4f57c0d0b5bd3fb8277b3bdced55540743162a", - "sha256": "1n89wjlsli7krb4fs8ln55wms5386xky4n2zm7k6457bhbh54fvn" + "commit": "20cefa0fb6514f30738a4b6774e0ce356b4af9bd", + "sha256": "0nbpxxplfg1954yxlj9d54v7ln99qb4fqy5p6d32qxh4v475fbdq" }, "stable": { "version": [ @@ -39849,11 +39865,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20210101, - 1358 + 20210508, + 1516 ], - "commit": "c84beb96b959c0a20d70dad3bb9e3bc275a5b001", - "sha256": "1qb49qw0lyb2v3yn4jzq8fyq45akrl4078kg2q38g3gh9n29wf52" + "commit": "23c09c9c0417c7de67a8965d9b506d0cc7aea7a2", + "sha256": "0c4cz1kyanqswz5ww8aql96hqxg8p8lwwwygw061rq2ycmkl54nk" }, "stable": { "version": [ @@ -40117,8 +40133,8 @@ 20210428, 1942 ], - "commit": "70c3d6d5d247836b2d9d988f204ce804ae5db67d", - "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0" + "commit": "4099dce8f5f17cce8f292cdf0bc1bf2e5cb6975c", + "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag" }, "stable": { "version": [ @@ -40279,25 +40295,25 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20210421, - 118 + 20210508, + 1838 ], "deps": [ "geiser" ], - "commit": "700ac985c1c729ba1005a0a076c683e9f781526f", - "sha256": "0bp70i8505rd0nwl44h9n9swnvqahr2fkhnv3q6020p1hgkjvdjs" + "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", + "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" }, "stable": { "version": [ 0, - 16 + 17 ], "deps": [ "geiser" ], - "commit": "700ac985c1c729ba1005a0a076c683e9f781526f", - "sha256": "0bp70i8505rd0nwl44h9n9swnvqahr2fkhnv3q6020p1hgkjvdjs" + "commit": "8dda28f4f1758221f84f5cb5dc5b5ca5fd56caa9", + "sha256": "0iw23nlgqppf6f00ly50m8lq85n9mv244pw3whxv0hynfjxr2ic0" } }, { @@ -40817,11 +40833,11 @@ "repo": "rcoedo/emacs-ghq", "unstable": { "version": [ - 20160803, - 1557 + 20210504, + 902 ], - "commit": "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825", - "sha256": "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628" + "commit": "582bd6daa505d04c7cc06d6c82ed8aee0624bfbe", + "sha256": "0lb3ic0s32ipvdka8y8grkfi8jb8j821g815v9dnslj7hzh07g2j" }, "stable": { "version": [ @@ -41207,16 +41223,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210328, - 1730 + 20210512, + 1949 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", - "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" }, "stable": { "version": [ @@ -41309,11 +41325,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20210127, - 1100 + 20210511, + 427 ], - "commit": "cca61a1c6b0c0fd6ecb1b0366711c618581eabb6", - "sha256": "1q6qrrxa3mf3pkkqr8piaij3yrgqh48xrrn3a442wn2i427q63kc" + "commit": "d050abdd7f5a46c9cfbec2953d2fca90095e2857", + "sha256": "1bx44spbhags7d2jjfcvanian36vkw1cw186zy7vl2nqwf9hfa95" }, "stable": { "version": [ @@ -41499,11 +41515,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20210318, - 313 + 20210504, + 2207 ], - "commit": "2b510cf3f28bed842853294fc4ee23c7f8b6435a", - "sha256": "0c5p5llxlgi09lymjnh0jpp36v5vfmi6rjb77123gcnsqi0031wn" + "commit": "0d2fd02c160cf2a09ca4b5b4ffa544833df5afed", + "sha256": "1ryb5hfdfv5iaakv74h5wnwislbc4b9ihjc32cy9sc4gizjvrrmp" }, "stable": { "version": [ @@ -43183,8 +43199,8 @@ "cl-lib", "go-mode" ], - "commit": "49a538028e63dbe20f428c52d91f09b70b564626", - "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" + "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", + "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" }, "stable": { "version": [ @@ -43276,11 +43292,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20210201, - 1458 + 20210509, + 2353 ], - "commit": "49a538028e63dbe20f428c52d91f09b70b564626", - "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" + "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", + "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" }, "stable": { "version": [ @@ -43399,8 +43415,8 @@ "deps": [ "go-mode" ], - "commit": "49a538028e63dbe20f428c52d91f09b70b564626", - "sha256": "1zmpbna0picp8iyscrqgvxz5pbkbpapzij0vprkqzfznvihn926n" + "commit": "34974346d1f74fa835d745514c9fe9afccce8dae", + "sha256": "1h0vyp3xbz6xx6warxi23w8kjjgkr0x1lr6r9a2qiz2rywn8jlxf" }, "stable": { "version": [ @@ -43557,8 +43573,8 @@ 20210102, 515 ], - "commit": "02a402b2323e025f77e89cf56d5e678e31a2d2f6", - "sha256": "07xxj1wqxjvzlqp41xj9jz1jfbb8h4578xmbfaqi4isljbadj04k" + "commit": "fcbd45f78b85500f66f323bd19994941832c28d1", + "sha256": "1akrm884nbqjf4l5667cfdxn8xawb2fkri40hv7k8w0pl9cjbamx" }, "stable": { "version": [ @@ -43694,8 +43710,8 @@ 20180221, 2015 ], - "commit": "83fdc39ff7b56453e3793356bcff3070b9b96445", - "sha256": "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3" + "commit": "6edffad5e6160f5949cdefc81710b2706fbcd4f6", + "sha256": "1n7lrr3282q3li4f06afms444qy13rfd316za0drqihakwyki2jk" } }, { @@ -43781,8 +43797,8 @@ 20180130, 1736 ], - "commit": "15fddd2eaf0fd656434b9ea72b374b29ffec7344", - "sha256": "0wya5sp4a4w2kg4c2pl26lpyxh8fvsmapry2sn8r996cd8lkdkra" + "commit": "9c8784ded344f6a35d1e1550385002f613a0c788", + "sha256": "1n1pk876yicv9hvwmja3hs6i7s25nv626p3gxsp9278yb933ml2m" } }, { @@ -43997,11 +44013,11 @@ "url": "https://depp.brause.cc/gotham-theme.git", "unstable": { "version": [ - 20210318, - 2207 + 20210508, + 1632 ], - "commit": "51876a72dbe5a16aeadde2e885da6bbf75909bd1", - "sha256": "042cpdl7srfj1ha3z27xj03bzp3vrz6ql4x0zzvjxsyj08z1q80y" + "commit": "8a97fb8a68cef8e431c972b3d5713b637e21dd7e", + "sha256": "1ldywxhbb34pj7p4rhhzlavwqci9i35i4f8cnyi1w5b1469v1x9f" }, "stable": { "version": [ @@ -44045,11 +44061,11 @@ "repo": "emacs-evil/goto-chg", "unstable": { "version": [ - 20201101, - 1029 + 20210508, + 1632 ], - "commit": "2af612153bc9f5bed135d25abe62f46ddaa9027f", - "sha256": "1awmvihqgw6kspx192bcp9xp56xqbma90wlhxfxmidx3bvxghwpv" + "commit": "3ce1389fea12edde4e343bc7d54c8da97a1a6136", + "sha256": "13v9d97ypkfa3g0x64psk29hpicl4djk35iwxhvw080bagrn5gls" }, "stable": { "version": [ @@ -44141,8 +44157,8 @@ "magit-popup", "s" ], - "commit": "82b771e4e219cd826d73291913eb2291ff2d8bfd", - "sha256": "0dprikwq6cna3zrgl7l706p4rhccn2sdp42ynbsza2kaiyz4ar7a" + "commit": "880725e0210d048e4d415d6aedb64c80e111357c", + "sha256": "0s7ya563j6ha10hm3r03dk053awws6740g42njxfvvccw3xqx80g" }, "stable": { "version": [ @@ -44207,11 +44223,11 @@ "repo": "xuchunyang/grab-mac-link.el", "unstable": { "version": [ - 20200712, - 428 + 20210511, + 1303 ], - "commit": "9b47cbe126a0735fa447a3c5e1e8ba80a7ef8d26", - "sha256": "1hx3a6sfc3ah3xgwii0l0jvshgbw0fjwsyrmb4sri0k8cla7fwin" + "commit": "2c722016ca01bd4265d57c4a7d55712c94cf4ea5", + "sha256": "1019304mw72swkw1dkhbcrfl0acg6gj0m1cwg2w8d89dba2ddbw8" }, "stable": { "version": [ @@ -44316,8 +44332,8 @@ 20160504, 911 ], - "commit": "26da902d1158c0312628d57578109be54eca2415", - "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" + "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", + "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" }, "stable": { "version": [ @@ -44805,27 +44821,28 @@ "repo": "mbezjak/emacs-groovy-imports", "unstable": { "version": [ - 20161003, - 851 + 20210505, + 1807 ], "deps": [ "pcache", "s" ], - "commit": "e56d7dda617555ec6205644d32ffddf2e1fa43d9", - "sha256": "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa" + "commit": "a60c3202973e3185091db623d960f71840a22205", + "sha256": "1bsmf64ycmfnsb0r0nyaky1h3x2fpr4qyck3ihw16pa6d7spaw8c" }, "stable": { "version": [ 1, - 0 + 0, + 1 ], "deps": [ "pcache", "s" ], - "commit": "e56d7dda617555ec6205644d32ffddf2e1fa43d9", - "sha256": "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa" + "commit": "a60c3202973e3185091db623d960f71840a22205", + "sha256": "1bsmf64ycmfnsb0r0nyaky1h3x2fpr4qyck3ihw16pa6d7spaw8c" } }, { @@ -44836,15 +44853,15 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20191031, - 2256 + 20210510, + 317 ], "deps": [ "dash", "s" ], - "commit": "26da902d1158c0312628d57578109be54eca2415", - "sha256": "113s9znqrdi9zm045hi3ws5ixrd0bzxfy3wr8lzxq9r3jbv67iz2" + "commit": "99eaf70720e4a6337fbd5acb68ae45cc1779bdc4", + "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" }, "stable": { "version": [ @@ -45098,7 +45115,7 @@ 20200416, 2136 ], - "commit": "fa0609b93f1ece777c0593529870390f21f5a788", + "commit": "e0653e4a654b7800dc15f7e1a06a956b77d2aabe", "sha256": "0aclxzxsh0ixibnw86d8gcyq5yzbfqzmz02rh2djk7l27yg50f10" }, "stable": { @@ -45107,7 +45124,7 @@ 0, 4 ], - "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "commit": "a60af277fbb52306c17663074cf9954dd6cea024", "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" } }, @@ -45277,14 +45294,14 @@ "repo": "wbolster/emacs-gvariant", "unstable": { "version": [ - 20190513, - 1005 + 20210507, + 1310 ], "deps": [ "parsec" ], - "commit": "b162867c03ead58784c47996ae329355ecea2869", - "sha256": "0yqgj3zcpmga9v085l98yr02k8bhgd4bzshmyjl1x98s50n207jp" + "commit": "f2e87076845800cbaaeed67f175ad4e4a9c01e37", + "sha256": "1m6gwplzps0hykzszh0vh4rs48hcfi99vxb4i870y46lq2y8x2xb" }, "stable": { "version": [ @@ -45826,11 +45843,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210502, - 155 + 20210507, + 2243 ], - "commit": "886795c15036d566aeced66f9508ae61ec0287ec", - "sha256": "1m8wlm12n32kv9pfxsz0xlpzmwn6icwyjj5fansq9v212wawq2b8" + "commit": "b35e8547b67f3d2c4d38ec7e7e516e3c0925352f", + "sha256": "1z6x28gv47vdi2a06p1w390a40ll1b1g2dhxhzpn998r6b1d8zxm" }, "stable": { "version": [ @@ -46160,16 +46177,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210426, - 551 + 20210510, + 1311 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "f680fcc9e771e4e798e4d2fa9aaf3708337c9289", - "sha256": "0rfjqcv53m7ccar7j51wfnxq6dnh75c44lxlnhaqg6i6a17gjd15" + "commit": "9e892eb9593d353076656d999c734072230be3a0", + "sha256": "097c91s1bwrs4n6mcxf3447p7x8rrndjk16xjhf3hhyxic0il66p" }, "stable": { "version": [ @@ -47068,14 +47085,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210425, - 1928 + 20210504, + 1723 ], "deps": [ "async" ], - "commit": "f680fcc9e771e4e798e4d2fa9aaf3708337c9289", - "sha256": "0rfjqcv53m7ccar7j51wfnxq6dnh75c44lxlnhaqg6i6a17gjd15" + "commit": "9e892eb9593d353076656d999c734072230be3a0", + "sha256": "097c91s1bwrs4n6mcxf3447p7x8rrndjk16xjhf3hhyxic0il66p" }, "stable": { "version": [ @@ -51078,17 +51095,17 @@ }, { "ename": "hide-lines", - "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", - "sha256": "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d", + "commit": "b61ab7d6dba6b0ca42d5647237ad15ca74177a88", + "sha256": "15hfxcq839i668jv89skq4qz8zdz6xwszgdjb1sfj7gi2fhw0xb7", "fetcher": "github", - "repo": "emacsorphanage/hide-lines", + "repo": "vapniks/hide-lines", "unstable": { "version": [ - 20151127, - 1840 + 20181123, + 111 ], - "commit": "331122bf19361130351cfe55968c2a7820329eb3", - "sha256": "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf" + "commit": "30d3557997bf5ab3a58d5756f27d8f983118f55c", + "sha256": "1cxschg194k3ahlaqp6aixwvh3qf5plgh5sbkk8fmbxarl4yb4jk" }, "stable": { "version": [ @@ -51866,20 +51883,20 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210503, - 1419 + 20210504, + 1406 ], - "commit": "d83f28ed95c04adf764acc6bd6faaa5f8ecfaea0", - "sha256": "1b864qf7n195sw3pkyp905px9p90cdacax74464if8n06l5m57a0" + "commit": "57378bd4511887a815725a7850e1ff2c6e9fda16", + "sha256": "0bdwdp8d0g7n0kv6l4h7alya3z6fsfi618dzw5x8f2az3r87yg8y" }, "stable": { "version": [ 3, - 1, - 2 + 3, + 0 ], - "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9", - "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w" + "commit": "57378bd4511887a815725a7850e1ff2c6e9fda16", + "sha256": "0bdwdp8d0g7n0kv6l4h7alya3z6fsfi618dzw5x8f2az3r87yg8y" } }, { @@ -53118,11 +53135,11 @@ "repo": "jojojames/ibuffer-sidebar", "unstable": { "version": [ - 20210215, - 1849 + 20210508, + 836 ], - "commit": "59e20690fc4f5ccd751e7a13a60664b97f053a1c", - "sha256": "1z6japr7n950222x33jinb34z7j6n5spj9cn8nq8f8yf8rgp6n2j" + "commit": "fb685e1e43db979e25713081d8ae4073453bbd5e", + "sha256": "04x87gngmvyj4nfq1dm3h9jr6b0kvikxsg1533kdkz9k72khs3n3" } }, { @@ -54435,11 +54452,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20210404, - 727 + 20210508, + 309 ], - "commit": "5048c685e7071631dbad52988dbf91ffc67a4af3", - "sha256": "0clj2rm5lsyd6c3087j0z5ndg20pji5c7yqd6r1jnpclrvvwb04w" + "commit": "044291cf063a86927dae50dffdb2b0e2e3f9199b", + "sha256": "0hiwq5nzh42f5ynjlhq9vlcgq8pmgcgbi9w5c5gczdl0s7cxv6l7" }, "stable": { "version": [ @@ -55921,11 +55938,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210503, - 1143 + 20210506, + 2157 ], - "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", - "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -55952,8 +55969,8 @@ "avy", "ivy" ], - "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", - "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -56320,8 +56337,8 @@ "hydra", "ivy" ], - "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", - "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -56957,11 +56974,11 @@ "url": "https://depp.brause.cc/jammer.git", "unstable": { "version": [ - 20200506, - 1247 + 20210508, + 1633 ], - "commit": "5d9bb7b953bd9daed9ca15bf27428db4301d60f8", - "sha256": "03gzbixxrbf1m9p19j0q72q2wi22viss28kf15az5a0891w10vck" + "commit": "a780e4c2adb2e85a4daadcefd1a2b189d761872f", + "sha256": "0s2piak1iyxj06z3hhywkrnrq5i1ppjcl5v55fys900fnyqzzgjy" }, "stable": { "version": [ @@ -57669,11 +57686,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20210404, - 1924 + 20210512, + 2301 ], - "commit": "9e7b841083c7bb1c76772e8a58428d59ea2fd0f4", - "sha256": "0l3qcnbdh7n4racd2b548h1f8plz1r78n1crcnsqnl7gpxxn1fmk" + "commit": "c3548cac4c4d2caffb750391b2d7d88c3892d139", + "sha256": "06328yfj7g575dyxa7a17hwbas3ly45hikrax6qzy64zsakp9gx2" } }, { @@ -57848,8 +57865,8 @@ 20180807, 1352 ], - "commit": "2cb7131e9cda6179541cfc7e3703c426ef3f8024", - "sha256": "1na2n607bdp5l9wg74i77rbd6wq6z4mcw2yp1b66xkzgmjhpndj6" + "commit": "516abed166d687aa8b197973315bd6ea0900fb62", + "sha256": "0l0hk6lfn6rvfxjmnkyigc0qqh6k1jbfg4i3g2s2d994hihdynhp" }, "stable": { "version": [ @@ -59134,15 +59151,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210503, - 1257 + 20210507, + 1241 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "28da5f50aa1ebe72f6b4e5bac1abeb720821a716", - "sha256": "0dg64wb9827wx0ax995hx4jhmxh5mn918zawasjwzi3dl92q7llb" + "commit": "4e46cc6c843d95427139f824f448f779be80fbc7", + "sha256": "1q3wa0i8ng2b0gsmpi9cvdr1h0ffs1pys95pgnxnsdw2cvlh4v6m" }, "stable": { "version": [ @@ -59919,8 +59936,8 @@ 20210318, 2106 ], - "commit": "c2b75c587abdc9594e69ef3f5069bd4920bb60e4", - "sha256": "16za2j07sdmb2r1r8fcpa45c66n6af41if5bnpk3maqvf1hm21zd" + "commit": "c0800fa6f9650acd5d13c9451f985d0eb4231272", + "sha256": "0xfh2mnxabv11h3n11qqiqiwwz4n3qfv8ljilncgjmj4h6c22zkr" }, "stable": { "version": [ @@ -60462,16 +60479,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210417, - 1141 + 20210508, + 1224 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a", - "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s" + "commit": "635e974cb692973856a4d26093876f5ad2285d3a", + "sha256": "0c3fz2v3zyq6s1gzz2013yafdhg46lffr4w8hwhxmgpsci6vf3hd" }, "stable": { "version": [ @@ -60572,8 +60589,8 @@ "highlight", "math-symbol-lists" ], - "commit": "74a47238ce1d2d86a3a62c5e8100a6198e73564b", - "sha256": "13cm2sgr9jkdjs649jlh4qsvi9fnma0qs48xbp2r5b29mnd4axrx" + "commit": "15de9f64cd0408052d9186435160092c4d435db2", + "sha256": "1wd8v7in280j9w5yxf9l9l79l7pmcpzqjidkb0sivvd5i1vlzvbd" } }, { @@ -61558,11 +61575,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20201207, - 2103 + 20210507, + 1556 ], - "commit": "a1154d65bf33ae34ea944b9e59d95b601fea7169", - "sha256": "0ibh09iz1m2m752rkk9dbyvmczrzv401gi4k18vlh67hz7vd5la0" + "commit": "7a2a8c49fd17c43c276dbe0aa941fd676a54a5cf", + "sha256": "02i7d8lzalwv6xaja82gn48qkf9ks0xvnaqzl9qwxiw980545z0y" }, "stable": { "version": [ @@ -61634,8 +61651,8 @@ 20201007, 2214 ], - "commit": "dbfd16af065b12d2dbce26ff1fbad151765243fd", - "sha256": "00dbbyx4m32j7qw2b83p7hx7z2ydixv8zr04l0bzalnnm34yb38s" + "commit": "f762e9310390edb7a5a49d8d9dc22693fbcde973", + "sha256": "022bnn3ksaaihi3cnc7ib15ry2kydp4rjh1v25vym7vmfxlw9akz" }, "stable": { "version": [ @@ -61881,17 +61898,17 @@ 20210303, 1751 ], - "commit": "09e4da2dd9f6f1ecf5e1f19b9cd7566c465c05fd", - "sha256": "070fq9drdb6b4zbkc6qvkd99qjy0nw3x3nlrr13xzg51lpbmzi3d" + "commit": "1faa2bc583ccb2c1b55a400683f352cc5cc5ed02", + "sha256": "0yns4cia5p1qg2g44yldw02hd5qcznxj7zqf6bamrwqys844zfjd" }, "stable": { "version": [ 0, - 15, + 16, 0 ], - "commit": "3c816a579cde789d9d6dd0a387577d4a997bfe3c", - "sha256": "070fq9drdb6b4zbkc6qvkd99qjy0nw3x3nlrr13xzg51lpbmzi3d" + "commit": "edfe0c73984e429b5329a883537d5cb738dc3213", + "sha256": "0yns4cia5p1qg2g44yldw02hd5qcznxj7zqf6bamrwqys844zfjd" } }, { @@ -63298,8 +63315,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210501, - 2348 + 20210506, + 34 ], "deps": [ "dap-mode", @@ -63310,14 +63327,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "257d881ceda1c91d681787a9cd71d1831cda173c", - "sha256": "1lf8xs1z4y6a6kywykraiz0w7nqlrq9ibwwr4zpgn0bqh5fbgy5q" + "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", + "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" }, "stable": { "version": [ 1, 18, - 2 + 3 ], "deps": [ "dap-mode", @@ -63328,8 +63345,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "40a86d6547c5625980201f6f772f0d28d09d1aa7", - "sha256": "0gwx4i4plb836hkmzvp1krx9n7vn39as3lzpmbfbnpcwny45aj3k" + "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", + "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" } }, { @@ -63347,8 +63364,8 @@ "dash", "lsp-mode" ], - "commit": "5a9c7e39905756d6cd58b686f6aa203f31c2271c", - "sha256": "1v9nqr6xpq6hqpaw8k5gx3nvxk7yjmkwyprw2009ckgb84icl8hi" + "commit": "1909466ee7f7f4aeef624acd10c710afe685ef8a", + "sha256": "0y5w97c37wj67mvwk23l4rq3i80fw82r758dsma6ly32h5xlsq8b" } }, { @@ -63499,8 +63516,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210501, - 500 + 20210506, + 829 ], "deps": [ "dap-mode", @@ -63512,8 +63529,8 @@ "request", "treemacs" ], - "commit": "9685334086c0b09d2bb16f631fb368f4ce931764", - "sha256": "0lzwwamdlyynq6lybhzcg8w7hmyraz7nhawk4nib0nfjawkr9jxm" + "commit": "ba347ab575e17e7fb101101ac7537dd0df6e55d9", + "sha256": "05ilrgmn6pa19zw98xhzi8cdn88wfhzx2nx5n1r060x4ywzawyz1" }, "stable": { "version": [ @@ -63698,8 +63715,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210503, - 1350 + 20210511, + 1617 ], "deps": [ "dash", @@ -63709,8 +63726,8 @@ "markdown-mode", "spinner" ], - "commit": "b2606d928222556552fab59a12da72e1fcbce6ed", - "sha256": "1yifkqhi42awvmdlq4253qn1cq8mcsrdpaz79y04jpd1a4i2wz10" + "commit": "a033e1fb378d8dd165ef4d95ce3698868412014b", + "sha256": "1by13qwx69ws16b4k10ixb75ndid7415fl9gb101gc8haxn27xyy" }, "stable": { "version": [ @@ -63960,14 +63977,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210414, - 855 + 20210508, + 454 ], "deps": [ "lsp-mode" ], - "commit": "b95e0e2db9e1561719c7f7815e7787fe71392871", - "sha256": "0a0746sjq40jxgpqdv3iixwvf97fnpj8wfyy88cxg2w6sf72scdl" + "commit": "7156fcd0d8beea0536c2830399631cd189ee4038", + "sha256": "0lvsdnn48z379cj553vwng6hsp9mnmy03qgxbnnamw5d0lkvfp9i" } }, { @@ -64488,8 +64505,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210430, - 404 + 20210512, + 1949 ], "deps": [ "dash", @@ -64497,8 +64514,8 @@ "transient", "with-editor" ], - "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", - "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" }, "stable": { "version": [ @@ -64526,15 +64543,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20210210, - 2312 + 20210512, + 405 ], "deps": [ "cl-lib", "magit" ], - "commit": "870174f23faa00b003b3eb63452228511c2da597", - "sha256": "156d0gd0a2cx9rn0zb9i96s3l62rys1dpxcdix2j6aix6iv669ql" + "commit": "d48fc38da0ed8c79a02591c5393aaef55498a988", + "sha256": "0qsnrwji66b0bwrgp1kj3b2mqq5vwphcs95mzk2y7xr75fwnvcbw" }, "stable": { "version": [ @@ -64776,14 +64793,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20200516, - 2029 + 20210512, + 408 ], "deps": [ "magit" ], - "commit": "a6130871e5f4421618e66d9254d0b5df9f3a1ef2", - "sha256": "1zrgqcxp2jshp52m0sa73kk071hvisqlrk79k9is6smkjss97s8c" + "commit": "04633693d1e902d54d19d404e96201637714361d", + "sha256": "1knm30fzh7lri89gl8scimb5gf3rzbnr7x033zzn12v9w8i3dchy" }, "stable": { "version": [ @@ -64845,8 +64862,8 @@ "libgit", "magit" ], - "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", - "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" } }, { @@ -65000,8 +65017,8 @@ "deps": [ "dash" ], - "commit": "471c63d92ce22b8ea653f821bc1893ecea324d4d", - "sha256": "1qx9164hcrs5k6bq4vpymma6b3g6c14c9zq9y5g9csfnjxmjwnjw" + "commit": "fcd50dd8ae7cb33332eb7c6d90932be41b869cae", + "sha256": "01mmia1zcq980gxb65v553nlr3zdy1zk772ad4q34zlkvvaq605r" }, "stable": { "version": [ @@ -65077,14 +65094,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20210503, - 340 + 20210512, + 407 ], "deps": [ "magit" ], - "commit": "3958523f3e76254b19efd3f32b0a968685fce185", - "sha256": "13va4wviimkpw67p52nl8zv6sb9f738r47yk1xlf4fh0yd48bsj6" + "commit": "d8609cb28d0411edf40031c1a551d64f383fac51", + "sha256": "1l3wqrv3338w7lgmpqpqqmc3wwh0dhl76nmfqlp8xjf44r3is2v7" }, "stable": { "version": [ @@ -65792,11 +65809,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210430, - 1736 + 20210506, + 1500 ], - "commit": "d1b836db16cb693293a2cb7064e5cf9df625df2a", - "sha256": "02zbxkzsd7166vpkqv16kmlbxpg7l0xnf784wjay1ngkh55ihvdq" + "commit": "445d2832a2f06484ad28d9b55676c52d63cd0a46", + "sha256": "0sf7b8f77cw3cgxhhq5qlmnzsfdrgx90m85dacm89hk2hpagmphf" }, "stable": { "version": [ @@ -65912,11 +65929,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210429, - 1605 + 20210504, + 249 ], - "commit": "94c65e2de2e10b7f3a5e72d412c64ab83b2b1a5e", - "sha256": "1lbxr6g53sz0nd3za44m6ixs6770zkdayihrm1bq2ip2xidl4kh7" + "commit": "9977753eebe3f5cca7ab85b18a7c719fdb0b7654", + "sha256": "0aaj4bdl7cks06kx0jbhw0rvcwl2g68wyniy344fz2dzwwmp7acf" }, "stable": { "version": [ @@ -65927,35 +65944,6 @@ "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7" } }, - { - "ename": "markdown-mode+", - "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156", - "sha256": "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00", - "fetcher": "github", - "repo": "milkypostman/markdown-mode-plus", - "unstable": { - "version": [ - 20170320, - 2104 - ], - "deps": [ - "markdown-mode" - ], - "commit": "411d079f4430a33c34ec0bbcb1535fe1145a2509", - "sha256": "0427cxvykmz8kz1gnn27yc9c4z8djyy6m9qz6wbd4np1cgqlmly2" - }, - "stable": { - "version": [ - 0, - 8 - ], - "deps": [ - "markdown-mode" - ], - "commit": "f35e63284c5caed19b29501730e134018a78e441", - "sha256": "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r" - } - }, { "ename": "markdown-preview-eww", "commit": "d9b3ad97a193c41068ca184b4835fa7a7a0ebc9c", @@ -66341,11 +66329,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20210410, - 1340 + 20210504, + 1439 ], - "commit": "587ad073069e8c932388d6f4ab8e7689b52bc6ad", - "sha256": "1lnwax7m105h9djvbyhwcxg6av9i04myq02dxhb1gw64w6i3vas8" + "commit": "c5824936cc7c2d24aeaac40010669f4eec89a239", + "sha256": "0rccwkglyw9hnab5mzhrzfrldlvi9c8ivygdh54jzfjlzcgwddv9" } }, { @@ -66672,16 +66660,16 @@ "repo": "mopemope/meghanada-emacs", "unstable": { "version": [ - 20200628, - 247 + 20210505, + 652 ], "deps": [ "company", "flycheck", "yasnippet" ], - "commit": "1e41f7f2c7a172e9699f3557c97c3f39a149bfc2", - "sha256": "1cplw3x94xc2yqvvimkjgppbb36mnj8n3gcx0k2gy7zwzdvzg4c6" + "commit": "6c57e8a0ae27e2929bb12572cf33059cd4ecbc04", + "sha256": "1wq4x80lqzlpixy701xncvmz0jwk1zgp1kpz1z7wgl5i0jnb1516" }, "stable": { "version": [ @@ -66862,16 +66850,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210427, - 438 + 20210511, + 314 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "e05a81e3793e370f04f414de8cb52948fe38e606", - "sha256": "1svw39xa9i7j0qiwbzjhw5lbcnqf7ipjz0dk29jhkxjzkk41qspk" + "commit": "bfe4a67b6f3ea14dcc9140e16731f45afb64faf0", + "sha256": "13w54vpv5y4mxvrzc36f6vciq5sjxxmfj7k0d81svpjywz9cd12r" } }, { @@ -66885,8 +66873,8 @@ 20210408, 1014 ], - "commit": "08e24475ec498105993a3e47bf032c088fe2e302", - "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" }, "stable": { "version": [ @@ -66914,8 +66902,8 @@ "auto-complete", "merlin" ], - "commit": "08e24475ec498105993a3e47bf032c088fe2e302", - "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" }, "stable": { "version": [ @@ -66947,8 +66935,8 @@ "company", "merlin" ], - "commit": "08e24475ec498105993a3e47bf032c088fe2e302", - "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" }, "stable": { "version": [ @@ -67009,8 +66997,8 @@ "iedit", "merlin" ], - "commit": "08e24475ec498105993a3e47bf032c088fe2e302", - "sha256": "1j01ym40y3x83rq2fiqs9vwv06sqrwynsm4qz6z1dgfmaavd7h6m" + "commit": "e0f4648b3c713030471e09d42b65265471e853b3", + "sha256": "073ppd8ckr6j4kw8a0y6pssgp3jvs85fy309pxrs0bd1m9s4hnsh" }, "stable": { "version": [ @@ -67035,14 +67023,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20210329, - 2328 + 20210505, + 1635 ], "deps": [ "f" ], - "commit": "b650649a9f28629154a041ef187c21c5128530f2", - "sha256": "0pffhrxw91p82gkyhf3bwcs910pjw8f7y94lsyqz5jzs469b0lcy" + "commit": "562ffe86cad91627e2b94b8684818562c3ad2b5d", + "sha256": "0g90fy27ivjaad1wp6rg8jx8dm44vb6zmsrlchzpwcyhkxs7zv8l" } }, { @@ -68370,11 +68358,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210503, - 743 + 20210512, + 1202 ], - "commit": "29fd33c19442c0be605830f0e01fc6789e2fa9a7", - "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj" + "commit": "ea3c277db14cfefaf54383c7b3e34bffe90150e8", + "sha256": "0w72946ar1fhv0qjinj9m28hr454mdgjqvsdkbgjha1cnk492akw" }, "stable": { "version": [ @@ -69076,8 +69064,8 @@ 20210306, 1053 ], - "commit": "fc187dafa37aa9d3d9493c5506eb9089bf4eb884", - "sha256": "0zc81gyvp1aqjy21i298wgji4am32cmwb0ahz66ixxlz0f4zi8pz" + "commit": "13a0f0af93fa6220256fa0df534691b893ae3424", + "sha256": "08gabqnnx3gc5arr1q79l5f0lzlkwsdi3h2vpcdd2xxbn6w3y12s" }, "stable": { "version": [ @@ -69389,16 +69377,16 @@ "repo": "yaruopooner/msvc", "unstable": { "version": [ - 20191211, - 540 + 20210503, + 1856 ], "deps": [ "ac-clang", "cedet", "cl-lib" ], - "commit": "9fe50e5961fa63fc5cf7326370f441993e9d5cfc", - "sha256": "133pidan95qyn78gdhfxlyk8x5f28rm5rwb9wdw1gpjy4l72q22f" + "commit": "122dc9cb7f145f12dac7b117a48fceb38b279432", + "sha256": "0ch9kvqvyirv8asqd5w2g3yb7h15741aavzm5hlmy8sj3l7q22jz" }, "stable": { "version": [ @@ -69674,8 +69662,8 @@ "repo": "mihaiolteanu/mugur", "unstable": { "version": [ - 20210428, - 730 + 20210503, + 1516 ], "deps": [ "anaphora", @@ -69683,8 +69671,8 @@ "dash", "s" ], - "commit": "0381bda4cc6f8634131bbc0e5c3efe548703b0fb", - "sha256": "1k8g6xb8iw9i4dq30mm1x0534bhby93pvfbrzc2qc8lvakza6n7l" + "commit": "b84752c391c5fe515960f77c80d08f313df57f33", + "sha256": "0la8lqr3wgizmnwnpys9mwrj1qi0al0gx6kxhlfwf9jr5gbdg9np" }, "stable": { "version": [ @@ -70734,11 +70722,11 @@ "repo": "rolandwalker/nav-flash", "unstable": { "version": [ - 20191204, - 1427 + 20210510, + 2035 ], - "commit": "dbb91216637e0a1e8bfd59aa883c75d45db70daf", - "sha256": "0f8dsxgk1a994clwkii9hv2ibvkf38kbvgd4sp3w1sf4vy12z5n5" + "commit": "d76314802273153c2c38156250d75f95ca352482", + "sha256": "006ghb4xrpp82wlshqmpsj0yh5vq8il6wl5v8f1cyy1vd21yl285" }, "stable": { "version": [ @@ -71384,8 +71372,8 @@ 20181024, 1439 ], - "commit": "ce700488e01af33bc478bc986e261e306180b993", - "sha256": "0xraqmi9cx8z2wdwk2d8z9yr0b0csx7xwv012k531zqmhk81srpq" + "commit": "0a632d11eb1e8b7becbd9756c3e3439777924f6d", + "sha256": "0s9gyvs5kjwa5nj9hrnxgpjl6kf2swnig8kyy6y4lgprfl2b4ifs" }, "stable": { "version": [ @@ -71510,8 +71498,8 @@ 20210405, 742 ], - "commit": "611ec73a72aac156511e9e3e61ee413ade9af5c1", - "sha256": "0jgzji627lfc4l4lnpv0j4570b4n89jn5a7p9s7c8xhww5w04z1i" + "commit": "ecda866b960321bb82deac26af45918e172ef0ba", + "sha256": "1yq1lyg4ix45n4cbqml36grmk6v1ici6dpdvr5yy56lv2zxbjrc4" } }, { @@ -72084,8 +72072,8 @@ 20210205, 1412 ], - "commit": "63413a5563450bdedee4c077f2f998578e75083a", - "sha256": "0n6z9858l5yp89dv9y494f1xvs52rxr8qacn4rj3fm2n6h0v63p8" + "commit": "a34d7b41444ad2fb50cc7def25659c88d439780a", + "sha256": "092zilqchq1hydjzwxgb493gwi7lrfvk02l4sarhn56zsbbyr9hh" }, "stable": { "version": [ @@ -72225,11 +72213,11 @@ "repo": "muirmanders/emacs-nova-theme", "unstable": { "version": [ - 20200826, - 1803 + 20210512, + 1802 ], - "commit": "279e165171558930f56d8d5cfc83e1bb6560e452", - "sha256": "0rwqnqkbasgp80cgsz0pp1gbg2w7803lh7z02565p193mrvfwr3b" + "commit": "1498f756a4c1c9ea9740cd3208f74d071283b930", + "sha256": "0jbk5wwv5dfcp4y19azl3jjcjlzr1547w1g1grq6kwpc69r5x2bf" } }, { @@ -72584,28 +72572,28 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210305, - 2006 + 20210510, + 1558 ], "deps": [ "dash", "s" ], - "commit": "ddd7d54fc66ace3a56ff839ccd1993e2f40a7412", - "sha256": "0zbqnraynz25gj3ca1iqvn36xkgh8x24hzk3pm1c6ga395xpq0ki" + "commit": "01c067e1b83175cb3f03c2061528393166173012", + "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "dash", "s" ], - "commit": "1549f362fda96b75760f20cee9b471362823ef4e", - "sha256": "1d5ff42fifssb38qvmhr8p6rvgak7z1mjhandirla05bjb4cramp" + "commit": "01c067e1b83175cb3f03c2061528393166173012", + "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" } }, { @@ -73883,8 +73871,8 @@ 20201204, 945 ], - "commit": "876682f6deef7306d7b16322464cc5ad05193494", - "sha256": "1jrf8jlp18pnwk99x2181b01mjgk3p6jj2ik29n5sqdg9p5q8czy" + "commit": "4a291edd95a65cdf9a0d67e7c21dfb5faeed17f2", + "sha256": "0bjcvxyi99zd2cn46771i22y0mjs5m1vg4c4c9vxg0kkz04wk3wv" }, "stable": { "version": [ @@ -74077,26 +74065,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210418, - 707 + 20210512, + 1429 ], "deps": [ "org-re-reveal" ], - "commit": "9f13380845c9eb69c45ad23888709cce0060d14d", - "sha256": "1r0l93w5lwczwl6p65yd2agvx46r06pf4znpvgcv3sg473f6hvj1" + "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", + "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" }, "stable": { "version": [ 3, - 18, - 3 + 20, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "9f13380845c9eb69c45ad23888709cce0060d14d", - "sha256": "1r0l93w5lwczwl6p65yd2agvx46r06pf4znpvgcv3sg473f6hvj1" + "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", + "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" } }, { @@ -74201,11 +74189,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210503, - 850 + 20210510, + 100 ], - "commit": "6f6c935dabe669a95196e459c0e516d31c711e45", - "sha256": "07jssr5v4l20dg24m15wbjzzfn8icnypx0k04d0zqyvmzz8hwkvg" + "commit": "4a0719021625ece4def8f18d28f86a681bee7d28", + "sha256": "1qggyq7yxg25k9iyyx5bsv8zmh1z14gdybc1d4qkyc905395jn0l" }, "stable": { "version": [ @@ -74661,19 +74649,19 @@ "repo": "ralph-schleicher/emacs-openfoam", "unstable": { "version": [ - 20210502, - 1738 + 20210508, + 1903 ], - "commit": "6447c666d7446865860f1490856373d1de4a11fe", - "sha256": "02sc61gnn25pfc38shi8ybmg8d4228vk2lyffxj7pszxz6sjya92" + "commit": "1623aa8d9f72128cc007f84b108d2f6c6205c330", + "sha256": "14s0sfsy6gif6rfs39ryzwqkp150m9jbz2mna5aj7hiny46gjskf" }, "stable": { "version": [ 0, - 11 + 13 ], - "commit": "2c77f46ec7bd4bd8fde694a7b009ec42730199aa", - "sha256": "02sc61gnn25pfc38shi8ybmg8d4228vk2lyffxj7pszxz6sjya92" + "commit": "7808319de0326aa293636df6c213467c279ff1ea", + "sha256": "14s0sfsy6gif6rfs39ryzwqkp150m9jbz2mna5aj7hiny46gjskf" } }, { @@ -74792,11 +74780,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210407, - 1548 + 20210507, + 1645 ], - "commit": "87ab7e47e343285f7afd42779c78551332b8fd84", - "sha256": "117lwgw5z980pay656pmgyfqdpvi0cxj69x3c7dcmz451n57ap9j" + "commit": "d97a91f6e12ace638e65bdccefd14d1e638a2dae", + "sha256": "05pk7pd3w59lzgfs0hh1jzm9pmk3yn3bskl951wyxgypix470a0r" }, "stable": { "version": [ @@ -74980,14 +74968,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210427, - 819 + 20210504, + 1109 ], "deps": [ "org" ], - "commit": "6ee49875f8bdefafbde849f5628d673e9740cf8c", - "sha256": "0qsl273qd2cc4nvv0zhsd8wn8kaw3swq6l577rkh4r6iwkqci5gf" + "commit": "c3466c45eb4f03944706cebfa677ea9cb5719a4d", + "sha256": "0wq98qjnry3l376vhzp22bbr7i5y5hcwc4lw6g7nqkw1jbja2rij" } }, { @@ -75212,14 +75200,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20210108, - 1512 + 20210507, + 658 ], "deps": [ "org" ], - "commit": "e9b9b3e5bb3c63cecb1367df49205c346d9c050a", - "sha256": "0j1f75p40p033acnkds2mxhqx5wilmlhak8cgn196x6y8j1ra7d8" + "commit": "e0c02b57836d4882da9aa3e65f04ba6045aae537", + "sha256": "1r6p3jn7lvyjr777hm803cs320n8lwbajy2iz88zp7lpc88zfhyg" } }, { @@ -75317,14 +75305,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200729, - 2021 + 20210508, + 110 ], "deps": [ "org" ], - "commit": "5b461ed7d458cdcbff0af5013fbdbe88cbfb13a4", - "sha256": "171ybf5n6a6ab3ycghc2z016qxbgqyj13kkcdsfqy0691wx7dcqb" + "commit": "a97232b4706869ecae16a1352487a99bc3cf97af", + "sha256": "1j4zjp0w7f17y0vddi39fj13iga0pfh5bgi66lwwghb18w0isgng" } }, { @@ -75901,14 +75889,14 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20201231, - 505 + 20210510, + 2202 ], "deps": [ "org" ], - "commit": "0151cabc7aa9f244f82e682b87713b344d780c23", - "sha256": "1szkx3n9gk6799rxv0jb3096pn2ssz82536x9a98xqwbimy4kvn6" + "commit": "51fcac59c724fdf58f478db62dbf6f157621d598", + "sha256": "1b9b5vii1xi93wdm7scc08h2wsak2axb53s32sa8dn80ss2paspw" }, "stable": { "version": [ @@ -76224,16 +76212,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210330, - 246 + 20210508, + 308 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "c8b2e592150c05ab53af8ee155ac169f58b963ee", - "sha256": "1rid2dl3r7p4c0sag9xcd74rj15pxapvrii286ilipkak6yhg2z2" + "commit": "e7a330ce3146e19efa9d92fbba32b89ada034e61", + "sha256": "1hg98gc90dcfad7mdz636dj7vlb2lg9p4nd06591slivrvzpypha" }, "stable": { "version": [ @@ -76631,14 +76619,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210429, - 59 + 20210511, + 1629 ], "deps": [ "htmlize" ], - "commit": "d9a690eeca64231159cd0f3f0ee214619858490e", - "sha256": "1fr8nw4pxbhml1ly1wx5glybgdh5g1g87aivzmjddycdsfcx2zqi" + "commit": "2bfdbff95ebe4470d877bd253017129509dc2b02", + "sha256": "1ig7fvz6lf5gsjmx8llpx7dc0bwxijhp5dgy8mxcr1i90yvrjfh0" } }, { @@ -77328,28 +77316,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20210405, - 1309 + 20210507, + 1615 ], "deps": [ "htmlize", "org" ], - "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369", - "sha256": "0y45g2d868ayl9igzdxzbfzw8n5qymzsdm9d3giwnlchqfrp987y" + "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", + "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh" }, "stable": { "version": [ 3, - 8, - 1 + 9, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "4d8a63cba537705f4ecf3f45838e3cfc83fa2369", - "sha256": "0y45g2d868ayl9igzdxzbfzw8n5qymzsdm9d3giwnlchqfrp987y" + "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", + "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh" } }, { @@ -77460,8 +77448,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210324, - 1337 + 20210510, + 1614 ], "deps": [ "bibtex-completion", @@ -77476,8 +77464,8 @@ "pdf-tools", "s" ], - "commit": "3ca9beb744621f007d932deb8a4197467012c23a", - "sha256": "1n262rsmil2n7dilf711gs8rciv8gd7wf3vadb0zcbkbn703jbk9" + "commit": "8aa2bb45268f660956151547533689d4ec30378d", + "sha256": "0ihjjmysldxx8n3q7mi06p5ydxknxy347c9lf3gnlgzcc776a49v" }, "stable": { "version": [ @@ -77603,8 +77591,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210502, - 1936 + 20210512, + 706 ], "deps": [ "dash", @@ -77614,8 +77602,8 @@ "org", "s" ], - "commit": "d2e933cc3e4f5ee843bfca9525a30eb395c60990", - "sha256": "09fbbji67ipfw1xn2960v9pwc6xm6w9z10j3c343f9a02aqyjwif" + "commit": "f754160402ccc12b6e0e8bc6b607d7deef5c5b60", + "sha256": "00c1wfgxzpdh3rd0drk1s8y1j41yjr1gkch8d1w9x8p1df4hn3hi" }, "stable": { "version": [ @@ -77643,29 +77631,31 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210330, - 852 + 20210507, + 2051 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "8d80bf980776df6ead53e917eb482ec8e309a1d7", - "sha256": "1rricy4kxny78cvryrfxcjb656ryq3rgx4na5d5kks8xhdjsckwf" + "commit": "80a86980801ff233d7c12ae9efef589ffa53df67", + "sha256": "0sm4l32xscpq9hmilj0srqh7vij5x3602h1f0yh9wmckz9jq4f4w" }, "stable": { "version": [ 0, - 5, - 0 + 6, + 0, + -1 ], "deps": [ "bibtex-completion", + "org-ref", "org-roam" ], - "commit": "81b6fedf99996a78199067e61935964dea9389ee", - "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9" + "commit": "03b3a843fdbba428b29faa932661bc74fd66e29b", + "sha256": "17ds31cdq4prlknbjhhcjz17sim26yx8iws1scg4xcffxnb1s39r" } }, { @@ -79059,15 +79049,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20210426, - 1746 + 20210512, + 1945 ], "deps": [ "magit", "org" ], - "commit": "e8db8dc74106dfabe316e63cc9032dd7bb9bc598", - "sha256": "0dqinq1n78mjll3agiqif2rxz8ikdz4qr88hxhrwbl4222dlaagz" + "commit": "043db4f0957416652f872ca18289ef00b9474963", + "sha256": "1rybcybb4xb6wsfhh772mapggabn14i7ca2fl30qkzyc5qmhc3s9" }, "stable": { "version": [ @@ -79201,8 +79191,8 @@ 20201129, 604 ], - "commit": "5c065aa584d18257a58cd7c5439df5ce23d989c3", - "sha256": "1pmkkihnrch7z705mc94dmr8bxb4mgg7c5iirmrar4hhg84l13q2" + "commit": "5aec071702c21dcc777e75b575d3875141688e46", + "sha256": "13405irnpwb1fgwv5d9mwywpbvb6d7smmi7nsd140l0i0m7anx1c" }, "stable": { "version": [ @@ -79353,6 +79343,29 @@ "sha256": "1w5xia4f539agf62mlhj8c6hh2zadmncr1dby6m6j2qm3ndqfyvk" } }, + { + "ename": "orthodox-christian-new-calendar-holidays", + "commit": "cd5dfee78c2afb49e59e65b62f2cbe584f3b8e7c", + "sha256": "05k9yj8695m86vwacsrr0cddcyh9jhdpnv6hiv43g6shniq2458n", + "fetcher": "github", + "repo": "cmchittom/orthodox-christian-new-calendar-holidays", + "unstable": { + "version": [ + 20210507, + 1619 + ], + "commit": "71216d56575da602ec713bf1bbe75c92606c1049", + "sha256": "1qfgfkww6v0glpnqdx3a6qixr63vbcvkby7ccw8qzpyb9bpar9g2" + }, + "stable": { + "version": [ + 1, + 3 + ], + "commit": "bcb858f607b0d833e1581e0630446ecc576eefd6", + "sha256": "1b6ms822j075fciijpwywzn675hbqqbaylz5iy3czlwypjg1slhh" + } + }, { "ename": "osa", "commit": "df18def95ae792387da2e21f1050cfc25af772fb", @@ -80472,10 +80485,13 @@ "stable": { "version": [ 0, - 2 + 4 ], - "commit": "ebd57eda69466735d7fc8f52831490176e1f144b", - "sha256": "1xhyvc1v5hdgki2sbdpajhhq8ydgym5q1cywcaxwbbmpjxi5sd64" + "deps": [ + "org-msg" + ], + "commit": "1e730396b8b7aa5101b3e3f538d6d4c15514f415", + "sha256": "1firb26xnci1qprb4v4p3cp9vnmmp5bvsm3154gy0n2jr0hzvbjj" } }, { @@ -80964,27 +80980,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210425, - 3 + 20210511, + 2055 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "bc6c0577c0c87c43095955f8210b221bb759f103", - "sha256": "0rg51c0nj6fcxf4lcbfh0l997s08g3k19jxmsms5xj26aavp9zj2" + "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", + "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" }, "stable": { "version": [ 0, - 13 + 15 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", - "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" + "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", + "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" } }, { @@ -81001,19 +81017,19 @@ "deps": [ "package-lint" ], - "commit": "bc6c0577c0c87c43095955f8210b221bb759f103", - "sha256": "0rg51c0nj6fcxf4lcbfh0l997s08g3k19jxmsms5xj26aavp9zj2" + "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", + "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" }, "stable": { "version": [ 0, - 13 + 15 ], "deps": [ "package-lint" ], - "commit": "9e28a5cd08e94db0ba4fb8847fa970c98316facc", - "sha256": "03pim9ijqmjqyv0qlkap5jw47iv9qsw1d7s2p9vrqjnpf4jxcq70" + "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", + "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" } }, { @@ -81084,20 +81100,20 @@ "repo": "emacscollective/packed", "unstable": { "version": [ - 20201120, - 2047 + 20210503, + 2046 ], - "commit": "47437da7839394b079699eb4cfcc00627ab2df8e", - "sha256": "0hp80n3mxnkssq431h9b9xlz21dqkyzjsajylrnbfvqqwqh293qk" + "commit": "ed63b4803899c3719aeeba461e249c473e5b26f0", + "sha256": "06blk8parnpq3qi6y5628q3v59c8dyi41glb289a0l16248qwphk" }, "stable": { "version": [ 3, 0, - 2 + 3 ], - "commit": "3b96dedb404f614479c1b321fac3e4bf11ba0782", - "sha256": "0fbv8ryxjz1ndfv4ximmr5m1rd9xkmi8dp0x14r8g5wiy9959asb" + "commit": "ed63b4803899c3719aeeba461e249c473e5b26f0", + "sha256": "06blk8parnpq3qi6y5628q3v59c8dyi41glb289a0l16248qwphk" } }, { @@ -81551,14 +81567,14 @@ "repo": "purcell/paredit-everywhere", "unstable": { "version": [ - 20180506, - 849 + 20210510, + 531 ], "deps": [ "paredit" ], - "commit": "f04c522e6b088a11255a95cb1e6a08198b4d6537", - "sha256": "1jp6wk4zkfcma4akchbdh8wg5fi0i74m4cgnqnmvbyzwkbj6sf0q" + "commit": "b81e5d5356c85001a71640941b469aea9cf2e309", + "sha256": "0qnm020npchrazj6na79ccwjhr7j1gm7n0yksqxzciram1lfggjk" }, "stable": { "version": [ @@ -81790,13 +81806,13 @@ "version": [ 0, 1, - 3 + 4 ], "deps": [ "cl-lib" ], - "commit": "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3", - "sha256": "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j" + "commit": "2cbbbc2254aa7bcaa4fb5e07c8c1bf2f381dba26", + "sha256": "1g1s8s45g3kkbi3h7w0pmadmzdswb64mkdvdpg2lihg341kx37gm" } }, { @@ -82504,10 +82520,10 @@ }, { "ename": "pdf-tools", - "commit": "8e3d53913f4e8a618e125fa9c1efb3787fbf002d", - "sha256": "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw", + "commit": "10a057a573123c7093159e662fafdc97c2dd4a02", + "sha256": "1x0yd86r3iybpiq7ypln1fy0cl55wznkcgvqszzqjdrnlpqs0abc", "fetcher": "github", - "repo": "politza/pdf-tools", + "repo": "vedang/pdf-tools", "unstable": { "version": [ 20200512, @@ -83368,11 +83384,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20210430, - 1507 + 20210512, + 1731 ], - "commit": "209913f8ce0f18898625b41e0094a99ce8accd0d", - "sha256": "048rnzhxsgq6vi4d64826ma1rkxsz42qbbppwqx7wiqj4nnmxshw" + "commit": "fb314f2f77f3238e08cfe36a6c46f6479fe069b9", + "sha256": "0k8izndbjhy6jizx2az37qlci4qv1y10lb7rmzmsci1pq1m3l7gd" }, "stable": { "version": [ @@ -84231,15 +84247,15 @@ "repo": "ZachMassia/PlatformIO-Mode", "unstable": { "version": [ - 20210501, - 1057 + 20210511, + 957 ], "deps": [ "async", "projectile" ], - "commit": "e7bde6fec31b57ffe1c0a98cd29477d5baea30f3", - "sha256": "0ian50v9vaz7kqzn20bhqadq50h0l3zhjkmniinpz4q9klh7drh9" + "commit": "f4fd8932995a8aed80eab14e54232010c2889012", + "sha256": "1m6qmqp124idja9dq8gj8pzajxf40lm1adrnd24hbp26wh9pvc54" }, "stable": { "version": [ @@ -86970,11 +86986,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210502, - 1922 + 20210512, + 556 ], - "commit": "c3505218ebb9b5c575b537c0f15736497a6c5700", - "sha256": "1vpmymgar4qn6zlkfwycrdp91iy86m6xhl43rd6awp6gh25b882g" + "commit": "632297dd0ab35a42ed6eac163dcaca1e71fcd83b", + "sha256": "0gzggng9iq62qlyzx0v6f586qfqvwibpz7jp7ar8r3wz32h95vjm" }, "stable": { "version": [ @@ -87077,19 +87093,17 @@ 20200619, 1742 ], - "commit": "5e84a6169cf0f9716c9285c95c860bcb355dbdc1", - "sha256": "0ixs95c1f98kmkq8kjv6mv0sj9phgqlb39imjzrn4mg4w92bilfn" + "commit": "45e9707871e2e40408fa530dc6d80cf2b1a0d287", + "sha256": "0pgb1ch0l7x84hw0nrd0xyig5ssw7x8bq1aybxrg7lwvqq2jbs9p" }, "stable": { "version": [ 3, - 16, - 0, - -1, - 1 + 17, + 0 ], - "commit": "7689f00ba8d1e818f2a8e7a4bf24577d9ccd5d84", - "sha256": "0r5k78m23jhcxxzhi2x6zz3dpglfx75f1zmkmdwpgc9y64kscckb" + "commit": "652d99a8ee8aa6b801e11977951fbf444cfccc8f", + "sha256": "18w8v2djl5fjhivc09w6ilc5npgacdxqn962q6vl5awc50crkgs3" } }, { @@ -87490,11 +87504,11 @@ "url": "https://depp.brause.cc/punpun-theme.git", "unstable": { "version": [ - 20200506, - 1241 + 20210508, + 1635 ], - "commit": "57c2c87b72336e5dee2165c6b0010022f6e7e51d", - "sha256": "03agwvk14rzxglmw5y43v3sy5hhpr5w6iimpf623hxwzfgl3f6xl" + "commit": "7026684cd568cb691af3ced5de14c375fe6f5a1a", + "sha256": "1nwvlp93l5lj259mchd1a2glq3jxd0h1vazsbjqfi07hsg86xjp0" } }, { @@ -87933,15 +87947,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210428, - 2307 + 20210512, + 616 ], "deps": [ "async", "xr" ], - "commit": "9e9cee799e95f53bf2d0462260c70ce8f59ddf4d", - "sha256": "1yjvf6h7rr7f3h6sdk95w3c2709c7jh6dfnfb7p9y1aw18ar9pvc" + "commit": "e6ff7bcdb028453886175ccc79398f34c98168c5", + "sha256": "1pkccislfbb47g8ypylgal7g7sncy97wy37nrjq6xl30i8gfba8n" }, "stable": { "version": [ @@ -87988,14 +88002,14 @@ "repo": "p1uxtar/pyim-cangjiedict", "unstable": { "version": [ - 20210429, - 930 + 20210507, + 928 ], "deps": [ "pyim" ], - "commit": "87f3f9447750e74cdf9525d97621c56deafb2bbf", - "sha256": "0pk03gfrfhj2r82ghnr840bqr0ix14nhnl7hwg1g1v89jkphps84" + "commit": "455e20e90044a1fcd6c4b45252745fa233e0107d", + "sha256": "0dv5l8cpccvc7jsc4qdijnz76dp2rznmcnkkn3w75xw46ai8chnk" } }, { @@ -88006,14 +88020,14 @@ "repo": "p1uxtar/pyim-smzmdict", "unstable": { "version": [ - 20210429, - 216 + 20210505, + 1445 ], "deps": [ "pyim" ], - "commit": "9bfb8713543332a05c1d76fe755ab82b5ccbba51", - "sha256": "0s4s5rhrbpxlp7fimqd36pnbqpdpcfd12r5xxfrcni91f1apzlns" + "commit": "fcddbde17a04d174c7353548056524687f7be8d2", + "sha256": "1mi4a8sizlplys93lac34d3fv8338lbk3hfg3n45vp14wvfvpjnq" } }, { @@ -88024,14 +88038,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20210428, - 558 + 20210504, + 1144 ], "deps": [ "pyim" ], - "commit": "24ac59a7b622d1a50ecdc69f9944bd39838de22c", - "sha256": "0apnf289jzfz5bmn7acq9lf13nf05phncvhc3cz9milax834c3l4" + "commit": "da51e226bca9be2ed6175298489be64e45492759", + "sha256": "0nl1yi3zf4pp7cksprmigm119dcp1d2477k4jdm10z7zfcq2p6r0" }, "stable": { "version": [ @@ -88103,8 +88117,8 @@ 20210411, 1931 ], - "commit": "7cffd7ffeeaa64f57c7b617036d6d1ffd8756745", - "sha256": "080k3bm741338nj5d1f3rn9zn9pwaffbbgbyd20pmqh881v37m4m" + "commit": "318f1afa9384742c3dd42daa4deb7d22c0b662e0", + "sha256": "164zxkjwf7m4ghm9d81z5j59h24jzsah4xpfbnk6b6jipzzdx836" }, "stable": { "version": [ @@ -88232,28 +88246,28 @@ "repo": "wbolster/emacs-python-black", "unstable": { "version": [ - 20200324, - 930 + 20210511, + 1545 ], "deps": [ "dash", "reformatter" ], - "commit": "a11ca73f6dfcdc125d27ff184496d66bdbd71326", - "sha256": "1jv2fwlf7q8l5npqcpr05xzqmfqlx6xmjn0zphh9rx6dd2dpdma9" + "commit": "6b6ab71d2762b6da703f8d1d3d964b712a98939e", + "sha256": "1cmzc0fa3jj7ajxbqhbsc8jx47k6g223sfd42c4lrqdnmh95760m" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "dash", "reformatter" ], - "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e", - "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk" + "commit": "6b6ab71d2762b6da703f8d1d3d964b712a98939e", + "sha256": "1cmzc0fa3jj7ajxbqhbsc8jx47k6g223sfd42c4lrqdnmh95760m" } }, { @@ -88346,6 +88360,14 @@ "sha256": "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99" } }, + { + "ename": "python-isort", + "commit": "8b359787b5f0113793714fd9710fde831e7afee3", + "sha256": "0svkcb68r3x1ajhrhhlnj71v33qp3pliv3if1mww19x970r69lmy", + "error": "Not in archive", + "fetcher": "github", + "repo": "wyuenho/emacs-python-isort" + }, { "ename": "python-mode", "commit": "82861e1ab114451af5e1106d53195afd3605448a", @@ -88998,15 +89020,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210328, - 2038 + 20210510, + 1517 ], "deps": [ "faceup", "pos-tip" ], - "commit": "045a871d61e930c2eea8647822df39b8319018e1", - "sha256": "0lpy4nmn21jzmf54avkl9yr8j6w62aqmi5yhmssfhq3x0l5srsjq" + "commit": "fc7e8144f117ae0c1e61904e3ee6401853c83deb", + "sha256": "142q7cv9j3vqlrpgrmlqpn1sq5f3k63i0my1hbgri8r6m4gh9nyd" } }, { @@ -89701,16 +89723,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20210420, - 953 + 20210508, + 2227 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "962b5af40c8970d09581613d67b1a5d99eaa39e7", - "sha256": "1rpc0viymnm5jdrl16nmvsz0y8wnca03l0nhllwidyvazbf4x5zl" + "commit": "34557f8d8fc6af8d3763380942cc07193335c73b", + "sha256": "0m7v523s518hf7dx31ayjfa60gkf4pyncqvca7b2sm1z5qmjzqqj" }, "stable": { "version": [ @@ -90097,11 +90119,11 @@ "repo": "ncaq/recentf-remove-sudo-tramp-prefix", "unstable": { "version": [ - 20210502, - 436 + 20210509, + 43 ], - "commit": "82e788e2c8a6834ca3db7696d5e90ccabede7587", - "sha256": "197a4xskmv88rbl9pdznvc5gfxskfp3zrl9larjdn5fxpiy5jmcb" + "commit": "c462344739867f35d39c8794c358b4c4b5af7dcc", + "sha256": "1bpf9bqnhwb6gcr6gxi2fgr03fdh0s7k0k3pgy543dpafhlzm2ac" } }, { @@ -90461,17 +90483,17 @@ }, { "ename": "reformatter", - "commit": "58de8cf8864867f7b3969f3a048a4844837078b4", - "sha256": "0z4wa0bmhz55c54vx7qxkl9x7ix20mmgygv91sqll68l10g63l0c", + "commit": "82368b9bf29492002918a2d77023ff2ef0b9917c", + "sha256": "127nss62cn24xj4hmmf6axxyy0ygx84dz0k8dc0xm1642gdndl58", "fetcher": "github", - "repo": "purcell/reformatter.el", + "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20200814, - 435 + 20210510, + 522 ], - "commit": "576d339aa80f40c6053592988001bdb285c1cf21", - "sha256": "1hdr5vr5xzlpj5xyapgbm9drrham6r776lmj8sjqaqrdffgxj8dh" + "commit": "e02a9ea94287f4195edeeab3033e017a56872f5b", + "sha256": "1dlm24gjplfdx3cv2j6jslwgfryh0mvcyccljrwq8rzw8svgs8ac" }, "stable": { "version": [ @@ -90672,14 +90694,14 @@ "repo": "torgeir/remark-mode.el", "unstable": { "version": [ - 20191103, - 1825 + 20210504, + 1238 ], "deps": [ "markdown-mode" ], - "commit": "e80a1b78304045dec3eceffb6c8cbaf2b6c7b57a", - "sha256": "1l06hh728p9gnlliz1nq9qg641gyxfzb7mlz8x88bmvb0wyzyr8r" + "commit": "9f15285445fdb53e720ffe72f5cf05231d340906", + "sha256": "0mgkcdagj4n47nahsxnk7l1b4v15cbwqaac4fr8809jvis1rfx5g" } }, { @@ -91053,6 +91075,21 @@ "sha256": "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv" } }, + { + "ename": "rescript-mode", + "commit": "d561116c1da2439da7368a83b5d481962f51280e", + "sha256": "0cjh418qipa3i3g02p1axdqblchc482gcs0nzn1xx9k26yfa6yy5", + "fetcher": "github", + "repo": "jjlee/rescript-mode", + "unstable": { + "version": [ + 20210506, + 2101 + ], + "commit": "964a62f907bf786cec6a60719d17244b2958ac62", + "sha256": "16r1bp6dv6s1k8pkxpf1wpk2rh7qd059z97naik60qa26rdwpa4w" + } + }, { "ename": "resize-window", "commit": "601a8d8f9046db6c4d50af983a11fa2501304028", @@ -91114,11 +91151,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20200901, - 1442 + 20210511, + 1331 ], - "commit": "a97dcc486a54d947aa15eeaedaccb3481f14fd85", - "sha256": "0qxwmza21ys5ln8pb441a38sxm2gl29s46sf8hpyzaxcjvc6blvl" + "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", + "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" } }, { @@ -91136,8 +91173,8 @@ "helm", "restclient" ], - "commit": "a97dcc486a54d947aa15eeaedaccb3481f14fd85", - "sha256": "0qxwmza21ys5ln8pb441a38sxm2gl29s46sf8hpyzaxcjvc6blvl" + "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", + "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" } }, { @@ -91363,11 +91400,11 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20201121, - 544 + 20210510, + 1104 ], - "commit": "21c966a02cdd4783dc6ea50b807589abc405d929", - "sha256": "1g8j80nklf14a178qhb7im01zrw84gmix4gcdn5l45194q6ngifk" + "commit": "b885d6bd2b3be69a2413c4dc5cc34344d821cba2", + "sha256": "0qqvab5n5y70mv9dq06xnqmpxy9pr994k3b83kw70pq43gb03nxd" }, "stable": { "version": [ @@ -92646,11 +92683,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20201117, - 1903 + 20210507, + 646 ], - "commit": "f14479e277ac7db75bf6756e0589941f84fdd749", - "sha256": "16q1b1dvdh0s7jd58x48m11c925f97lnlm1xn6z1iz8c0bxgqqjm" + "commit": "b44321c6fbbfc53e211083dfa565525e79f596c6", + "sha256": "0gwf9a4cgpl3agggaj8x6r5hmq88wghzvyh69shc378n564n1cq5" } }, { @@ -93081,8 +93118,8 @@ 20200830, 301 ], - "commit": "d9d4a9757b4616df755c2219dfcff451f4e3c0a2", - "sha256": "0i8p8y2c8dvrm5a5vk1a6vf6cgfyc3ah58w095qn94mjgcdg026m" + "commit": "739b96ee2152c25de9b59cbaad137e8fe20cd284", + "sha256": "0znl94xnbxm9i7a2mpsl5848s4l9hgx8z5hjipjk8cl5q34xmgw6" } }, { @@ -93885,11 +93922,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210423, - 1822 + 20210510, + 1316 ], - "commit": "c68c7f6c21877b09734a8543fee363cf2fbbecf4", - "sha256": "1g8y6wkmn8j5gjd37i344xmyln6x13jlry9pxdwq3kwkwzkznznm" + "commit": "bfefb8e1a350d44b56290b2c7ddc3418ec217b30", + "sha256": "1ps5jvhidkgn7bssqsib23iz283cim7mszlga2d8fdnmn2618q3q" }, "stable": { "version": [ @@ -94419,14 +94456,14 @@ "url": "https://depp.brause.cc/shackle.git", "unstable": { "version": [ - 20201116, - 1428 + 20210508, + 1637 ], "deps": [ "cl-lib" ], - "commit": "1c88d2a2fdd2efb3e990da69d6fedeaee5ff71a2", - "sha256": "15adhf4iqcmirngcbq5gnn80yxg4hp9kyiccwn23hqq4az05pfyx" + "commit": "4ef05b117c87e1f0d97e0ee74fd2f0bfd07a49b1", + "sha256": "12x2b133a7npl2bibgsi5rr73cg77g1dljdwg4l49ipp7g4dsmcb" }, "stable": { "version": [ @@ -94479,11 +94516,11 @@ "repo": "arturovm/shades-of-purple-emacs", "unstable": { "version": [ - 20210213, - 1939 + 20210506, + 1448 ], - "commit": "96c58f2421165d67f300cc5014715fc0517e8f8c", - "sha256": "17cnwc235wm6la3wh1wcrs621jqzka7xnrrbcsk4kv8fnidi81n4" + "commit": "e9d2ac081ae657b1ad6a30b9f53e8572479deb80", + "sha256": "0s3ga5ap1m9xfm20hnaanh4vvvkfv6d5h5mxia1sn526349lnpw5" } }, { @@ -94494,11 +94531,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20210216, - 2031 + 20210512, + 1625 ], - "commit": "e4563469fe20b9e6e63d7b19c86ac8b8b615df1d", - "sha256": "1p7a4lps2w6dnc5i1fiwx22ij4in70a0h0bl5bp7ab5ba6l22kaw" + "commit": "dbcef650b906fec62608d5e4e3075bf251e675e1", + "sha256": "0qnqp06vb2ikkwy0p10x3s7mil6c948w42mx4c72cdz36m116zc0" } }, { @@ -94687,11 +94724,11 @@ "repo": "DamienCassou/shell-switcher", "unstable": { "version": [ - 20210501, - 604 + 20210509, + 1045 ], - "commit": "b16b4bdb54d807c5557f3fe95491bc611741eb37", - "sha256": "03fmryw522lh31jnrab8kclzzj3b1v0lr105a5qqalqh4srj6nq3" + "commit": "ed74b20fa12935be0068765f5bc8de97b92a8020", + "sha256": "18ynh2j3mq206lqgkd7zmxzxh3661w9nbawkwvgkk2qi3837xrbr" }, "stable": { "version": [ @@ -94887,8 +94924,8 @@ 20210329, 149 ], - "commit": "a395147050674ff88f03a6ac354a84ccbdc23f1e", - "sha256": "1gpbmnfxc5z2nm03d5989z8mb91wlq8788vvsl9kf2yl8s4fg5a0" + "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", + "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" } }, { @@ -95074,15 +95111,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20210502, - 1350 + 20210506, + 358 ], "deps": [ "language-detection", "org" ], - "commit": "fb0fee03dfbebc21f2b9ce142764d04479cfaa58", - "sha256": "1m3kf8730brldx6l59xv92m9946aqb2b42pgjj8bl0l1x757ijk5" + "commit": "52f7d5827b108d148f1dd02fd8fd32f0f0d3699c", + "sha256": "1p6l22w1jf9sz6azlaj7xzc8l6xijhd62h5lnf1v4ixjgvkayq10" }, "stable": { "version": [ @@ -95735,14 +95772,14 @@ "repo": "purcell/skewer-less", "unstable": { "version": [ - 20160828, - 2021 + 20210510, + 532 ], "deps": [ "skewer-mode" ], - "commit": "8ce9d030e18133319181d5dabe3e905c8ca5fd6b", - "sha256": "1hkk9si9z9zd2x2cv2gs0z423prlwlhq847irypz2dm1bnm5dzrx" + "commit": "baa973581c2ab7326db65803df97d1a7382b6564", + "sha256": "0md6gghgp8hn296fjwc3ikliw7p412v20917v0kqqlisdskizfbx" }, "stable": { "version": [ @@ -95931,15 +95968,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210430, - 1239 + 20210512, + 1220 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "a4c9c4cc5318fa0f023089755f81f2d2d2281d9b", - "sha256": "1ah15zagmsd65qfiwspcb0l2frza05iq4dw7hcrdlyqpx5rmhpd9" + "commit": "bdda756a5667a537497a35f5a0fc5b7c28bf3bd3", + "sha256": "0xm3fdwla8axag1zpc7361mgyjpf1qg907l86w4v8ald8z4qcvl9" }, "stable": { "version": [ @@ -97387,8 +97424,8 @@ "flycheck", "solidity-mode" ], - "commit": "b83354943626ea7c50011d5806b17be17077d1c4", - "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" + "commit": "383ac144727c716c65989c079ae76127e25144c3", + "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" }, "stable": { "version": [ @@ -97412,11 +97449,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20210331, - 1709 + 20210505, + 1704 ], - "commit": "b83354943626ea7c50011d5806b17be17077d1c4", - "sha256": "0h4fyyv2k44x67nwqflh3zpazfkcf5zbgdzwjxbwjgvvxm1hdqlx" + "commit": "383ac144727c716c65989c079ae76127e25144c3", + "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" }, "stable": { "version": [ @@ -98780,11 +98817,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210502, - 1549 + 20210504, + 632 ], - "commit": "688d55eeaedef9f95a123db130bfb456c94c587d", - "sha256": "0n633q3jv0l2klxf590lp9a3dy0wpmh37xl0fii9afsvaydrdww7" + "commit": "ce69158f5efb3040a00e89ffef0d1931e5038f53", + "sha256": "1sfrp9iwrinx1q9hm6rdb1gayn4jhqsh00c3yzg83wbdw1vl8vpw" }, "stable": { "version": [ @@ -99208,8 +99245,8 @@ 20200606, 1308 ], - "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824", - "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1" + "commit": "311caea3f11330a42a37efe078305b4ce42e53ae", + "sha256": "1hfr36xb24y829pcd4maw206lyhrb3qwxxzj6gwh3a0nw8s1sr1m" }, "stable": { "version": [ @@ -100315,14 +100352,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210404, - 1302 + 20210509, + 1535 ], "deps": [ "ivy" ], - "commit": "4ffee1c37340a432b9d94a2aa3c870c0a8203dcc", - "sha256": "02d5a8s263lp2zvy39mxkyr7qy5475i4ic2bpm2qm0ixr4fkfdy8" + "commit": "11444e82ad3ec4b718b03ee51fc3ba62cbba81bc", + "sha256": "1bvqicw10lz048lwn4p4ilxyk3sfmplclz1gk6zsyimf72y3xymg" }, "stable": { "version": [ @@ -100603,6 +100640,21 @@ "sha256": "10n0871xzycifyqp73xnbqmrgy60imlb26yhm3p6vfj3d84mg1b2" } }, + { + "ename": "symbolist", + "commit": "967f1819c8d3a6ead5cc5bb7a577be07dabdbe5e", + "sha256": "1i940i77agy7c1rv7cqarxcbgjwvjnl05gwi0k2n45pzb91pvgld", + "fetcher": "github", + "repo": "lassik/emacs-symbolist", + "unstable": { + "version": [ + 20210503, + 1220 + ], + "commit": "f600e07fe06c19b67f917a8839bbcd6c78f1fbd4", + "sha256": "02x71kdnkhyzscc2bxayv55qfanqy0hm7rckq4mqhxbryjz7qcab" + } + }, { "ename": "symbolword-mode", "commit": "be2018e0206c3f39c1b67e83000b030d70a72ceb", @@ -100637,8 +100689,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210416, - 353 + 20210505, + 11 ], "deps": [ "evil", @@ -100650,8 +100702,8 @@ "seq", "undo-tree" ], - "commit": "3af93352a522bf8b88841a0d7114789a11741bb2", - "sha256": "1rrhzq9kixvvjjlb8xan5dd3g9jpygl83l77sl9r5ddv0flg6ali" + "commit": "7292c3371ad0d32e5e2fe73ddf14d5cfeffb6d23", + "sha256": "1qw90li4f8h5jp78lgx042slwwpi7mwch077zpk552df8xrd0aqy" }, "stable": { "version": [ @@ -101268,11 +101320,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20201103, - 903 + 20210505, + 1051 ], - "commit": "07ee34725bc19fc1679effb262a014dbc6311aa2", - "sha256": "1flm1vq5fxmix0y6vnikbqr2v4q4idvzj26ilgq7pgx3m9d2q0gi" + "commit": "f31d282a70b0eb24470935438af59de96ddace2e", + "sha256": "1f3kxc9l0f4r7fxhrz77lghn4847f3b7dk8j84sn6d5zr436by8n" } }, { @@ -101513,15 +101565,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210429, - 1950 + 20210511, + 1722 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "cc3c22a22e02a5606407d70e76ec221d5ec82533", - "sha256": "0j0zrravv4whakzgxvprisyxnlpcbmdywljq5vnvww2j1f75vwj7" + "commit": "bc57c9e27a8c8c82d17cf2a2131e386494d49a1f", + "sha256": "0v9297syqz42fah5ng90a26b16wq1xvm4nh5cqphx4dgb31q2s08" }, "stable": { "version": [ @@ -102604,18 +102656,18 @@ 20200212, 1903 ], - "commit": "e7c2e64c404b5cba6b27948ffaf36b56992e4580", - "sha256": "0mshmbbl3v3f0qjmw9g1z5pkr2183j091wxr8nc1ksr28y2q6vnr" + "commit": "0eb6c413562a22e4c24cbb56d18cef63645d952c", + "sha256": "1q0g36bj4w6a5zj8nz3s7id59640fvzaqab7371w543kxrslwwrk" }, "stable": { "version": [ 2021, 5, - 3, + 10, 0 ], - "commit": "5d2501709782c10358b73c85d8911880d34c7fa3", - "sha256": "022sgd9hsgmqr586xmzdbzmxfqaq69ps2ghq430h4ad992wanvkz" + "commit": "50867396a98d4341bd4468d5211878b4d9b8b96a", + "sha256": "167g3vw7vvd7b2y3w01d895qwpv4amv9dj0pc5iv08jhn8i17jhw" } }, { @@ -102671,8 +102723,8 @@ "deps": [ "haskell-mode" ], - "commit": "ce6d01ac1f41b9121e414cfcf6253cbbff4c034e", - "sha256": "0i12lswqpdfnbmq7q4vdds33qkm4f4lyh02c27y82c74aymh81d0" + "commit": "cfc231660a642b2451f874824365931419ab45a0", + "sha256": "06wqsljigm7hvycvg4p5rilivr8g7im300jlnm1r463dc1d12kjh" }, "stable": { "version": [ @@ -103550,8 +103602,8 @@ 20201101, 1045 ], - "commit": "2f70aa236878d9c3726c31d6ba922e2d7076951d", - "sha256": "1fi0qc8qbcgkjjvi5iysifammqcc6nwcrwjhwi713zykd5cir180" + "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", + "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" }, "stable": { "version": [ @@ -104028,8 +104080,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210422, - 2011 + 20210504, + 701 ], "deps": [ "ace-window", @@ -104041,8 +104093,8 @@ "pfuture", "s" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -104078,8 +104130,8 @@ "all-the-icons", "treemacs" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" } }, { @@ -104097,8 +104149,8 @@ "evil", "treemacs" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -104127,8 +104179,8 @@ "deps": [ "treemacs" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -104159,8 +104211,8 @@ "pfuture", "treemacs" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -104192,8 +104244,8 @@ "persp-mode", "treemacs" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -104225,8 +104277,8 @@ "perspective", "treemacs" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" } }, { @@ -104244,8 +104296,8 @@ "projectile", "treemacs" ], - "commit": "f13249866b300ec3a4908bf132d984c6354e3fcf", - "sha256": "1wbn0jb21jvsi11gwhb1y8igkxvw54gyndamdgrngsyqjck5mxz9" + "commit": "73fdbf241c1163ed85f6dce7f9593eca1648d295", + "sha256": "0iyqz8mh6f9wgyk9a0ch7hf13xkcnmwxsvnvgcfhx6iizwf07hl7" }, "stable": { "version": [ @@ -107754,8 +107806,8 @@ "s", "versuri" ], - "commit": "16f9d9ee4744f4170ab9eab361783e3e32e3b627", - "sha256": "19pfxdg4kmvir6fgn9i4mqqlqk7lq77170kva6avxz12jz36i22r" + "commit": "43b9364042922950f612ac57d8c526921a01b291", + "sha256": "14432mnm5lvccb9x3fymzi53kxfh2if92c5q14llz6pbbif8x3vh" }, "stable": { "version": [ @@ -107789,8 +107841,8 @@ "org-roam", "s" ], - "commit": "c4f39b853c54cbfab48876812012e040b56838ee", - "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5" + "commit": "0f73528e603b1901cbe36eccd536a9113ef0439d", + "sha256": "030aglgmph8p9qi160ws6qv288mkwpyhhj0m946q72y7hmsc5xxp" }, "stable": { "version": [ @@ -107874,11 +107926,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210420, - 1048 + 20210507, + 231 ], - "commit": "a395147050674ff88f03a6ac354a84ccbdc23f1e", - "sha256": "1gpbmnfxc5z2nm03d5989z8mb91wlq8788vvsl9kf2yl8s4fg5a0" + "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", + "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" } }, { @@ -108048,15 +108100,15 @@ "repo": "cmpitg/wand", "unstable": { "version": [ - 20200302, - 1536 + 20210511, + 725 ], "deps": [ "dash", "s" ], - "commit": "731b5ca33269fe563239bff16da6c41489432b80", - "sha256": "0r5mbslwf3x0mrndz65w4pp88xii019zg5p6x214zxpr87s75zdp" + "commit": "08c3d9156517a31dd98ea64bfc269fae730b643c", + "sha256": "18xgi1anficjl6cnhhv197zbrnb0p63pnj8gshvixb6fr4ybw8k0" } }, { @@ -108466,6 +108518,36 @@ "sha256": "0a6nirdn1l7cymjycbns38ja9an1z4l5lwjk5h428aly3pmkvdqj" } }, + { + "ename": "weblio", + "commit": "eb75b14af27dbadba064b601ed06fd6124be3a8b", + "sha256": "0zgcnq6f978aly36xdzk5fzwsm6qymcscbxsmpmjkhhkggl24ll7", + "fetcher": "github", + "repo": "pzel/weblio", + "unstable": { + "version": [ + 20210511, + 2105 + ], + "deps": [ + "request" + ], + "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1", + "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2" + }, + "stable": { + "version": [ + 0, + 3, + 3 + ], + "deps": [ + "request" + ], + "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1", + "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2" + } + }, { "ename": "weblogger", "commit": "e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2", @@ -108678,11 +108760,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210426, - 2101 + 20210511, + 1320 ], - "commit": "ba042c41554cb46593ef67b40a5523487cf9c6f6", - "sha256": "1k2fyy8kdlpb9vqqm0izxjwqqh84ih78wkc2xpmck771a5xzggf8" + "commit": "4fedd7e72d200c1d36b4fa0bab10c68ef72f7135", + "sha256": "1x3cfx0v9m1fx7r1k9rjc77514isznsz31vwsidanyrd6cflk8wm" } }, { @@ -108964,11 +109046,11 @@ "repo": "purcell/whitespace-cleanup-mode", "unstable": { "version": [ - 20200304, - 2227 + 20210510, + 533 ], - "commit": "3c5a7161c0dd0caa65e9a61640b06aff101be848", - "sha256": "1i4xnl178lbaqnrxxk9qxzz3v0krj4wawh8zyprh2xirgxqspks8" + "commit": "b108b73ddf8f7e747d5a20a681560171e02ad037", + "sha256": "13il7yi6j0cd995xzadbilhg50zcvzbpcqvivh9r1qbqq3q5aw1y" }, "stable": { "version": [ @@ -109931,8 +110013,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210429, - 1645 + 20210504, + 1132 ], "deps": [ "ace-link", @@ -109940,8 +110022,8 @@ "swiper", "zoutline" ], - "commit": "7ed797cacf8949928b97bc0fab0bf0f80931b055", - "sha256": "0yp2z5j7vqjfk7s3pid44y2ygccvpgqxazzly3z9q4swjw59p5j8" + "commit": "c99ef5478183d0ab56b0abe943206491c802e003", + "sha256": "1qbs5dvqcip7y77f8sdyr7zw64vgxlybj4isi7x841j4z7kh5m11" }, "stable": { "version": [ @@ -109981,11 +110063,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20210426, - 1223 + 20210511, + 1128 ], - "commit": "1d9de2d23ff4ebb61964b399a19bdb460cadd32f", - "sha256": "18hh6v15fjixjain9br26jdysdph4c1bb3wq9q1wmq62wb9x8n9d" + "commit": "f74a58f3cfb2e94cee4c4527b2f7aeb8fa5ab46c", + "sha256": "0m50xxi5nz08byxjdp5k20d075anv88lsdk1z2q66y2jqaqbxian" }, "stable": { "version": [ @@ -110510,11 +110592,11 @@ "url": "https://depp.brause.cc/xbm-life.git", "unstable": { "version": [ - 20201116, - 1119 + 20210508, + 1640 ], - "commit": "c5f442b152c46e5f31632e87be5c3a3c157a5ab1", - "sha256": "1481g835hk0j296jvjyawjcyj6lkvsjwz01r329i5bzhyvyn6lm5" + "commit": "ec6abb0182068294a379cb49ad5346b1d757457d", + "sha256": "19xh1pzh5kgfjjckg73ljylv14912an536rl04jahaxfknf4ypm6" }, "stable": { "version": [ @@ -110601,20 +110683,19 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20210103, - 1339 + 20210504, + 1106 ], "deps": [ "aio", "auctex", "avy", "dash", - "dash-functional", "f", "s" ], - "commit": "5812aa55a816bb66d90443a6a634069d9fbfecf1", - "sha256": "1nwhrbpqgbcv1467zyjwww6r04k965fkrkc5v3iqzkg88ld43sj0" + "commit": "4994ae4a660ee94d341ce1905c12b4cf39fee574", + "sha256": "0cqvz8bkpjc4fmdn10zq70q3bvixx25yn13ihxygsdi1mjmn30fh" } }, { @@ -111260,11 +111341,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20201109, - 1026 + 20210508, + 1641 ], - "commit": "fc5e1c58f94472944c4aa838f00f6adcac6fa992", - "sha256": "0gsa153yp8lmwrvcc3nzpw5lj037y7q2nm23k5k404r5as4k355l" + "commit": "3a57058468211f3cb18e71aecc630dcacb87636b", + "sha256": "1p09vzl6miafjhl9aw67day304wc27g72b0vcbr3barfgczypzsa" }, "stable": { "version": [ @@ -111827,11 +111908,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210324, - 1847 + 20210509, + 520 ], - "commit": "4ea0f4d8128951432169b1e6db3dd4ac42492e93", - "sha256": "177zh0d6ax9j1fdv569b0adnb873b2913b9pmj26y8ipsbg4iwa6" + "commit": "9a26f361083ed1d0dd56e659fae913ffea51c739", + "sha256": "1da39wyb8zhpyvqxld19cna0jdjhpdiwsmac6ari7nw8i8dvbbhw" }, "stable": { "version": [ @@ -111900,30 +111981,30 @@ "repo": "tuedachu/ytdl", "unstable": { "version": [ - 20201017, - 1024 + 20210506, + 914 ], "deps": [ "async", "dash", "transient" ], - "commit": "8ef80b85f766cc1f93a932e64604998cfe7f6f03", - "sha256": "1xv93ny942gha1ipic5r6z4icjsb7src7ssdck9983kks3zacjk7" + "commit": "23da64f5c38b8cb83dbbadf704171b86cc0fa937", + "sha256": "010arhvibyw50lqhsr8bm0vj3pzry1h1vgcvxnmyryirk3dv40jl" }, "stable": { "version": [ 1, 3, - 5 + 6 ], "deps": [ "async", "dash", "transient" ], - "commit": "8ef80b85f766cc1f93a932e64604998cfe7f6f03", - "sha256": "1xv93ny942gha1ipic5r6z4icjsb7src7ssdck9983kks3zacjk7" + "commit": "23da64f5c38b8cb83dbbadf704171b86cc0fa937", + "sha256": "010arhvibyw50lqhsr8bm0vj3pzry1h1vgcvxnmyryirk3dv40jl" } }, { @@ -112235,15 +112316,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210409, - 2126 + 20210506, + 2009 ], "deps": [ "ace-window", "deft" ], - "commit": "c21705202180d16fa9f3a652e6e3af9ddc868a3b", - "sha256": "1ghrbz9azzddmgidbiqg3c0mqidgsjhryy03id0ln3bnv1z51vwn" + "commit": "3f9c95df6009620425e8b41e7345835a40dd9862", + "sha256": "0jk11s6pbkisxlhl1940gyhrc5cngzar45w45h9pnsg7922vv7b1" }, "stable": { "version": [ @@ -112462,14 +112543,14 @@ "url": "https://depp.brause.cc/zone-nyan.git", "unstable": { "version": [ - 20200506, - 1207 + 20210508, + 1642 ], "deps": [ "esxml" ], - "commit": "253a0484ea5076c0f485c561a3f8370ba560f4f2", - "sha256": "094kn0yxgzl9c39qm12h9cp6yia2rhaxwf9zmq2lk5x93nnss6m5" + "commit": "38b6e9f1f5871e9166b00a1db44680caa56773be", + "sha256": "10zb1ffq98jxzzym1ss9ly9ydbkrqynlkwn6s2hbc3h0av5ymmaq" }, "stable": { "version": [ @@ -112642,30 +112723,30 @@ "repo": "fvdbeek/emacs-zotero", "unstable": { "version": [ - 20210406, - 2204 + 20210512, + 820 ], "deps": [ "ht", "oauth", "s" ], - "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad", - "sha256": "1n0y6wap2yvqa75jf5yvdb9dy304c7i5g28g5lqj20ikj914wai7" + "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", + "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 2 ], "deps": [ "ht", "oauth", "s" ], - "commit": "bee8196c5db26b75abc1359a5a7cb8a2b1f192ad", - "sha256": "1n0y6wap2yvqa75jf5yvdb9dy304c7i5g28g5lqj20ikj914wai7" + "commit": "15eb7a8d099c93440f0a8920499633103f00fc83", + "sha256": "13mrssrkcjrrpc470rjpb3mwjfdsyvr4i8niqza54rzk0zxj2m95" } }, { diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index a45238fd191..8e29fd48c83 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sunrise-commander/sunrise-commander/"; - description = "Two-pane file manager for Emacs based on Dired and inspired by MC"; + description = "Orthodox (two-pane) file manager for Emacs"; license = licenses.gpl3Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs-modes/updater-emacs.nix index 4c321065445..7502bcc2fee 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs-modes/updater-emacs.nix @@ -29,7 +29,7 @@ let in [ promise semaphore ]); in pkgs.mkShell { - buildInputs = [ + packages = [ pkgs.git pkgs.nix pkgs.bash diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock b/pkgs/applications/editors/neovim/neovide/Cargo.lock new file mode 100644 index 00000000000..4e37d0fbfa1 --- /dev/null +++ b/pkgs/applications/editors/neovim/neovide/Cargo.lock @@ -0,0 +1,3292 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9fe5e32de01730eb1f6b7f5b51c17e03e2325bf40a74f754f04f130043affff" + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "ahash" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29661b60bec623f0586702976ff4d0c9942dcb6723161c2df0eea78455cfedfb" +dependencies = [ + "const-random", +] + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "andrew" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e" +dependencies = [ + "bitflags", + "line_drawing", + "rusttype 0.7.9", + "walkdir", + "xdg", + "xml-rs", +] + +[[package]] +name = "andrew" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" +dependencies = [ + "bitflags", + "rusttype 0.9.2", + "walkdir", + "xdg", + "xml-rs", +] + +[[package]] +name = "android_log-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8052e2d8aabbb8d556d6abbcce2a22b9590996c5f849b9c7ce4544a2e3b984e" + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" + +[[package]] +name = "approx" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" +dependencies = [ + "num-traits", +] + +[[package]] +name = "ash" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c69a8137596e84c22d57f3da1b5de1d4230b1742a710091c85f4d7ce50f00f38" +dependencies = [ + "libloading 0.6.7", +] + +[[package]] +name = "ash-window" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905c4ca25f752e7ab3c3e8f2882625f876e4c3ea5feffbc83f81d697e043afd6" +dependencies = [ + "ash", + "raw-window-handle", + "raw-window-metal", +] + +[[package]] +name = "async-trait" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bindgen" +version = "0.55.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b13ce559e6433d360c26305643803cb52cfbabbc2b9c47ce04a58493dfb443" +dependencies = [ + "bitflags", + "cexpr", + "cfg-if 0.1.10", + "clang-sys", + "clap", + "env_logger", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2 1.0.26", + "quote 1.0.9", + "regex", + "rustc-hash", + "shlex", + "which 3.1.1", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +dependencies = [ + "byteorder", + "iovec", +] + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "calloop" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aa2097be53a00de9e8fc349fea6d76221f398f5c4fa550d420669906962d160" +dependencies = [ + "mio", + "mio-extras", + "nix 0.14.1", +] + +[[package]] +name = "calloop" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" +dependencies = [ + "log", + "nix 0.18.0", +] + +[[package]] +name = "cargo-husky" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" + +[[package]] +name = "cc" +version = "1.0.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" + +[[package]] +name = "cexpr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom 5.1.2", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi 0.3.9", +] + +[[package]] +name = "clang-sys" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" +dependencies = [ + "glob", + "libc", + "libloading 0.7.0", +] + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[package]] +name = "cmake" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" +dependencies = [ + "cc", +] + +[[package]] +name = "cocoa" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" +dependencies = [ + "bitflags", + "block", + "core-foundation 0.7.0", + "core-graphics 0.19.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c54201c07dcf3a5ca33fececb8042aed767ee4bfd5a0235a8ceabcda956044b2" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +dependencies = [ + "bitflags", + "block", + "core-foundation 0.9.1", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "const-random" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" +dependencies = [ + "getrandom 0.2.2", + "lazy_static", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "core-foundation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys 0.8.2", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + +[[package]] +name = "core-graphics" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" +dependencies = [ + "bitflags", + "core-foundation 0.7.0", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269f35f69b542b80e736a20a89a05215c0ce80c2c03c514abb2e318b78379d86" +dependencies = [ + "bitflags", + "core-foundation 0.9.1", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation 0.9.1", + "foreign-types", + "libc", +] + +[[package]] +name = "core-text" +version = "19.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +dependencies = [ + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "foreign-types", + "libc", +] + +[[package]] +name = "core-video-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" +dependencies = [ + "cfg-if 0.1.10", + "core-foundation-sys 0.7.0", + "core-graphics 0.19.2", + "libc", + "objc", +] + +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-channel 0.4.4", + "crossbeam-deque 0.7.3", + "crossbeam-epoch 0.8.2", + "crossbeam-queue", + "crossbeam-utils 0.7.2", +] + +[[package]] +name = "crossbeam-channel" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +dependencies = [ + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.4", +] + +[[package]] +name = "crossbeam-deque" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +dependencies = [ + "crossbeam-epoch 0.8.2", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch 0.9.4", + "crossbeam-utils 0.8.4", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "lazy_static", + "maybe-uninit", + "memoffset 0.5.6", + "scopeguard", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.4", + "lazy_static", + "memoffset 0.6.3", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +dependencies = [ + "cfg-if 0.1.10", + "crossbeam-utils 0.7.2", + "maybe-uninit", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 0.1.10", + "lazy_static", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" +dependencies = [ + "autocfg 1.0.1", + "cfg-if 1.0.0", + "lazy_static", +] + +[[package]] +name = "crossfire" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8434f61eb40fc72030b18a370f7a06b428d27de66b0281977967216312b14dc7" +dependencies = [ + "async-trait", + "crossbeam", + "futures 0.3.15", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "curl" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adba2012502267c1fdde381e0e3acc44bf8be96b2f7d455089dcc2c8ad2f67bd" +dependencies = [ + "curl-sys", + "libc", + "openssl-probe", + "openssl-sys", + "schannel", + "socket2", + "winapi 0.3.9", +] + +[[package]] +name = "curl-sys" +version = "0.4.43+curl-7.76.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a802c7a9828b7d139efaed1bc92471ab6681ed86d19a105605f5eadcb0837d11" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", + "winapi 0.3.9", +] + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.26", + "quote 1.0.9", + "strsim 0.9.3", + "syn 1.0.72", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "deflate" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +dependencies = [ + "adler32", + "byteorder", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "derive-new" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "difference" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" + +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +dependencies = [ + "cfg-if 0.1.10", + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" +dependencies = [ + "libloading 0.6.7", +] + +[[package]] +name = "dlib" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" +dependencies = [ + "libloading 0.7.0", +] + +[[package]] +name = "downcast" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb454f0228b18c7f4c3b0ebbee346ed9c52e7443b0999cd543ff3571205701d" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "dwrote" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" +dependencies = [ + "lazy_static", + "libc", + "winapi 0.3.9", + "wio", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "encoding_rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "euclid" +version = "0.20.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad" +dependencies = [ + "num-traits", +] + +[[package]] +name = "expat-sys" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +dependencies = [ + "cmake", + "pkg-config", +] + +[[package]] +name = "filetime" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.2.8", + "winapi 0.3.9", +] + +[[package]] +name = "flate2" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +dependencies = [ + "cfg-if 1.0.0", + "crc32fast", + "libc", + "miniz_oxide", +] + +[[package]] +name = "flexi_logger" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "515fb7f6541dafe542c87c12a7ab6a52190cccb6c348b5951ef62d9978189ae8" +dependencies = [ + "chrono", + "glob", + "log", + "regex", +] + +[[package]] +name = "float-cmp" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "float-ord" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-kit" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f9042cb45150fb2b2a012fc03d0f1d2071f18e90397b9d2a5ec8ade8464bf20" +dependencies = [ + "bitflags", + "byteorder", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "core-text", + "dirs", + "dwrote", + "float-ord", + "freetype", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "servo-fontconfig", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "fragile" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" + +[[package]] +name = "freetype" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6" +dependencies = [ + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + +[[package]] +name = "futures" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" + +[[package]] +name = "futures-executor" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" + +[[package]] +name = "futures-macro" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +dependencies = [ + "autocfg 1.0.1", + "proc-macro-hack", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "futures-sink" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" + +[[package]] +name = "futures-task" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" + +[[package]] +name = "futures-util" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +dependencies = [ + "autocfg 1.0.1", + "futures 0.1.31", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite 0.2.6", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", + "tokio-io", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", +] + +[[package]] +name = "gif" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" +dependencies = [ + "color_quant", + "lzw", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "harfbuzz" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "776caa9519beb53f697d578b6777eebd1262265c84ae797620b7f8f9b3648d91" +dependencies = [ + "harfbuzz-sys", +] + +[[package]] +name = "harfbuzz-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8c27ca13930dc4ffe474880040fe9e0f03c2121600dc9c95423624cab3e467" +dependencies = [ + "cc", + "core-graphics 0.22.2", + "core-text", + "foreign-types", + "freetype", + "pkg-config", +] + +[[package]] +name = "hashbrown" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6073d0ca812575946eb5f35ff68dbe519907b25c42530389ff946dc84c6ead" +dependencies = [ + "ahash", + "autocfg 0.1.7", +] + +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +dependencies = [ + "libc", +] + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "image" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a" +dependencies = [ + "byteorder", + "gif", + "jpeg-decoder", + "num-iter", + "num-rational", + "num-traits", + "png", + "scoped_threadpool", + "tiff", +] + +[[package]] +name = "inflate" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +dependencies = [ + "adler32", +] + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jpeg-decoder" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +dependencies = [ + "rayon", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" + +[[package]] +name = "libloading" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "libloading" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "libz-sys" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "line_drawing" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9" +dependencies = [ + "num-traits", +] + +[[package]] +name = "lock_api" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "lock_api" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "lru" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609345ddee5badacf857d4f547e0e5a2e987db77085c24cd887f73573a04237" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "lzw" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + +[[package]] +name = "memchr" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "memmap2" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg 1.0.1", +] + +[[package]] +name = "memoffset" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" +dependencies = [ + "autocfg 1.0.1", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg 1.0.1", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow 0.2.2", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio", + "slab", +] + +[[package]] +name = "mio-named-pipes" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +dependencies = [ + "log", + "mio", + "miow 0.3.7", + "winapi 0.3.9", +] + +[[package]] +name = "mio-uds" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" +dependencies = [ + "iovec", + "libc", + "mio", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "mockall" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01458f8a19b10cb28195290942e3149161c75acf67ebc8fbf714ab67a2b943bc" +dependencies = [ + "cfg-if 0.1.10", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a673cb441f78cd9af4f5919c28576a3cc325fb6b54e42f7047dacce3c718c17b" +dependencies = [ + "cfg-if 0.1.10", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "ndk" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a356cafe20aee088789830bfea3a61336e84ded9e545e00d3869ce95dcb80c" +dependencies = [ + "jni-sys", + "ndk-sys 0.1.0", + "num_enum", +] + +[[package]] +name = "ndk" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb167c1febed0a496639034d0c76b3b74263636045db5489eee52143c246e73" +dependencies = [ + "jni-sys", + "ndk-sys 0.2.1", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-glue" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1730ee2e3de41c3321160a6da815f008c4006d71b095880ea50e17cf52332b8" +dependencies = [ + "android_log-sys", + "lazy_static", + "libc", + "log", + "ndk 0.1.0", + "ndk-sys 0.1.0", +] + +[[package]] +name = "ndk-glue" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdf399b8b7a39c6fb153c4ec32c72fd5fe789df24a647f229c239aa7adb15241" +dependencies = [ + "lazy_static", + "libc", + "log", + "ndk 0.2.1", + "ndk-macro", + "ndk-sys 0.2.1", +] + +[[package]] +name = "ndk-macro" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" +dependencies = [ + "darling", + "proc-macro-crate", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "ndk-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2820aca934aba5ed91c79acc72b6a44048ceacc5d36c035ed4e051f12d887d" + +[[package]] +name = "ndk-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" + +[[package]] +name = "neovide" +version = "0.7.0" +dependencies = [ + "anyhow", + "async-trait", + "cargo-husky", + "cfg-if 0.1.10", + "crossfire", + "derive-new", + "dirs", + "euclid", + "flexi_logger", + "font-kit", + "futures 0.3.15", + "image", + "lazy_static", + "log", + "lru", + "mockall", + "neovide-derive", + "nvim-rs", + "parking_lot 0.10.2", + "pin-project", + "rand", + "rmpv", + "rust-embed", + "sdl2-sys", + "skia-safe", + "skribo", + "skulpin", + "tokio", + "unicode-segmentation", + "which 4.1.0", + "winapi 0.3.9", + "winres", +] + +[[package]] +name = "neovide-derive" +version = "0.1.0" +dependencies = [ + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "nix" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +dependencies = [ + "bitflags", + "cc", + "cfg-if 0.1.10", + "libc", + "void", +] + +[[package]] +name = "nix" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" +dependencies = [ + "bitflags", + "cc", + "cfg-if 0.1.10", + "libc", +] + +[[package]] +name = "nix" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +dependencies = [ + "bitflags", + "cc", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "memchr", + "version_check", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "num-derive" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg 1.0.1", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +dependencies = [ + "autocfg 1.0.1", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg 1.0.1", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg 1.0.1", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca565a7df06f3d4b485494f25ba05da1435950f4dc263440eda7a6fa9b8e36e4" +dependencies = [ + "derivative", + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffa5a33ddddfee04c0283a7653987d634e880347e96b5b2ed64de07efb59db9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "nvim-rs" +version = "0.1.1-alpha.0" +source = "git+https://github.com/kethku/nvim-rs#109feea9e345fcbb2674384b0d6914ba4b8fc61e" +dependencies = [ + "async-trait", + "futures 0.3.15", + "log", + "pin-project", + "rmp", + "rmpv", + "tokio", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "once_cell" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" + +[[package]] +name = "openssl-probe" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + +[[package]] +name = "openssl-sys" +version = "0.9.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +dependencies = [ + "autocfg 1.0.1", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-float" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +dependencies = [ + "num-traits", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "parking_lot" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" +dependencies = [ + "lock_api 0.3.4", + "parking_lot_core 0.7.2", +] + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api 0.4.4", + "parking_lot_core 0.8.3", +] + +[[package]] +name = "parking_lot_core" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" +dependencies = [ + "cfg-if 0.1.10", + "cloudabi", + "libc", + "redox_syscall 0.1.57", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.8", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b451513912d6b3440e443aa75a73ab22203afedc4a90df8526d008c0f86f7cb3" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pin-project" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "0.4.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "pin-project-lite" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + +[[package]] +name = "pin-project-lite" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "png" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef859a23054bbfee7811284275ae522f0434a3c8e7f4b74bd4a35ae7e1c4a283" +dependencies = [ + "bitflags", + "crc32fast", + "deflate", + "inflate", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "predicates" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" +dependencies = [ + "difference", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" + +[[package]] +name = "predicates-tree" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" +dependencies = [ + "predicates-core", + "treeline", +] + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + +[[package]] +name = "proc-macro2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +dependencies = [ + "unicode-xid 0.2.2", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2 1.0.26", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core", +] + +[[package]] +name = "raw-window-handle" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211" +dependencies = [ + "libc", +] + +[[package]] +name = "raw-window-metal" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd21ed1cdef7f1b1579b972148ba6058b5b545959a14d91ea83c4f0ea9f289b" +dependencies = [ + "cocoa 0.24.0", + "core-graphics 0.22.2", + "objc", + "raw-window-handle", +] + +[[package]] +name = "rayon" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +dependencies = [ + "autocfg 1.0.1", + "crossbeam-deque 0.8.0", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +dependencies = [ + "crossbeam-channel 0.5.1", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.4", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + +[[package]] +name = "redox_syscall" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +dependencies = [ + "getrandom 0.2.2", + "redox_syscall 0.2.8", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rmp" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f55e5fa1446c4d5dd1f5daeed2a4fe193071771a2636274d0d7a3b082aa7ad6" +dependencies = [ + "byteorder", + "num-traits", +] + +[[package]] +name = "rmpv" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c760afe11955e16121e36485b6b828326c3f0eaff1c31758d96dbeb5cf09fd5" +dependencies = [ + "num-traits", + "rmp", +] + +[[package]] +name = "rust-embed" +version = "5.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "5.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "rust-embed-utils", + "syn 1.0.72", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" +dependencies = [ + "walkdir", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "rusttype" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5" +dependencies = [ + "rusttype 0.8.3", +] + +[[package]] +name = "rusttype" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0" +dependencies = [ + "approx", + "ordered-float", + "stb_truetype", +] + +[[package]] +name = "rusttype" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scoped_threadpool" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "sdl2" +version = "0.34.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deecbc3fa9460acff5a1e563e05cb5f31bba0aa0c214bb49a43db8159176d54b" +dependencies = [ + "bitflags", + "lazy_static", + "libc", + "raw-window-handle", + "sdl2-sys", +] + +[[package]] +name = "sdl2-sys" +version = "0.34.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41a29aa21f175b5a41a6e26da572d5e5d1ee5660d35f9f9d0913e8a802098f74" +dependencies = [ + "cfg-if 0.1.10", + "cmake", + "flate2", + "libc", + "tar", + "unidiff", + "version-compare", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" + +[[package]] +name = "serde_json" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "servo-fontconfig" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +dependencies = [ + "libc", + "servo-fontconfig-sys", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" +dependencies = [ + "expat-sys", + "freetype-sys", + "pkg-config", +] + +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" + +[[package]] +name = "signal-hook-registry" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +dependencies = [ + "libc", +] + +[[package]] +name = "skia-bindings" +version = "0.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e158e83da2315e0b82eaf21e8aa771b9d32c7fd92ce56f247a8c63be8acc7a3e" +dependencies = [ + "bindgen", + "cc", + "curl", + "flate2", + "heck", + "regex", + "serde_json", + "tar", + "toml", +] + +[[package]] +name = "skia-safe" +version = "0.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85dd8abb714b094d5cb22b53aecc5d23aaa7219067d2347fbc9a7c3bc5118633" +dependencies = [ + "bitflags", + "lazy_static", + "skia-bindings", +] + +[[package]] +name = "skribo" +version = "0.1.0" +source = "git+https://github.com/linebender/skribo#62fabc1257e4ba4460a7e32087026e85e694ecc6" +dependencies = [ + "font-kit", + "harfbuzz", + "harfbuzz-sys", + "log", + "pathfinder_geometry", + "unicode-normalization", +] + +[[package]] +name = "skulpin" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11f1c75af5e20eaa1dd985692b42b697b49f3581eb8088526688120a951b1ad" +dependencies = [ + "log", + "skulpin-app-winit", + "skulpin-renderer", + "skulpin-renderer-sdl2", + "skulpin-renderer-winit", +] + +[[package]] +name = "skulpin-app-winit" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf156763a67080ce9a8965bba2b1c7cdee9f51f4e1fdb2b3ef6dcf7d9fbf63f" +dependencies = [ + "log", + "skulpin-renderer", + "skulpin-renderer-winit", +] + +[[package]] +name = "skulpin-renderer" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19f77569926563e91b3e8a5b1b77d192be6a8db8e3f0c4e05e887843998dd47e" +dependencies = [ + "ash", + "log", + "skia-bindings", + "skia-safe", +] + +[[package]] +name = "skulpin-renderer-sdl2" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2391513a1fcb62aad9e95fa0c7ab2ecaf0565dd68fee8bf096f1ed9a25abf936" +dependencies = [ + "ash-window", + "log", + "raw-window-handle", + "sdl2", + "skulpin-renderer", +] + +[[package]] +name = "skulpin-renderer-winit" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc972e8252690259199c00f3e0a307082c6b666e57b72d629cf608e0396a0f01" +dependencies = [ + "ash-window", + "log", + "raw-window-handle", + "skulpin-renderer", + "winit 0.22.2", + "winit 0.23.0", +] + +[[package]] +name = "slab" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "smithay-client-toolkit" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421c8dc7acf5cb205b88160f8b4cc2c5cfabe210e43b2f80f009f4c1ef910f1d" +dependencies = [ + "andrew 0.2.1", + "bitflags", + "dlib 0.4.2", + "lazy_static", + "memmap", + "nix 0.14.1", + "wayland-client 0.23.6", + "wayland-protocols 0.23.6", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80" +dependencies = [ + "andrew 0.3.1", + "bitflags", + "calloop 0.6.5", + "dlib 0.4.2", + "lazy_static", + "log", + "memmap2", + "nix 0.18.0", + "wayland-client 0.28.5", + "wayland-cursor", + "wayland-protocols 0.28.5", +] + +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "stb_truetype" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51" +dependencies = [ + "byteorder", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + +[[package]] +name = "syn" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "unicode-xid 0.2.2", +] + +[[package]] +name = "tar" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "tiff" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" +dependencies = [ + "byteorder", + "lzw", + "num-derive", + "num-traits", +] + +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tinyvec" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" +dependencies = [ + "bytes 0.5.6", + "fnv", + "iovec", + "lazy_static", + "libc", + "memchr", + "mio", + "mio-named-pipes", + "mio-uds", + "num_cpus", + "pin-project-lite 0.1.12", + "signal-hook-registry", + "slab", + "tokio-macros", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-io" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +dependencies = [ + "bytes 0.4.12", + "futures 0.1.31", + "log", +] + +[[package]] +name = "tokio-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "syn 1.0.72", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "treeline" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" + +[[package]] +name = "ttf-parser" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc" + +[[package]] +name = "unicode-normalization" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unidiff" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a62719acf1933bfdbeb73a657ecd9ecece70b405125267dd549e2e2edc232c" +dependencies = [ + "encoding_rs", + "lazy_static", + "regex", +] + +[[package]] +name = "vcpkg" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version-compare" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wayland-client" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1080ebe0efabcf12aef2132152f616038f2d7dcbbccf7b2d8c5270fe14bcda" +dependencies = [ + "bitflags", + "calloop 0.4.4", + "downcast-rs", + "libc", + "mio", + "nix 0.14.1", + "wayland-commons 0.23.6", + "wayland-scanner 0.23.6", + "wayland-sys 0.23.6", +] + +[[package]] +name = "wayland-client" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c" +dependencies = [ + "bitflags", + "downcast-rs", + "libc", + "nix 0.20.0", + "scoped-tls", + "wayland-commons 0.28.5", + "wayland-scanner 0.28.5", + "wayland-sys 0.28.5", +] + +[[package]] +name = "wayland-commons" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb66b0d1a27c39bbce712b6372131c6e25149f03ffb0cd017cf8f7de8d66dbdb" +dependencies = [ + "nix 0.14.1", + "wayland-sys 0.23.6", +] + +[[package]] +name = "wayland-commons" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a" +dependencies = [ + "nix 0.20.0", + "once_cell", + "smallvec", + "wayland-sys 0.28.5", +] + +[[package]] +name = "wayland-cursor" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b37e5455ec72f5de555ec39b5c3704036ac07c2ecd50d0bffe02d5fe2d4e65ab" +dependencies = [ + "nix 0.20.0", + "wayland-client 0.28.5", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cc286643656742777d55dc8e70d144fa4699e426ca8e9d4ef454f4bf15ffcf9" +dependencies = [ + "bitflags", + "wayland-client 0.23.6", + "wayland-commons 0.23.6", + "wayland-scanner 0.23.6", +] + +[[package]] +name = "wayland-protocols" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95df3317872bcf9eec096c864b69aa4769a1d5d6291a5b513f8ba0af0efbd52c" +dependencies = [ + "bitflags", + "wayland-client 0.28.5", + "wayland-commons 0.28.5", + "wayland-scanner 0.28.5", +] + +[[package]] +name = "wayland-scanner" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93b02247366f395b9258054f964fe293ddd019c3237afba9be2ccbe9e1651c3d" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "xml-rs", +] + +[[package]] +name = "wayland-scanner" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720" +dependencies = [ + "proc-macro2 1.0.26", + "quote 1.0.9", + "xml-rs", +] + +[[package]] +name = "wayland-sys" +version = "0.23.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d94e89a86e6d6d7c7c9b19ebf48a03afaac4af6bc22ae570e9a24124b75358f4" +dependencies = [ + "dlib 0.4.2", + "lazy_static", +] + +[[package]] +name = "wayland-sys" +version = "0.28.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2" +dependencies = [ + "dlib 0.5.0", + "lazy_static", + "pkg-config", +] + +[[package]] +name = "which" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" +dependencies = [ + "libc", +] + +[[package]] +name = "which" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" +dependencies = [ + "either", + "libc", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "winit" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4ccbf7ddb6627828eace16cacde80fc6bf4dbb3469f88487262a02cf8e7862" +dependencies = [ + "bitflags", + "cocoa 0.20.2", + "core-foundation 0.7.0", + "core-graphics 0.19.2", + "core-video-sys", + "dispatch", + "instant", + "lazy_static", + "libc", + "log", + "mio", + "mio-extras", + "ndk 0.1.0", + "ndk-glue 0.1.0", + "ndk-sys 0.1.0", + "objc", + "parking_lot 0.10.2", + "percent-encoding", + "raw-window-handle", + "smithay-client-toolkit 0.6.6", + "wayland-client 0.23.6", + "winapi 0.3.9", + "x11-dl", +] + +[[package]] +name = "winit" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5bc559da567d8aa671bbcd08304d49e982c7bf2cb91e10288b9188931c1b772" +dependencies = [ + "bitflags", + "cocoa 0.23.0", + "core-foundation 0.9.1", + "core-graphics 0.22.2", + "core-video-sys", + "dispatch", + "instant", + "lazy_static", + "libc", + "log", + "mio", + "mio-extras", + "ndk 0.2.1", + "ndk-glue 0.2.1", + "ndk-sys 0.2.1", + "objc", + "parking_lot 0.11.1", + "percent-encoding", + "raw-window-handle", + "smithay-client-toolkit 0.12.3", + "wayland-client 0.28.5", + "winapi 0.3.9", + "x11-dl", +] + +[[package]] +name = "winres" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc" +dependencies = [ + "toml", +] + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "x11-dl" +version = "2.18.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8" +dependencies = [ + "lazy_static", + "libc", + "maybe-uninit", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +dependencies = [ + "libc", +] + +[[package]] +name = "xcursor" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a9a231574ae78801646617cefd13bfe94be907c0e4fa979cfd8b770aa3c5d08" +dependencies = [ + "nom 6.1.2", +] + +[[package]] +name = "xdg" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" + +[[package]] +name = "xml-rs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix new file mode 100644 index 00000000000..b4c12304a9d --- /dev/null +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -0,0 +1,115 @@ +{ rustPlatform +, runCommand +, lib +, fetchFromGitHub +, fetchgit +, makeWrapper +, pkg-config +, python2 +, expat +, openssl +, SDL2 +, vulkan-loader +, fontconfig +, ninja +, gn +, llvmPackages +, makeFontsConf +}: +rustPlatform.buildRustPackage rec { + pname = "neovide"; + version = "20210515"; + + src = + let + repo = fetchFromGitHub { + owner = "Kethku"; + repo = "neovide"; + rev = "0b976c3d28bbd24e6c83a2efc077aa96dde1e9eb"; + sha256 = "sha256-asaOxcAenKdy/yJvch3HFfgnrBnQagL02UpWYnz7sa8="; + }; + in + runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + # Reasons for patching Cargo.toml: + # - I got neovide built with latest compatible skia-save version 0.35.1 + # and I did not try to get it with 0.32.1 working. Changing the skia + # version is time consuming, because of manual dependecy tracking and + # long compilation runs. + sed -i $out/Cargo.toml \ + -e '/skia-safe/s;0.32.1;0.35.1;' + cp ${./Cargo.lock} $out/Cargo.lock + ''; + + cargoSha256 = "sha256-XMPRM3BAfCleS0LXQv03A3lQhlUhAP8/9PdVbAUnfG0="; + + SKIA_OFFLINE_SOURCE_DIR = + let + repo = fetchFromGitHub { + owner = "rust-skia"; + repo = "skia"; + # see rust-skia/Cargo.toml#package.metadata skia + rev = "m86-0.35.0"; + sha256 = "sha256-uTSgtiEkbE9e08zYOkRZyiHkwOLr/FbBYkr2d+NZ8J0="; + }; + # The externals for skia are taken from skia/DEPS + externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); + in + runCommand "source" { } ('' + cp -R ${repo} $out + chmod -R +w $out + + mkdir -p $out/third_party/externals + cd $out/third_party/externals + '' + (builtins.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "cp -ra ${value} ${name}") externals))); + + SKIA_OFFLINE_NINJA_COMMAND = "${ninja}/bin/ninja"; + SKIA_OFFLINE_GN_COMMAND = "${gn}/bin/gn"; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + + # test needs a valid fontconfig file + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + nativeBuildInputs = [ + pkg-config + makeWrapper + python2 # skia-bindings + llvmPackages.clang # skia + ]; + + # All tests passes but at the end cargo prints for unknown reason: + # error: test failed, to rerun pass '--bin neovide' + # Increasing the loglevel did not help. In a nix-shell environment + # the failure do not occure. + doCheck = false; + + buildInputs = [ + expat + openssl + SDL2 + fontconfig + ]; + + postFixup = '' + wrapProgram $out/bin/neovide \ + --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + + postInstall = '' + for n in 16x16 32x32 48x48 256x256; do + install -m444 -D "assets/neovide-$n.png" \ + "$out/share/icons/hicolor/$n/apps/neovide.png" + done + install -m444 -Dt $out/share/icons/hicolor/scalable/apps assets/neovide.svg + install -m444 -Dt $out/share/applications assets/neovide.desktop + ''; + + meta = with lib; { + description = "This is a simple graphical user interface for Neovim."; + homepage = "https://github.com/Kethku/neovide"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ck3d ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json new file mode 100644 index 00000000000..be1fdb181c2 --- /dev/null +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -0,0 +1,37 @@ +{ + "expat": { + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", + "rev": "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb", + "sha256": "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI=" + }, + "libjpeg-turbo": { + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", + "rev": "64fc43d52351ed52143208ce6a656c03db56462b", + "sha256": "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig=" + }, + "icu": { + "url": "https://chromium.googlesource.com/chromium/deps/icu.git", + "rev": "dbd3825b31041d782c5b504c59dcfb5ac7dda08c", + "sha256": "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE=" + }, + "zlib": { + "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", + "rev": "eaf99a4e2009b0e5759e6070ad1760ac1dd75461", + "sha256": "sha256-B4PgeSVBU/MSkPkXTu9jPIa37dNJPm2HpmiVf6XuOGE=" + }, + "harfbuzz": { + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", + "rev": "3a74ee528255cc027d84b204a87b5c25e47bff79", + "sha256": "sha256-/4UdoUj0bxj6+EfNE8ofjtWOn2VkseEfvdFah5rwwBM=" + }, + "libpng": { + "url": "https://skia.googlesource.com/third_party/libpng.git", + "rev": "386707c6d19b974ca2e3db7f5c61873813c6fe44", + "sha256": "sha256-67kf5MBsnBBi0bOfX/RKL52xpaCWm/ampltAI+EeQ+c=" + }, + "libgifcodec": { + "url": "https://skia.googlesource.com/libgifcodec", + "rev": "d06d2a6d42baf6c0c91cacc28df2542a911d05fe", + "sha256": "sha256-ke1X5iyj2ah2NqGVdFv8GuoRAzXg1aCeTdZwUM8wvCI=" + } +} diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 12995d3c5fe..6ae837105a9 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0l4lx5h2daw9c5vl4kz6sq2i58b45xy4948x4q0wnwbqdqlqc9s4"; - x86_64-darwin = "0qqgs7vns52bz9xkys822sjjkvyq4l20iipz6sx5kinxg6h04jyy"; - aarch64-linux = "1gnh5kk4r0kfik9yfvvcbavhws4n8kn89kyl2qzpa2ryy52kk81j"; - armv7l-linux = "0zz5fn9nxq58i3svhgc25s6fdz7i3rxc0naflyx1jzmpzipp4v6n"; + x86_64-linux = "08qrag9nzmngzzvs2cgbmc4zzxlb9kwn183v8caj6dvcrjvfqgbv"; + x86_64-darwin = "0rlyr08lla3xadlh373xqcks8a9akk3x2cmakgn17q2b16988fmq"; + aarch64-linux = "1m277940xsasqac4i88s05xrqsab99jhl3ka0zzfbixrgr2dj8q1"; + armv7l-linux = "1qm4cggjj50vdnrx848x810gz3ahh0hndra22lsvcjdbsw8g35rk"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.56.1"; + version = "1.56.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index c77e60950c9..d6e97c5d682 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 -, ApplicationServices +, ApplicationServices, Foundation }: let @@ -50,7 +50,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] - ++ lib.optional stdenv.isDarwin ApplicationServices; + ++ lib.optionals stdenv.isDarwin + [ ApplicationServices Foundation ]; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 fftw ] diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index a69f8d7f057..15b7c37244f 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -9,11 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0ihwrx4gspj8l7fc8vxch6dpjrw1lvv9z3c19f0wxnmnxhv1cjvs"; }; - NIX_CFLAGS_COMPILE = builtins.toString [ - "-Wno-error=format-truncation" - "-Wno-error=deprecated-declarations" - "-Wno-error=stringop-overflow" - ]; + NIX_CFLAGS_COMPILE = builtins.toString ( + [ "-Wno-error=deprecated-declarations" ] + ++ lib.optionals (!stdenv.cc.isClang) [ + "-Wno-error=format-truncation" + "-Wno-error=stringop-overflow" + ] + ); buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 70645202a46..583a8a1931b 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "20.3"; + version = "20.4"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-hmAksLPQxzB4O+ET+O/pmL/J4FG4+Dt0ulSsgjBWKxw="; + sha256 = "sha256-ZTYkKyu0/axf2uLUmQHRW/2bQ6p2zK7xBF66ozbPS2c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index e6350dfb7cb..3204a4a0e85 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.4.10"; + version = "3.5.0"; src = fetchzip { - url = "http://www-eu.apache.org/dist/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-4/EcVjIc+8OMkll8OxE5oXiqk+w9k1Nv9ld8N7oFFp0="; + url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; + sha256 = "sha256-aVhDbOYhgYaWjttGjJvBKbov7OGWh2/llBTePFPGXDM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index f92fe87b948..bb1573f74c5 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,46 +1,59 @@ { fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }: -# Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of -# adding this to services.udev.packages on NixOS + +# Although we copy in the udev rules here, you probably just want to use +# logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.0.2"; + version = "1.0.5"; + src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "0k5z9dap6rawiafkg1x7zjx51ala7wra6j6lvc2nn0y8r79yp7a9"; + sha256 = "sha256-k87DqIkvy5CVEsHT82ZArSM2JBi5sYdSCPfP4KjI850="; }; - propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; + propagatedBuildInputs = with python3Packages; [ + gobject-introspection + gtk3 + psutil + pygobject3 + pyudev + pyyaml + xlib + ]; + makeWrapperArgs = [ + "--prefix PYTHONPATH : $PYTHONPATH" + "--prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH" + ]; + + # the -cli symlink is just to maintain compabilility with older versions where + # there was a difference between the GUI and CLI versions. postInstall = '' - wrapProgram "$out/bin/solaar" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - wrapProgram "$out/bin/solaar-cli" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ln -s $out/bin/solaar $out/bin/solaar-cli - install -Dm644 -t $out/etc/udev/rules.d rules.d/*.rules + install -Dm444 -t $out/etc/udev/rules.d rules.d/*.rules ''; - enableParallelBuilding = true; + # No tests + doCheck = false; + meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' - Solaar is a Linux device manager for Logitech’s Unifying Receiver - peripherals. It is able to pair/unpair devices to the receiver, and for - most devices read battery status. + Solaar is a Linux manager for many Logitech keyboards, mice, and trackpads that + connect wirelessly to a USB Unifying, Lightspeed, or Nano receiver, connect + directly via a USB cable, or connect via Bluetooth. Solaar does not work with + peripherals from other companies. - It comes in two flavors, command-line and GUI. Both are able to list the - devices paired to a Unifying Receiver, show detailed info for each - device, and also pair/unpair supported devices with the receiver. + Solaar can be used as a GUI application or via its command-line interface. - To be able to use it, make sure you have access to /dev/hidraw* files. + This tool requires either to be run with root/sudo or alternatively to have the udev rules files installed. On NixOS this can be achieved by setting `hardware.logitech.wireless.enable`. ''; - license = licenses.gpl2; homepage = "https://pwr-solaar.github.io/Solaar/"; - platforms = platforms.linux; + license = licenses.gpl2Only; maintainers = with maintainers; [ spinus ysndr ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 9d93c8ae435..5f108049c35 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-gPrXeS7XT38Dil/EBwmeKIJrmPlEK+hmiyHi4p28tl0="; + sha256 = "sha256-rox8X+lYiiCXO66JemW+R2I6y/IxdK6qpaiFXYoL6nY="; }; - cargoSha256 = "sha256-9YKCtryb9mTPz9iWE7Iuk2SKgV0knWRbaouF+1DCjv8="; + cargoSha256 = "sha256-ujmBAld6DCc1l+yUu9qhRF8pS5HoIlstcdPTeTAyyXs="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 0b97110b1dd..387177a8c4c 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,19 +1,17 @@ { lib , stdenv , fetchurl -, fetchsvn , makeWrapper , makeDesktopItem -# sweethome3d 6.4.2 does not yet build with jdk 9 and later. -# this is fixed on trunk (7699?) but let's build with jdk8 until then. +# sweethome3d 6.5.2 does not yet fully build&run with jdk 9 and later? , jdk8 -# it can run on the latest stable jre fine though -, jre +, jre8 , ant , gtk3 , gsettings-desktop-schemas , p7zip , libXxf86vm +, unzip }: let @@ -49,7 +47,7 @@ let patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; buildInputs = [ ant jdk8 p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' @@ -77,7 +75,7 @@ let # without it a "Profiles [GL4bc, GL3bc, GL2, GLES1] not available on device null" # exception is thrown on startup. # https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753 - makeWrapper ${jre}/bin/java $out/bin/$exec \ + makeWrapper ${jre8}/bin/java $out/bin/$exec \ --set MESA_GL_VERSION_OVERRIDE 2.1 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-Dsun.java2d.opengl=true -jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" @@ -102,14 +100,13 @@ in { application = mkSweetHome3D rec { pname = lib.toLower module + "-application"; - version = "6.4.2"; + version = "6.5.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; - src = fetchsvn { - url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "13rczayakwb5246hqnp8lnw61p0p7ywr2294bnlp4zwsrz1in9z4"; - rev = "7504"; + src = fetchurl { + url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; + sha256 = "1j0xm2vmcxxjmf12k8rfnisq9hd7hqaiyxrfbrbjxis9iq3kycp3"; }; desktopName = "Sweet Home 3D"; icons = { diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index f5dbd0510a3..783ea3e7940 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,17 +1,17 @@ { lib , stdenv -, fetchcvs +, fetchurl , makeWrapper , makeDesktopItem -# sweethome3d 6.4.2 does not yet build with jdk 9 and later. -# this is fixed on trunk (7699?) but let's build with jdk8 until then. +# sweethome3d 6.5.2 does not yet fully build&run with jdk 9 and later? , jdk8 -# it can run on the latest stable jre fine though -, jre +, jre8 , ant , gtk3 , gsettings-desktop-schemas -, sweethome3dApp }: +, sweethome3dApp +, unzip +}: let @@ -20,6 +20,14 @@ let + removeSuffix "libraryeditor" (toLower m) + "-editor"; + applicationSrc = stdenv.mkDerivation { + name = "application-src"; + src = sweethome3dApp.src; + nativeBuildInputs = [ unzip ]; + buildPhase = ""; + installPhase = "cp -r . $out"; + }; + mkEditorProject = { pname, module, version, src, license, description, desktopName }: @@ -35,18 +43,18 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ant jre jdk8 gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ ant jre8 jdk8 gtk3 gsettings-desktop-schemas ]; postPatch = '' - sed -i -e 's,../SweetHome3D,${application.src},g' build.xml + sed -i -e 's,../SweetHome3D,${applicationSrc},g' build.xml sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml ''; buildPhase = '' runHook preBuild - ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk8}/lib + ant -lib ${applicationSrc}/libtest -lib ${applicationSrc}/lib -lib ${jdk8}/lib runHook postBuild ''; @@ -56,7 +64,7 @@ let mkdir -p $out/share/{java,applications} cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications - makeWrapper ${jre}/bin/java $out/bin/$exec \ + makeWrapper ${jre8}/bin/java $out/bin/$exec \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -d${toString stdenv.hostPlatform.parsed.cpu.bits}" ''; @@ -78,31 +86,27 @@ let in { textures-editor = mkEditorProject rec { - version = "1.5"; + version = "1.7"; module = "TexturesLibraryEditor"; pname = module; description = "Easily create SH3T files and edit the properties of the texture images it contain"; license = lib.licenses.gpl2Plus; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h"; - module = module; - tag = "V_" + d2u version; + src = fetchurl { + url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; + sha256 = "03vb9y645qzffxxdhgbjb0d98k3lafxckg2vh2s86j62b6357d0h"; }; desktopName = "Sweet Home 3D - Textures Library Editor"; }; furniture-editor = mkEditorProject rec { - version = "1.19"; + version = "1.27"; module = "FurnitureLibraryEditor"; pname = module; description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; license = lib.licenses.gpl2; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; - sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs"; - module = module; - tag = "V_" + d2u version; + src = fetchurl { + url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; + sha256 = "1zxbcn9awgax8lalzkc05f5yfwbgnrayc17fkyv5i19j4qb3r2a0"; }; desktopName = "Sweet Home 3D - Furniture Library Editor"; }; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 5690dc0db10..0b6a57492c5 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ] ++ optional stdenv.isLinux libseccomp ++ optional stdenv.isDarwin gtk-mac-integration; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = { homepage = "https://git.pwmt.org/pwmt/zathura"; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index cb65c753bcc..d7f2d9c58d6 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.24.82"; + version = "1.24.85"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "iWUJ5yLWWQvg510Atf+Pd9ya/1NnMNW2Sp/RVFn4PCc="; + sha256 = "jE9INGYz78Vyvps4ESimtH1rL4GdboAUtMx1p31XQGk="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b086523e7b8..1dfa0bcb5e9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "90.0.4430.93", - "sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk", - "sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6", + "version": "90.0.4430.212", + "sha256": "17nmhrkl81qqvzbh861k2mmifncx4wg1mv1fmn52f8gzn461vqdb", + "sha256bin64": "1y33c5829s22yfj0qmsj8fpcxnjhcm3fsxz7744csfsa9cy4fjr7", "deps": { "gn": { "version": "2021-02-09", @@ -55,8 +55,8 @@ "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" }, "ungoogled-patches": { - "rev": "90.0.4430.93-1", - "sha256": "11adnd96iwkkri3yyzvxsq43gqsc12fvd87rvqqflj0irrdk98a0" + "rev": "90.0.4430.212-1", + "sha256": "05jh05a4g50ws7pr18dl5pwi95knygh6xywp7kyydir7wy1pbin8" } } } diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 8310d058492..05419543507 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.3.3"; + version = "2021.5.6"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-St2WBdy76OVFlYoY1RGwQj1WsUpPtsL7yX1MFwztKgs="; + sha256 = "sha256-CwwdU5phnJGcSVXCoea3jZoSa9uoABJKL/Z1BsYUY1g="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 959b0a9877f..f31744102ba 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-+LuBz58hTzi/hGwqX/0VMNYn/+SRYgnNefn3B3i7eEs="; + sha256 = "sha256-6w0FwVmzICsjWH7lE2ZnIhictNFTpo8pQ2Wvsyn925A="; }; vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 52bd01ae17b..60d5dec48a5 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-5IUcKVbHxL5qb7M087sZSsd50t5zSaeWATnyLHkVsRU="; + sha256 = "sha256-gJjCw28SqU49kIiRH+MZgeYN4VBgKVEaRPr5A/2c5Pc="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 897428a7577..929c254a1bd 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub , go-bindata @@ -11,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.19.0"; + version = "1.20.0"; - vendorSha256 = "sha256-WGW2uz3YJIUjLsYQ6rXNvgJGLrZSIkEEk07llLzMVXA="; + vendorSha256 = "sha256-ncgf2C4PZMoVMZIMDn9LwP2EDqg7T/WbUPRd/SqGGnU="; doCheck = false; @@ -21,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-F+nPSWX9gs/hvOR6g8MW4b+JW+w3ScDaaF/FLHbLspY="; + sha256 = "sha256-TnvbO8OLjnI5WGy3QR4OZbesOBat2VsL7ElCnj2Tkmk="; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/nixops/shell.nix b/pkgs/applications/networking/cluster/nixops/shell.nix index 3fc06b0bc73..0139cb2c812 100644 --- a/pkgs/applications/networking/cluster/nixops/shell.nix +++ b/pkgs/applications/networking/cluster/nixops/shell.nix @@ -1,7 +1,7 @@ -{ pkgs ? import {} }: +{ pkgs ? import { } }: pkgs.mkShell { - buildInputs = [ + packages = [ pkgs.poetry2nix.cli pkgs.pkg-config pkgs.libvirt diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index 82f508c63ee..cf4a9cde526 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "0.12.10"; - sha256 = "12hlzjkay7y1502nmfvq2qkhp9pq7vp4zxypawnh98qvxbzv149l"; + version = "0.12.12"; + sha256 = "0hz5fsqv8jh22zhs0r1yk0c4qf4sf11hmqg4db91kp2xrq72a0qg"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix index 99c43aeeee4..f4551d1e823 100644 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.4"; - sha256 = "0znaxz9mzbqb59p6rwa5h89m344m2ci39jsx8dfh1v5fc17r0fcq"; + version = "1.0.5"; + sha256 = "06l56fi4fhplvl8v0i88q18yh1hwwd12fngnrflb91janbyk6p4l"; } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 4cab638ba67..ca10fdcf9bc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.1"; + version = "0.29.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fr33DRFZrUZQELYMf8z5ShOZobwylgoiW+yi6qdtFP4="; + sha256 = "sha256-e4DwMphX8I37MShMt5nnoizfL919mJaFCkDGNeGXHbQ="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 008592778aa..4adc508392a 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "davmail"; - version = "5.4.0"; + version = "5.5.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3135.zip"; - sha256 = "05n2j5canh046744arvni6yfdsandvjkld93w3p7rg116jrh19gq"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3299.zip"; + sha256 = "sha256-NN/TUOcUIifNzrJnZmtYhs6UVktjlfoOYJjYaMEQpI4="; }; sourceRoot = "."; @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' + runHook preInstall mkdir -p $out/share/davmail cp -vR ./* $out/share/davmail makeWrapper $out/share/davmail/davmail $out/bin/davmail \ --prefix PATH : ${jre}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 libXtst ]} + runHook postInstall ''; meta = with lib; { @@ -25,6 +27,6 @@ stdenv.mkDerivation rec { description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; maintainers = [ maintainers.hinton ]; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index cac662c9b6b..a17f3d2e40d 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x002p7wPKbcmr4uE04mgKBagHQV/maEo99Y2Jr7xgK4="; + sha256 = "sha256-9lIjQaMYy0FGMkR29Es3BMIAcn+jQYudyFJHwezlXKM="; }; - vendorSha256 = "sha256-lR5+xVi/ROOFoRWyK0h/8uiSP/joQ9Zr9kMaQ+sWNhM="; + vendorSha256 = "sha256-thvbqDhLdY+g/byFHJ9Tdiw8WYRccu4X1Rb0pdhE34E="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index ac7af8e53b3..8182832089d 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -20,19 +20,19 @@ stdenv.mkDerivation rec { pname = "newsflash"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - hash = "sha256-EInI5Unaz9m8/gJ7vAzJVyMynJGq0KZh12dNK8r1wnY="; + hash = "sha256-pskmvztKOwutXRHVnW5u68/0DAuV9Gb+Ovp2JbXiMYo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-xrWZhjfYnO6M3LMTP6l3+oZOusvUWuRBDesIlsiEJ6s="; + hash = "sha256-qq8cZplt5YWUwsXUShMDhQm3RGH2kCEBk64x6bOa50E="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 6b143abda3b..a4a1b3405b1 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.6.0"; + version = "5.7.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "19sdmkxxzaidb89m8k56p94hq2yaxwn9islzrzwb86f50hlrq46w"; + sha256 = "0yfr0n84p3jp8mnnqww2dqpcj9gd7rwpygpq4v10rmrnli18qygw"; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 3e58e83143f..6b73f03531d 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: @@ -13,6 +13,15 @@ mkDerivation rec { sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; + patches = [ + # Fix compilation failure with "error: template with C linkage", fixes #122505 + (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_glib2.diff?h=seafile-client&id=7be253aaa2bdb6771721f45aa08bc875c8001c5a"; + name = "fix_build_with_glib2.diff"; + sha256 = "0hl7rcqfr8k62c1pr133bp3j63b905izaaggmgvr1af4jibal05v"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; @@ -29,6 +38,6 @@ mkDerivation rec { description = "Desktop client for Seafile, the Next-generation Open Source Cloud Storage"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ eduardosm ]; }; } diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index ce322037735..7dcb6d467d6 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -4,7 +4,7 @@ , unwrapped # If it's a minimal build, we don't want to wrap it with lndir and # wrapProgram.. -, wrap ? true +, doWrap ? true # For the wrapper , makeWrapper # For lndir @@ -138,7 +138,7 @@ let ; pkgs = packages; }; - self = if wrap then + self = if doWrap then stdenv.mkDerivation { inherit name passthru; buildInputs = [ diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index e51d181266a..fd49957aa35 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg -, libraw, libtiff, libpng, libjpeg, libheif, ffms +, libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "0h3slgpj6zdc0rwmyr9zb0vgf53283hpwb7h26skdswmggsk90i5"; }; + patches = [ + # Backport fix for broken build on glib-2.68 + (fetchpatch { + url = "https://gitlab.com/free-astro/siril/-/commit/d319fceca5b00f156e1c5e3512d3ac1f41beb16a.diff"; + sha256 = "00lq9wq8z48ly3hmkgzfqbdjaxr0hzyl2qwbj45bdnxfwqragh5m"; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config git criterion wrapGAppsHook ]; diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 715f5bb8bfa..4f5872de07d 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "11apzq7l1lk3yxw97g9dfr0gwnvfh58x6apifcblgd66gbip3y1y"; + sha256 = "sha256-uEKTB8935YY6lpXv2tJBQ1hrRk63vALLQb6SUXsVyhQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix index bed562abe23..ba1d6c27ccb 100644 --- a/pkgs/applications/science/biology/cd-hit/default.nix +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, zlib, perl, perlPackages, openmp }: stdenv.mkDerivation rec { version = "4.8.1"; @@ -14,8 +14,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ perl perlPackages.TextNSP perlPackages.PerlMagick ]; nativeBuildInputs = [ zlib makeWrapper ]; + buildInputs = lib.optional stdenv.cc.isClang openmp; - makeFlags = [ "PREFIX=$(out)/bin" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}c++" # remove once https://github.com/weizhongli/cdhit/pull/114 is merged + "PREFIX=$(out)/bin" + ]; preInstall = "mkdir -p $out/bin"; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 1a5c0de5fb7..9848eb58399 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -15,84 +15,124 @@ , boost , pkg-config , doxygen +, graphviz , pcre , libpthreadstubs , libXdmcp , lndir +, util-linux +, libselinux +, libsepol +, libthai +, libdatrie +, libxkbcommon +, epoxy +, dbus +, at-spi2-core +, libXtst + +, swig +, python +, wxPython +, opencascade +, opencascade-occt +, libngspice +, valgrind + , stable , baseName , kicadSrc , kicadVersion , i18n , withOCE -, opencascade , withOCC -, opencascade-occt , withNgspice -, libngspice , withScripting -, swig -, python -, wxPython , debug -, valgrind +, sanitizeAddress +, sanitizeThreads , withI18n -, gtk3 }: assert lib.asserts.assertMsg (!(withOCE && stdenv.isAarch64)) "OCE fails a test on Aarch64"; assert lib.asserts.assertMsg (!(withOCC && withOCE)) "Only one of OCC and OCE may be enabled"; +assert lib.assertMsg (!(stable && (sanitizeAddress || sanitizeThreads))) + "Only kicad-unstable(-small) supports address/thread sanitation"; +assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) + "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "kicad-base"; - version = kicadVersion; + version = if (stable) then kicadVersion else builtins.substring 0 10 src.rev; src = kicadSrc; # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here - # "-1" appended to indicate we're adding a patch postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace "unknown" "${builtins.substring 0 10 src.rev}-1" \ - --replace "${version}" "${version}-1" + --replace "unknown" "${builtins.substring 0 10 src.rev}" \ ''; - makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; + makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - cmakeFlags = - optionals (withScripting) [ - "-DKICAD_SCRIPTING=ON" - "-DKICAD_SCRIPTING_MODULES=ON" - "-DKICAD_SCRIPTING_PYTHON3=ON" - "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" - ] - ++ optional (!withScripting) - "-DKICAD_SCRIPTING=OFF" - ++ optional (withNgspice) "-DKICAD_SPICE=ON" - ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" - ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" - ++ optionals (withOCE) [ - "-DKICAD_USE_OCE=ON" - "-DOCE_DIR=${opencascade}" - ] - ++ optionals (withOCC) [ - "-DKICAD_USE_OCC=ON" - "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" - ] - ++ optionals (debug) [ - "-DCMAKE_BUILD_TYPE=Debug" - "-DKICAD_STDLIB_DEBUG=ON" - "-DKICAD_USE_VALGRIND=ON" - ] - ; + cmakeFlags = optionals (withScripting) [ + "-DKICAD_SCRIPTING=ON" + "-DKICAD_SCRIPTING_MODULES=ON" + "-DKICAD_SCRIPTING_PYTHON3=ON" + "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" + ] + ++ optional (!withScripting) + "-DKICAD_SCRIPTING=OFF" + ++ optional (withNgspice) "-DKICAD_SPICE=ON" + ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" + ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" + ++ optionals (withOCE) [ + "-DKICAD_USE_OCE=ON" + "-DOCE_DIR=${opencascade}" + ] + ++ optionals (withOCC) [ + "-DKICAD_USE_OCC=ON" + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + ] + ++ optionals (debug) [ + "-DCMAKE_BUILD_TYPE=Debug" + "-DKICAD_STDLIB_DEBUG=ON" + "-DKICAD_USE_VALGRIND=ON" + ] + ++ optionals (sanitizeAddress) [ + "-DKICAD_SANITIZE_ADDRESS=ON" + ] + ++ optionals (sanitizeThreads) [ + "-DKICAD_SANITIZE_THREADS=ON" + ]; - nativeBuildInputs = [ cmake doxygen pkg-config lndir ]; + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + lndir + ] + # wanted by configuration on linux, doesn't seem to affect performance + # no effect on closure size + ++ optionals (stdenv.isLinux) [ + util-linux + libselinux + libsepol + libthai + libdatrie + libxkbcommon + epoxy + dbus.daemon + at-spi2-core + libXtst + ]; buildInputs = [ libGLU @@ -100,6 +140,7 @@ stdenv.mkDerivation rec { zlib libX11 wxGTK + wxGTK.gtk pcre libXdmcp gettext @@ -110,7 +151,6 @@ stdenv.mkDerivation rec { curl openssl boost - gtk3 ] ++ optionals (withScripting) [ swig python wxPython ] ++ optional (withNgspice) libngspice diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 86bda3092bc..79a044a800c 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -25,6 +25,8 @@ , withScripting ? true , python3 , debug ? false +, sanitizeAddress ? false +, sanitizeThreads ? false , with3d ? true , withI18n ? true , srcs ? { } @@ -146,28 +148,28 @@ let }; python = python3; - wxPython = python.pkgs.wxPython_4_0; + wxPython = if (stable) + then python.pkgs.wxPython_4_0 + else python.pkgs.wxPython_4_1; inherit (lib) concatStringsSep flatten optionalString optionals; in stdenv.mkDerivation rec { # Common libraries, referenced during runtime, via the wrapper. - passthru.libraries = callPackages ./libraries.nix { inherit libSrc libVersion; }; - passthru.i18n = callPackage ./i18n.nix { - src = i18nSrc; - version = i18nVersion; - }; + passthru.libraries = callPackages ./libraries.nix { inherit libSrc; }; + passthru.i18n = callPackage ./i18n.nix { src = i18nSrc; }; base = callPackage ./base.nix { inherit stable baseName; inherit kicadSrc kicadVersion; inherit (passthru) i18n; inherit wxGTK python wxPython; - inherit debug withI18n withOCC withOCE withNgspice withScripting; + inherit withI18n withOCC withOCE withNgspice withScripting; + inherit debug sanitizeAddress sanitizeThreads; }; inherit pname; - version = kicadVersion; + version = if (stable) then kicadVersion else builtins.substring 0 10 src.src.rev; src = base; dontUnpack = true; @@ -193,14 +195,31 @@ stdenv.mkDerivation rec { # wrapGAppsHook did these two as well, no idea if it matters... "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" - + # required to open a bug report link in firefox-wayland + "--set-default MOZ_DBUS_REMOTE 1" + ] + ++ optionals (stable) + [ "--set-default KISYSMOD ${footprints}/share/kicad/modules" "--set-default KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" "--set-default KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (stable && with3d) [ "--set-default KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (!stable) + [ + "--set-default KICAD6_FOOTPRINT_DIR ${footprints}/share/kicad/modules" + "--set-default KICAD6_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set-default KICAD6_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD6_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD6_TEMPLATE_DIR : ${footprints}/share/kicad/template" + ] + ++ optionals (!stable && with3d) + [ + "--set-default KISYS3DMOD ${packages3d}/share/kicad/3dmodels" + "--set-default KICAD6_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" + ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 @@ -238,6 +257,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share ln -s ${base}/share/applications $out/share/applications + ln -s ${base}/share/metainfo $out/share/metainfo ln -s ${base}/share/icons $out/share/icons ln -s ${base}/share/mime $out/share/mime ''; @@ -260,8 +280,7 @@ stdenv.mkDerivation rec { The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; license = lib.licenses.gpl3Plus; - # berce seems inactive... - maintainers = with lib.maintainers; [ evils kiwi berce ]; + maintainers = with lib.maintainers; [ evils kiwi ]; # kicad is cross platform platforms = lib.platforms.all; # despite that, nipkgs' wxGTK for darwin is "wxmac" diff --git a/pkgs/applications/science/electronics/kicad/i18n.nix b/pkgs/applications/science/electronics/kicad/i18n.nix index 9a93e4ca7ce..c9a70a0060d 100644 --- a/pkgs/applications/science/electronics/kicad/i18n.nix +++ b/pkgs/applications/science/electronics/kicad/i18n.nix @@ -2,13 +2,13 @@ , cmake , gettext , src -, version }: stdenv.mkDerivation { - inherit src version; + inherit src; pname = "kicad-i18n"; + version = builtins.substring 0 10 src.rev; nativeBuildInputs = [ cmake gettext ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index e98f2e49576..9591cbc31c3 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -2,13 +2,12 @@ , cmake , gettext , libSrc -, libVersion }: let mkLib = name: stdenv.mkDerivation { pname = "kicad-${name}"; - version = libVersion; + version = builtins.substring 0 10 (libSrc name).rev; src = libSrc name; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 8a5e5d8f5f5..5fa9aba64b0 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,17 +3,17 @@ { "kicad" = { kicadVersion = { - version = "5.1.9"; + version = "5.1.10"; src = { - rev = "73d0e3b20dec05c4350efa5b69916eb29a7bfcb5"; - sha256 = "1cqh3bc9y140hbryfk9qavs2y3lj5sm9q0qjxcf4mm472afzckky"; + rev = "88a1d61d58fdd62149bd1e00984e01540148ca1b"; + sha256 = "10ix560bqy0lprnik1bprxw9ix4g8w2ipvyikx551ak9ryvgwjcc"; }; }; libVersion = { - version = "5.1.9"; + version = "5.1.10"; libSources = { - i18n.rev = "04f3231f60d55400cb81564b2cd465a57d5192d5"; - i18n.sha256 = "04jq1dcag6i2ljjfqrib65mn4wg4c4nmi7i946l3bywc0rkqsx1f"; + i18n.rev = "f081afe79be4660d5c49a9d674e3cb666d76d4d0"; + i18n.sha256 = "0y51l0r62cnxkvpc21732p3cx7pjvaqjih8193502hlv9kv1j9p6"; symbols.rev = "6dec5004b6a2679c19d4857bda2f90c5ab3a5726"; symbols.sha256 = "0n25rq32jwyigfw26faqraillwv6zbi2ywy26dkz5zqlf5xp56ad"; templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; @@ -27,23 +27,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-12-23"; + version = "2021-05-13"; src = { - rev = "912657dd238ad78cfc5d9d5e426ea850d5554fb3"; - sha256 = "1p5kr4d4zpajwdmya1f351y1ix8qmvsx1hrnvhzh7yc3g72kgxah"; + rev = "8513ca974c28d76d9f74a7dc96601d98e66e87fd"; + sha256 = "1xlj6jwzwxsa14djqhj0csziii21mr9czvdj6fxqp6px84cifjsh"; }; }; libVersion = { - version = "2020-12-23"; + version = "2021-05-13"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; - symbols.rev = "e538abb015b4f289910a6f26b2f1b9cb8bf2efdb"; - symbols.sha256 = "117y4cm46anlrnw6y6mdjgl1a5gab6h6m7cwx3q7qb284m9bs5gi"; - templates.rev = "32a4f6fab863976fdcfa232e3e08fdcf3323a954"; - templates.sha256 = "13r94dghrh9slpj7nkzv0zqv5hk49s6pxm4q5ndqx0y8037ivmhk"; - footprints.rev = "15ffd67e01257d4d8134dbd6708cb58977eeccbe"; - footprints.sha256 = "1ad5k3wh2zqfibrar7pd3g363jk2q51dvraxnq3zlxa2x4znh7mw"; + symbols.rev = "32de73ea01347a005790119eb4102c550815685c"; + symbols.sha256 = "0gj10v06rkxlxngc40d1sfmlcagy5p7jfxid0lch4w0wxfjmks7z"; + templates.rev = "073d1941c428242a563dcb5301ff5c7479fe9c71"; + templates.sha256 = "14p06m2zvlzzz2w74y83f2zml7mgv5dhy2nyfkpblanxawrzxv1x"; + footprints.rev = "8fa36dfa3423d8777472e3475c1c2b0b2069624f"; + footprints.sha256 = "138xfkr0prxw2djkwc1m4mlp9km99v12sivbqhm1jkq5yxngdbin"; packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 00c830fcd33..e9496ce60c2 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: @@ -20,6 +20,15 @@ mkDerivation rec { qtbase qtsvg ]; + patches = [ + # Allow building with glib 2.68 + # PR at https://github.com/sigrokproject/pulseview/pull/39 + (fetchpatch { + url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch"; + sha256 = "07ifsis9jlc0jjp2d11f7hvw9kaxcbk0a57h2m4xsv1d7vzl9yfh"; + }) + ]; + meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; homepage = "https://sigrok.org/"; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 45a1345de86..d20be86daf0 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl -, openssl, gmp, zlib, fetchFromGitHub, rustPlatform }: +, openssl, gmp, zlib, fetchFromGitHub, rustPlatform, libiconv }: let libPath = lib.makeLibraryPath [ gmp ]; @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; OPENSSL_NO_VENDOR = 1; - buildInputs = [ curl zlib openssl ]; + buildInputs = [ curl zlib openssl ] + ++ lib.optional stdenv.isDarwin libiconv; cargoBuildFlags = [ "--features no-self-update" ]; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 51389d20b7d..8d27446bd66 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.34"; + version = "1.8.36"; src = fetchPypi { inherit pname version; - sha256 = "b922c9b6cf4719667e195a02d8364ccebbe7966a9c18666f8ac22eae9d9e7a2c"; + sha256 = "1gc92gp45d9pcxhmc03kbnar61jxfpx50v3jhdrsflpzhxyhjz5g"; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with lib; { description = "MAVLink proxy and command line ground station"; homepage = "https://github.com/ArduPilot/MAVProxy"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index c4d9605ddf8..1b9304d49e7 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.1.2"; + version = "4.1.3"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -63,7 +63,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "16q0g9b1kyan3qhhp5mmfnrx9h8q7qn83baplbiprqjgpvkxfll4"; + sha256 = "0fbf564vzckvy1dc8f6yd8vpnzwzsgynva13bl2ks06768rrq9fb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 82286289fba..6ddeffe68eb 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "terminator"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; rev = "v${version}"; - sha256 = "sha256-Rd5XieB7K2BkSzrAr6Kmoa30xuwvsGKpPrsG2wrU1o8="; + sha256 = "1pfrzna30xv9yri6dsny1j5k35417m4hsg97c455vssywyl9w4jr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 9b2853551c2..6c95d7e016f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, Security +, libiconv, Security , pkg-config, openssl }: @@ -19,7 +19,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 5422bde2657..264677dc1cd 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lefthook"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-wW8Obh0YmAZHKrXLQ8364+TrAmLIYKRir2qXdWLtVkE="; + sha256 = "sha256-IKrutZJhs2iuwhXoV+81rDoaSi/xdYRpIlF1YjGFGY4="; }; - vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko="; + vendorSha256 = "sha256-Rp67FnFU27u85t02MIs7wZQoOa8oGsHVVPQ9OdIyTJg="; doCheck = false; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 6db7cbad6e9..1f798e33eb8 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl, Security }: +{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl +, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; @@ -14,8 +15,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6"; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = if stdenv.isDarwin + then [ libiconv Security ] + else [ openssl ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix index 10912e489e2..1e91c267985 100644 --- a/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "1.21.2"; + version = "1.21.3"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "sha256-FXtjR/4/f434gp78PBSt+QrYtMYcnljO3Htxss/wH7U="; + sha256 = "sha256-OShd6sPGXXu0rlSwuQFMWqrLscE6Y0I2eV2YJYyZNMs="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index 67e7b8bbc27..648dfabc29f 100644 --- a/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "7.6.2"; + version = "7.6.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-MdgPUKkbqNt/WKUTrYNetlyUBQcYLSn0J8EHH2Z9I+g="; + sha256 = "sha256-F2uvf3BChN4p4VV1vTMAAPwQchVI5paTdxSFEi0u9a0="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 3e6b3dc51dc..9e018215dad 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -38,15 +38,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20210219"; - kodiVersion = "19.0"; + kodiReleaseDate = "20210508"; + kodiVersion = "19.1"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; - rev = "${kodiVersion}-${rel}"; - sha256 = "097dg6a7v4ia85jx1pmlpwzdpqcqxlrmniqd005q73zvgj67zc2p"; + rev = "v${kodiVersion}"; + sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h"; }; ffmpeg = stdenv.mkDerivation rec { diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index a632640e900..a8fbb1d09c1 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.24.2"; + version = "0.24.3"; suffix = { x86_64-linux = "x86_64"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "0l7x9sfyx52n0mwrmicdcnhm8z10q57kk1a5wf459l8lvp59xw08"; + x86_64-linux = "sha256-i6NMVFoLm4hQJH7RnhfC0t+0DJCINoP5b/iCv9JyRdk="; aarch64-linux = "0m7xs12g97z1ipzaf7dgknf3azlah0p6bdr9i454azvzg955238b"; }; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index bc66791ad36..e7479957444 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fetchpatch, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which, @@ -23,6 +23,18 @@ 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 = [ + # Fix building with glib 2.68. Remove after next release. + # We drop AUTHORS due to conflicts when applying. + # https://github.com/vmware/open-vm-tools/pull/505 + (fetchpatch { + url = "https://github.com/vmware/open-vm-tools/commit/82931a1bcb39d5132910c7fb2ddc086c51d06662.patch"; + stripLen = 1; + excludes = [ "AUTHORS" ]; + sha256 = "0yz5hnngr5vd4416hvmh8734a9vxa18d2xd37kl7if0p9vik6zlg"; + }) + ]; + postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 1633c8d66f3..840ada805d7 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "virt-manager-qt"; - version = "0.71.95"; + version = "0.72.97"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = version; - sha256 = "1s8753bzsjyixpv1c2l9d1xjcn8i47k45qj7pr50prc64ldf5f47"; + sha256 = "0b2bx7ah35glcsiv186sc9cqdrkhg1vs9jz036k9byk61np0cb1i"; }; cmakeFlags = [ @@ -22,10 +22,9 @@ mkDerivation rec { patches = [ (fetchpatch { - # Maintainer note: Check whether this patch is still needed when a new version is released - name = "krdc-variable-name-changes.patch"; - url = "https://github.com/fadenb/qt-virt-manager/commit/4640f5f64534ed7c8a1ecc6851f1c7503988de6d.patch"; - sha256 = "1chl58nra1mj96n8jmnjbsyr6vlwkhn38afhwqsbr0bgyg23781v"; + # drop with next update + url = "https://github.com/F1ash/qt-virt-manager/commit/0d338b037ef58c376d468c1cd4521a34ea181edd.patch"; + sha256 = "1wjqyc5wsnxfwwjzgqjr9hcqhd867amwhjd712qyvpvz8x7p2s24"; }) ]; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index ce0b40c0bb7..2ed6bc30366 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc +{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, freetype, asciidoc , xdotool, xorgserver, xsetroot, xterm, runtimeShell , nixosTests }: stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38"; + sha256 = "01f1bv9axjhw1l2gwhdwahljssj0h8q7a1bqwbpnwvln0ayv39qb"; }; outputs = [ @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { libXinerama libXrandr libXft + libXrender freetype ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index 8f684fec620..2aade360745 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "kbdd"; - version = "unstable-2017-01-29"; + version = "unstable-2021-04-26"; src = fetchFromGitHub { owner = "qnikst"; repo = "kbdd"; - rev = "0e1056f066ab6e3c74fd0db0c9710a9a2b2538c3"; - sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj"; + rev = "3145099e1fbbe65b27678be72465aaa5b5872874"; + sha256 = "1gzcjnflgdqnjgphiqpzwbcx60hm0h2cprncm7i8xca3ln5q6ba1"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Simple daemon and library to make per window layout using XKB"; homepage = "https://github.com/qnikst/kbdd"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.wedens ]; }; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 2636d9100d5..03abea94a2e 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -4,6 +4,8 @@ , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests +# Used by the NixOS module: +, isNixOS ? false }: stdenv.mkDerivation rec { @@ -27,6 +29,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = lib.optionalString isNixOS '' + echo -e '\ninclude /etc/sway/config.d/*' >> config.in + ''; + nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 964828fdaba..07459295d75 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -4,6 +4,8 @@ , withBaseWrapper ? true, extraSessionCommands ? "", dbus , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 , extraOptions ? [] # E.g.: [ "--verbose" ] +# Used by the NixOS module: +, isNixOS ? false }: assert extraSessionCommands != "" -> withBaseWrapper; @@ -11,6 +13,7 @@ assert extraSessionCommands != "" -> withBaseWrapper; with lib; let + sway = sway-unwrapped.override { inherit isNixOS; }; baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then @@ -20,16 +23,16 @@ let fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec ${sway-unwrapped}/bin/sway "$@" + exec ${sway}/bin/sway "$@" else - exec ${dbus}/bin/dbus-run-session ${sway-unwrapped}/bin/sway "$@" + exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@" fi ''; in symlinkJoin { - name = "sway-${sway-unwrapped.version}"; + name = "sway-${sway.version}"; paths = (optional withBaseWrapper baseWrapper) - ++ [ sway-unwrapped ]; + ++ [ sway ]; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); @@ -49,5 +52,5 @@ in symlinkJoin { passthru.providedSessions = [ "sway" ]; - inherit (sway-unwrapped) meta; + inherit (sway) meta; } diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 984d61f1f75..ed7d11a1314 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -1,6 +1,6 @@ # Builder for Agda packages. -{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages, nixosTests }: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, ghcWithPackages, nixosTests }: with lib.strings; diff --git a/pkgs/build-support/mkshell/default.nix b/pkgs/build-support/mkshell/default.nix index a70dc0390cb..7ca4cc23c1d 100644 --- a/pkgs/build-support/mkshell/default.nix +++ b/pkgs/build-support/mkshell/default.nix @@ -3,18 +3,22 @@ # A special kind of derivation that is only meant to be consumed by the # nix-shell. { - inputsFrom ? [], # a list of derivations whose inputs will be made available to the environment - buildInputs ? [], - nativeBuildInputs ? [], - propagatedBuildInputs ? [], - propagatedNativeBuildInputs ? [], - ... + # a list of packages to add to the shell environment + packages ? [ ] +, # propagate all the inputs from the given derivations + inputsFrom ? [ ] +, buildInputs ? [ ] +, nativeBuildInputs ? [ ] +, propagatedBuildInputs ? [ ] +, propagatedNativeBuildInputs ? [ ] +, ... }@attrs: let mergeInputs = name: lib.concatLists (lib.catAttrs name - ([attrs] ++ inputsFrom)); + ([ attrs ] ++ inputsFrom)); rest = builtins.removeAttrs attrs [ + "packages" "inputsFrom" "buildInputs" "nativeBuildInputs" @@ -26,15 +30,15 @@ in stdenv.mkDerivation ({ name = "nix-shell"; - phases = ["nobuildPhase"]; + phases = [ "nobuildPhase" ]; buildInputs = mergeInputs "buildInputs"; - nativeBuildInputs = mergeInputs "nativeBuildInputs"; + nativeBuildInputs = packages ++ (mergeInputs "nativeBuildInputs"); propagatedBuildInputs = mergeInputs "propagatedBuildInputs"; propagatedNativeBuildInputs = mergeInputs "propagatedNativeBuildInputs"; shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook" - (lib.reverseList inputsFrom ++ [attrs])); + (lib.reverseList inputsFrom ++ [ attrs ])); nobuildPhase = '' echo diff --git a/pkgs/data/themes/amber/default.nix b/pkgs/data/themes/amber/default.nix index 258dcff3266..e39f0e3f645 100644 --- a/pkgs/data/themes/amber/default.nix +++ b/pkgs/data/themes/amber/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amber-theme"; - version = "3.36-2"; + version = "3.38-1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1g0hkv9sxfxfnpv8x7g64lr2by7wd4k216s3y9xpibsycdbwpyi5"; + sha256 = "sha256-OrdBeAD+gdIu6u8ESE9PtqYadSuJ8nx1Z8fB4D9y4W4="; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index fff5e4bf41a..630d928e602 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -1,9 +1,11 @@ { lib, stdenv , fetchFromGitHub , sassc -, autoreconfHook +, meson +, ninja , pkg-config , gtk3 +, glib , gnome , gtk-engine-murrine , optipng @@ -13,22 +15,24 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20210127"; + version = "20210412"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "sha256-P7YZTD5bAWNWepL7qsZZAMf8ujzNbHOj/SLx8Fw3bi4="; + sha256 = "sha256-BNJirtBtdWsIzQfsJsZzg1zFbJEzZPq1j2qZ+1QjRH8="; }; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkg-config sassc optipng inkscape gtk3 + glib # for glib-compile-resources ]; propagatedUserEnvPkgs = [ @@ -36,23 +40,21 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - enableParallelBuilding = true; - preBuild = '' # Shut up inkscape's warnings about creating profile directory export HOME="$NIX_BUILD_ROOT" ''; - configureFlags = [ - "--with-cinnamon=${cinnamon.cinnamon-common.version}" - "--with-gnome-shell=${gnome.gnome-shell.version}" - "--disable-unity" + mesonFlags = [ + "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm" + "-Dvariants=light,darker,dark,lighter" + "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" + "-Dgnome_shell_version=${gnome.gnome-shell.version}" + "-Dgtk3_version=${gtk3.version}" + # You will need to patch gdm to make use of this. + "-Dgnome_shell_gresource=true" ]; - postInstall = '' - install -Dm644 -t $out/share/doc/${pname} AUTHORS *.md - ''; - meta = with lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; homepage = "https://github.com/jnsh/arc-theme"; diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 3e80575a33d..9c0b1f65976 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38"; + sha256 = "2M30n57uHDo8aZHDL4VjxKfE2w23ymPOUcyRjkM7M6U="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index abdf751baeb..a00b239641f 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -1,46 +1,45 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, gnome , meson , ninja -, vala , pkg-config +, vala +, gettext +, itstool +, python3 +, appstream-glib +, desktop-file-utils +, wrapGAppsHook , glib , gtk3 -, python3 , libxml2 , gtk-vnc -, gettext -, desktop-file-utils -, appstream-glib -, gobject-introspection -, freerdp -, wrapGAppsHook +, gtk-frdp +, gnome }: stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "3.38.1"; + version = "40.0.1"; src = fetchurl { - url = "mirror://gnome/sources/connections/${lib.versions.majorMinor version}/connections-${version}.tar.xz"; - hash = "sha256-5c7uBFkh9Vsw6bWWUDjNTMDrrFqI5JEgYlsWpfyuTpA="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-vpvLoHzz+vWs4M5UzSL4YJtNx3ZuJe5f2cGAw5WbTRE="; }; nativeBuildInputs = [ - desktop-file-utils - gettext - glib # glib-compile-resources meson - appstream-glib ninja pkg-config - python3 vala + gettext + itstool + python3 + appstream-glib + desktop-file-utils + glib # glib-compile-resources wrapGAppsHook - - # for gtk-frdp subproject - gobject-introspection ]; buildInputs = [ @@ -48,9 +47,7 @@ stdenv.mkDerivation rec { gtk-vnc gtk3 libxml2 - - # for gtk-frdp subproject - freerdp + gtk-frdp ]; postPatch = '' @@ -60,8 +57,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = "connections"; - attrPath = "gnome-connections"; + packageName = pname; }; }; diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 885f21cf3ec..ae1334cd562 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , fetchpatch , meson @@ -9,13 +10,14 @@ , gettext , gnome , glib -, gtk3 +, gtk4 +, wayland +, libadwaita , libpeas , gnome-online-accounts , gsettings-desktop-schemas +, libportal , evolution-data-server -, libxml2 -, libsoup , libical , librest , json-glib @@ -23,26 +25,13 @@ stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "3.28.1"; + version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08ygqbib72jlf9y0a16k54zz51sncpq2wa18wp81v46q8301ymy7"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "aAl8lvBnXHFCZn0QQ0ToNHLdf8xTj+wKzb9gJrucobE="; }; - patches = [ - # fix build with libecal 2.0 - (fetchpatch { - name = "gnome-todo-eds-libecal-2.0.patch"; - url = "https://src.fedoraproject.org/rpms/gnome-todo/raw/bed44b8530f3c79589982e03b430b3a125e9bceb/f/gnome-todo-eds-libecal-2.0.patch"; - sha256 = "1ghrz973skal36j90wm2z13m3panw983r6y0k7z9gpj5lxgz92mq"; - }) - ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - nativeBuildInputs = [ meson ninja @@ -54,23 +43,30 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 + gtk4 + wayland # required by gtk header + libadwaita libpeas gnome-online-accounts gsettings-desktop-schemas gnome.adwaita-icon-theme + # Plug-ins - evolution-data-server - libxml2 - libsoup + libportal # background + evolution-data-server # eds libical - librest - json-glib + librest # todoist + json-glib # todoist ]; - # Fix parallel building: missing dependency from src/gtd-application.c - # Probably remove for 3.30+ https://gitlab.gnome.org/GNOME/gnome-todo/issues/170 - preBuild = "ninja src/gtd-vcs-identifier.h"; + postPatch = '' + chmod +x build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/meson_post_install.py + + # https://gitlab.gnome.org/GNOME/gnome-todo/merge_requests/103 + substituteInPlace src/meson.build \ + --replace 'Gtk-3.0' 'Gtk-4.0' + ''; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 8411b2edecb..fda0f6e2ffd 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -12,17 +12,20 @@ , libvncserver , libsecret , libnotify +, libxkbcommon , gdk-pixbuf , freerdp +, fuse3 +, gnome }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "0.1.9"; + version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-8iZtp4tBRT7NNRKuzwop3rcMvq16RG/I2sAlEIsJ0M8="; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-mvpuUlVwo3IJP5cwM4JwkDiU87H5+KnfX1eDbqHSnek="; }; nativeBuildInputs = [ @@ -36,11 +39,13 @@ stdenv.mkDerivation rec { buildInputs = [ cairo freerdp + fuse3 gdk-pixbuf # For libnotify glib libnotify libsecret libvncserver + libxkbcommon pipewire systemd ]; @@ -54,6 +59,13 @@ stdenv.mkDerivation rec { "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" ]; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; description = "GNOME Remote Desktop server"; diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 6c38b790959..6e8168a306a 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -1,20 +1,23 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib -, gnome, gnome-menus, substituteAll }: +{ lib +, stdenv +, fetchurl +, meson +, ninja +, gettext +, pkg-config +, glib +, gnome +, gnome-menus +, substituteAll +}: stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "15hak4prx2nx1svfii39clxy1lll8crdf7p91if85jcsh6r8ab8p"; - }; - - passthru = { - updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; - }; + sha256 = "T7/OCtQ1e+5zrn3Bjqoe9MqnOF5PlPavuN/HJR/RqL8="; }; patches = [ @@ -22,24 +25,19 @@ stdenv.mkDerivation rec { src = ./fix_gmenu.patch; gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) - - # Do not show welcome dialog in gnome-classic. - # Needed for gnome-shell 40.1. - # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/169 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/commit/3e8bbb07ea7109c44d5ac7998f473779e742d041.patch"; - sha256 = "jSmPwSBgRBfPPP9mGVjw1mSWumIXQqtA6tSqHr3U+3w="; - }) ]; - doCheck = true; - # 60 is required for tests - # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 - checkInputs = [ spidermonkey_68 ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + glib + ]; - nativeBuildInputs = [ meson ninja pkg-config gettext glib ]; - - mesonFlags = [ "-Dextension_set=all" ]; + mesonFlags = [ + "-Dextension_set=all" + ]; preFixup = '' # The meson build doesn't compile the schemas. @@ -63,11 +61,18 @@ stdenv.mkDerivation rec { done ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "gnome.${pname}"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; description = "Modify and extend GNOME Shell functionality and behavior"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 66eaafb2cc7..41d2fac5e61 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -1,6 +1,5 @@ { fetchurl , fetchpatch -, fetchgit , substituteAll , lib, stdenv , meson @@ -67,20 +66,14 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.0-unstable-2021-05-01"; + version = "40.1"; outputs = [ "out" "devdoc" ]; - src = fetchgit { - url = "https://gitlab.gnome.org/GNOME/gnome-shell.git"; - rev = "a8a79c03330427808e776c344f7ebc42782a1b5a"; - sha256 = "ivHV0SRpnBqsdC7fu1Xhtd/BA55O0UdbUyDLy5KHNYs="; - fetchSubmodules = true; + src = fetchurl { + url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-9j4r7Zm9iVjPMT2F9EoBjVn4UqBbqfKap8t0S+xvprc="; }; - # src = fetchurl { - # url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - # sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg="; - # }; patches = [ # Hardcode paths to various dependencies so that they can be found at runtime. diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 9f6a64ef182..4ad082dabfc 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -1,8 +1,8 @@ { fetchurl -, fetchpatch , substituteAll , runCommand -, lib, stdenv +, lib +, stdenv , pkg-config , gnome , gettext @@ -45,13 +45,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "40.0"; + version = "40.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-enGzEuWmZ8U3SJUYilBqP2tnF2i8s2K2jv3FYnc9GY4="; + sha256 = "sha256-pl8ycpYRM4KWh9QQcmfk4ZKQ5thueAf62H6rCDHB4MA="; }; patches = [ @@ -63,13 +63,6 @@ let self = stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit zenity; }) - - # Fix non-deterministic build failure: - # https://gitlab.gnome.org/GNOME/mutter/-/issues/1682 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch"; - sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU="; - }) ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index e58d8ce6e42..f01a2cd545e 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "35"; + version = "38"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "sha256-Yl5ut6kJAkAAdCBiNFpwDgshXCLMmFH3/zhnFGpyKqs="; + sha256 = "sha256-LZ+C9iK+j7+DEscYCIObxXc0Bn0Z0xSsEFMZxc8REWA="; }; patches = [ @@ -28,11 +28,13 @@ stdenv.mkDerivation rec { dontBuild = true; uuid = "sound-output-device-chooser@kgshank.net"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall + + makeFlags = [ + "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions" + ]; + + preInstall = '' + mkdir -p ${placeholder "out"}/share/gnome-shell/extensions ''; meta = with lib; { diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index e7b5e8a1a9c..a6cfad43b66 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; - version = "unstable-2021-04-08"; + version = "unstable-2021-05-04"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "gnome-shell-system-monitor-applet"; - rev = "942603da39de12f50b1f86efbde92d7526d1290e"; - sha256 = "0lzb7064bigw2xsqkzr8qfhp9wfmxyi3823j2782v99jpcz423aw"; + rev = "bc38ccf49ac0ffae0fc0436f3c2579fc86949f10"; + sha256 = "0yb5sb2xv4m18a24h4daahnxgnlmbfa0rfzic0zs082qv1kfi5h8"; }; buildInputs = [ diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index 22fdd00cb2f..33666c53bb8 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,16 +1,19 @@ -{ mkXfceDerivation, gobject-introspection, vala, gtk3, gtksourceview4, xfconf }: +{ mkXfceDerivation, gobject-introspection, gtk3, gtksourceview4, gspell }: mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.4"; + version = "0.5.5"; odd-unstable = false; - sha256 = "0yrmjs6cyzm08jz8wzrx8wdxj7zdbxn6x625109ckfcfxrkp4a2f"; + sha256 = "1c985xb3395bn1024qhqqdnlkbn02zldsnybxsw49xqh55pa4a2n"; - nativeBuildInputs = [ gobject-introspection vala ]; + nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ gtk3 gtksourceview4 xfconf ]; + buildInputs = [ gtk3 gtksourceview4 gspell ]; + + # Use the GSettings keyfile backend rather than DConf + configureFlags = [ "--enable-keyfile-settings" ]; meta = { description = "Simple text editor for Xfce"; diff --git a/pkgs/development/arduino/arduino-cli/default.nix b/pkgs/development/arduino/arduino-cli/default.nix index 95586d064d9..9629d90a345 100644 --- a/pkgs/development/arduino/arduino-cli/default.nix +++ b/pkgs/development/arduino/arduino-cli/default.nix @@ -4,18 +4,18 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.12.1"; + version = "0.18.1"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "1jlxs4szss2250zp8rz4bislgnzvqhxyp6z48dhx7zaam03hyf0w"; + sha256 = "sha256-EtkONrP/uaetsdC47WsyQOE71Gsz0wKUiTiYThj8Kq8="; }; subPackages = [ "." ]; - vendorSha256 = "03yj2iar63qm10fw3jh9fvz57c2sqcmngb0mj5jkhbnwf8nl7mhc"; + vendorSha256 = "sha256-kPIhG6lsH+0IrYfdlzdv/X/cUQb22Xza9Q6ywjKae/4="; doCheck = false; @@ -32,15 +32,20 @@ let }; +in +if stdenv.isLinux then # buildFHSUserEnv is needed because the arduino-cli downloads compiler # toolchains from the internet that have their interpreters pointed at # /lib64/ld-linux-x86-64.so.2 -in buildFHSUserEnv { - inherit (pkg) name meta; + buildFHSUserEnv + { + inherit (pkg) name meta; - runScript = "${pkg.outPath}/bin/arduino-cli"; + runScript = "${pkg.outPath}/bin/arduino-cli"; - extraInstallCommands = '' - mv $out/bin/$name $out/bin/arduino-cli - ''; -} + extraInstallCommands = '' + mv $out/bin/$name $out/bin/arduino-cli + ''; + } +else + pkg diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix index dd6af73547a..736004fb580 100644 --- a/pkgs/development/compilers/copper/default.nix +++ b/pkgs/development/compilers/copper/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://tibleiz.net/copper/"; license = licenses.bsd2; platforms = platforms.x86_64; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix index cf0ba2303e1..18f4d3aff19 100644 --- a/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -1,4 +1,4 @@ -{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary +{ mkDerivation, fetchpatch, ansi-terminal, ansi-wl-pprint, base, binary , bytestring, Cabal, cmark, containers, directory, elm-format , fetchgit, filepath, free, HUnit, indents, json, mtl , optparse-applicative, parsec, process, QuickCheck, quickcheck-io @@ -14,6 +14,15 @@ mkDerivation { rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e"; fetchSubmodules = true; }; + patches = [ + # Update code after breaking change in optparse-applicative + # https://github.com/zwilias/elm-instrument/pull/5 + (fetchpatch { + name = "update-optparse-applicative.patch"; + url = "https://github.com/mdevlamynck/elm-instrument/commit/c548709d4818aeef315528e842eaf4c5b34b59b4.patch"; + sha256 = "0ln7ik09n3r3hk7jmwwm46kz660mvxfa71120rkbbaib2falfhsc"; + }) + ]; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath process ]; diff --git a/pkgs/development/compilers/mono/5.nix b/pkgs/development/compilers/mono/5.nix index 0ecb362acb4..c49379c670e 100644 --- a/pkgs/development/compilers/mono/5.nix +++ b/pkgs/development/compilers/mono/5.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "5.20.1.27"; - sha256 = "15rpwxw642ad1na93k5nj7d2lb24f21kncr924gxr00178a9x0jy"; + version = "5.20.1.34"; + sha256 = "12vw5dkhmp1vk9l658pil8jiqirkpdsc5z8dm5mpj595yr6d94fd"; enableParallelBuilding = true; }) diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 6203eaf47ba..c90f689e21c 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -35,6 +35,7 @@ "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; + "armv5tel" = "armv5te"; }.${cpu.name} or cpu.name; in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index bd96010e8bf..41e63d63dbe 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,24 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, llvmPackages +, libxml2 +, zlib +}: llvmPackages.stdenv.mkDerivation rec { - version = "0.7.1"; pname = "zig"; + version = "0.7.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "1z6c4ym9jmga46cw2arn7zv2drcpmrf3vw139gscxp27n7q2z5md"; + hash = "sha256-rZYv8LFH3M70SyPwPVyul+Um9j82K8GZIepVmaonzPw="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; buildInputs = [ - llvmPackages.clang-unwrapped - llvmPackages.llvm - llvmPackages.lld libxml2 zlib - ]; + ] ++ (with llvmPackages; [ + clang-unwrapped + lld + llvm + ]); preBuild = '' export HOME=$TMPDIR; @@ -33,12 +43,12 @@ llvmPackages.stdenv.mkDerivation rec { doCheck = true; meta = with lib; { + homepage = "https://ziglang.org/"; description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; - homepage = "https://ziglang.org/"; license = licenses.mit; + maintainers = with maintainers; [ andrewrk AndersonTorres ]; platforms = platforms.unix; - maintainers = [ maintainers.andrewrk ]; # See https://github.com/NixOS/nixpkgs/issues/86299 broken = stdenv.isDarwin; }; diff --git a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh index f3cdcbc0c10..37f0585d1fe 100755 --- a/pkgs/development/dotnet-modules/python-language-server/create_deps.sh +++ b/pkgs/development/dotnet-modules/python-language-server/create_deps.sh @@ -4,6 +4,8 @@ # Run this script to generate deps.nix # ./create_deps.sh /path/to/microsoft/python/language/server/source/checkout +set -euo pipefail + SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" if [ -d "$1" ]; then @@ -14,13 +16,13 @@ else fi # Generate lockfiles in source checkout -cd $CHECKOUT_PATH/src +cd "$CHECKOUT_PATH/src" dotnet nuget locals all --clear dotnet restore -v normal --no-cache PLS.sln --use-lock-file -r linux-x64 # Use the lockfiles to make a file with two columns: name and version number # for all possible package dependencies -cd $SCRIPTDIR +cd "$SCRIPTDIR" echo "" > all_versions.txt for lockfile in $(find "$CHECKOUT_PATH" -name packages.lock.json); do echo "Processing lockfile $lockfile" diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 526e93f84c4..6502890af2b 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -11,7 +11,7 @@ let deps = import ./deps.nix { inherit fetchurl; }; - version = "2020-06-19"; + version = "2020-10-08"; # Build the nuget source needed for the later build all by itself # since it's a time-consuming step that only depends on ./deps.nix. @@ -49,8 +49,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "838ba78e00173d639bd90f54d8610ec16b4ba3a2"; - sha256 = "0nj8l1apcb67gqwy5i49v0f01fs4lvdfmmp4w2hvrpss9if62c1m"; + rev = "76a29da373a4bb1e81b052f25802f3ca872d0a67"; + sha256 = "16jb90lacdrhi4dpp084bqzx351mv23f4mhl4lz5h6rkfzj5jxgg"; }; buildInputs = [dotnet-sdk_3 openssl icu]; @@ -62,6 +62,8 @@ stdenv.mkDerivation { ]; buildPhase = '' + runHook preBuild + mkdir home export HOME=$(mktemp -d) export DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -75,14 +77,20 @@ stdenv.mkDerivation { pushd src/LanguageServer/Impl dotnet publish --no-restore -c Release -r linux-x64 popd + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out cp -r output/bin/Release/linux-x64/publish $out/lib mkdir $out/bin makeWrapper $out/lib/Microsoft.Python.LanguageServer $out/bin/python-language-server + + runHook postInstall ''; postFixup = '' diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index 6a494e7e521..899f38d256d 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -46,18 +46,6 @@ in [ sha256 = "190d755l60j3l5m1661wj19gj9w6ngza56q3vkijkkmbbabdmqln"; }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Ref"; - version = "3.0.1"; - sha256 = "0k2ry757qhm99xwm0wh4zalxn9nmxhfswd184z1fjr42szr511fb"; - }) - - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.0.3"; - sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9"; - }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.8"; @@ -72,8 +60,8 @@ in [ (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.5.0"; - sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; + version = "16.7.1"; + sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; }) (fetchNuGet { @@ -84,38 +72,8 @@ in [ (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "3.1.2"; - sha256 = "1zwvzp0607irs7irfbq8vnclg5nj2jpyggw9agm4a32la5ngg27m"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.0.3"; - sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Host.linux-x64"; version = "3.1.8"; - sha256 = "0iawz5mqaf1c4r5cf0ks4wqhgpbqi185l80q4909axh516xsjnvs"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Ref"; - version = "3.0.0"; - sha256 = "1qi382157ln7yngazvr3nskpjkab4x8sqx11l13xyg56vyyjyyiw"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Ref"; - version = "3.1.0"; - sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.0.3"; - sha256 = "1ykgfnphbkyck0gqbbh5n96w59z2bq47g896ygal1j4nblj3s44v"; + sha256 = "1v2lr0vbssqayzgxvdwb54jmvz7mvlih4l9h7i71gm3c62nlbq8y"; }) (fetchNuGet { @@ -138,8 +96,8 @@ in [ (fetchNuGet { name = "Microsoft.NETCore.Platforms"; - version = "2.0.0"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + version = "3.0.0"; + sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { @@ -156,44 +114,38 @@ in [ (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.5.0"; - sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + version = "16.7.1"; + sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.5.0"; - sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; + version = "16.7.1"; + sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.5.0"; - sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; + version = "16.7.1"; + sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; }) (fetchNuGet { name = "Microsoft.VisualStudio.Threading"; - version = "16.4.33"; - sha256 = "09djx2xz22w48csd0bkpwi1rgpjpaj3mml16wfy8jlsnc66swmnh"; + version = "16.5.132"; + sha256 = "05lngndl6hg4v3vk9l1n1g2lbfjb7jnr5dnkjld9wx3vamdfcfxw"; }) (fetchNuGet { name = "Microsoft.VisualStudio.Threading"; - version = "16.4.45"; - sha256 = "16p61kxsnwanp3nac0gkarl7a94c02qyqjzdkijl5va9k3fa97m6"; + version = "16.6.13"; + sha256 = "0qbvcwy7njz5zpqgfqdf41gf9xqcz64z4rkfjf6bi4zynpkv6n1l"; }) (fetchNuGet { name = "Microsoft.VisualStudio.Threading.Analyzers"; - version = "16.4.45"; - sha256 = "12m0f037pz3ynm69810p4c96nrlnqihx6w4qyrs0kqsxiajf16jc"; - }) - - (fetchNuGet { - name = "Microsoft.VisualStudio.Validation"; - version = "15.3.15"; - sha256 = "1v3r2rlichlvxjrmj1grii1blnl9lp9npg2p6q3q4j6lamskxa9r"; + version = "16.6.13"; + sha256 = "09nqkjnarwj0chb6xrzscq98mpgi86n2a3mfdd3y695kviq99s18"; }) (fetchNuGet { @@ -210,8 +162,8 @@ in [ (fetchNuGet { name = "Microsoft.Win32.Registry"; - version = "4.5.0"; - sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; + version = "4.6.0"; + sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) (fetchNuGet { @@ -222,20 +174,20 @@ in [ (fetchNuGet { name = "MSTest.TestAdapter"; - version = "2.1.0"; - sha256 = "1g1v8yjnk4nr1c36k3cz116889bnpiw1i1jkmqnpb19wms7sq7cz"; + version = "2.1.2"; + sha256 = "1390nyc0sf5c4j75cq58bzqjcw77sp2lmpllmm5sp8ysi0fjyfs5"; }) (fetchNuGet { name = "MSTest.TestFramework"; - version = "2.1.0"; - sha256 = "0mac4h7ylw953chclhz0lrn19yks3bab9dn9x9fpjqi7309gid0p"; + version = "2.1.2"; + sha256 = "1617q2accpa8fwy9n1snmjxyx2fz3phks62mdi45cl65kdin0x4z"; }) (fetchNuGet { name = "Nerdbank.Streams"; - version = "2.4.60"; - sha256 = "01554nbs6dj4fjd59b95kaw84j27kfb5y5ixjbl23nh62kpgrd3r"; + version = "2.5.76"; + sha256 = "017h8m1zrm247alhlz4vqsz580b8b88s50cyxb939hmc2nn0qlfv"; }) (fetchNuGet { @@ -276,8 +228,8 @@ in [ (fetchNuGet { name = "NSubstitute"; - version = "4.2.1"; - sha256 = "0wgfjh032qds994fmgxvsg88nhgjrx7p9rnv6z678jm62qi14asy"; + version = "4.2.2"; + sha256 = "1zi1z5i61c2nq8p3jwbkca28yaannrvv6g6q5mmz1775apmfyh79"; }) (fetchNuGet { @@ -600,8 +552,8 @@ in [ (fetchNuGet { name = "StreamJsonRpc"; - version = "2.3.103"; - sha256 = "0z8ahxkbbrzsn56ylzlciriiid4bslf6y1rk49wzahwpvzlik1iw"; + version = "2.5.46"; + sha256 = "0rsgxfxcfgbx1w2jhllx1cwnbj9vra6034gv4kgzahh0v5vn8shf"; }) (fetchNuGet { @@ -804,14 +756,8 @@ in [ (fetchNuGet { name = "System.IO.Pipelines"; - version = "4.5.3"; - sha256 = "1z44vn1qp866lkx78cfqdd4vs7xn1hcfn7in6239sq2kgf5qiafb"; - }) - - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.6.0"; - sha256 = "0r9ygjbxpyi6jgb67qnpbp42b7yvvhgmcjxnb50k3lb416claavh"; + version = "4.7.0"; + sha256 = "1cx6bl2bhzp30ahy2csnwbphmlwwp840j56wgab105xc32la0mg4"; }) (fetchNuGet { @@ -1080,8 +1026,8 @@ in [ (fetchNuGet { name = "System.Security.AccessControl"; - version = "4.5.0"; - sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + version = "4.6.0"; + sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) (fetchNuGet { @@ -1146,8 +1092,8 @@ in [ (fetchNuGet { name = "System.Security.Principal.Windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + version = "4.6.0"; + sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) (fetchNuGet { diff --git a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt index 169ddfbb7b5..ec49eee7e9c 100644 --- a/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt +++ b/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -1,14 +1,2 @@ -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.3 -Microsoft.AspNetCore.App.Ref 3.0.1 -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.2 -Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.3 -Microsoft.AspNetCore.App.Runtime.linux-x64 3.0.2 -Microsoft.NetCore.App.Ref 3.1.0 -Microsoft.NetCore.App.Ref 3.0.0 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.3 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.2 -Microsoft.NetCore.App.Runtime.linux-x64 3.0.2 -Microsoft.NetCore.App.Runtime.linux-x64 3.0.3 -Microsoft.NetCore.App.Host.linux-x64 3.1.3 -Microsoft.NetCore.App.Host.linux-x64 3.0.2 -Microsoft.NetCore.App.Host.linux-x64 3.0.3 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.8 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.8 diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 5334429fbba..8fc7d8feac8 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.3.2"; - sha256 = "eU3BmBJqrcg3FmkuAIfB3UoSNfQQfvGNyC2jBffwm/w="; + version = "23.3.4"; + sha256 = "EKewwcK1Gr84mmFVxVmOLaPiFtsG3r/1ubGOUwM/EYY="; } diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix new file mode 100644 index 00000000000..6808d0a849d --- /dev/null +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz +mkDerivation { + version = "24.0"; + sha256 = "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w"; +} diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index c32a1b038e4..aba4c318bea 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -76,7 +76,8 @@ in stdenv.mkDerivation ({ ./otp_build autoconf ''; - configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ] + configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ] + ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24 ++ optional enableThreads "--enable-threads" ++ optional enableSmpSupport "--enable-smp-support" ++ optional enableKernelPoll "--enable-kernel-poll" diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index 53a83607c86..a6e995c9bcc 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -1,4 +1,5 @@ -{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv, gcc, Security, cmake }: +{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, lib, stdenv +, gcc, cmake, libiconv, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "evcxr"; @@ -16,7 +17,9 @@ rustPlatform.buildRustPackage rec { RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; nativeBuildInputs = [ pkg-config makeWrapper cmake ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin + [ libiconv CoreServices Security ]; + postInstall = let wrap = exe: '' wrapProgram $out/bin/${exe} \ diff --git a/pkgs/development/interpreters/lua-5/5.4.darwin.patch b/pkgs/development/interpreters/lua-5/5.4.darwin.patch new file mode 100644 index 00000000000..eb16ed9c689 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/5.4.darwin.patch @@ -0,0 +1,48 @@ +--- a/Makefile 2021-05-14 22:39:14.407200562 +0300 ++++ b/Makefile 2021-05-14 22:36:23.828513407 +0300 +@@ -41,7 +41,7 @@ + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.${version}.dylib + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -60,6 +60,8 @@ + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) ++ ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${luaversion}.dylib ++ ln -s -f liblua.${luaversion}.dylib $(INSTALL_LIB)/liblua.dylib + + uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) +--- a/src/Makefile 2021-05-14 22:35:38.575051882 +0300 ++++ b/src/Makefile 2021-05-14 22:35:33.584631206 +0300 +@@ -32,7 +32,7 @@ + + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + +-LUA_A= liblua.a ++LUA_A= liblua.${version}.dylib + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -57,11 +57,13 @@ + a: $(ALL_A) + + $(LUA_A): $(BASE_O) +- $(AR) $@ $(BASE_O) +- $(RANLIB) $@ ++ $(CC) -dynamiclib -install_name $(out)/lib/liblua.${version}.dylib \ ++ -compatibility_version ${version} -current_version ${version} \ ++ -o liblua.${version}.dylib $^ + + $(LUA_T): $(LUA_O) $(LUA_A) +- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++ $(CC) -fno-common $(MYLDFLAGS) \ ++ -o $@ $(LUA_O) $(LUA_A) -L. -llua.${version} $(LIBS) + + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 3a52d58ffab..43ed70fee1d 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -17,7 +17,7 @@ in rec { lua5_4 = callPackage ./interpreter.nix { sourceVersion = { major = "5"; minor = "4"; patch = "2"; }; hash = "0ksj5zpj74n0jkamy3di1p6l10v4gjnd2zjnb453qc6px6bhsmqi"; - patches = [ + patches = if stdenv.isDarwin then [ ./5.4.darwin.patch ] else [ # build lua as a shared library as well, MIT-licensed from # https://github.com/archlinux/svntogit-packages/tree/packages/lua/trunk ./liblua.so.patch diff --git a/pkgs/development/libraries/cairomm/1.16.nix b/pkgs/development/libraries/cairomm/1.16.nix index 2beeb71e5e3..2e936607e8e 100644 --- a/pkgs/development/libraries/cairomm/1.16.nix +++ b/pkgs/development/libraries/cairomm/1.16.nix @@ -8,6 +8,7 @@ , cairo , fontconfig , libsigcxx30 +, ApplicationServices }: stdenv.mkDerivation rec { @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ boost # for tests fontconfig + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices ]; propagatedBuildInputs = [ @@ -47,7 +50,8 @@ stdenv.mkDerivation rec { BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - doCheck = true; + # Tests fail on Darwin, possibly because of sandboxing. + doCheck = !stdenv.isDarwin; meta = with lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index 1df570d7d29..855a9eef8ea 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -12,11 +12,17 @@ stdenv.mkDerivation rec { }; buildInputs = lib.optional enableUnicodeHelp [ icu.dev ]; - cmakeFlags = lib.optional enableUnicodeHelp [ "-DCXXOPTS_USE_UNICODE_HELP=TRUE" ]; + cmakeFlags = [ "-DCXXOPTS_BUILD_EXAMPLES=OFF" ] + ++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE" + # Due to -Wsuggest-override, remove when cxxopts is updated + ++ lib.optional stdenv.isDarwin "-DCXXOPTS_ENABLE_WARNINGS=OFF"; nativeBuildInputs = [ cmake ] ++ lib.optional enableUnicodeHelp [ pkg-config ]; doCheck = true; + # Conflict on case-insensitive filesystems. + dontUseCmakeBuildDir = true; + meta = with lib; { homepage = "https://github.com/jarro2783/cxxopts"; description = "Lightweight C++ GNU-style option parser library"; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 19b03eb620c..355e9e5f07f 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "geos"; @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ python ]; - # https://trac.osgeo.org/geos/ticket/993 configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; diff --git a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch index 51bc206659d..a82a06d427b 100644 --- a/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch +++ b/pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch @@ -1,18 +1,18 @@ -From 2bf6614a6d7516e194e39eb691c05b486860153c Mon Sep 17 00:00:00 2001 +From 57bed86429db9d871f1442c94f14e94e38972ca3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 21:15:15 -0400 Subject: [PATCH] meson: add options for tests installation dirs --- meson_options.txt | 6 ++++++ - tests/meson.build | 19 ++++++++++++++----- - 2 files changed, 20 insertions(+), 5 deletions(-) + tests/meson.build | 23 ++++++++++++++++------- + 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index 578bdae..6f5fa23 100644 +index b9a2fb5..4b8629f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -22,3 +22,9 @@ option('tests', type: 'boolean', +@@ -23,3 +23,9 @@ option('tests', type: 'boolean', option('installed_tests', type: 'boolean', value: true, description: 'Install tests') @@ -23,12 +23,12 @@ index 578bdae..6f5fa23 100644 + value: '', + description: 'Installation directory for binary files in tests') diff --git a/tests/meson.build b/tests/meson.build -index 1f9bd0e..0253ac3 100644 +index 77281f5..c4c7fac 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -22,8 +22,17 @@ unit_tests = [ - python = python3.find_python() - gen_installed_test = join_paths(meson.current_source_dir(), 'gen-installed-test.py') +@@ -21,8 +21,17 @@ unit_tests = [ + + gen_installed_test = find_program('gen-installed-test.py') -installed_test_datadir = join_paths(get_option('prefix'), get_option('datadir'), 'installed-tests', graphene_api_path) -installed_test_bindir = join_paths(get_option('prefix'), get_option('libexecdir'), 'installed-tests', graphene_api_path) @@ -46,9 +46,9 @@ index 1f9bd0e..0253ac3 100644 # Make tests conditional on having mutest-1 installed system-wide, or # available as a subproject -@@ -42,13 +51,13 @@ if mutest_dep.found() +@@ -40,13 +49,13 @@ if mutest_dep.found() + output: wrapper, command: [ - python, gen_installed_test, - '--testdir=@0@'.format(installed_test_bindir), + '--testdir=@0@'.format(test_bindir), @@ -62,7 +62,7 @@ index 1f9bd0e..0253ac3 100644 ) test(unit, -@@ -57,7 +66,7 @@ if mutest_dep.found() +@@ -55,7 +64,7 @@ if mutest_dep.found() include_directories: graphene_inc, c_args: common_cflags, install: get_option('installed_tests'), @@ -71,6 +71,22 @@ index 1f9bd0e..0253ac3 100644 ), env: ['MUTEST_OUTPUT=tap'], protocol: 'tap', +@@ -70,13 +79,13 @@ if build_gir and host_system == 'linux' and not meson.is_cross_build() + output: wrapper, + command: [ + gen_installed_test, +- '--testdir=@0@'.format(installed_test_bindir), ++ '--testdir=@0@'.format(test_bindir), + '--testname=@0@'.format(unit), + '--outdir=@OUTDIR@', + '--outfile=@0@'.format(wrapper), + ], + install: get_option('installed_tests'), +- install_dir: installed_test_datadir, ++ install_dir: test_datadir, + ) + + test(unit, -- -2.22.0 +2.31.1 diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index b1b27a3d298..a9c647268ac 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "graphene"; - version = "1.10.2"; + version = "1.10.6"; outputs = [ "out" "devdoc" "installedTests" ]; @@ -24,19 +24,14 @@ stdenv.mkDerivation rec { owner = "ebassi"; repo = pname; rev = version; - sha256 = "1ljhhjafi1nlndjswx7mg0d01zci90wz77yvz5w8bd9mm8ssw38s"; + sha256 = "v6YH3fRMTzhp7wmU8in9ukcavzHmOAW54EK9ZwQyFxc="; }; patches = [ + # Add option for changing installation path of installed tests. ./0001-meson-add-options-for-tests-installation-dirs.patch ]; - mesonFlags = [ - "-Dgtk_doc=true" - "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" - "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" - ]; - nativeBuildInputs = [ docbook_xml_dtd_43 docbook_xsl @@ -57,8 +52,18 @@ stdenv.mkDerivation rec { mutest ]; + mesonFlags = [ + "-Dgtk_doc=true" + "-Dinstalled_test_datadir=${placeholder "installedTests"}/share" + "-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec" + ]; + doCheck = true; + postPatch = '' + patchShebangs tests/gen-installed-test.py + ''; + passthru = { tests = { installedTests = nixosTests.installed-tests.graphene; diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix new file mode 100644 index 00000000000..e6c6d939193 --- /dev/null +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitLab +, meson +, ninja +, pkg-config +, vala +, gobject-introspection +, glib +, gtk3 +, freerdp +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "gtk-frdp"; + version = "3.37.1-unstable-2020-10-26"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = pname; + rev = "805721e82ca1df6a50da3b5bd3b75d6747016482"; + sha256 = "q/UFKYj3LUkAzll3KeKd6oec0GJnDtTuFMTTatKFlcs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gobject-introspection + ]; + + buildInputs = [ + glib + gtk3 + freerdp + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/gtk-frdp"; + description = "RDP viewer widget for GTK"; + maintainers = teams.gnome.members; + license = licenses.lgpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index 5eacdaa8f3c..97c5303eabe 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libportal"; - version = "0.3"; + version = "0.4"; outputs = [ "out" "dev" "devdoc" ]; @@ -20,22 +20,9 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1s3g17zbbmq3m5jfs62fl94p4irln9hfhpybj7jb05z0p1939rk3"; + sha256 = "fuYZWGkdazq6H0rThqpF6KIcvwgc17o+CiISb1LjBso="; }; - patches = [ - # Fix build and .pc file - # https://github.com/flatpak/libportal/pull/20 - (fetchpatch { - url = "https://github.com/flatpak/libportal/commit/7828be4ec8f05f8de7b129a1e35b5039d8baaee3.patch"; - sha256 = "04nadcxx69mbnzljwjrzm88cgapn14x3mghpkhr8b9yrjn7yj86h"; - }) - (fetchpatch { - url = "https://github.com/flatpak/libportal/commit/bf5de2f6fefec65f701b4ec8712b48b29a33fb71.patch"; - sha256 = "1v0b09diq49c01j5gg2bpvn5f5gfw1a5nm1l8grc4qg4z9jck1z8"; - }) - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 27db05ee98a..82f71f59070 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1fsgvmncd9caw552lyfg8swmsd6bh4ijjsph69bwacwfxwf09j75"; }; + # Don't make deprecated usages hard errors + prePatch = '' + substituteInPlace configure --replace "-Werror" ""; + ''; + # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; @@ -23,9 +28,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 dbus-glib ]; - # Don't make deprecated usages hard errors - preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; - doCheck = true; meta = { diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index d4f6391fe6f..48c5a4f9b47 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: let - version = "5.1.3"; + version = "5.1.4"; in stdenv.mkDerivation { pname = "libxc"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "14czspifznsmvvix5hcm1rk18iy590qk8p5m00p0y032gmn9i2zj"; + sha256 = "0rs6v72zz3jr22r29zxxdk8wdsfv6wid6cx2661974z09dbvbr1f"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 741f05bea6f..4d52b848ae4 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "4.5.1"; + version = "4.5.14"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1fsldk7gxagxkbkzksz6dz8a8dmix1lxfy8nvvp0m355pzgqj6lb"; + sha256 = "sha256-ixqJ37+ljAru3hZ512nosTak0G/m6/nnmv2p/s5sVLs="; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 44e107693c9..95afae065ef 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, cmake, taglib}: +{lib, stdenv, fetchurl, cmake, taglib, zlib}: stdenv.mkDerivation rec { name = "taglib-extras-1.0.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y"; }; buildInputs = [ taglib ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake zlib ]; # Workaround for upstream bug https://bugs.kde.org/show_bug.cgi?id=357181 preConfigure = '' diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 3fcfaa12339..5f136a5e6b6 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -1,39 +1,21 @@ -{ lib, stdenv, fetchurl, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake , zlib }: stdenv.mkDerivation rec { pname = "taglib"; - version = "1.11.1"; + version = "1.12"; - src = fetchurl { - url = "http://taglib.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0ssjcdjv4qf9liph5ry1kngam1y7zp8fzr9xv4wzzrma22kabldn"; + src = fetchFromGitHub { + owner = "taglib"; + repo = "taglib"; + rev = "v${version}"; + sha256 = "sha256-omErajnYgxbflsbe6pS2KsexZcXisso0WGYnmIud7WA="; }; - patches = [ - (fetchpatch { - # https://github.com/taglib/taglib/issues/829 - name = "CVE-2017-12678.patch"; - url = "https://github.com/taglib/taglib/commit/eb9ded1206f18.patch"; - sha256 = "1bvpxsvmlpi3by7myzss9kkpdkv405612n8ff68mw1ambj8h1m90"; - }) - - (fetchpatch { - # https://github.com/taglib/taglib/pull/869 - name = "CVE-2018-11439.patch"; - url = "https://github.com/taglib/taglib/commit/272648ccfcccae30e002ccf34a22e075dd477278.patch"; - sha256 = "0p397qq4anvcm0p8xs68mxa8hg6dl07chg260lc6k2929m34xv72"; - }) - - (fetchpatch { - # many consumers of taglib have started vendoring taglib due to this bug - name = "fix_ogg_corruption.patch"; - url = "https://github.com/taglib/taglib/commit/9336c82da3a04552168f208cd7a5fa4646701ea4.patch"; - sha256 = "01wlwk4gmfxdg5hjj9jmrain7kia89z0zsdaf5gn3nibmy5bq70r"; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; @@ -51,7 +33,6 @@ stdenv.mkDerivation rec { Speex, WavPack, TrueAudio, WAV, AIFF, MP4 and ASF files. ''; license = with licenses; [ lgpl3 mpl11 ]; - inherit (cmake.meta) platforms; maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 973e7dc028e..26872565de8 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,6 +1,14 @@ -{ config, stdenv, lib, fetchgit, cmake -, cudaSupport ? config.cudaSupport or false, cudatoolkit -, ncclSupport ? false, nccl +{ config +, stdenv +, lib +, fetchFromGitHub +, cmake +, gtest +, doCheck ? true +, cudaSupport ? config.cudaSupport or false +, cudatoolkit +, ncclSupport ? false +, nccl , llvmPackages }: @@ -8,37 +16,43 @@ assert ncclSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "xgboost"; - version = "0.90"; + version = "1.4.1"; - # needs submodules - src = fetchgit { - url = "https://github.com/dmlc/xgboost"; - rev = "refs/tags/v${version}"; - sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4"; + src = fetchFromGitHub { + owner = "dmlc"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "12b1417dg8jqyxd72kg5a3xhg5h11vz0k7bkv72mzrv83jvgn5ci"; }; nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; - buildInputs = lib.optional cudaSupport cudatoolkit + buildInputs = [ gtest ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional ncclSupport nccl; - cmakeFlags = lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] - ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; + cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] + ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; + + inherit doCheck; installPhase = let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; in '' + runHook preInstall mkdir -p $out cp -r ../include $out install -Dm755 ../lib/${libname} $out/lib/${libname} install -Dm755 ../xgboost $out/bin/xgboost + runHook postInstall ''; meta = with lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/mobile/androidenv/examples/shell.nix b/pkgs/development/mobile/androidenv/examples/shell.nix index 95f6a3bdbba..45cccf22c7d 100644 --- a/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/pkgs/development/mobile/androidenv/examples/shell.nix @@ -115,7 +115,7 @@ let in pkgs.mkShell rec { name = "androidenv-demo"; - buildInputs = [ androidSdk platformTools jdk pkgs.android-studio ]; + packages = [ androidSdk platformTools jdk pkgs.android-studio ]; LANG = "C.UTF-8"; LC_ALL = "C.UTF-8"; diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 3654d7b5296..22c06e96afe 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, stdenv }: +{ pkgs, nodejs, stdenv, fetchFromGitHub }: let since = (version: pkgs.lib.versionAtLeast nodejs.version version); @@ -209,6 +209,26 @@ let ''; }; + netlify-cli = + let + esbuild = pkgs.esbuild.overrideAttrs (old: rec { + version = "0.11.14"; + + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "sha256-N7WNam0zF1t++nLVhuxXSDGV/JaFtlFhufp+etinvmM="; + }; + + }); + in + super.netlify-cli.override { + preRebuild = '' + export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" + ''; + }; + ssb-server = super.ssb-server.override { buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ]; meta.broken = since "10"; diff --git a/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch b/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch new file mode 100644 index 00000000000..42fa3728680 --- /dev/null +++ b/pkgs/development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch @@ -0,0 +1,11 @@ +--- a/Build.PL ++++ b/Build.PL +@@ -88,7 +88,7 @@ if ( $^O =~ /mswin32/i ) { + } + } + else { +- if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^aarch64|^riscv64/ ) { ++ if ( $Config{archname} =~ /^x86_64|^ppc64|^s390x|^riscv64/ ) { + $libdir =~ s/\bbin\b/lib64/; + if ( !-d $libdir ) { + my $test = $libdir; diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index 01a299c89fd..ccacef6df57 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -11,20 +11,20 @@ buildPythonPackage rec { pname = "accuweather"; - version = "0.1.1"; + version = "0.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-fjOwa13hxY8/gCM6TCAFWVmEY1oZyqKyc6o3OSsxHpY="; + sha256 = "sha256-Swe8vegRcyaeG4n/8aeGFLrXkwcLM/Al53yD6oD/0GA="; }; postPatch = '' substituteInPlace setup.py \ --replace "pytest-runner" "" - substituteInPlace pytest.ini \ + substituteInPlace setup.cfg \ --replace "--cov --cov-report term-missing" "" ''; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 872b82748cf..c7fc8b0b574 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.13.0"; + version = "3.13.1"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-FlPd3bj2sU52nc2+XohNhBWRa+1Dr/SyaiSusxX6PeE="; + sha256 = "sha256-SUK2EpOHCFWm4zV+yRtzz81B0GMcwRsVnTOh2msSsSk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 5377785ff25..6cbbe7c5d80 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.1"; + version = "0.3.2"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "sha256-b+9ySme44TdIlVnF8AHBBGd8pkoeYG99wmDK/nyAreo="; + sha256 = "sha256-+K4fV8dlRpOZC5B7cvkfPRVK/2OBkH9qOmAnOwsm7kQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 8388cd33e08..eec3b5cc813 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -1,73 +1,90 @@ { lib -, stdenv -, fetchPypi , buildPythonPackage , isPy27 -, ansible -, pyyaml -, ruamel-yaml -, rich -, pytestCheckHook -, pytest-xdist -, git -, wcmatch +, fetchPypi +, setuptools-scm +, ansible-base , enrich -, python +, flaky +, pyyaml +, rich +, ruamel-yaml +, tenacity +, wcmatch +, yamllint +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { pname = "ansible-lint"; - version = "5.0.2"; + version = "5.0.8"; disabled = isPy27; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vgt/KqNozTPaON/I19SybBZuo7bbl3Duq5dTBTMlj44="; + sha256 = "sha256-tnuWKEB66bwVuwu3H3mHG99ZP+/msGhMDMRL5fyQgD8="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + ansible-base + enrich + flaky + pyyaml + rich + ruamel-yaml + tenacity + wcmatch + yamllint + ]; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pytestFlagsArray = [ + "--numprocesses" "auto" + ]; + postPatch = '' + # Both patches are addressed in https://github.com/ansible-community/ansible-lint/pull/1549 + # and should be removed once merged upstream + + # fixes test_get_yaml_files_umlaut and test_run_inside_role_dir substituteInPlace src/ansiblelint/file_utils.py \ - --replace 'raise RuntimeError("Unable to determine file type for %s" % pathex)' 'return "playbook"' + --replace 'os.path.join(root, name)' 'os.path.normpath(os.path.join(root, name))' + # fixes test_custom_kinds + substituteInPlace src/ansiblelint/file_utils.py \ + --replace "if name.endswith('.yaml') or name.endswith('.yml')" "" ''; - buildInputs = [ python ]; - - propagatedBuildInputs = [ ansible enrich pyyaml rich ruamel-yaml wcmatch ]; - - checkInputs = [ pytestCheckHook pytest-xdist git ]; - preCheck = '' # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) - export PATH=$PATH:${lib.makeBinPath [ ansible ]} + export PATH=$PATH:${lib.makeBinPath [ ansible-base ]} # create a working ansible-lint executable export PATH=$PATH:$PWD/src/ansiblelint ln -rs src/ansiblelint/__main__.py src/ansiblelint/ansible-lint patchShebangs src/ansiblelint/__main__.py + + # create symlink like in the git repo so test_included_tasks does not fail + ln -s ../roles examples/playbooks/roles ''; disabledTests = [ # requires network "test_prerun_reqs_v1" "test_prerun_reqs_v2" - # Assertion error with negative numbers; maybe requieres an ansible update? - "test_negative" - "test_example" - "test_playbook" - "test_included_tasks" - "test_long_line" - - "test_get_yaml_files_umlaut" - "test_run_inside_role_dir" - "test_role_handler_positive" ]; - # fails to run tests due to issues with temporary directory - doCheck = !stdenv.isDarwin; - - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-base ]}" ]; meta = with lib; { homepage = "https://github.com/ansible-community/ansible-lint"; diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix new file mode 100644 index 00000000000..f3470f80b50 --- /dev/null +++ b/pkgs/development/python-modules/ansible/base.nix @@ -0,0 +1,78 @@ +{ lib +, buildPythonPackage +, fetchPypi +, installShellFiles +, ansible-collections +, cryptography +, jinja2 +, junit-xml +, lxml +, ncclient +, packaging +, paramiko +, pexpect +, psutil +, pycrypto +, pyyaml +, requests +, scp +, windowsSupport ? false, pywinrm +, xmltodict +}: + +buildPythonPackage rec { + pname = "ansible-base"; + version = "2.10.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0l91bwbavjnaqsnb4c6f17xl7r0cvglz3rxqfs63aagw10z5sqq4"; + }; + + # ansible_connection is already wrapped, so don't pass it through + # the python interpreter again, as it would break execution of + # connection plugins. + postPatch = '' + substituteInPlace lib/ansible/executor/task_executor.py \ + --replace "[python," "[" + ''; + + nativeBuildInputs = [ + installShellFiles + ]; + + propagatedBuildInputs = [ + # depend on ansible-collections instead of the other way around + ansible-collections + # from requirements.txt + cryptography + jinja2 + packaging + pyyaml + # optional dependencies + junit-xml + lxml + ncclient + paramiko + pexpect + psutil + pycrypto + requests + scp + xmltodict + ] ++ lib.optional windowsSupport pywinrm; + + postInstall = '' + installManPage docs/man/man1/*.1 + ''; + + # internal import errors, missing dependencies + doCheck = false; + + meta = with lib; { + description = "Radically simple IT automation"; + homepage = "https://www.ansible.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/ansible/collections.nix b/pkgs/development/python-modules/ansible/collections.nix new file mode 100644 index 00000000000..9547b9a0918 --- /dev/null +++ b/pkgs/development/python-modules/ansible/collections.nix @@ -0,0 +1,77 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ansible-base +, jsonschema +, jxmlease +, ncclient +, netaddr +, paramiko +, pynetbox +, scp +, textfsm +, ttp +, xmltodict +, withJunos ? false +, withNetbox ? false +}: + +buildPythonPackage rec { + pname = "ansible"; + version = "3.4.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "096rbgz730njk0pg8qnc27mmz110wqrw354ca9gasb7rqg0f4d6a"; + }; + + postPatch = '' + # make ansible-base depend on ansible-collection, not the other way around + sed -i '/ansible-base/d' setup.py + ''; + + propagatedBuildInputs = lib.unique ([ + # Support ansible collections by default, make all others optional + # ansible.netcommon + jxmlease + ncclient + netaddr + paramiko + xmltodict + # ansible.posix + # ansible.utils + jsonschema + textfsm + ttp + xmltodict + # ansible.windows + + # lots of collections with dedicated requirements.txt and pyproject.toml files, + # add the dependencies for the collections you need conditionally and install + # ansible using overrides to enable the collections you need. + ] ++ lib.optionals (withJunos) [ + # ansible_collections/junipernetworks/junos/requirements.txt + jxmlease + ncclient + paramiko + scp + xmltodict + ] ++ lib.optionals (withNetbox) [ + # ansible_collections/netbox/netbox/pyproject.toml + pynetbox + ]); + + # don't try and fail to strip 48000+ non strippable files, it takes >5 minutes! + dontStrip = true; + + # difficult to test + doCheck = false; + + meta = with lib; { + description = "Radically simple IT automation"; + homepage = "http://www.ansible.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/legacy.nix similarity index 92% rename from pkgs/development/python-modules/ansible/default.nix rename to pkgs/development/python-modules/ansible/legacy.nix index 245375c26be..2779feffee8 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/legacy.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.12"; + version = "2.9.21"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0c794k0cyl54807sh9in0l942ah6g6wlz5kf3qvy5lhd581zlgyb"; + sha256 = "1pfiwq2wfw11vmxdq2yhk86hm5jljlrnphlzfjr01kwzfikkdp5m"; }; prePatch = '' diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 2acec8ccc6f..4057758155e 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "89f126a072d3a6eee091e1afeed87e0b2ed3c34ed31a1814062174de3cab8d9b"; + sha256 = "7d727542927a926f488fa62d04e2c5728c72660f17f822e627f349285f295063"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 9f41ed5756f..9813becd145 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -5,29 +5,29 @@ , pytest-asyncio , pytest-error-for-skips , pytest-runner -, pytest-tornasync -, pytest-trio , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "brother"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-0NfqPlQiOkNhR+H55E9LE4dGa9R8vcSyPNbbIeiRJV8="; + sha256 = "sha256-Cfut6Y4Hln32g4V13xbOo5JdjPv2cH6FCDqvRRyijIA="; }; + nativeBuildInputs = [ + pytest-runner + ]; + postPatch = '' - substituteInPlace pytest.ini \ + substituteInPlace setup.cfg \ --replace "--cov --cov-report term-missing " "" - substituteInPlace requirements-test.txt \ - --replace "pytest-cov" "" ''; propagatedBuildInputs = [ @@ -37,9 +37,6 @@ buildPythonPackage rec { checkInputs = [ pytest-asyncio pytest-error-for-skips - pytest-runner - pytest-tornasync - pytest-trio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 52a43d0d113..a42f586aadb 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.1.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1b9m9l8bz2slkrq0l5z8zd8pd0js5w4k7dam8bdp00kv3aln4si9"; + sha256 = "0vh2v1qs65kwcj1x8r1wj2g456kflspyz7mjara9ph9qs7j97y74"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 4c17eb2b6e5..d0ba54d27f7 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0bv1qq4cf24cklxfqfnkhjb6w4xqcp3afdcan75n6v7mnwqxyyvr"; + sha256 = "13bcshfas3r7hl205il9fzdjfhd18jf0lxrr5wd8r6qzdrl6i1y6"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 042bddc1d12..966f267d458 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1a40fbmbf4gb0hgpr40yr9fb17ynxwi6vj8hvv3mm1fm9nqiggm1"; + sha256 = "1qb82s72mrm39123kwkypa2nhdsks6v9nkpw4vvscnq4p9xbzw2c"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1fcm4h489sb5a1hk82y1a8575s4k6qd82qkfbm2q5gd14bdvysb0"; + sha256 = "0kwzj28dmhkcr44nf39s82xjc9y5p27w4ywxfpm55cim3hwxbcb1"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1qw9g2maixlcm5l1kpmc721b2p4b7adw5rsimlqcjz96mjya7acj"; + sha256 = "0vvp6z0d0qf5i5kykzph28hr3g9wgzrmmbbzdnm94yk4wsqq7w86"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1q0fm2h4alcck6g8fwwd42jsmkw3gdy9xmw1p78xnvk5dgs6cf9c"; + sha256 = "0y839swv9vdkwi4i1hjiyrjbj1bs74sbkpr5f58ivkjlf5alb56b"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0n8q607rl1qs012gpkxpq1n7ny8306n4vr3hjlz96pm60a7j7904"; + sha256 = "1zsh1bvrl3byx0ycz5jnhijzifxglm8w7kcxp79k7frw7i02fpvy"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 5237f2ae733..334737a9055 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0n5p9x9gz276nv1m8vn3d74jfbd35gff332cjxxqvabk06iqcjp6"; + sha256 = "0q16vgvlhiybq5rhva9kcj5v2mhfpdb5czm2vng4rrfqqiqq918m"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/colored-traceback/default.nix b/pkgs/development/python-modules/colored-traceback/default.nix new file mode 100644 index 00000000000..35d1d5a896c --- /dev/null +++ b/pkgs/development/python-modules/colored-traceback/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pygments +}: + +buildPythonPackage rec { + pname = "colored-traceback"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-bafOKx2oafa7VMkntBW5VyfEu22ahMRhXqd9mHKRGwU="; + }; + + buildInputs = [ pygments ]; + + # No setuptools tests for the package. + doCheck = false; + + pythonImportsCheck = [ "colored_traceback" ]; + + meta = with lib; { + homepage = "https://github.com/staticshock/colored-traceback.py"; + description = "Automatically color Python's uncaught exception tracebacks"; + license = licenses.isc; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 3df013e7599..27f3f291113 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -42,6 +42,12 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = [ + # this test is flaky on darwin because it depends on the resolution of filesystem mtimes + # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257 + "test_write_file_exists" + ]; + meta = with lib; { description = "CSV on the Web"; homepage = "https://github.com/cldf/csvw"; diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index 05737ecf9a8..be1b705dc02 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -1,38 +1,40 @@ { lib -, pkgs , buildPythonPackage , fetchFromGitHub -, pytest +, pytestCheckHook }: buildPythonPackage rec { - pname = "DendroPy"; - version = "4.4.0"; + pname = "dendropy"; + version = "4.5.1"; - # tests are incorrectly packaged in pypi version src = fetchFromGitHub { owner = "jeetsukumaran"; repo = pname; rev = "v${version}"; - sha256 = "097hfyv2kaf4x92i4rjx0paw2cncxap48qivv8zxng4z7nhid0x9"; + sha256 = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; }; - preCheck = '' - # Needed for unicode python tests - export LC_ALL="en_US.UTF-8" - cd tests # to find the 'support' module - ''; + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytest pkgs.glibcLocales ]; + disabledTests = [ + # FileNotFoundError: [Errno 2] No such file or directory: 'paup' + "test_basic_split_count_with_incorrect_rootings_raises_error" + "test_basic_split_count_with_incorrect_weight_treatment_raises_error" + "test_basic_split_counting_under_different_rootings" + "test_group1" + # AssertionError: 6 != 5 + "test_by_num_lineages" + ]; - checkPhase = '' - pytest -k 'not test_dataio_nexml_reader_tree_list and not test_pscores_with' - ''; + pythonImportsCheck = [ "dendropy" ]; - meta = { + meta = with lib; { + description = "Python library for phylogenetic computing"; homepage = "https://dendropy.org/"; - description = "A Python library for phylogenetic computing"; - maintainers = with lib.maintainers; [ unode ]; - license = lib.licenses.bsd3; + license = licenses.bsd3; + maintainers = with maintainers; [ unode ]; }; } diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix new file mode 100644 index 00000000000..c5a06fb6499 --- /dev/null +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, libGL +, libX11 +, pytestCheckHook +, psutil +}: + +buildPythonPackage rec { + pname = "glcontext"; + version = "2.3.3"; + + src = fetchFromGitHub { + owner = "moderngl"; + repo = pname; + rev = version; + sha256 = "16kwrfjijn9bnb48rk17wapmhxq6g9s59zczh65imyncb9k82wkc"; + }; + + disabled = !isPy3k; + + buildInputs = [ libGL libX11 ]; + + postPatch = '' + substituteInPlace glcontext/x11.cpp \ + --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace '"libX11.so"' '"${libX11}/lib/libX11.so"' + substituteInPlace glcontext/egl.cpp \ + --replace '"libGL.so"' '"${libGL}/lib/libGL.so"' \ + --replace '"libEGL.so"' '"${libGL}/lib/libEGL.so"' + ''; + + # Tests fail because they try to open display. See + # https://github.com/NixOS/nixpkgs/pull/121439 + # for details. + doCheck = false; + + pythonImportsCheck = [ "glcontext" ]; + + meta = with lib; { + homepage = "https://github.com/moderngl/glcontext"; + description = "OpenGL implementation for ModernGL"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ friedelino ]; + }; +} diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 0c2d74a90e1..d251ec75ff5 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -28,6 +28,11 @@ buildPythonPackage rec { responses ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyjwt[crypto]>=1.5.3,<2.0.0" "pyjwt[crypto] >=1.5.3, <3.0.0" + ''; + pythonImportsCheck = [ "globus_sdk" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index 6ed9f48dd61..6c2454dbbfe 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -1,7 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, requests +{ buildPythonPackage +, cryptography +, fetchPypi +, lib +, pythonOlder , protobuf , pycryptodome +, requests }: buildPythonPackage rec { @@ -14,11 +18,17 @@ buildPythonPackage rec { sha256 = "0ampvsv97r3hy1cakif4kmyk1ynf3scbvh4fbk02x7xrxn4kl38w"; }; - propagatedBuildInputs = [ requests protobuf pycryptodome ]; + # package doesn't contain unit tests + # scripts in ./test require networking + doCheck = false; + + pythonImportsCheck = [ "gpapi.googleplay" ]; + + propagatedBuildInputs = [ cryptography protobuf pycryptodome requests ]; meta = with lib; { homepage = "https://github.com/NoMore201/googleplay-api"; - license = licenses.gpl3; + license = licenses.gpl3Only; description = "Google Play Unofficial Python API"; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 036122f702b..1d6d6b39d04 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "hickle" ]; meta = { + # incompatible with h5py>=3.0, see https://github.com/telegraphic/hickle/issues/143 + broken = true; description = "Serialize Python data to HDF5"; homepage = "https://github.com/telegraphic/hickle"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index a0efa9b575d..e6e1e605cca 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.2.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc"; + sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix new file mode 100644 index 00000000000..727548f21d5 --- /dev/null +++ b/pkgs/development/python-modules/jxmlease/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, python +}: + +buildPythonPackage rec { + pname = "jxmlease"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "17l3w3ak07p72s8kv8hg0ilxs0kkxjn7bfwnl3g2cw58v1siab31"; + }; + + propagatedBuildInputs = [ + lxml + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover -v + runHook postCheck + ''; + + meta = with lib; { + description = "Converts between XML and intelligent Python data structures"; + homepage = "https://github.com/Juniper/jxmlease"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 9144a4026f6..a82db34d880 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "1.1.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "14592b9vq2iza5agxr29z1mh536if7a9p9hvyjnibsrv22mzwz7l"; + sha256 = "sha256-vijyqki2x813H2xbmz2JIXlh87J5l6NFoZcOu8xi61o="; }; propagatedBuildInputs = [ @@ -22,8 +22,6 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace requirements.txt \ - --replace "karton-core==4.2.0" "karton-core" substituteInPlace requirements.txt \ --replace "malduck==4.1.0" "malduck" ''; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 219a9066dc7..a2e7898f049 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -14,16 +14,6 @@ buildPythonPackage rec { LC_ALL = "en_US.utf-8"; - # remove version bounds - prePatch = '' - sed -i -e 's/==.*//g' requirements.txt - '' - # ipaddress is part of the standard library of Python 3.3+ - + lib.optionalString (!pythonOlder "3.3") '' - substituteInPlace requirements.txt \ - --replace "ipaddress" "" - ''; - nativeBuildInputs = [ glibcLocales ]; propagatedBuildInputs = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index f32f541573e..447d2b00b01 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -4,6 +4,7 @@ , isPy3k , libGL , libX11 +, glcontext }: buildPythonPackage rec { @@ -17,7 +18,7 @@ buildPythonPackage rec { disabled = !isPy3k; - buildInputs = [ libGL libX11 ]; + buildInputs = [ libGL libX11 glcontext ]; # Tests need a display to run. doCheck = false; diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 7f6d9893c96..e06d5aa3780 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -7,6 +7,7 @@ , pyglet , pillow , pyrr +, glcontext }: buildPythonPackage rec { @@ -20,7 +21,7 @@ buildPythonPackage rec { sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q"; }; - propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr ]; + propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index 0851f5c71ef..1c8cae9f041 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , gevent , nose , mock @@ -12,12 +12,34 @@ buildPythonPackage rec { pname = "pika"; version = "1.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "f023d6ac581086b124190cb3dc81dd581a149d216fa4540ac34f9be1e3970b89"; + src = fetchFromGitHub { + owner = "pika"; + repo = "pika"; + rev = version; + sha256 = "sha256-Wog6Wxa8V/zv/bBrFOigZi6KE5qRf82bf1GK2XwvpDI="; }; - checkInputs = [ nose mock twisted tornado gevent ]; + propagatedBuildInputs = [ gevent tornado twisted ]; + + checkInputs = [ nose mock ]; + + postPatch = '' + # don't stop at first test failure + # don't run acceptance tests because they access the network + # don't report test coverage + substituteInPlace setup.cfg \ + --replace "stop = 1" "stop = 0" \ + --replace "tests=tests/unit,tests/acceptance" "tests=tests/unit" \ + --replace "with-coverage = 1" "with-coverage = 0" + ''; + + checkPhase = '' + runHook preCheck + + PIKA_TEST_TLS=true nosetests + + runHook postCheck + ''; meta = with lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 308f308dbb7..b9f71de8e94 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -8,6 +8,7 @@ , pygments , ROPGadget , capstone +, colored-traceback , paramiko , pip , psutil @@ -15,26 +16,34 @@ , pyserial , dateutil , requests +, rpyc , tox , unicorn , intervaltree , installShellFiles }: +let + debuggerName = lib.strings.getName debugger; +in buildPythonPackage rec { - version = "4.3.1"; + version = "4.5.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "12ja913kz8wl4afrmpzxh9fx6j7rcwc2vqzkvfr1fxn42gkqhqf4"; + sha256 = "sha256-IWHMorSASG/po8ib1whS3xPuoUUlD0tbbWI35DI2SIY="; }; - # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538, - # but since that is a niche use case and it requires extra work to get unicorn 1.0.2rc3 to work we relax - # the bound here. Check if this is still necessary when updating! postPatch = '' + # Upstream has set an upper bound on unicorn because of https://github.com/Gallopsled/pwntools/issues/1538, + # but since that is a niche use case and it requires extra work to get unicorn 1.0.2rc3 to work we relax + # the bound here. Check if this is still necessary when updating! sed -i 's/unicorn>=1.0.2rc1,<1.0.2rc4/unicorn>=1.0.2rc1/' setup.py + + # Upstream hardcoded the check for the command `gdb-multiarch`; + # Forcefully use the provided debugger, as `gdb` (hence `pwndbg`) is built with multiarch in `nixpkgs`. + sed -i 's/gdb-multiarch/${debuggerName}/' pwnlib/gdb.py ''; nativeBuildInputs = [ @@ -48,6 +57,7 @@ buildPythonPackage rec { pygments ROPGadget capstone + colored-traceback paramiko pip psutil @@ -55,6 +65,7 @@ buildPythonPackage rec { pyserial dateutil requests + rpyc tox unicorn intervaltree @@ -68,7 +79,7 @@ buildPythonPackage rec { postFixup = '' mkdir -p "$out/bin" - makeWrapper "${debugger}/bin/${lib.strings.getName debugger}" "$out/bin/pwntools-gdb" + makeWrapper "${debugger}/bin/${debuggerName}" "$out/bin/pwntools-gdb" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index be3cddc7c14..2cb89812ea5 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -49,6 +50,9 @@ buildPythonPackage { # This test try to remove a dicom inside $HOME/.pydicom/data/ and download it again. disabledTests = [ "test_fetch_data_files" + ] ++ lib.optionals stdenv.isAarch64 [ + # https://github.com/pydicom/pydicom/issues/1386 + "test_array" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyfuse3/default.nix b/pkgs/development/python-modules/pyfuse3/default.nix index 33479cc66e4..180f5902fac 100644 --- a/pkgs/development/python-modules/pyfuse3/default.nix +++ b/pkgs/development/python-modules/pyfuse3/default.nix @@ -1,22 +1,14 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }: +{ lib, buildPythonPackage, fetchPypi, pkg-config, fuse3, trio, pytestCheckHook, pytest-trio, which }: buildPythonPackage rec { pname = "pyfuse3"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9feb42a8639dc4815522ee6af6f7221552cfd2df1c7a7e9df96767be65e18667"; + sha256 = "45f0053ad601b03a36e2c283a5271403674245a66a0daf50e3deaab0ea4fa82f"; }; - patches = [ - # Fixes tests with pytest 6, to be removed in next stable version - (fetchpatch { - url = "https://github.com/libfuse/pyfuse3/commit/0070eddfc33fc2fba8eb4fe9353a2d2fa1ae575b.patch"; - sha256 = "0lb4x1j31ihs3qkn61x41k2vqwcjl2fp1c2qx2jg9br6yqhjmg3b"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ fuse3 ]; @@ -36,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 3 bindings for libfuse 3 with async I/O support"; homepage = "https://github.com/libfuse/pyfuse3"; - license = licenses.gpl2; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ nyanloutre ]; }; } diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index ade4c01833c..efc06ad0c96 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.3.0"; + version = "21.5.0"; # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-2vW4BN5qwJZYQ8FU3bpSA2v1dX6TOhcHDbHRMDPoRAs="; + sha256 = "sha256-/F4UMFUs60o3QazfFYEWgTGHg4z5knzNWolUpk5SIeM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 2f39be79821..894e5c128e9 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python MAVLink interface and utilities"; homepage = "https://github.com/ArduPilot/pymavlink"; - license = with licenses; [ lgpl3Only mit ]; + license = with licenses; [ lgpl3Plus mit ]; maintainers = with maintainers; [ lopsided98 ]; }; } diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 9d524bfe946..46b60419ad8 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b85jfBZfMZtqtmID+tGBgOe9o0BbmBH83UV71lYAI5c="; + sha256 = "sha256-jqVfBAjIdRBB5AYd0ZkMi7qAUR6vSYeBI4OYEv+mKwE="; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix new file mode 100644 index 00000000000..e81a4b8dd66 --- /dev/null +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, requests +, six +, pytestCheckHook +, pyyaml +}: + +buildPythonPackage rec { + pname = "pynetbox"; + version = "6.1.2"; + + src = fetchFromGitHub { + owner = "netbox-community"; + repo = pname; + rev = "v${version}"; + sha256 = "0di07rny3gqdfb0rf7hm3x03rpn7rydpv3lrl7cak2ccpqm0wzhl"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + requests + six + ]; + + checkInputs = [ + pytestCheckHook + pyyaml + ]; + + disabledTestPaths = [ + # requires docker for integration test + "tests/integration" + ]; + + meta = with lib; { + description = "API client library for Netbox"; + homepage = "https://github.com/netbox-community/pynetbox"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index e4296a4f0b5..ec1e4a6c5c5 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.45"; + version = "0.0.46"; disabled = !isPy3k; @@ -23,10 +23,14 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "0wzmrd9ja5makvsgf0ckil99wr8vw91dml8fi9miiq4la0100q0n"; + sha256 = "sha256-5vQBSKDgzwdWkyGduq2cWa7Eq5l01gbs236H2Syc/Dc="; }; - propagatedBuildInputs = [ ifaddr requests xmltodict ]; + propagatedBuildInputs = [ + ifaddr + requests + xmltodict + ]; checkInputs = [ pytestCheckHook @@ -38,10 +42,10 @@ buildPythonPackage rec { "test_desc_from_uri" # test requires network access ]; - meta = { - homepage = "https://github.com/amelchio/pysonos"; + meta = with lib; { description = "A SoCo fork with fixes for Home Assistant"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ juaningan ]; + homepage = "https://github.com/amelchio/pysonos"; + license = licenses.mit; + maintainers = with maintainers; [ juaningan ]; }; } diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 9155151950a..bf17988e758 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -3,56 +3,35 @@ , fetchFromGitHub , taglib , cython -, pytest -, glibcLocales -, fetchpatch +, pytestCheckHook }: buildPythonPackage rec { - pname = "pytaglib"; - version = "1.4.5"; + pname = "pytaglib"; + version = "1.4.6"; src = fetchFromGitHub { owner = "supermihi"; repo = pname; rev = "v${version}"; - sha256 = "1gvvadlgk8ny8bg76gwvvfcwp1nfgrjphi60h5f9ha7h5ff1g2wb"; + sha256 = "sha256-UAWXR1MCxEB48n7oQE+L545F+emlU3HErzLX6YTRteg="; }; - patches = [ - # fix tests on python 2.7 - (fetchpatch { - url = "https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch"; - sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj"; - }) - - # properly install pyprinttags - (fetchpatch { - url = "https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch"; - sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp"; - }) - (fetchpatch { - url = "https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch"; - sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m"; - }) + buildInputs = [ + cython + taglib ]; - postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner', " "" - ''; + checkInputs = [ + pytestCheckHook + ]; - buildInputs = [ taglib cython ]; + pythonImportsCheck = [ "taglib" ]; - checkInputs = [ pytest glibcLocales ]; - - checkPhase = '' - LC_ALL=en_US.utf-8 pytest . - ''; - - meta = { + meta = with lib; { + description = "Python bindings for the Taglib audio metadata library"; homepage = "https://github.com/supermihi/pytaglib"; - description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.mrkkrp ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mrkkrp ]; }; } diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index a750f02505a..cd1e09557ec 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -1,25 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, requests-mock, tox -, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted, ujson }: +{ lib +, aiohttp +, buildPythonPackage +, dateparser +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, six +, ujson +, websockets +}: buildPythonPackage rec { - version = "0.7.9"; pname = "python-binance"; + version = "1.0.10"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "476459d91f6cfe0a37ccac38911643ea6cca632499ad8682e0957a075f73d239"; + src = fetchFromGitHub { + owner = "sammchardy"; + repo = pname; + rev = "v${version}"; + sha256 = "09pq2blvky1ah4k8yc6zkp2g5nkn3awc52ad3lxvj6m33akfzxiv"; }; - doCheck = false; # Tries to test multiple interpreters with tox - checkInputs = [ pytest requests-mock tox ]; + propagatedBuildInputs = [ + aiohttp + dateparser + requests + six + ujson + websockets + ]; - propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ujson ]; + checkInputs = [ + pytestCheckHook + requests-mock + ]; - meta = { + disabledTestPaths = [ + # Tests require network access + "tests/test_api_request.py" + "tests/test_historical_klines.py" + ]; + + pythonImportsCheck = [ "binance" ]; + + meta = with lib; { description = "Binance Exchange API python implementation for automated trading"; homepage = "https://github.com/sammchardy/python-binance"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.bhipple ]; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index b5155fd4bb6..7fc92a2236b 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.4.1"; + version = "13.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "141w3701jjl460702xddqvi3hswp24jnkl6cakvz2aqrmcyxq7sc"; + sha256 = "sha256-g9v0zUYyf9gYu2ZV8lCAJKCt5o69s1RNo1xGmtwjvds="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 285602bce4a..fd2c80af890 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -41,10 +41,16 @@ buildPythonPackage rec { disabledTests = [ # requires FAISS (not in Nixpkgs) "test_accuracy_calculator_and_faiss" + "test_global_embedding_space_tester" + "test_with_same_parent_label_tester" # require network access: "test_get_nearest_neighbors" "test_tuplestoweights_sampler" "test_untrained_indexer" + "test_metric_loss_only" + "test_pca" + # flaky + "test_distributed_classifier_loss_and_miner" ]; meta = { diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 393170cfb9f..1146fe892f5 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "1.3.1"; + version = "1.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "02fpbyg46mlpc2c1j4zylw9a1h6bacxvigrl3cndsf6fxlhfx15z"; + sha256 = "sha256-xvHvZx22orJR94cRMyyXey27Ksh2/ULHRvv7xxXv11k="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyxb/default.nix b/pkgs/development/python-modules/pyxb/default.nix new file mode 100644 index 00000000000..3be79736e55 --- /dev/null +++ b/pkgs/development/python-modules/pyxb/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "PyXB"; + version = "1.2.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1d17pyixbfvjyi2lb0cfp0ch8wwdf44mmg3r5pwqhyyqs66z601a"; + }; + + pythonImportsCheck = [ + "pyxb" + ]; + + # tests don't complete + # https://github.com/pabigot/pyxb/issues/130 + doCheck = false; + + meta = with lib; { + description = "Python XML Schema Bindings"; + homepage = "https://github.com/pabigot/pyxb"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix index 07bc719698a..6294eee7f34 100644 --- a/pkgs/development/python-modules/rfc3339-validator/default.nix +++ b/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -10,23 +10,14 @@ buildPythonPackage rec { pname = "rfc3339-validator"; - version = "0.1.3"; + version = "0.1.4"; src = fetchPypi { pname = "rfc3339_validator"; inherit version; - sha256 = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32"; + sha256 = "0srg0b89aikzinw72s433994k5gv5lfyarq1adhas11kz6yjm2hk"; }; - patches = [ - # Fixes test failure on darwin. Filed upstream: https://github.com/naimetti/rfc3339-validator/pull/3. - # Not yet merged. - (fetchpatch { - url = "https://github.com/rmcgibbo/rfc3339-validator/commit/4b6bb62c30bd158d3b4663690dcba1084ac31770.patch"; - sha256 = "0h9k82hhmp2xfzn49n3i47ws3rpm9lvfs2rjrds7hgx5blivpwl6"; - }) - ]; - propagatedBuildInputs = [ six ]; checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 31dcc86e0bc..8c18380c3ba 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -37,8 +37,12 @@ buildPythonPackage rec { inherit doCheck; disabledTests = [ - "test_gunicorn" # No "examples" directory in pypi distribution. - "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution. + # No "examples" directory in pypi distribution + "test_gunicorn" + "test_zero_downtime" + # flaky + "test_keep_alive_client_timeout" + "test_reloader_live" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index ba5b37c8d9c..9526c27eb17 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "71de00c9711926816f750bc0f57ef2abbcb1bfbdf5378c601df7ec978f44857a"; + sha256 = "sha256-wSJ9ONyjFbo1GCNz8SnD4nIujtmZ5SWE5qyn0oeHBzk="; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/pkgs/development/python-modules/telfhash/default.nix b/pkgs/development/python-modules/telfhash/default.nix index a7aca8866ed..ddb265bf033 100644 --- a/pkgs/development/python-modules/telfhash/default.nix +++ b/pkgs/development/python-modules/telfhash/default.nix @@ -17,6 +17,8 @@ buildPythonPackage { sha256 = "jNu6qm8Q/UyJVaCqwFOPX02xAR5DwvCK3PaH6Fvmakk="; }; + patches = [ ./telfhash-new-tlsh-hash.patch ]; + # The tlsh library's name is just "tlsh" postPatch = '' substituteInPlace requirements.txt --replace "python-tlsh" "tlsh" diff --git a/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch b/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch new file mode 100644 index 00000000000..3984a4c1e81 --- /dev/null +++ b/pkgs/development/python-modules/telfhash/telfhash-new-tlsh-hash.patch @@ -0,0 +1,30 @@ +diff --git a/telfhash/grouping.py b/telfhash/grouping.py +index c62f8d9..4ee9f0b 100644 +--- a/telfhash/grouping.py ++++ b/telfhash/grouping.py +@@ -32,10 +32,10 @@ import tlsh + def get_combination(telfhash_data): + + # +- # TLSH hash is 70 characters long. if the telfhash is not 70 ++ # The new TLSH hash is 72 characters long. if the telfhash is not 72 + # characters in length, exclude from the list + # +- files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 70] ++ files_list = [x for x in list(telfhash_data.keys()) if telfhash_data[x]["telfhash"] is not None and len(telfhash_data[x]["telfhash"]) == 72] + + # + # get the combination of all the possible pairs of filenames +diff --git a/telfhash/telfhash.py b/telfhash/telfhash.py +index f2bbd25..c6e346c 100755 +--- a/telfhash/telfhash.py ++++ b/telfhash/telfhash.py +@@ -132,7 +132,7 @@ def get_hash(symbols_list): + symbol_string = ",".join(symbols_list) + encoded_symbol_string = symbol_string.encode("ascii") + +- return tlsh.forcehash(encoded_symbol_string).lower() ++ return tlsh.forcehash(encoded_symbol_string) + + + def elf_get_imagebase(elf): diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix new file mode 100644 index 00000000000..1ebad532200 --- /dev/null +++ b/pkgs/development/python-modules/ttp/default.nix @@ -0,0 +1,93 @@ +{ lib +, buildPythonPackage +, callPackage +, fetchFromGitHub +, cerberus +, configparser +, deepdiff +, geoip2 +, jinja2 +, openpyxl +, tabulate +, yangson +, pytestCheckHook +, pyyaml +}: + +let + ttp_templates = callPackage ./templates.nix { }; +in +buildPythonPackage rec { + pname = "ttp"; + version = "0.6.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dmulyalin"; + repo = pname; + rev = version; + sha256 = "08pglwmnhdrsj9rgys1zclhq1h597izb0jq7waahpdabfg25v2sw"; + }; + + propagatedBuildInputs = [ + # https://github.com/dmulyalin/ttp/blob/master/docs/source/Installation.rst#additional-dependencies + cerberus + configparser + deepdiff + geoip2 + jinja2 + # n2g unpackaged + # netmiko unpackaged + # nornir unpackaged + openpyxl + tabulate + yangson + ]; + + pythonImportsCheck = [ + "ttp" + ]; + + checkInputs = [ + pytestCheckHook + pyyaml + ttp_templates + ]; + + disabledTestPaths = [ + # missing package n2g + "test/pytest/test_N2G_formatter.py" + ]; + + disabledTests = [ + # data structure mismatches + "test_yangson_validate" + "test_yangson_validate_yang_lib_in_output_tag_data" + "test_yangson_validate_multiple_inputs_mode_per_input_with_yang_lib_in_file" + "test_yangson_validate_multiple_inputs_mode_per_template" + "test_yangson_validate_multiple_inputs_mode_per_input_with_yang_lib_in_file_to_xml" + "test_yangson_validate_multiple_inputs_mode_per_template_to_xml" + "test_adding_data_from_files" + "test_lookup_include_csv" + "test_inputs_with_template_base_path" + "test_group_inputs" + "test_inputs_url_filters_extensions" + # ValueError: dictionary update sequence element #0 has length 1; 2 is required + "test_include_attribute_with_yaml_loader" + # TypeError: string indices must be integers + "test_lookup_include_yaml" + # missing package n2g + "test_n2g_formatter" + ]; + + pytestFlagsArray = [ + "test/pytest" + ]; + + meta = with lib; { + description = "Template Text Parser"; + homepage = "https://github.com/dmulyalin/ttp"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/ttp/templates.nix b/pkgs/development/python-modules/ttp/templates.nix new file mode 100644 index 00000000000..835548d0784 --- /dev/null +++ b/pkgs/development/python-modules/ttp/templates.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ttp-templates"; + version = "0.1.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "ttp_templates"; + inherit version; + sha256 = "0vg7k733i8jqnfz8mpq8kzr2l7b7drk29zkzik91029f6w7li007"; + }; + + # drop circular dependency on ttp + postPatch = '' + substituteInPlace setup.py --replace '"ttp>=0.6.0"' "" + ''; + + # circular dependency on ttp + doCheck = false; + + meta = with lib; { + description = "Template Text Parser Templates"; + homepage = "https://github.com/dmulyalin/ttp_templates"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix index 81a8d05f5bf..b113e2c3709 100644 --- a/pkgs/development/python-modules/xgboost/default.nix +++ b/pkgs/development/python-modules/xgboost/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage -, pytest -, nose +, pytestCheckHook +, cmake , scipy , scikitlearn , stdenv @@ -10,28 +10,52 @@ , matplotlib , graphviz , datatable +, hypothesis }: buildPythonPackage { pname = "xgboost"; inherit (xgboost) version src meta; - patches = [ - (substituteAll { - src = ./lib-path-for-python.patch; - libpath = "${xgboost}/lib"; - extention = stdenv.hostPlatform.extensions.sharedLibrary; - }) + nativeBuildInputs = [ cmake ]; + buildInputs = [ xgboost ]; + propagatedBuildInputs = [ scipy ]; + checkInputs = [ + pytestCheckHook + scikitlearn + pandas + matplotlib + graphviz + datatable + hypothesis ]; - postPatch = "cd python-package"; - - propagatedBuildInputs = [ scipy ]; - buildInputs = [ xgboost ]; - checkInputs = [ nose pytest scikitlearn pandas matplotlib graphviz datatable ]; - - checkPhase = '' - ln -sf ../demo . - nosetests ../tests/python + # Override existing logic for locating libxgboost.so which is not appropriate for Nix + prePatch = let + libPath = "${xgboost}/lib/libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' + echo 'find_lib_path = lambda: ["${libPath}"]' > python-package/xgboost/libpath.py ''; + + dontUseCmakeConfigure = true; + + postPatch = '' + cd python-package + ''; + + preCheck = '' + ln -sf ../demo . + ln -s ${xgboost}/bin/xgboost ../xgboost + ''; + + pytestFlagsArray = ["../tests/python"]; + disabledTestPaths = [ + # Requires internet access: https://github.com/dmlc/xgboost/blob/03cd087da180b7dff21bd8ef34997bf747016025/tests/python/test_ranking.py#L81 + "../tests/python/test_ranking.py" + ]; + disabledTests = [ + "test_cli_binary_classification" + "test_model_compatibility" + ]; + } diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch deleted file mode 100644 index c9252c12fed..00000000000 --- a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py -index d87922c0..859a30fb 100644 ---- a/python-package/xgboost/libpath.py -+++ b/python-package/xgboost/libpath.py -@@ -19,32 +19,4 @@ def find_lib_path(): - lib_path: list(string) - List of all found library path to xgboost - """ -- curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) -- # make pythonpack hack: copy this directory one level upper for setup.py -- dll_path = [curr_path, os.path.join(curr_path, '../../lib/'), -- os.path.join(curr_path, './lib/'), -- os.path.join(sys.prefix, 'xgboost')] -- if sys.platform == 'win32': -- if platform.architecture()[0] == '64bit': -- dll_path.append(os.path.join(curr_path, '../../windows/x64/Release/')) -- # hack for pip installation when copy all parent source directory here -- dll_path.append(os.path.join(curr_path, './windows/x64/Release/')) -- else: -- dll_path.append(os.path.join(curr_path, '../../windows/Release/')) -- # hack for pip installation when copy all parent source directory here -- dll_path.append(os.path.join(curr_path, './windows/Release/')) -- dll_path = [os.path.join(p, 'xgboost.dll') for p in dll_path] -- elif sys.platform.startswith('linux') or sys.platform.startswith('freebsd'): -- dll_path = [os.path.join(p, 'libxgboost.so') for p in dll_path] -- elif sys.platform == 'darwin': -- dll_path = [os.path.join(p, 'libxgboost.dylib') for p in dll_path] -- -- lib_path = [p for p in dll_path if os.path.exists(p) and os.path.isfile(p)] -- -- # From github issues, most of installation errors come from machines w/o compilers -- if not lib_path and not os.environ.get('XGBOOST_BUILD_DOC', False): -- raise XGBoostLibraryNotFound( -- 'Cannot find XGBoost Library in the candidate path, ' + -- 'did you install compilers and run build.sh in root path?\n' -- 'List of candidates:\n' + ('\n'.join(dll_path))) -- return lib_path -+ return ["@libpath@/libxgboost@extention@"] diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index aefe3ed2b95..ca23184726c 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.1"; + version = "0.18.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-Zf7Od3v54LxMofm67XHeRM4Yeg1+KQLRhFl1BihAxGc="; + sha256 = "sha256-7jfZtncjcYaAS/7N06FWXh4qSTH6y+VdFx3kKyQxIbM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix new file mode 100644 index 00000000000..44ac6cf9fe1 --- /dev/null +++ b/pkgs/development/python-modules/yangson/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, pyxb +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "yangson"; + version = "1.4.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "11w4aq0w2rnkz1axgmw003z2snd4kc49dil6kp1ajlqnfh1pcx8m"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pyxb + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "yangson" + ]; + + meta = with lib; { + description = "Library for working with data modelled in YANG"; + homepage = "https://github.com/CZ-NIC/yangson"; + license = with licenses; [ + gpl3Plus + lgpl3Plus + ]; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index 042f5a1aa6d..226fc049e08 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.12"; + version = "0.1.15"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "sha256-pppA/Uyz1ge7UOG1PrqpTQC5sSGMWPw0J+CtaoZpOCM="; + sha256 = "sha256-ViU/CKkmBY8WwQq/oJ2/qETqr2k8JNFtNPhozw5BmEc="; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index fee73f7e98c..9ebc04ca63a 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.60.0"; + version = "1.61.0"; vendorSha256 = null; @@ -32,7 +32,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-HhJOjTuPuQT8CYRf4yaR+d/MyTWlM1y+FiEU7S5rEs0="; + sha256 = "sha256-Z6G80Xg2DSoUj8vhxkDr3W/wh3fecRwxm0oly2GYDdg="; }; meta = with lib; { diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 58ca9107c54..d07d39b2a3a 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "1d9p2f79f2k7nnka9qja3dlqvvl240l09frkb17ff2f5kyi1qabv"; + sha256 = "sha256-jG4KaDCzx0PAJu6Hr+xnKsAdz97LmGUF0El3rSiLQPo="; }; - vendorSha256 = "1wfm55idlxf6cbm6b5z3fip0j94nwr7m0zxx6a2nsr03d4x0ad0k"; + vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; postInstall = '' mv $out/bin/debugger $out/bin/earthly-debugger diff --git a/pkgs/development/tools/ecpdap/default.nix b/pkgs/development/tools/ecpdap/default.nix index 46b5945fb94..3bb12c40e35 100644 --- a/pkgs/development/tools/ecpdap/default.nix +++ b/pkgs/development/tools/ecpdap/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkg-config, libusb1 }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, libusb1, AppKit }: rustPlatform.buildRustPackage rec { pname = "ecpdap"; @@ -15,7 +15,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 ] + ++ lib.optional stdenv.isDarwin AppKit; postInstall = '' mkdir -p $out/etc/udev/rules.d diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index a3f58ae827e..9b5c286ca08 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -86,30 +86,30 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - electron_10 = mkElectron "10.4.4" { - x86_64-linux = "e82d347ff4753fd4296550e403390c7a9c448d150ea6bb05bd245fd43ac5a708"; - x86_64-darwin = "b8f01dedbd81c58e1dc0fafd316e4c1be07681f7e6d42d3f6f3947cf78d9a8fa"; - i686-linux = "2e7847c902e174496e152030932a921ca1cfb2ffcb556e2a01b08d8235eb333d"; - armv7l-linux = "303c246816bff2dc7aeb26d37d99fe82e4bbe484e3e96f42731f6350498b1af2"; - aarch64-linux = "21ba3370b01870fc498d7e180d034a3e3b59a84af231d2dcd82984d6d09fd5da"; - headers = "0qxzsycpdq1g8a2yaw7g43da1f8ijpbhj97vvxza8nnvxiay5apf"; + electron_10 = mkElectron "10.4.5" { + x86_64-linux = "d7f6203d09b4419262e985001d4c4f6c1fdfa3150eddb0708df9e124bebd0503"; + x86_64-darwin = "e3ae7228010055b1d198d8dbaf0f34882d369d8caf76206a59f198301a3f3913"; + i686-linux = "dd6abc0dc00d8f9d0e31c8f2bb70f7bbbaec58af4c446f8b493bbae9a9428e2f"; + armv7l-linux = "86bc5f9d3dc94d19e847bf10ab22d98926b616d9febcbdceafd30e35b8f2b2db"; + aarch64-linux = "655b36d68332131250f7496de0bb03a1e93f74bb5fc4b4286148855874673dcd"; + headers = "1kfgww8wha86yw75k5yfq4mxvjlxgf1jmmzxy0p3hyr000kw26pk"; }; - electron_11 = mkElectron "11.4.4" { - x86_64-linux = "154ae71e674b37b6cb5ec56e0f569435cb9303a5b0c0608bd2e1d026803be1a5"; - x86_64-darwin = "783962e25433178a1e41b895dbbebc7b82efbe819dbd08c9314d2f4547c73e05"; - i686-linux = "fcfeba63e490648156f01bbe51f27123f93762713f6ab5e4433dc9c232708a25"; - armv7l-linux = "3b98dabbce5a5a8ba66d2f909174b792eeccddd95fd4396a596130f6817ec0d3"; - aarch64-linux = "cf886b382f4e3815487ee1403d4bb6ff434ecd9625e61c9ecf082f482c88617e"; - headers = "1wjcygxy6lvmf1lw857rcd499jk8103nvld0q3jj4r90gwbdhfi3"; + electron_11 = mkElectron "11.4.5" { + x86_64-linux = "6019703cbd37787ba4f0953cb82415c3fac47c8dba3a3af925b00636792d0f89"; + x86_64-darwin = "0f28a1fb4fb6e05f3b602c7e5d8646084344257ba9db977fead9229111a8f599"; + i686-linux = "886a348e1e984b5ea3e4090168fff4ae9f262b1a158e49ff62c544add6d98bec"; + armv7l-linux = "009eeae8463a6e5ad8cdefd4ec645f38604881f7cbbcdd5e5dabb6955ef5d002"; + aarch64-linux = "3cc0f9abb03cd9b9de42a749b38748485d85ba511b205ce8de3e56a903c62211"; + headers = "10a0nf40crjq14p15g8s3ncj1w0dq1kqhfsm3aq5dppj2gx0k8dn"; }; - electron_12 = mkElectron "12.0.5" { - x86_64-linux = "e89c97f7ee43bf08f2ddaba12c3b78fb26a738c0ea7608561f5e06c8ef37e22b"; - x86_64-darwin = "c5a5e8128478e2dd09fc7222fb0f562ed3aefa3c12470f1811345be03e9d3b76"; - i686-linux = "6ef8d93be6b05b66cb7c1f1640228dc1215d02851e190e7f16e4313d8ccd6135"; - armv7l-linux = "7312956ee48b1a8c02d778cac00e644e8cb27706cf4b387e91c3b062a1599a75"; - aarch64-linux = "7b2dc425ce70b94ef71b74ed59416e70c4285ae13ef7ea03505c1aafab44904f"; - headers = "1aqjhams0zvgq2bm9hc578ylmahi6qggzjfc69kh9vpv2sylimy9"; + electron_12 = mkElectron "12.0.6" { + x86_64-linux = "3c632a25ed6502de00d089ee493475b89dd24c2a85ffa00130a5f06001898f27"; + x86_64-darwin = "416348dad569d64d34396be6590ca15761dce91b77aab8219112464d55d00575"; + i686-linux = "2182f2a7e0564b615db3ef99204df8fd3dbd8b0da2fa2eccc960885d9360f018"; + armv7l-linux = "9482309c023a9c367a9403ad750d44a87d68510179fb767707c161672dcd6ffb"; + aarch64-linux = "3033c5dbfbdb5226f6dc528333d237fcb500c2301b1a547ba8a89e54ebc111ab"; + headers = "1la0bfigy2vq7jxrcddj4z5i2xk3cj974ymy0nmbhfnjbwqr7hg2"; }; } diff --git a/pkgs/development/tools/flip-link/default.nix b/pkgs/development/tools/flip-link/default.nix index 36467848c4f..697e4fb3536 100644 --- a/pkgs/development/tools/flip-link/default.nix +++ b/pkgs/development/tools/flip-link/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "flip-link"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "13rgpbwaz2b928rg15lbaszzjymph54pwingxpszp5paihx4iayr"; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "Adds zero-cost stack overflow protection to your embedded programs"; homepage = "https://github.com/knurling-rs/flip-link"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 73126752b98..a44b5ed8c76 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "d-feet"; - version = "0.3.15"; + version = "0.3.16"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/d-feet/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cgxgpj546jgpyns6z9nkm5k48lid8s36mvzj8ydkjqws2d19zqz"; + sha256 = "hzPOS5qaVOwYWx2Fv02p2dEQUogqiAdg/2D5d5stHMs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix new file mode 100644 index 00000000000..c52a9ae4c03 --- /dev/null +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, jq, makeWrapper }: + +buildGoModule rec { + pname = "jiq"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "fiatjaf"; + repo = pname; + rev = version; + sha256 = "sha256-EPhnfgmn0AufuxwcwRrEEQk+RD97akFJSzngkTl4LmY="; + }; + + vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; + + nativeBuildInputs = [ makeWrapper ]; + + checkInputs = [ jq ]; + + postInstall = '' + wrapProgram $out/bin/jiq \ + --prefix PATH : ${lib.makeBinPath [ jq ]} + ''; + + meta = with lib; { + homepage = "https://github.com/fiatjaf/jiq"; + license = licenses.mit; + description = "jid on jq - interactive JSON query tool using jq expressions"; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 980aa0f09ea..04d61995d3f 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -20,4 +20,6 @@ pkgs.buildPythonApplication rec { toml jsonschema ]; + # https://github.com/nix-community/pypi2nix/issues/460 + meta.broken = true; } diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 838740d1fd0..4dcc0b31563 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -11,6 +11,13 @@ rustPlatform.buildRustPackage rec { sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp"; }; + postPatch = '' + # Remove #[deny(warnings)] which is equivalent to -Werror in C. + # Prevents build failures when upgrading rustc, which may give more warnings. + substituteInPlace src/lib.rs \ + --replace "#![deny(warnings)]" "" + ''; + cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67"; buildInputs = [ llvmPackages.clang-unwrapped v8 ] diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index d5feba80d09..c6a02a4dff2 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "1ynv5d2rxlc1gzq93v8qjyl5063w7q42g9m95250yh2lmf9hdj5i"; + sha256 = "sha256-7XOpK6+JVV/p+g/Lb/ORUC9msME0vtuDbmiCBmuOJ8w="; }; - cargoSha256 = "03rphdps17gzcmf8n5w14x5i5rjnfznsl150s3cz5vzhbmnlpszf"; + cargoSha256 = "sha256-KYITZHBcb5G+7PW8kwbHSsereVjH39cVLQjqNaCq2iU="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 02376c0bfe7..b8763c94323 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,16 +2,16 @@ , atk, at-spi2-atk, at-spi2-core, alsaLib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes -, libXrender, libXtst, libXScrnSaver +, libXrender, libXtst, libXScrnSaver, libdrm, mesa }: stdenv.mkDerivation rec { pname = "postman"; - version = "7.36.1"; + version = "8.4.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-6brThKTAQI3cu3SSqvEIT1nwlQ/jPTP+d/Q/m/Ez5nQ="; + sha256 = "040l0g6m8lmjrm0wvq8z13xyddasz7v95v54d658w14gv0n713vw"; name = "${pname}.tar.gz"; }; @@ -43,10 +43,12 @@ stdenv.mkDerivation rec { gtk3 freetype fontconfig + mesa nss nspr pango udev + libdrm libuuid libX11 libxcb diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 2e90176be7e..9b5256fc1c7 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -5,6 +5,8 @@ , libsndfile , libvorbis , ncurses +, which +, pkg-config , lib, stdenv }: stdenv.mkDerivation rec { @@ -19,6 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-xVC/iE71W/Wdy5aPGH9DtcVAHWCcg3HkEA3iDV6OYUo="; }; + nativeBuildInputs = [ which pkg-config ]; buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ]; preBuild = '' makeFlagsArray+=( diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index ecda439e7ab..8eab2f05720 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,23 +1,26 @@ -{ mkDerivation, lib, fetchgit, cmake, pkg-config, git +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config, git , qtbase, qtquickcontrols, openal, glew, vulkan-headers, vulkan-loader, libpng -, ffmpeg, libevdev, python3 +, ffmpeg, libevdev, libusb1, zlib, curl, python3 +, sdl2Support ? true, SDL2 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib }: let - majorVersion = "0.0.12"; - gitVersion = "10811-a86a3d2fe"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) + majorVersion = "0.0.16"; + gitVersion = "12235-a4f4b81e6"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; - src = fetchgit { - url = "https://github.com/RPCS3/rpcs3"; - rev = "v${majorVersion}"; - sha256 = "182rkmbnnlcfzam4bwas7lwv10vqiqvvaw3299a3hariacd7rq8x"; + src = fetchFromGitHub { + owner = "RPCS3"; + repo = "rpcs3"; + rev = "a4f4b81e6b0c00f4c30f9f5f182e5fe56f9fb03c"; + fetchSubmodules = true; + sha256 = "1d70nljl1kmpbk50jpjki7dglw1bbxd7x4qzg6nz5np2sdsbpckd"; }; preConfigure = '' @@ -30,8 +33,13 @@ mkDerivation { ''; cmakeFlags = [ + "-DUSE_SYSTEM_ZLIB=ON" + "-DUSE_SYSTEM_LIBUSB=ON" "-DUSE_SYSTEM_LIBPNG=ON" "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_CURL=ON" + # NB: Can't use this yet, our CMake doesn't include FindWolfSSL.cmake + #"-DUSE_SYSTEM_WOLFSSL=ON" "-DUSE_NATIVE_INSTRUCTIONS=OFF" ]; @@ -39,8 +47,9 @@ mkDerivation { buildInputs = [ qtbase qtquickcontrols openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev python3 - ] ++ lib.optional pulseaudioSupport libpulseaudio + libevdev zlib libusb1 curl python3 + ] ++ lib.optional sdl2Support SDL2 + ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; @@ -48,7 +57,7 @@ mkDerivation { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar neonfuz ilian ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e2ec999e3ce..4ab0700e8a5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -221,12 +221,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-05-09"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "b255889419f58b9da1ae49243b433378e3d0b820"; - sha256 = "05wspv7j3q300fr7sg5i65j3fl7ac0lw93jkpi70f0h7kqi5hl5j"; + rev = "0a71b6211ff2d367f012b484e8eba9ef433b85c3"; + sha256 = "1axn0glc40kqygd50m28layk16y28ah9bi6j36id6v0czhxfi475"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -269,12 +269,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-05-11"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "78ab34de8c77e2e230502945bd4d156af5d54ab8"; - sha256 = "0smbf73i0ingvagxyjk6lb6g2axr6mgqk74c8w27504bnvay7y0w"; + rev = "fa07efc01700896f1b52d11a237e16aacebac443"; + sha256 = "1x10ygg0mb11imx0q9nhz02w10csa3ca0djfldk9cbx5lb8f8f95"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -401,12 +401,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-05-12"; + version = "2021-05-15"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "4e5d98ff3a243167cafbc48de104a279b42318ac"; - sha256 = "006rgvhvnd30qygqdqrlqxbc3yv9qk2ndmr7rkd5fln95g7ib8b5"; + rev = "17ff080bd699dabc9e5735d950e2081eb5da4022"; + sha256 = "0l70y8zzxa761hwgcwviqpa54wgxdbbhabfs39pv7s2871xqkng5"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-05-10"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "6cc7432fa00d8a7351cee54f7b800e992057315a"; - sha256 = "048mvb82ni7m3ch5i32q54qnsh3rl28yw1q7fcsapklnknaaq3qh"; + rev = "33f02db3161500185cd25734d6861605281bef06"; + sha256 = "1qv04l5hli7hq38sfdgx3pfiw38fgpw4my55vrs7bx7ipk7xk4w2"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -714,12 +714,12 @@ let context_filetype-vim = buildVimPluginFrom2Nix { pname = "context_filetype-vim"; - version = "2021-05-11"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "context_filetype.vim"; - rev = "62c74b280d5cb0c16ed7a84e5b4eff4336d30d40"; - sha256 = "1bwwcf6lnx0drjn7192fnplnq1xw85yf2g2fh7mnab7i5w2lmbw3"; + rev = "7f8c2f1340d450951462778b412e3b18038b4e82"; + sha256 = "1zb4d5lk1gygyjqlkkjv46d0cgd2mddhgj7srlh0rcnlw3myswnr"; }; meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; @@ -942,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-05-02"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "17bf89c269e59c9169f4024b0a957b2b71faf21d"; - sha256 = "0m57ia5gh987axm81qbmfbjigdnf1sbkp2grkcf7sq0m3gms10qp"; + rev = "f34db320ae8d31d6264112fe04283822df68f2e3"; + sha256 = "0nb9lh5yc1a5yhw1hih33nkvhspmzpskz61s82azx0hccafcazn9"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1184,12 +1184,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-05-10"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "4e7a08aaa7827184bd492f19aa38fc67aac0f0c8"; - sha256 = "00b0v1wk4wccd4c5xkqn0yvilp3z14r66983kyblpivqfdwy9gs5"; + rev = "c870a30b18e3250534699420bd770ca60c042d49"; + sha256 = "1kv785jl31hd3gmq8pz76l4w4pw0sndnhw9zpsg1bcz7bwsw2c3h"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1523,12 +1523,12 @@ let friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-05-10"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "9178101a99226fb4a973fd88ba6e84972c7b0a94"; - sha256 = "1dy9b5ipzs412sz31mqqrr6rfjs24569pw17z9b3z40dipmzg1x8"; + rev = "47ef802dcb1ad384990b4842b4ba54e1af89316a"; + sha256 = "1mi62dyqiw32yl568p8nph74rb4n1hiimdv11ghrjca3jqasb6rk"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1679,24 +1679,24 @@ let git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-05-08"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "10ed3095e68c824899832e61fff58ad88ca6282f"; - sha256 = "1l2appxysix9pkgfk6lw3pr2b2qi37qd05lpf0sd7zr89ikrr0cr"; + rev = "2a26734c6322449a56d02c25a2947e9b7519ca49"; + sha256 = "0ib0yl7zqklj9i1sgv854d3xl5sqbdf2khh9cpraik1rv23nlf2h"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-05-05"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "4b990ccdaa8d9bd5be017d8aa8035474bc035b1d"; - sha256 = "1skyzqq6ycr81g1dd10wsdx9d4dv4zdhh1gs0gbdjkhpf36hrb0v"; + rev = "77cb4e1ef26d4133ac0cdfd3d5563b1456b8bf81"; + sha256 = "1q4155rd3rs5qr8spm7lw4yavgpv67yqgy4615agmarh94syn4rx"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -1715,12 +1715,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-05-08"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "d89f88384567afc7a72b597e130008126fdb97f7"; - sha256 = "03qs6kcv9wxwikpl1hhlkm7w66952i60wz38a72s87ykgdkk16ij"; + rev = "016ad5a5d7d3f2d824ffd6b5b27f63a382b251ea"; + sha256 = "10gzdvmrmsgf07y8n1b79b8vnr37ijdzxni67ff92wwlhvqz13qg"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2446,18 +2446,6 @@ let meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; - lsp-trouble-nvim = buildVimPluginFrom2Nix { - pname = "lsp-trouble-nvim"; - version = "2021-05-11"; - src = fetchFromGitHub { - owner = "folke"; - repo = "lsp-trouble.nvim"; - rev = "0f584688c3dcd6a2cacf2e750da7fe3b5e7f260e"; - sha256 = "14wfnv98ys0mc9xpfl0d06iv63k4bfhjy8h35sngb0mikb1wb0ns"; - }; - meta.homepage = "https://github.com/folke/lsp-trouble.nvim/"; - }; - lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions-nvim"; version = "2021-02-17"; @@ -2496,12 +2484,12 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-05-12"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "33aaabe672f120050fd34264719e27a9bf518f18"; - sha256 = "1zsnhlcch4wgs69zjxdxaczxpi8ypscxgmjc41v2qwk4vmjlqlv1"; + rev = "9d9ee2d60ed22a603bd92afabd38e10eb15b413b"; + sha256 = "0b3mqn0w45wwdilxin1qsfxljm6rmzf984l9jgbgda4gk4a5df1p"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -3192,36 +3180,36 @@ let nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-05-05"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "e368305d2544339b998446972aef9050439b1156"; - sha256 = "0aaknlvjsshk8gcv69wmmyarc53f5y4h0fndwhhzij3c92zwqsyi"; + rev = "1eef75abc5d8bb0bf0273b56ad20a3454ccbb27d"; + sha256 = "161nrdr5k659xsqqfw88vdqd9a0mvfr3cixx7qfb6jlc9wcyzs3m"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-05-10"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "ffbad27affde968cff2db0af9654431377fee8c7"; - sha256 = "0vlismqzm24h24shc0m49qvxyv03mnd68ahzlwa314ybvs2s10wj"; + rev = "51f155757bd92b24b32b5f4a6bcd09de0e9b8936"; + sha256 = "0xdh3f28sn342z6q175s6shqirryz6p8sf6dz72y7wv9y5a7x7y4"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-05-09"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "297f214477ec10ccf381dd5644656df4cf8f46bf"; - sha256 = "14l6m1vai51ir2vl7qmqqf9waa32fvxjmplr82asf4px1g436mlq"; + rev = "64ba179ea810b868eda1031b2c476596657e3a52"; + sha256 = "0fi7naa720ihvxad3628w482bzav8nsipz497zv8f033zcj5qcq3"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3324,12 +3312,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-05-12"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "f1fd61642c687f37f14e3f947c840e0f33e4b09a"; - sha256 = "0d8bz0khmvrrcpcyrnwagykj4hmbr55a8g39qrwm3zkmry5if4qg"; + rev = "131a8e75b91543a74c95014e381e70ee517476d6"; + sha256 = "0g30ajlp2lvkpji7nf5vpbnl61wz09rngrfhdc9zw3xwcd52a2da"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3372,12 +3360,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-05-07"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0a921bf2be74d293c8a8d6dd70122c1d01151a30"; - sha256 = "1vj331bgkyl8j19cniwwn49aal21vqsqgy17wgxa37g5igb14jrw"; + rev = "3ed00a8a0de63054af5f133d6096d755ea0ac230"; + sha256 = "04waag4lvsygbzxydifw2hkdm9biwcs1663giah9nrwaahf0m32a"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3444,12 +3432,12 @@ let nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-05-11"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "5bf694fce51f0711e3e005e105992178d87a86c6"; - sha256 = "1ka3hqcyjbrnawiz4wx35qpql3jxl0vllnskz5vqhqr5gfl9rz5b"; + rev = "ffe9a7e44d888f6f745e532a5aace8547e176ef0"; + sha256 = "165dzr7b7dhpzirbdm2nnpzrw1l27qv37sza9am5b4qiy54fmar3"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3480,12 +3468,12 @@ let nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-05-03"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "8a7f7c2ed73d68d081029baf0e0dd71c1ed744b7"; - sha256 = "1zg8nzg60yp359rz4zyyli8imnb3ri3mimd28n4f5sn3ydlm697c"; + rev = "b497f282b3db3d3e8641d724c49aedff0d83924c"; + sha256 = "0n5mdni9pvxg1cj1ri0nch4wk28kx0sy0k2vcw7c8d0pw5hfadqb"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3516,12 +3504,12 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-05-02"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "3540654cacb93f66ebfb5ca770c42b7a715ed2d5"; - sha256 = "0azsnaz9bf90v9szhvidrxq37xvggvp0dzpjwpk0dc28wjx2c2zd"; + rev = "6478cb17624d2509e4c3d78a7f8c50db634d7c0b"; + sha256 = "0lqxiy73jr340sl264acscc67dfcavmiz7d1abnijwjp9h1ms159"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3660,12 +3648,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-05-05"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "0e263350f9c972796c49ce5e04be75a86909759b"; - sha256 = "1cjrnlglfb2w8q41fajv4j16w28287h70i41raqqh4wm3l94nahw"; + rev = "c51be59d62ac0b4fca80a4a4d75ab0870f494246"; + sha256 = "13ak67pm1k183xq8w2lbdn5hnf3lfxklcagrzjkxb96flf6fmiyh"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4671,12 +4659,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-05-11"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "22a78a46364b1e79549267c9365a31684689ed08"; - sha256 = "0y0y37v0qikfi7p9a5c63knil70r4mk249hsyxjjgg2m3di8i29g"; + rev = "e88864123bf9896d294f83140937e5eab6e105f1"; + sha256 = "1h1xk0rwj83cz3sfihcfny4825ia084lsl4xhj7zsdlw0fq8miaq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4814,6 +4802,18 @@ let meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; + trouble-nvim = buildVimPluginFrom2Nix { + pname = "trouble-nvim"; + version = "2021-05-12"; + src = fetchFromGitHub { + owner = "folke"; + repo = "trouble.nvim"; + rev = "135d4e95dd8a266272964ac2b13a31812b2db82d"; + sha256 = "087a9gwzydvnh8fqqqvhpv3vz7g4bgmrrw2jxdc8nqj1a39gn3b4"; + }; + meta.homepage = "https://github.com/folke/trouble.nvim/"; + }; + tslime-vim = buildVimPluginFrom2Nix { pname = "tslime-vim"; version = "2020-09-09"; @@ -5476,12 +5476,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-05-12"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "8c17472d0fe5a515ab3618edd0cad3dd16972e09"; - sha256 = "15k2agpi832wdfacf289fffkvgg8q2gc01y9fa8qsnhjqnlrqra9"; + rev = "c1b20c2a4db279918942c5486b8a61bb1571ebf5"; + sha256 = "148l1s419rhb21492mvb0v4mw1hcmsp8djn57r77sc958rqilyad"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5740,12 +5740,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-05-07"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "13f776a6ca7fb9905a329a1ac469d3ebe22e377e"; - sha256 = "11vlafq22z2xff8dvr5j80igfxrkkyx1p84khbpgyv1cq09dwsgk"; + rev = "fb0833459d3c329df2e861eb8cc62b60295b62af"; + sha256 = "1wwk110kf8y8gcaqq1v0alhpzb90fjx849zkkr6zia45xgrzwmh2"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -5788,12 +5788,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2021-02-19"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "4d14cb82cf7381c2f8eca284d1a757faaa73b159"; - sha256 = "1wwqchf50c19a5d5g037rjjpskn7dpsq9alhzim2x6bgffb5yamd"; + rev = "4c2df59e37b6680e0ec17b543b11a405dc40262c"; + sha256 = "0knpfl0lwiy0w2f9qd3gz3yl03dqzn6fllv0isl0iz24csya6v2h"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -6100,12 +6100,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-03-20"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "e04a615e72ec2e216116b5c6514ac4d86b21ffc3"; - sha256 = "1q17xlwprkvx27fbb9xg1zh5nyx8gif3pp6p8vd3r6zhzqqdl469"; + rev = "07b0256b08e0da6d31200663cbe6d6f8c995a287"; + sha256 = "0zp3ghiqyg1qf8rxx5a1hqxyz4sqqw1afbh9qzsjlw18g0va86kj"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -6220,12 +6220,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-05-02"; + version = "2021-05-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "32b0d6266361614a6a07cfe850750e900cd50575"; - sha256 = "0pyidvyn246sm8w9mdcj0rmipqnc4b63q80l8z5y5v3zpy37v4mf"; + rev = "0868c30cc08a4cf49b5f43e08412c671b19fa3f0"; + sha256 = "06pqam0ap0pb87gr8dvwzvnx1i62g73l81jrnwl7mzzz26p3ircj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6340,12 +6340,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-05-06"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "efc854422b4e816f42f5281d4f30a3c33340b349"; - sha256 = "0gcy1cgpnzcgapcqnbrvk6anzp9jxm3k8xkclkwvwlmv3r212fsh"; + rev = "381f73610ba281da8a56cdcf37e11a9dfcc822de"; + sha256 = "0zaw9xc8f5275661g4alxmkx554q49il6fkf3kh3lyalas59l9d8"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -7483,12 +7483,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-04-20"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "2a0af02d0fd59baeb84cf865e395827750c875f0"; - sha256 = "06vrham1zg5vfr4q4gmz2ski4y02c3bfivzy4rlfvjs81qj3vn3m"; + rev = "a2d1adf046d1ce09499fcd5d595a5376fa43bb05"; + sha256 = "0a2sakpw32gdvw6nraz6m3ifnb06ir0dyryh07ck719pkn9kp000"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -8720,12 +8720,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-03-21"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "08e37d47406d7f57e5907af4dc6bd35cff2b04b3"; - sha256 = "157gvlpb0i3jn9gjcjgz02y843jh03pqnwfkv2bf9qh7bknrnxr5"; + rev = "17fed1b0471e224c59b9ae1b8a3cbeea570dd14b"; + sha256 = "13ffj8jmbazw6s35ddwwfmbg33wqqpc823i45m0b4q9h4ybjn4ry"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9069,12 +9069,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-05-06"; + version = "2021-05-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "3c6aa0fd0e1e79b0266fa1d054517656aa234c33"; - sha256 = "0b42p82m8nr5asbcrydiv4wdrw7q57pgn6iinav647zhfmz4glp3"; + rev = "ffb07473638f5a155dde79bfdc6c0d92f30f463b"; + sha256 = "06h6rni46rfjhb9cn79swqnk9l7kxwv4hv265hizjk452scqwb7b"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9165,12 +9165,12 @@ let which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-05-11"; + version = "2021-05-13"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "342c8cdb3651967c96c356eb2d79561c0c9273ee"; - sha256 = "1v1z8yk711gjd3qawj2vmwa5l9jmqqxfj9jjw9zq1m011msp18iv"; + rev = "840311c272eda2c4fc0d92070e9ef2dd13f884e7"; + sha256 = "0ys931k4imq1vn8y7apwnfisf19aib8kvyvlfk7sjriyd50sqg3b"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 4e87b7d36cb..2a9bc166826 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -605,7 +605,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-Jy8ThtcdPV4fMGcQbJJnibwb3o5iEHNn54831OI9adc="; + cargoSha256 = "16fhiv6qmf7dv968jyybkgs1wkphy383s78g8w5wnz4i0czld8dq"; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fd90458c865..ff4b066be24 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -137,7 +137,7 @@ fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main -folke/lsp-trouble.nvim@main +folke/trouble.nvim@main folke/which-key.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 7d53fcb31ee..6f61a94ca14 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -926,6 +926,23 @@ let }; }; + stephlin.vscode-tmux-keybinding = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-tmux-keybinding"; + publisher = "stephlin"; + version = "0.0.6"; + sha256 = "0mph2nval1ddmv9hpl51fdvmagzkqsn8ljwqsfha2130bb7la0d9"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/stephlin.vscode-tmux-keybinding/changelog"; + description = "A simple extension for tmux behavior in vscode terminal."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=stephlin.vscode-tmux-keybinding"; + homepage = "https://github.com/StephLin/vscode-tmux-keybinding"; + license = licenses.mit; + maintainers = with maintainers; [ dbirks ]; + }; + }; + streetsidesoftware.code-spell-checker = buildVscodeMarketplaceExtension { mktplcRef = { name = "code-spell-checker"; diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index fb58c94cde9..eb215d0fd22 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.4131"; - sha256 = "167fwb1nri9xs5bx14zdg2q3fsmlbihcvnk90fv9av8zirpwa3vs"; + version = "1.0.4272"; + sha256 = "kH8ZiNzpAfR1BnKjYc+hcNMEmhBNyHlnOlj8fCdNGjY="; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ @@ -128,7 +128,7 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; license = licenses.unfree; - maintainers = with maintainers; [ jraygauthier ]; + maintainers = with maintainers; [ jraygauthier V ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index e9e4b9f0cfc..89950a51598 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -41,13 +41,13 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2021.4.765268190"; + version = "2021.5.829140558"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "0x7dn3vc83mph2gaxgx26bn7g71hqdpp1mpizmd4jqcrknc4d7ci"; + sha256 = "0y2HN4WGYUUXBfqp8Xb4oaA0hbLZmE3kDUXMBAOjvPQ="; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 86453b960cb..7290c04342e 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -13,8 +13,8 @@ in }; postPatch = '' - mkdir -p wakatime-master - cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime + mkdir wakatime-cli + ln -s ${wakatime}/bin/wakatime ./wakatime-cli/wakatime-cli ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 1ed6d9c5f72..9ce65cd8726 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "anbox-modules"; - version = "2019-11-15-" + kernel.version; + version = "2020-06-14-${kernel.version}"; src = fetchFromGitHub { owner = "anbox"; repo = "anbox-modules"; - rev = "e0a237e571989987806b32881044c539db25e3e1"; - sha256 = "1km1nslp4f5znwskh4bb1b61r1inw1dlbwiyyq3rrh0f0agf8d0v"; + rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086"; + sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -34,10 +34,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Anbox ashmem and binder drivers."; homepage = "https://github.com/anbox/anbox-modules"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; - broken = (versionOlder kernel.version "4.4"); + broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5"; maintainers = with maintainers; [ edwtjo ]; }; - } diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 354f4b1bff2..7da14593410 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchurl, fetchpatch, kernel }: let cfg = import ./version.nix; in @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = cfg.sha256.${pname}; }; + patches = [ + (fetchpatch { + # Fix build with Kernel>=5.12, remove for batman-adv>=2021.1 + url = "https://git.open-mesh.org/batman-adv.git/patch/6d67ca7f530d4620e3d066b02aefbfd8893d6c05?hp=362da918384286a959ad7c3455d9d33d9ff99d7d"; + sha256 = "039x67yfkwl0b8af8vwx5m58ji2qn8x44rr1rkzi5j43cvmnh2cg"; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 28096059101..8a41cd126df 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.38"; + version = "0.40"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "sha256-UR6NHIO/L/QbuVerXe32RNT33wwrDvIZpV6nlYaImI8="; + sha256 = "sha256-Yr08Kb8YU7xqBnhhS8rn+GFXAV68Hgj4aY26eptb9/8="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index 61044526e44..2ae8bb2dca2 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "fatrace"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "sha256-1daYCVGz8Zd42j2QMFL5EAULKkmBnbE828i5NV9Kcb8="; + sha256 = "sha256-w7leZPdmiTc+avihP203e6GLvbRzbCtNOJdF8MM2v68="; }; buildInputs = [ python3 which ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 6e703feb992..63692149f3d 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.12"; + version = "1.14"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-o3Vc5p/AFZwbkEWJZzO6wWAJ/BmSh0eKxdnjm5B9BFU="; + sha256 = "sha256-uGe4TO1/bs8k2z3wOJqaZgT6u6yX/7wx4HMSS2hN4XE="; }; outputs = [ "out" "man" ] @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { ]; postUnpack = '' + mkdir -p iwd/ell + ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h patchShebangs . ''; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d97341fccca..a7505c95f10 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,20 +13,20 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.35-hardened1.patch", - "sha256": "133k9h187jpkyfqrd66v4k0z3l3gg6r0g4x8nsic9sarapdd62v7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.35-hardened1/linux-hardened-5.10.35-hardened1.patch" + "name": "linux-hardened-5.10.37-hardened1.patch", + "sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch" }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.19-hardened1.patch", - "sha256": "16czmg41nijl7zaahb4ggi8z7hizc0qsqg3az8vzll5kvzzr313f", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.19-hardened1/linux-hardened-5.11.19-hardened1.patch" + "name": "linux-hardened-5.11.21-hardened1.patch", + "sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.117-hardened1.patch", - "sha256": "0b9mfw49yrdgsj9804nh0qxzj49z2xb1jvxhvdxpm9yjlnyw85bv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.117-hardened1/linux-hardened-5.4.117-hardened1.patch" + "name": "linux-hardened-5.4.119-hardened1.patch", + "sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 7ba90db9aed..36b54e8191d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,8 +1,9 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { version = "4.4.268"; extraMeta.branch = "4.4"; + extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c6308a178e4..d1cd267dd22 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,8 +1,9 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: +{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { version = "4.9.268"; extraMeta.branch = "4.9"; + extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f40e7740c45..f150ab1cb0a 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.35"; + version = "5.10.37"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc"; + sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix index 9d704bf3078..2988984e34c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.19"; + version = "5.11.21"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0jrb8wbxj0dadyadggcn49hlxzxgz8mz8xr0ckgbnnvb8snikvjs"; + sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 9450b4ec304..39366147ae5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.2"; + version = "5.12.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "03gp5vq8vkwvksjsa1birds37rmrr73s9ik6m1wvgz8mdncvk64c"; + sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index ebb7ffca409..8d6a063e643 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.117"; + version = "5.4.119"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0w679qymqh8dlb1mh2vxr382m1pzxdjwlp3bqzjr4043fmbrp62f"; + sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 368d65d75bb..90c0c4e2930 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.30-rt38"; # updated by ./update-rt.sh + version = "5.10.35-rt39"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl"; + sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0f8wcs0y1qx3kqsan8g7bh1my2yc77k6d1g3q12nfxvbmlgs766n"; + sha256 = "03gq9y111k4js4cc87yc9y7hyg1wxwbc1bjyjdvb4nrx2wqka79y"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/pkgs/os-specific/linux/logitech-udev-rules/default.nix index fde75fdcd65..0b0e9e8f203 100644 --- a/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ b/pkgs/os-specific/linux/logitech-udev-rules/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (solaar) version; buildCommand = '' - install -Dm644 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules + install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index d921eb71b0e..b66a56a8f8b 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -5,37 +5,40 @@ with lib; let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtl8192eu"; in stdenv.mkDerivation rec { - name = "rtl8192eu-${kernel.version}-${version}"; - version = "4.4.1.20200620"; + pname = "rtl8192eu"; + version = "${kernel.version}-4.4.1.20210403"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "925ac2be34dd608a7ca42daebf9713f0c1bcec74"; - sha256 = "159vg0scq47wnn600karpgzx3naaiyl1rg8608c8d28nhm62gvjz"; + rev = "ab35c7e9672f37d75b7559758c99f6d027607687"; + sha256 = "sha256-sTIaye4oWNYEnNuXlrTLobaFKXzBLsfJXdJuc10EdJI="; }; hardeningDisable = [ "pic" ]; - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildInputs = [ bc ]; + nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; installPhase = '' + runHook preInstall + mkdir -p ${modDestDir} find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; find ${modDestDir} -name '*.ko' -exec xz -f {} \; + + runHook postInstall ''; - meta = { + meta = with lib; { description = "Realtek rtl8192eu driver"; homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + license = licenses.gpl2Only; + platforms = platforms.linux; + broken = stdenv.hostPlatform.isAarch64; maintainers = with maintainers; [ troydm ]; }; } diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix index 779f7312cac..8138e6de96e 100644 --- a/pkgs/servers/adminer/default.nix +++ b/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, php }: +{ lib, stdenv, fetchurl, php, nix-update-script }: stdenv.mkDerivation rec { - version = "4.8.0"; + version = "4.8.1"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "sha256-T2LEUoIbFrMta+wP7PNci0QkFYrJZmWP3RP/JzgqUoc="; + sha256 = "sha256-2rkNq79sc5RBFxWuiaSlpWr0rwrnEFlnW1WcoxjoP2M="; }; nativeBuildInputs = [ @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Database management in a single PHP file"; homepage = "https://www.adminer.org"; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 6feb4f6bd03..608326117f1 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.14.1"; + version = "8.16.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "sha256-AtBkGODC8x25GQENRSRiptUvDIcHGg9JnqVnDxXzmmQ="; + sha256 = "sha256-0J+P4E9hYPbYBb6qvtBjH1jhKrDW187+309YBHORNZA="; }; buildPhase = '' diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 721bbc4735f..843b7c34008 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.6.1"; + version = "20.11.7.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1c2dqqddw5bfb27smq7rqa7v1wymdj155ky50rbyvl36pmhc9djp"; + sha256 = "0ril6k4dj96qhx5x7r4nc2ghp7n9700808731v4qn9yvcslqzg9a"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 708a1e6f65e..5f070aa398c 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub}: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "matrix-dendrite"; @@ -13,6 +13,10 @@ buildGoModule rec { vendorSha256 = "1l1wydvi0yalas79cvhrqg563cvs57hg9rv6qnkw879r6smb2x1n"; + passthru.tests = { + inherit (nixosTests) dendrite; + }; + meta = with lib; { homepage = "https://matrix.org"; description = "Dendrite is a second-generation Matrix homeserver written in Go!"; diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index f533b4537ad..76fcac91f9d 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,10 +2,10 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.15"; + version = "3.4.16"; deleteVendor = true; - vendorSha256 = "sha256-1q5tYNDmlgHdPgL2Pn5BS8z3SwW2E3OaZkKPAtnhJZY="; + vendorSha256 = null; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-jJC2+zv0io0ZulLVaPMrDD7qkOxGfGtFyZvJ2hTmU24="; + sha256 = "sha256-mTQwa9dYc0U0tjum1vR8Dbe/xLRHFUthcklA+Ye6/jw="; }; buildPhase = '' diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index e6454ced2a7..b92975149db 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "5.6"; + version = "5.7"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; - sha256 = "18ksld775balh0yx2icj7fya9fvjkfgvwznvccdlmhi3zidg550h"; + sha256 = "sha256-pUPOYqgJKntQZRRodcyYeFNLCdxKhT8sK1bi3jl6b0s="; }; preConfigure = '' diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a9d3ae02ea1..7616dc0ee87 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -397,6 +397,8 @@ in with py.pkgs; buildPythonApplication rec { "uptime" "vacuum" "verisure" + "version" + "vesync" "weather" "webhook" "websocket_api" @@ -411,6 +413,8 @@ in with py.pkgs; buildPythonApplication rec { "zone" "zwave" "zwave_js" + ] ++ lib.optionals (builtins.any (s: s == stdenv.hostPlatform.system) debugpy.meta.platforms) [ + "debugpy" ]; pytestFlagsArray = [ diff --git a/pkgs/servers/irc/inspircd/default.nix b/pkgs/servers/irc/inspircd/default.nix index f907e337ce6..561151bfa75 100644 --- a/pkgs/servers/irc/inspircd/default.nix +++ b/pkgs/servers/irc/inspircd/default.nix @@ -142,13 +142,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0x3paasf4ynx4ddky2nq613vyirbhfnxzkjq148k7154pz3q426s"; + sha256 = "1817gmxk4v7k5398d2fb6qkwadg0fd980gqmr80wdnppx450ikn7"; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; @@ -160,6 +160,8 @@ stdenv.mkDerivation rec { buildInputs = extraInputs; configurePhase = '' + runHook preConfigure + patchShebangs configure make/*.pl # configure is executed twice, once to set the extras @@ -183,6 +185,8 @@ stdenv.mkDerivation rec { --module-dir ${placeholder "lib"}/lib/inspircd \ --runtime-dir /var/run \ --script-dir ${placeholder "bin"}/share/inspircd \ + + runHook postConfigure ''; postInstall = '' diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix index 56309f6f1bb..0168a98ca73 100644 --- a/pkgs/servers/mbtileserver/default.nix +++ b/pkgs/servers/mbtileserver/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "mbtileserver"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "consbio"; repo = pname; rev = "v${version}"; - sha256 = "0b0982rn5jsv8zxfkrcmhys764nim6136hafc8ccj0mwdyvwafxd"; + sha256 = "sha256-QdirExVv7p7Mnhp8EGdTVRlmEiYpzoXVQbtO8aS9Kas="; }; - vendorSha256 = null; + vendorSha256 = "sha256-mUUxUZn8out6WNvKJKHoz+R44RDB0oWJb+57w72+E5w="; meta = with lib; { description = "A simple Go-based server for map tiles stored in mbtiles format"; homepage = "https://github.com/consbio/mbtileserver"; + changelog = "https://github.com/consbio/mbtileserver/blob/v${version}/CHANGELOG.md"; license = licenses.isc; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 290fce257f1..ae27fe751de 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,22 +15,22 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-04-22T15-44-28Z"; + version = "2021-05-11T23-27-41Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "147a4vgf2hdpbndska443axzvxx56bmc0011m3cq4ca1vm783k8q"; + sha256 = "0yljq4lm9maz73ha9m38ljv977999p57rfkzybgzbjjrijgszm2b"; }; - vendorSha256 = "0qj1zab97q8s5gy7a304wqi832y8m083cnk8hllz8lz9yjcw6q92"; + vendorSha256 = "1dm8nbg86zvxakc7h4dafqb035sc5x6viz8p409l22l695qrp6bi"; doCheck = false; subPackages = [ "." ]; - patchPhase = '' + postPatch = '' sed -i "s/Version.*/Version = \"${versionToTimestamp version}\"/g" cmd/build-constants.go sed -i "s/ReleaseTag.*/ReleaseTag = \"RELEASE.${version}\"/g" cmd/build-constants.go sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 9a172120da8..d6e3accdf41 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "do-agent"; - version = "3.9.4"; + version = "3.10.0"; src = fetchFromGitHub { owner = "digitalocean"; repo = "do-agent"; rev = version; - sha256 = "sha256-h5Bv6Us1NrxhUWBckUcGzh3qDk8yDbkmLnV6ZYDdClU="; + sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g="; }; buildFlagsArray = '' diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 3aa1e18a9f1..5e7d386d7e1 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.9.0"; + version = "1.9.1"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - sha256 = "1zmkajg48i40jm624p2h03bwg7w28682yfcgk42ig3d50p8xwqc3"; + sha256 = "1m68isplrs3zvkg0mans9bgablsif6264x3w475bpnhf68r87v1q"; }; - vendorSha256 = "1594bpfwhbjgayf4aacs7rfjxm4cnqz8iak8kpm1xzsm1cx1il17"; + vendorSha256 = "0acwgb0h89parkx75jp057m2hrqyd95vr2zcfqnxbnyy98gxip73"; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix index af58a6ebe94..e93db302552 100644 --- a/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-s3-exporter"; - version = "0.3.0"; + version = "0.4.1"; goPackagePath = "github.com/ribbybibby/s3_exporter"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ribbybibby"; repo = "s3_exporter"; rev = "v${version}"; - sha256 = "062qi4rfqkxwknncwcvx4g132bxhkn2bhbxi4l90wl93v6sdp9l2"; + sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq"; }; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 5cfdf615830..74b7c2112f9 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "bind_exporter"; - version = "20161221-${lib.strings.substring 0 7 rev}"; - rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; - - goPackagePath = "github.com/digitalocean/bind_exporter"; + version = "0.4.0"; src = fetchFromGitHub { - inherit rev; - owner = "digitalocean"; + rev = "v${version}"; + owner = "prometheus-community"; repo = "bind_exporter"; - sha256 = "1nd6pc1z627w4x55vd42zfhlqxxjmfsa9lyn0g6qq19k4l85v1qm"; + sha256 = "152xi6kf1wzb7663ixv27hsdbf1x6s51fdp85zhghg1y700ln63v"; }; + vendorSha256 = "172aqrckkhlyhpkanrcs66m13p5qp4fd2w8xv02j2kqq13klwm1a"; + passthru.tests = { inherit (nixosTests.prometheus-exporters) bind; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 3cb04304e26..67ec88332b5 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bird-exporter"; - version = "1.3.5-git"; + version = "1.2.5"; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; - rev = "019fc09804625658d452a8e043cc16559c3b5b84"; - sha256 = "1iym46368k8zzy4djx511m926dg8x5mg3xi91f65sknqv26zfggb"; + rev = version; + sha256 = "06rlmmvr79db3lh54938yxi0ixcfb8fni0vgcv3nafqnlr2zbs58"; }; - vendorSha256 = null; + vendorSha256 = "14bjdfqvxvb9gs1nm0nnlib52vd0dbvjll22x7d2cc721cbd0hj0"; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 88ef3f02602..da235ff96fb 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "blackbox_exporter"; - version = "0.18.0"; - rev = version; - - goPackagePath = "github.com/prometheus/blackbox_exporter"; + version = "0.19.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1h4s0ww1drh14slrj9m7mx224qx9c6hyjav8sj959r75902i9491"; + sha256 = "1lrabbp6nsd9h3hs3y5a37yl4g8zzkv0m3vhz2vrir3wmfn07n4g"; }; + vendorSha256 = "1wi9dmbxb6i1qglnp1v0lkqpp7l29lrbsg4lvx052nkcwkgq8g1y"; + # dns-lookup is performed for the tests doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index b3b61567d48..d089a3877cd 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -2,16 +2,16 @@ buildGoPackage rec { pname = "collectd-exporter"; - version = "0.3.1"; + version = "0.5.0"; rev = version; goPackagePath = "github.com/prometheus/collectd_exporter"; - src= fetchFromGitHub { - inherit rev; + src = fetchFromGitHub { + rev = "v${version}"; owner = "prometheus"; repo = "collectd_exporter"; - sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; + sha256 = "0vb6vnd2j87iqxdl86j30dk65vrv4scprv200xb83203aprngqgh"; }; passthru.tests = { inherit (nixosTests.prometheus-exporters) collectd; }; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 2852fb2afc2..49a5d420cbd 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,17 +1,19 @@ -{ stdenv, lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests +{ stdenv, lib, go, buildGoModule, fetchFromGitHub, mkYarnPackage, nixosTests , fetchpatch }: let - version = "2.23.0"; + version = "2.26.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-UQ1r8271EiZDU/h2zta6toMRfk2GjXol8GexYL9n+BE="; + sha256 = "06zr10zx3f526wcxj77smcl8wk55mhlnikd0b8vbjl9yyb0qc5mz"; }; + goPackagePath = "github.com/prometheus/prometheus"; + webui = mkYarnPackage { src = "${src}/web/ui/react-app"; packageJSON = ./webui-package.json; @@ -25,19 +27,13 @@ let installPhase = "mv build $out"; distPhase = "true"; }; -in buildGoPackage rec { +in buildGoModule rec { pname = "prometheus"; inherit src version; - goPackagePath = "github.com/prometheus/prometheus"; + vendorSha256 = "0h14pmk74lxj7z39jb4xwvx3whwkaxn9686y23sgrpkra5sk6dbm"; - patches = [ - # Fix https://github.com/prometheus/prometheus/issues/8144 - (fetchpatch { - url = "https://github.com/prometheus/prometheus/commit/8b64b70fe4a5aa2877c95aa12c6798b12d3ff7ec.patch"; - sha256 = "sha256-RuXT5pBXv8z6WoE59KNGh+OXr1KGLGWs/n0Hjf4BuH8="; - }) - ]; + excludedPackages = [ "documentation/prometheus-mixin" ]; postPatch = '' ln -s ${webui.node_modules} web/ui/react-app/node_modules @@ -59,8 +55,10 @@ in buildGoPackage rec { '' ]; + # only run this in the real build, not during the vendor build + # this should probably be fixed in buildGoModule preBuild = '' - make -C go/src/${goPackagePath} assets + if [ -d vendor ]; then make assets; fi ''; preInstall = '' diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index a0bc409a7fc..78c35d8cf16 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "domain-exporter"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = "domain_exporter"; rev = "v${version}"; - sha256 = "0pvz5vx9jvxdrkmzqzh7dfi09sb55j6zpx5728m5v38p8cl8vyh6"; + sha256 = "018y0xwdn2f2shhwaa0hqm4y8xsbqwif0733qb0377wpjbj4v137"; }; - vendorSha256 = "02m2mnx93xq6cl54waazgxq6vqbswfn9aafz0h694n6rskvdn784"; + vendorSha256 = "0s1hs8byba9y57abg386n09wfg1wcqpzs164ap0km8ap2i96bdlb"; doCheck = false; # needs internet connection diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 18055f9b06a..38976521c0f 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -1,20 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.2.5"; - - goPackagePath = "github.com/mvisonneau/gitlab-ci-pipelines-exporter"; - - goDeps = ./gitlab-ci-pipelines-exporter_deps.nix; + version = "0.4.9"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; - rev = version; - sha256 = "0qmy6pqfhx9bphgh1zqi68kp0nscwy1x7z13lfiaaz8pgsjh95yy"; + rev = "v${version}"; + sha256 = "13zs8140n4z56i0xkl6jvvmwy80l07dxyb23wxzd5avbdm8knypz"; }; + vendorSha256 = "1k620r3d1swhj7cfmqjh5n08da2a6w87fwrsajl0y324iyw2chsa"; + doCheck = true; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix deleted file mode 100644 index d439c9aab10..00000000000 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter_deps.nix +++ /dev/null @@ -1,390 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.34.0"; - sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - 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/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.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.3.0"; - sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/heptiolabs/healthcheck"; - fetch = { - type = "git"; - url = "https://github.com/heptiolabs/healthcheck"; - rev = "6ff867650f40"; - sha256 = "17aqrqhx2ibv6mcxsmli6m3hmvwi06cnpaly05daimay3cys5q0l"; - }; - } - { - goPackagePath = "github.com/jpillora/backoff"; - fetch = { - type = "git"; - url = "https://github.com/jpillora/backoff"; - rev = "3050d21c67d7"; - sha256 = "1nxapdx9xg5gwiscfhq7m0w14hj4gaxb4avmgf1mx9zd3jnw9jxv"; - }; - } - { - 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/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - }; - } - { - 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/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - 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/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/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 = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.6.0"; - sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.3"; - sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; - }; - } - { - 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.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/xanzy/go-gitlab"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/go-gitlab"; - rev = "v0.19.0"; - sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "f99c8df09eb5"; - sha256 = "0jwi6c6366999mnpzwx3a2kr7hzvdx97qfwiphx0r7cy0mpf28hf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ca1201d0de80"; - sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "0f29369cfe45"; - sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fc99dfbffb4e"; - sha256 = "186x8bg926qb9sprs5zpd97xzvvhc2si7q1nhvyg12r5cd6v7zjd"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "d0a3d012864b"; - sha256 = "1s2jbb94hbcb01hgkd9kzb9js13grj80a72il7467pm57b3rnggg"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.1"; - sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; - }; - } - { - 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/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 6a42297d502..6af1dbffbc8 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -2,16 +2,15 @@ buildGoPackage rec { pname = "haproxy_exporter"; - version = "0.8.0"; - rev = "v${version}"; + version = "0.12.0"; goPackagePath = "github.com/prometheus/haproxy_exporter"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "prometheus"; repo = "haproxy_exporter"; - sha256 = "0gx8pq67w71ch3g3c77xaz39msrd9graizc6d3shwabdjx35yc6q"; + sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn"; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index e6505857bf5..2c08374ec73 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: let - version = "0.10"; + version = "0.15.0"; jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar"; mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = mavenUrl; - sha256 = "1pvqphrirq48xhmx0aa6vkxz6qy1cx2q6jxsh7rin432iap7j62f"; + sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 796eb065e63..268cdff9348 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-json-exporter"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "json_exporter"; rev = "v${version}"; - sha256 = "1aabvd75a2223x5wnbyryigj7grw6l05jhr3g3s97b1f1hfigz6d"; + sha256 = "0nhww7pbyqpiikcli1ysqa15d4y76h3jaij1j0sj8i3mhv1nsjz9"; }; - vendorSha256 = "03kb0gklq08krl7qnvs7267siw1pkyy346b42dsk1d9gr5302wsw"; + vendorSha256 = "1fiy6x06mqxbv9c4rxfl4q7hvblbzhknkpcp0alz61f3fk5wxsgp"; passthru.tests = { inherit (nixosTests.prometheus-exporters) json; }; diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix new file mode 100644 index 00000000000..1f5ff7c0223 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -0,0 +1,33 @@ +{ lib, python3Packages, nixosTests }: + +python3Packages.buildPythonApplication rec { + pname = "kea-exporter"; + version = "0.4.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0dpzicv0ksyda2lprldkj452c23qycl5c9avca6x7f7rbqry9pnd"; + }; + + propagatedBuildInputs = with python3Packages; [ + click + prometheus_client + ]; + + checkPhase = '' + $out/bin/kea-exporter --help > /dev/null + $out/bin/kea-exporter --version | grep -q ${version} + ''; + + passthru.tests = { + inherit (nixosTests.prometheus-exporters) kea; + }; + + meta = with lib; { + description = "Export Kea Metrics in the Prometheus Exposition Format"; + homepage = "https://github.com/mweinelt/kea-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 0fa2bced125..289b8f2403d 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -2,20 +2,17 @@ buildGoPackage rec { pname = "mesos_exporter"; - version = "0.1.0"; - rev = version; + version = "1.1.2"; goPackagePath = "github.com/prometheus/mesos_exporter"; src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; + rev = "v${version}"; + owner = "mesos"; repo = "mesos_exporter"; - sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; + sha256 = "0nvjlpxdhh60wcdw2fdc8h0vn6fxkz0nh7zrx43hjxymvc15ixza"; }; - goDeps = ./mesos-exporter_deps.nix; - meta = with lib; { description = "Export Mesos metrics to Prometheus"; homepage = "https://github.com/prometheus/mesos_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix deleted file mode 100644 index e8fdcc95da2..00000000000 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; - sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/antonlindstrom/mesos_stats"; - fetch = { - type = "git"; - url = "https://github.com/antonlindstrom/mesos_stats"; - rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; - sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index ee5bafbc7c9..65206256194 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nginx_exporter"; - version = "0.8.0"; + version = "0.9.0"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "sha256-fFzwJXTwtI0NXZYwORRZomj/wADqxW+wvDH49QK0IZw="; + sha256 = "04y5vpj2kv2ygdzxy3crpnx4mhpkm1ns2995kxgvjlhnyck7a5rf"; }; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index fad49d27575..359349c14f4 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginxlog_exporter"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "martin-helmich"; repo = "prometheus-nginxlog-exporter"; rev = "v${version}"; - sha256 = "1kqyjw5yqgjb8xa5irdhpqvwp1qhba6igpc23n2qljhbh0aybkbq"; + sha256 = "0kcwhaf9k7c1xsz78064qz5zb4x3xgi1ifi49qkwiaqrzx2xy26p"; }; - vendorSha256 = "130hq19y890amxhjywg5blassl8br2p9d62aai8fj839p3p2a7zp"; + vendorSha256 = "05hisrhlklbs26cgblzfjh6mhaih5asvbll54jngnmwylwjd1mmc"; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 42ccb91017f..ea351db83f4 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,23 +1,27 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "node_exporter"; - version = "1.0.1"; + version = "1.1.2"; rev = "v${version}"; - goPackagePath = "github.com/prometheus/node_exporter"; - src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - sha256 = "1r0xx81r9v019fl0iv078yl21ndhb356y7s7zx171zi02k7a4p2l"; + sha256 = "1kz52zhsm0xx63vczzplj15hli4i22qfxl08grb7m50bqk651j1n"; }; + vendorSha256 = "05lr2ln87902bwamw4l3rrk2j9sdgv1pcvxyvzbga64rymi9dmjb"; + # FIXME: tests fail due to read-only nix store doCheck = false; - buildFlagsArray = '' + excludedPackages = [ "docs/node-mixin" ]; + + buildFlagsArray = let + goPackagePath = "github.com/prometheus/node_exporter"; + in '' -ldflags= -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Version=${version} -X ${goPackagePath}/vendor/github.com/prometheus/common/version.Revision=${rev} diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix deleted file mode 100644 index 93aae1b867e..00000000000 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter-deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; - sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "748d386b5c1ea99658fd69fe9f03991ce86a90c1"; - sha256 = "0xm0is6sj6r634vrfx85ir0gd9h1xxk25fgc5z07zrjp19f5wqp5"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "94ff84a9a6ebb5e6eb9172897c221a64df3443bc"; - sha256 = "188xwc13ml51i29fhp8bz4a7ncmk0lvdw3nnwr56k2l36pp1swil"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "6f3806018612930941127f2a7c6c453ba2c527d2"; - sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "3e6a7635bac6573d43f49f97b47eb9bda195dba8"; - sha256 = "1q4nwm9lf4jd90z08s6gz8j1zzrk2jn9vpw49xdb8mwxmhv13xgm"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"; - sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 021905ba9e0..42a8187214e 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,20 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "openvpn_exporter-unstable"; - version = "2017-05-15"; - rev = "a2a179a222144fa9a10030367045f075375a2803"; - - goPackagePath = "github.com/kumina/openvpn_exporter"; + version = "0.3.0"; src = fetchFromGitHub { owner = "kumina"; repo = "openvpn_exporter"; - inherit rev; - sha256 = "1cjx7ascf532a20wwzrsx3qqs6dr04jyf700s3jvlvhhhx43l8m4"; + rev = "v${version}"; + sha256 = "14m4n5918zimdnyf0yg2948jb1hp1bdf27k07j07x3yrx357i05l"; }; - goDeps = ./openvpn-exporter-deps.nix; + vendorSha256 = "1jgw0nnibydhcd83kp6jqkf41mhwldp8wdhqk0yjw18v9m0p7g5s"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/servers/monitoring/prometheus/process-exporter.nix b/pkgs/servers/monitoring/prometheus/process-exporter.nix index a147a3c2905..048a3ff264c 100644 --- a/pkgs/servers/monitoring/prometheus/process-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/process-exporter.nix @@ -1,18 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "process-exporter"; - version = "0.7.1"; - - goPackagePath = "github.com/ncabatoff/process-exporter"; + version = "0.7.5"; src = fetchFromGitHub { owner = "ncabatoff"; repo = pname; rev = "v${version}"; - sha256 = "0jkh4xzjlrlabpll3igpyhqs35f1dxifjkbfxvijjcq9yahxfj0x"; + sha256 = "0v1q8mi8p01smzfxaf52kbqnjz9fx4rp64jqhgbcx0s45q3bph9l"; }; + vendorSha256 = "19y2w1vplf7qqkzcpi01ssawv9badhwpglh2gz69fgl6xc3mxfmp"; + postPatch = '' substituteInPlace proc/read_test.go --replace /bin/cat cat ''; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index a370bf1f248..c0294319370 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,20 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "prom2json"; - version = "0.1.0"; - rev = version; - - goPackagePath = "github.com/prometheus/prom2json"; + version = "1.3.0"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "prometheus"; repo = "prom2json"; - sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; + sha256 = "09glf7br1a9k6j2hs94l2k4mlmlckdz5c9v6qg618c2nd4rk1mz6"; }; - goDeps = ./prom2json_deps.nix; + vendorSha256 = null; meta = with lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix deleted file mode 100644 index 20cabe3d385..00000000000 --- a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index b7832395f62..ff89469c2ea 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -1,19 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "rabbitmq_exporter"; - version = "1.0.0-RC7.1"; - - goPackagePath = "github.com/kbudde/rabbitmq_exporter"; + version = "1.0.0-RC8"; src = fetchFromGitHub { owner = "kbudde"; repo = "rabbitmq_exporter"; rev = "v${version}"; - sha256 = "5Agg99yHBMgpWGD6Nk+WvAorRc7j2PGD+3z7nO3N/5s="; + sha256 = "162rjp1j56kcq0vdi0ch09ka101zslxp684x6jvw0jq0aix4zj3r"; }; - goDeps = ./rabbitmq-exporter_deps.nix; + vendorSha256 = "1cvdqf5pdwczhqz6xb6w86h7gdr0l8fc3lav88xq26r4x75cm6v0"; meta = with lib; { description = "Prometheus exporter for RabbitMQ"; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix deleted file mode 100644 index 901edfaf6d9..00000000000 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter_deps.nix +++ /dev/null @@ -1,793 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "371fbbdaa898"; - sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/Azure/go-ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-ansiterm"; - rev = "d6e3b3328b78"; - sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.14"; - sha256 = "0n34wi9l9ks2z3cz97j30ljfmqppwf1zxr16hwbnswyrk54fcxm3"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/Nvveen/Gotty"; - fetch = { - type = "git"; - url = "https://github.com/Nvveen/Gotty"; - rev = "cd527374f1e5"; - sha256 = "1ylvr1p6p036ns3g3wdz8f92f69symshkc8j54fa6gpg4hyk0k6q"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "c3de453c63f4"; - sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.1"; - sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.2.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff/v3"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v3.2.2"; - sha256 = "01h52k1sl6drabm3fgd4yy1iwbz06wcbbh16zd6v4wi7slabma9m"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cespare/xxhash/v2"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v2.1.1"; - sha256 = "0rl5rs8546zj1vzggv38w93wx0b5dvav7yy5hzxa8kw7iikv1cgr"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/containerd/continuity"; - fetch = { - type = "git"; - url = "https://github.com/containerd/continuity"; - rev = "d3ef23f19fbb"; - sha256 = "0k5838j54ymqpg0dffr8k4vh992my9zlqrplx4syms09r9z9vap9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "v0.4.0"; - sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "v0.4.0"; - sha256 = "0k8gja8ql4pqg5rzmqvka42vjfs6rzablak87whcnqba6qxpimvz"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "bb3d318650d4"; - sha256 = "1lqd8ix3cb164j5iazjby2jpa6bdsflhy0h9mi4yldvvcvrc194c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.9.0"; - sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.0"; - sha256 = "1fjvl5n77abxz5qsd4mgyvjq19x43c5bfvmq62mq3m5plx6zksc8"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "v1.0.0"; - sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/gotestyourself/gotestyourself"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotestyourself"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "v1.1.9"; - sha256 = "0pkn2maymgl9v6vmq9q1si8xr5bbl88n6981y0lx09px6qxb29qx"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kbudde/gobert"; - fetch = { - type = "git"; - url = "https://github.com/kbudde/gobert"; - rev = "77f4c9cb2e7e"; - sha256 = "1d2m4b0pxswqhkjpbql3kbb9fjvyys4b9cpmhb9iwkcmnq3n8x91"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/kylelemons/godebug"; - fetch = { - type = "git"; - url = "https://github.com/kylelemons/godebug"; - rev = "v1.1.0"; - sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.1"; - sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.7.0"; - sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "v1.0.0-rc1"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "v1.0.1"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "v1.0.0-rc9"; - sha256 = "1ss5b46cbbckyqlwgj8dbd5l59c5y0kp679hcpc0ybaj53pmwxj7"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/ory/dockertest"; - fetch = { - type = "git"; - url = "https://github.com/ory/dockertest"; - rev = "v3.3.5"; - sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/ory/dockertest/v3"; - fetch = { - type = "git"; - url = "https://github.com/ory/dockertest"; - rev = "v3.6.0"; - sha256 = "1l4czdb532rl1qjjh1ad00h1686dz9h9bg1kmmpyjfm4ggckndyw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v1.5.1"; - sha256 = "0nkhjpwpqr3iz2jsqrl37qkj1g4i8jvi5smgbvhxcpyinjj00067"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "v0.2.0"; - sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.9.1"; - sha256 = "12pyywb02p7d30ccm41mwn69qsgqnsgv1w9jlqrrln2f1svnbqch"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "v0.0.11"; - sha256 = "1msc8bfywsmrgr2ryqjdqwkxiz1ll08r3qgvaka2507z1wpcpj2c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.5.0"; - sha256 = "02s74gxzlzr982avw7vbfjkj696hyhklx1ikmmjiqp3z1l8hkghk"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "2da4a54c5cee"; - sha256 = "18qbrp774fx6dyibjcy9snld705gslq6z2sql1biyjahxkm1vpfy"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/streadway/amqp"; - fetch = { - type = "git"; - url = "https://github.com/streadway/amqp"; - rev = "1c71cc93ed71"; - sha256 = "0k740vmzkdv9il201x4mj0md73w30jqlmn1q7m1ng3dmi635qrlr"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/tkanos/gonfig"; - fetch = { - type = "git"; - url = "https://github.com/tkanos/gonfig"; - rev = "896f3d81fadf"; - sha256 = "1wcyq3vlfp12zsnnv1gpycqgzvq3nk8pvcabni6wxxyk3350d43m"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d3edc9973b7e"; - sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "1957bb5e6d1f"; - sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "a101b041ded4"; - sha256 = "1pm50dybm5wixjjspvfpafjmiy81b1zp08h13gxc5cylrfgncrfl"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.21.0"; - sha256 = "12bwln8z1lf9105gdp6ip0rx741i4yfz1520gxnp8861lh9wcl63"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/ory-am/dockertest.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/ory-am/dockertest.v3"; - rev = "v3.3.5"; - sha256 = "0fgj60l82sl6chd7i4s7lxqjr9hxkzmkaxnc8h6qbvn42246sy68"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - moduleDir = ""; - }; - } - { - goPackagePath = "gotest.tools"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v2.2.0"; - sha256 = "0yif3gdyckmf8i54jq0xn00kflla5rhib9sarw66ngnbl7bn9kyl"; - moduleDir = ""; - }; - } - { - goPackagePath = "gotest.tools/v3"; - fetch = { - type = "git"; - url = "https://github.com/gotestyourself/gotest.tools"; - rev = "v3.0.2"; - sha256 = "0cap2aq2wphnbkkzkck5zdjxb64q3jqxfwpkgqys7279rbr8cvjm"; - moduleDir = ""; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 34c058d5d6c..a2636d9f714 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -1,19 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "redis_exporter"; - version = "1.7.0"; - - goPackagePath = "github.com/oliver006/redis_exporter"; + version = "1.23.1"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "0rwaxpylividyxz0snfgck32kvpgjkhg20bmdnlp35cdzxcxi8m1"; + sha256 = "0hlzxmc3jnmbym7by89bb73nlr0gw1xj8d88x10zx55kry7p0jfn"; }; - goDeps = ./redis-exporter-deps.nix; + vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; buildFlagsArray = '' -ldflags= @@ -22,6 +20,9 @@ buildGoPackage rec { -X main.BuildDate=unknown ''; + # needs a redis server + doCheck = false; + passthru.tests = { inherit (nixosTests.prometheus-exporters) redis; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index d21ddcf5647..b998e1d24c6 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -1,8 +1,8 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: let - baseVersion = "0.3.1"; - commit = "9ba85274dcc21bf8132cbe3b3dccfcb4aab57d9f"; + baseVersion = "0.4.2"; + commit = "722200c4adbd6d1e5d847dfbbd9dec07aa4ca38d"; in buildGoModule rec { pname = "smokeping_prober"; @@ -24,9 +24,9 @@ buildGoModule rec { rev = commit; owner = "SuperQ"; repo = "smokeping_prober"; - sha256 = "sha256:19596di2gzcvlcwiypsncq4zwbyb6d1r6wxsfi59wax3423i7ndg"; + sha256 = "1lpcjip6qxhalldgm6i2kgbajfqy3vwfyv9jy0jdpii13lv6mzlz"; }; - vendorSha256 = "sha256:1b2v3v3kn0m7dvjxbs8q0gw6zingksdqhm5g1frx0mymqk0lg889"; + vendorSha256 = "0p2jmlxpvpaqc445j39b4z4i3mnjrm25khv3sq6ylldcgfd31vz8"; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index ece22e496d1..effb2ab9079 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,18 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub, net-snmp, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, net-snmp, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "snmp_exporter"; - version = "0.19.0"; - - goPackagePath = "github.com/prometheus/snmp_exporter"; + version = "0.20.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "snmp_exporter"; rev = "v${version}"; - sha256 = "1ppi5lmc2lryawpw1b3kpg3qxr7v62zbiwg2v1d8sq1y5b2xdza6"; + sha256 = "0qwbnx3l25460qbah4ik9mlcyrm31rwm51451gh0jprii80cf16x"; }; + vendorSha256 = "1rivil3hwk269ikrwc4i22k2y5c9zs5ac058y7llz8ivrrjr2w4h"; + buildInputs = [ net-snmp ]; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 31bd583280c..51fb56382df 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "statsd_exporter"; - version = "0.9.0"; - rev = version; - - goPackagePath = "github.com/prometheus/statsd_exporter"; + version = "0.20.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "statsd_exporter"; - sha256 = "0bgi00005j41p650rb6n1iz2w9m4p22d1w91f2hwlh5bqxf55al3"; + sha256 = "1k98dmjn2mfwg36khpbxg7yk6rn4sk4v264i4rmqs4v8gss2h3kn"; }; + vendorSha256 = "1fihbchl5g5z9xrca68kaq26l674chcby634k8iz5h31dai8hpyh"; + meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; homepage = "https://github.com/prometheus/statsd_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index c94be3490fa..27eb3721c95 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "unstable-2020-03-26"; + version = "1.6"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; - rev = "f0f90fc69723de8b716cda16cb419e8a025130ff"; - sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; + rev = version; + sha256 = "1cp7c1w237r271m8b1y8pj5jy7j2iadp4vbislxfyp4kga9i4dcc"; }; - vendorSha256 = "1h9iz3sbz02hb8827hcssqlfg2ag3ymq38siffw9wzajslzhp9sx"; + vendorSha256 = "1cslg29l9mmyhpdz14ca9m18iaz4hhznplz8fmi3wa3l8r7ih751"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json index 3c4c3eb8568..15e2dcb519e 100644 --- a/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/pkgs/servers/monitoring/prometheus/webui-package.json @@ -3,21 +3,33 @@ "version": "0.1.0", "private": true, "dependencies": { + "@codemirror/autocomplete": "^0.18.3", + "@codemirror/closebrackets": "^0.18.0", + "@codemirror/commands": "^0.18.0", + "@codemirror/comment": "^0.18.0", + "@codemirror/highlight": "^0.18.3", + "@codemirror/history": "^0.18.0", + "@codemirror/language": "^0.18.0", + "@codemirror/lint": "^0.18.1", + "@codemirror/matchbrackets": "^0.18.0", + "@codemirror/search": "^0.18.2", + "@codemirror/state": "^0.18.2", + "@codemirror/view": "^0.18.3", "@fortawesome/fontawesome-svg-core": "^1.2.14", "@fortawesome/free-solid-svg-icons": "^5.7.1", "@fortawesome/react-fontawesome": "^0.1.4", "@reach/router": "^1.2.1", - "@testing-library/react-hooks": "^3.1.1", "@types/jest": "^26.0.10", "@types/jquery": "^3.5.1", "@types/node": "^12.11.1", "@types/reach__router": "^1.2.6", "@types/react": "^16.8.2", - "@types/react-copy-to-clipboard": "^4.3.0", + "@types/react-copy-to-clipboard": "^5.0.0", "@types/react-dom": "^16.8.0", - "@types/react-resize-detector": "^4.2.0", + "@types/react-resize-detector": "^5.0.0", "@types/sanitize-html": "^1.20.2", "bootstrap": "^4.2.1", + "codemirror-promql": "^0.14.0", "css.escape": "^1.5.1", "downshift": "^3.4.8", "enzyme-to-json": "^3.4.3", @@ -34,7 +46,7 @@ "react-copy-to-clipboard": "^5.0.1", "react-dom": "^16.7.0", "react-resize-detector": "^5.0.7", - "react-scripts": "3.4.3", + "react-scripts": "3.4.4", "react-test-renderer": "^16.9.0", "reactstrap": "^8.0.1", "sanitize-html": "^1.20.1", @@ -63,6 +75,7 @@ "not op_mini all" ], "devDependencies": { + "@testing-library/react-hooks": "^3.1.1", "@types/enzyme": "^3.10.3", "@types/enzyme-adapter-react-16": "^1.0.5", "@types/flot": "0.0.31", @@ -83,6 +96,7 @@ "eslint-plugin-react": "7.x", "eslint-plugin-react-hooks": "2.x", "jest-fetch-mock": "^3.0.3", + "mutationobserver-shim": "^0.3.7", "prettier": "^1.18.2", "sinon": "^9.0.3" }, @@ -90,6 +104,9 @@ "jest": { "snapshotSerializers": [ "enzyme-to-json/serializer" + ], + "transformIgnorePatterns": [ + "/node_modules/(?!codemirror-promql).+(js|jsx)$" ] } } diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 8475e7533b0..4b26fca7276 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -10,19 +10,19 @@ }; } { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + name = "_babel_code_frame___code_frame_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; }; } { - name = "_babel_compat_data___compat_data_7.12.5.tgz"; + name = "_babel_compat_data___compat_data_7.13.12.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz"; - sha1 = "f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"; + name = "_babel_compat_data___compat_data_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz"; + sha1 = "a8a5ccac19c200f9dd49624cac6e19d7be1236a1"; }; } { @@ -34,187 +34,163 @@ }; } { - name = "_babel_core___core_7.12.3.tgz"; + name = "_babel_core___core_7.13.10.tgz"; path = fetchurl { - name = "_babel_core___core_7.12.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz"; - sha1 = "1b436884e1e3bff6fb1328dc02b208759de92ad8"; + name = "_babel_core___core_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz"; + sha1 = "07de050bbd8193fcd8a3c27918c0890613a94559"; }; } { - name = "_babel_generator___generator_7.12.5.tgz"; + name = "_babel_generator___generator_7.13.9.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz"; - sha1 = "a2c50de5c8b6d708ab95be5e6053936c1884a4de"; + name = "_babel_generator___generator_7.13.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz"; + sha1 = "3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha1 = "0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; - sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha1 = "6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"; }; } { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.10.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.12.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"; - sha1 = "55fc1ead5242caa0ca2875dcb8eed6d311e50f48"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz"; + sha1 = "1310a1678cb8427c07a753750da4f8ce442bdd0c"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; - sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz"; + sha1 = "30d30a005bca2c953f5653fc25091a492177f4f6"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.17.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; - sha1 = "cb470c76198db6a24e9dbc8987275631e5d29831"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; + sha1 = "a2ac87e9e319269ac655b8d4415e94d38d663cb7"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; - sha1 = "3c45998f431edd4a9214c5f1d3ad1448a6137f6e"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz"; + sha1 = "3c2f91b7971b9fc11fe779c945c014065dea340e"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz"; - sha1 = "18b1302d4677f9dc4740fe8c9ed96680e29d37e8"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; + sha1 = "17b5c59ff473d9f956f40ef570cf3a76ca12657f"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; - sha1 = "b53c10db78a640800152692b13393147acb9bb30"; + name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; - sha1 = "8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; + sha1 = "5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; + sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; - sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e"; + name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; + sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; - sha1 = "fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz"; + sha1 = "600e58350490828d82282631a1422268e982ba96"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; + sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; - sha1 = "50dc96413d594f995a77905905b05893cd779673"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; + sha1 = "376a760d9f7b4b2077a9dd05aa9c3927cadb2209"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha1 = "2f75a831269d4f677de49986dff59927533cf375"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; + sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804"; }; } { - name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; - sha1 = "32dfbb79899073c415557053a19bd055aae50ae0"; - }; - } - { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; - path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; - sha1 = "8c4dbbf916314f6047dc05e6a2217074238347fd"; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; - sha1 = "f009a17543bbbbce16b06206ae73b63d3fca68d9"; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136"; + name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; + sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; }; } { @@ -226,67 +202,75 @@ }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; - sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz"; - sha1 = "175567380c3e77d60ff98a54bb015fe78f2178d9"; + name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; + sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.12.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; - sha1 = "3332339fc4d1fbbf1c27d7958c27d34708e990d9"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; + sha1 = "bdb5c66fda8526ec235ab894ad53a1235c79fcc4"; }; } { - name = "_babel_helpers___helpers_7.12.5.tgz"; + name = "_babel_helpers___helpers_7.13.10.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz"; - sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e"; + name = "_babel_helpers___helpers_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz"; + sha1 = "fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"; }; } { - name = "_babel_highlight___highlight_7.10.4.tgz"; + name = "_babel_highlight___highlight_7.13.10.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + name = "_babel_highlight___highlight_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz"; + sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; }; } { - name = "_babel_parser___parser_7.12.5.tgz"; + name = "_babel_parser___parser_7.13.12.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz"; - sha1 = "b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"; + name = "_babel_parser___parser_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.12.tgz"; + sha1 = "ba320059420774394d3b0c0233ba40e4250b81d1"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz"; - sha1 = "dc6c1170e27d8aca99ff65f4925bd06b1c90550e"; + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; + sha1 = "a3484d84d0b549f3fc916b99ee4783f26fabad2a"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz"; + sha1 = "87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"; }; } { @@ -298,11 +282,11 @@ }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; - sha1 = "a082ff541f2a29a4821065b8add9346c0c16e5de"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; + sha1 = "146376000b94efd001e57a40a88a525afaab9f37"; }; } { @@ -314,35 +298,35 @@ }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz"; - sha1 = "43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; + sha1 = "876a1f6966e1dec332e8c9451afda3bebcdf2e1d"; }; } { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; - sha1 = "8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; + sha1 = "393be47a4acd03fa2af6e3cde9b06e33de1b446d"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; - sha1 = "d45423b517714eedd5621a9dfdc03fa9f4eb241c"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; + sha1 = "bf1fb362547075afda3634ed31571c5901afef7b"; }; } { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; - sha1 = "f2c490d36e1b3c9659241034a5d2cd50263a2751"; + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; + sha1 = "93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"; }; } { @@ -354,11 +338,11 @@ }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; - sha1 = "3ed4fff31c015e7f3f1467f190dbe545cd7b046c"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; + sha1 = "3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"; }; } { @@ -370,27 +354,27 @@ }; } { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz"; - sha1 = "b1ce757156d40ed79d59d467cb2b154a5c4149ba"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; + sha1 = "bd9da3188e787b5120b4f9d465a8261ce67ed1db"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; - sha1 = "def9bd03cea0f9b72283dac0ec22d289c7691069"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; + sha1 = "5d210a4d727d6ce3b18f9de82cc99a3964eed60a"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; - sha1 = "ccc2421af64d3aae50b558a71cede929a5ab2942"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; + sha1 = "3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"; }; } { @@ -402,27 +386,27 @@ }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz"; - sha1 = "cce122203fc8a32794296fc377c6dedaf4363797"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; + sha1 = "ba9feb601d422e0adea6760c2bd6bbb7bfec4866"; }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; - sha1 = "86814f6e7a21374c980c10d38b4493e703f4a389"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; + sha1 = "04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; - sha1 = "2a183958d417765b9eae334f47758e5d6a82e072"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha1 = "bebde51339be829c17aaaaced18641deb62b39ba"; }; } { @@ -434,19 +418,19 @@ }; } { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; - sha1 = "bcb297c5366e79bebadef509549cd93b04f19978"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz"; - sha1 = "81a8b535b284476c41be6de06853a8802b98c5dd"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz"; + sha1 = "fac829bf3c7ef4a1bc916257b403e58c6bdaf648"; }; } { @@ -466,11 +450,11 @@ }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"; - sha1 = "a77670d9abe6d63e8acadf4c31bb1eb5a506bbdd"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; + sha1 = "5df9962503c0a9c918381c929d51d4d6949e7e86"; }; } { @@ -482,11 +466,11 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; - sha1 = "9d9d357cc818aa7ae7935917c1257f67677a0926"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; + sha1 = "044fb81ebad6698fe62c478875575bcbb9b70f15"; }; } { @@ -538,99 +522,99 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; - sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; - sha1 = "460ba9d77077653803c3dd2e673f76d66b4029e5"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; + sha1 = "9dff111ca64154cef0f4dc52cf843d9f12ce4474"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; - sha1 = "8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; + sha1 = "10a59bebad52d637a027afa692e8d5ceff5e3dae"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; - sha1 = "3849a49cc2a22e9743cbd6b52926d30337229af1"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; + sha1 = "8e112bf6771b82bf1e974e5e26806c5c99aa516f"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; - sha1 = "f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha1 = "a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz"; - sha1 = "f0ee727874b42a208a48a586b84c3d222c2bbef1"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; + sha1 = "f36e55076d06f41dfd78557ea039c1b581642e61"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; - sha1 = "65e650fcaddd3d88ddce67c0f834a3d436a32db6"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; + sha1 = "0265155075c42918bf4d3a4053134176ad9b533b"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; - sha1 = "d68cf6c9b7f838a8a4144badbe97541ea0904852"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; + sha1 = "845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; - sha1 = "b9a570fe0d0a8d460116413cb4f97e8e08b2f847"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; + sha1 = "c5dce270014d4e1ebb1d806116694c12b7028963"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; - sha1 = "a1d16c14862817b6409c0a678d6f9373ca9cd975"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha1 = "3f1601cc29905bfcb67f53910f197aeafebb25ad"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; - sha1 = "745661baba295ac06e686822797a69fbaa2ca228"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha1 = "6f06b87a8b803fd928e54b81c258f0a0033904de"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; - sha1 = "b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha1 = "4d52390b9a273e651e4aba6aee49ef40e80cd0a1"; }; } { @@ -642,115 +626,115 @@ }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; - sha1 = "07640f28867ed16f9511c99c888291f560921cfa"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; + sha1 = "c799f881a8091ac26b54867a845c3e97d2696062"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; - sha1 = "2ec76258c70fe08c6d7da154003a480620eba667"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha1 = "bb024452f9aaed861d374c8e7a24252ce3a50051"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; - sha1 = "d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha1 = "2ca45bafe4a820197cf315794a4d26560fe4bdb9"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; - sha1 = "496038602daf1514a64d43d8e17cbb2755e0c3ad"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha1 = "5ffa66cd59b9e191314c9f1f803b938e8c081e40"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; - sha1 = "3154300b026185666eebb0c0ed7f8415fefcf6f9"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; + sha1 = "19f511d60e3d8753cc5a6d4e775d3a5184866cc3"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; - sha1 = "fa403124542636c786cf9b460a0ffbb48a86e648"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; + sha1 = "7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; - sha1 = "663fea620d593c93f214a464cd399bf6dc683086"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; + sha1 = "6d066ee2bff3c7b3d60bf28dec169ad993831ae3"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; - sha1 = "eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz"; + sha1 = "8a3d96a97d199705b9fd021580082af81c06e70b"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; - sha1 = "b407f5c96be0d9f5f88467497fa82b30ac3e8753"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha1 = "2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; - sha1 = "80073f02ee1bb2d365c3416490e085c95759dec0"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha1 = "e22d8c3af24b150dd528cbd6e685e799bf1c351c"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; - sha1 = "4ea08696b8d2e65841d0c7706482b048bed1066e"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha1 = "b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; - sha1 = "d2e963b038771650c922eff593799c96d853255d"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; + sha1 = "8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; - sha1 = "41bc81200d730abb4456ab8b3fbd5537b59adecd"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha1 = "4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.10.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz"; - sha1 = "4471f0851feec3231cc9aaa0dccde39947c1ac1e"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.10.tgz"; + sha1 = "5d3de8a8ee53f4612e728f4f17b8c9125f8019e5"; }; } { @@ -762,43 +746,43 @@ }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; - sha1 = "1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; + sha1 = "c28effd771b276f4647411c9733dbb2d2da954bd"; }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz"; - sha1 = "677de5b96da310430d6cfb7fee16a1603afa3d56"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; + sha1 = "f510c0fa7cd7234153539f9a362ced41a5ca1447"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz"; - sha1 = "ef43cbca2a14f1bd17807dbe4376ff89d714cf28"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz"; + sha1 = "422d99d122d592acab9c35ea22a6cfd9bf189f60"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; - sha1 = "d07de6863f468da0809edcf79a1aa8ce2a82a26b"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz"; + sha1 = "051d76126bee5c9a6aa3ba37be2f6c1698856bcb"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz"; - sha1 = "39ede0e30159770561b6963be143e40af3bde00c"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; + sha1 = "1df5dfaf0f4b784b43e96da6f28d630e775f68b3"; }; } { @@ -810,19 +794,19 @@ }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; - sha1 = "5f0a28d842f6462281f06a964e88ba8d7ab49753"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; + sha1 = "b628bcc9c85260ac1aeb05b45bde25210194a2f5"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; - sha1 = "6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha1 = "7d9988d4f06e0fe697ea1d9803188aa18b472695"; }; } { @@ -834,67 +818,67 @@ }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; - sha1 = "0bf9cac5550fce0cfdf043420f661d645fdc75e3"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha1 = "db755732b70c539d504c6390d9ce90fe64aff7ad"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; - sha1 = "527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; + sha1 = "84887710e273c1815ace7ae459f6f42a5d31d5fd"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz"; - sha1 = "5c24cf50de396d30e99afc8d1c700e8bce0f5caf"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha1 = "760ffd936face73f860ae646fb86ee82f3d06d1f"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; - sha1 = "b43ece6ed9a79c0c71119f576d299ef09d942843"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; + sha1 = "a36049127977ad94438dee7443598d1cefdf409d"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz"; - sha1 = "9ca6be343d42512fbc2e68236a82ae64bc7af78a"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha1 = "785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.13.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; - sha1 = "d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz"; + sha1 = "4a498e1f3600342d2a9e61f60131018f55774853"; }; } { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; - sha1 = "5232b9f81ccb07070b7c3c36c67a1b78f1845709"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha1 = "840ced3b816d3b5127dd1d12dcedc5dead1a5e74"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; - sha1 = "cc9661f61390db5c65e3febaccefd5c6ac3faecb"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha1 = "b52521685804e155b1202e83fc188d34bb70f5ac"; }; } { @@ -906,11 +890,11 @@ }; } { - name = "_babel_preset_env___preset_env_7.12.1.tgz"; + name = "_babel_preset_env___preset_env_7.13.12.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz"; - sha1 = "9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"; + name = "_babel_preset_env___preset_env_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.12.tgz"; + sha1 = "6dff470478290582ac282fb77780eadf32480237"; }; } { @@ -930,11 +914,11 @@ }; } { - name = "_babel_preset_react___preset_react_7.12.5.tgz"; + name = "_babel_preset_react___preset_react_7.12.13.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz"; - sha1 = "d45625f65d53612078a43867c5c6750e78772c56"; + name = "_babel_preset_react___preset_react_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz"; + sha1 = "5f911b2eb24277fa686820d5bd81cad9a0602a0a"; }; } { @@ -946,11 +930,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.13.10.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz"; - sha1 = "ffee91da0eb4c6dae080774e94ba606368e414f4"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.10.tgz"; + sha1 = "14c3f4c85de22ba88e8e86685d13e8861a82fe86"; }; } { @@ -962,35 +946,35 @@ }; } { - name = "_babel_runtime___runtime_7.12.5.tgz"; + name = "_babel_runtime___runtime_7.13.10.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz"; - sha1 = "410e7e487441e1b360c29be715d870d9b985882e"; + name = "_babel_runtime___runtime_7.13.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz"; + sha1 = "47d42a57b6095f4468da440388fdbad8bebf0d7d"; }; } { - name = "_babel_template___template_7.10.4.tgz"; + name = "_babel_template___template_7.12.13.tgz"; path = fetchurl { - name = "_babel_template___template_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; - sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; + name = "_babel_template___template_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; + sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; }; } { - name = "_babel_traverse___traverse_7.12.5.tgz"; + name = "_babel_traverse___traverse_7.13.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.12.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz"; - sha1 = "78a0c68c8e8a35e4cacfd31db8bb303d5606f095"; + name = "_babel_traverse___traverse_7.13.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz"; + sha1 = "6d95752475f86ee7ded06536de309a65fc8966cc"; }; } { - name = "_babel_types___types_7.12.6.tgz"; + name = "_babel_types___types_7.13.12.tgz"; path = fetchurl { - name = "_babel_types___types_7.12.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz"; - sha1 = "ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"; + name = "_babel_types___types_7.13.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz"; + sha1 = "edbf99208ef48852acdff1c8a681a1e4ade580cd"; }; } { @@ -1001,6 +985,134 @@ sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; }; } + { + name = "_codemirror_autocomplete___autocomplete_0.18.3.tgz"; + path = fetchurl { + name = "_codemirror_autocomplete___autocomplete_0.18.3.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.18.3.tgz"; + sha1 = "6c75904c1156e4d9a00e56b9a3e559dda6149e1e"; + }; + } + { + name = "_codemirror_closebrackets___closebrackets_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_closebrackets___closebrackets_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/closebrackets/-/closebrackets-0.18.0.tgz"; + sha1 = "4bd7e9227ed6e90e590fa6d289d34b0c065cb8cf"; + }; + } + { + name = "_codemirror_commands___commands_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_commands___commands_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.18.0.tgz"; + sha1 = "10344d7d7a0fecad826e9853c1e6069d706298c6"; + }; + } + { + name = "_codemirror_comment___comment_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_comment___comment_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/comment/-/comment-0.18.0.tgz"; + sha1 = "f42e3baaacbeb57f22f4a3eabe5738b3d2bca1f7"; + }; + } + { + name = "_codemirror_highlight___highlight_0.18.3.tgz"; + path = fetchurl { + name = "_codemirror_highlight___highlight_0.18.3.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/highlight/-/highlight-0.18.3.tgz"; + sha1 = "50e268630f113c322a2dc97c9f68d71934fffcb0"; + }; + } + { + name = "_codemirror_history___history_0.18.1.tgz"; + path = fetchurl { + name = "_codemirror_history___history_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/history/-/history-0.18.1.tgz"; + sha1 = "853cde4b138b172235d58f945871f0fc08b7310a"; + }; + } + { + name = "_codemirror_language___language_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_language___language_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/language/-/language-0.18.0.tgz"; + sha1 = "16c3beaf372d0ecfcb76d708a8f55efccaa25563"; + }; + } + { + name = "_codemirror_lint___lint_0.18.1.tgz"; + path = fetchurl { + name = "_codemirror_lint___lint_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.18.1.tgz"; + sha1 = "ef5502d3bc27eaf23c670fa888bd23d09b59af55"; + }; + } + { + name = "_codemirror_matchbrackets___matchbrackets_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_matchbrackets___matchbrackets_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/matchbrackets/-/matchbrackets-0.18.0.tgz"; + sha1 = "64a493090d942de19f15a9ed3cb0fa19ed55f18b"; + }; + } + { + name = "_codemirror_panel___panel_0.18.1.tgz"; + path = fetchurl { + name = "_codemirror_panel___panel_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/panel/-/panel-0.18.1.tgz"; + sha1 = "b2179cdfb7d7c2913ba682d61d00edff160cfad0"; + }; + } + { + name = "_codemirror_rangeset___rangeset_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_rangeset___rangeset_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.18.0.tgz"; + sha1 = "8b3bec00c1cee8c3db3827a752a76819ead2dfab"; + }; + } + { + name = "_codemirror_search___search_0.18.2.tgz"; + path = fetchurl { + name = "_codemirror_search___search_0.18.2.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/search/-/search-0.18.2.tgz"; + sha1 = "7f6311ce4d5749d92aefb41b2f8628d28d90918c"; + }; + } + { + name = "_codemirror_state___state_0.18.3.tgz"; + path = fetchurl { + name = "_codemirror_state___state_0.18.3.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/state/-/state-0.18.3.tgz"; + sha1 = "f275293b077d6c3867c0343320d6b29c10e54f84"; + }; + } + { + name = "_codemirror_text___text_0.18.0.tgz"; + path = fetchurl { + name = "_codemirror_text___text_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/text/-/text-0.18.0.tgz"; + sha1 = "a4a98862989ccef5545e730b269136d524c6a7c7"; + }; + } + { + name = "_codemirror_tooltip___tooltip_0.18.4.tgz"; + path = fetchurl { + name = "_codemirror_tooltip___tooltip_0.18.4.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/tooltip/-/tooltip-0.18.4.tgz"; + sha1 = "981bc0ced792c6754148edbc1f60092f3fa54207"; + }; + } + { + name = "_codemirror_view___view_0.18.3.tgz"; + path = fetchurl { + name = "_codemirror_view___view_0.18.3.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/view/-/view-0.18.3.tgz"; + sha1 = "31ffcd0a073124b95feac47d2a3a03bfb3546fca"; + }; + } { name = "_csstools_convert_colors___convert_colors_1.4.0.tgz"; path = fetchurl { @@ -1018,35 +1130,35 @@ }; } { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.35.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz"; - sha1 = "3436795d5684f22742989bfa08f46f50f516f259"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.35.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.35.tgz"; + sha1 = "01dd3d054da07a00b764d78748df20daf2b317e9"; }; } { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.35.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz"; - sha1 = "da092bfc7266aa274be8604de610d7115f9ba6cf"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.35.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.35.tgz"; + sha1 = "85aea8c25645fcec88d35f2eb1045c38d3e65cff"; }; } { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.3.tgz"; path = fetchurl { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz"; - sha1 = "e1432676ddd43108b41197fee9f86d910ad458ef"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.3.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.3.tgz"; + sha1 = "52eebe354f60dc77e0bde934ffc5c75ffd04f9d8"; }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.14.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.12.tgz"; - sha1 = "fbdea86e8b73032895e6ded1ee1dbb1874902d1a"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.14.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.14.tgz"; + sha1 = "bf28875c3935b69ce2dc620e1060b217a47f64ca"; }; } { @@ -1089,6 +1201,14 @@ sha1 = "68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"; }; } + { + name = "_hypnosphi_create_react_context___create_react_context_0.3.1.tgz"; + path = fetchurl { + name = "_hypnosphi_create_react_context___create_react_context_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz"; + sha1 = "f8bfebdc7665f5d426cba3753e0e9c7d3154d7c6"; + }; + } { name = "_jest_console___console_24.9.0.tgz"; path = fetchurl { @@ -1202,11 +1322,11 @@ }; } { - name = "_sinonjs_commons___commons_1.8.1.tgz"; + name = "_sinonjs_commons___commons_1.8.2.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; - sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + name = "_sinonjs_commons___commons_1.8.2.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz"; + sha1 = "858f5c4b48d80778fde4b9d541f27edc0d56488b"; }; } { @@ -1218,19 +1338,11 @@ }; } { - name = "_sinonjs_formatio___formatio_5.0.1.tgz"; + name = "_sinonjs_samsam___samsam_5.3.1.tgz"; path = fetchurl { - name = "_sinonjs_formatio___formatio_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz"; - sha1 = "f13e713cb3313b1ab965901b01b0828ea6b77089"; - }; - } - { - name = "_sinonjs_samsam___samsam_5.3.0.tgz"; - path = fetchurl { - name = "_sinonjs_samsam___samsam_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.0.tgz"; - sha1 = "1d2f0743dc54bf13fe9d508baefacdffa25d4329"; + name = "_sinonjs_samsam___samsam_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz"; + sha1 = "375a45fe6ed4e92fca2fb920e007c48232a6507f"; }; } { @@ -1354,19 +1466,19 @@ }; } { - name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz"; + name = "_testing_library_react_hooks___react_hooks_3.7.0.tgz"; path = fetchurl { - name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.4.2.tgz"; - sha1 = "8deb94f7684e0d896edd84a4c90e5b79a0810bc2"; + name = "_testing_library_react_hooks___react_hooks_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.7.0.tgz"; + sha1 = "6d75c5255ef49bce39b6465bf6b49e2dac84919e"; }; } { - name = "_types_babel__core___babel__core_7.1.12.tgz"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.12.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz"; - sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"; + name = "_types_babel__core___babel__core_7.1.14.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; + sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; }; } { @@ -1386,19 +1498,19 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; - sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; + name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; + sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; }; } { - name = "_types_cheerio___cheerio_0.22.22.tgz"; + name = "_types_cheerio___cheerio_0.22.28.tgz"; path = fetchurl { - name = "_types_cheerio___cheerio_0.22.22.tgz"; - url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.22.tgz"; - sha1 = "ae71cf4ca59b8bbaf34c99af7a5d6c8894988f5f"; + name = "_types_cheerio___cheerio_0.22.28.tgz"; + url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.28.tgz"; + sha1 = "90808aabb44fec40fa2950f4c72351e3e4eb065b"; }; } { @@ -1441,14 +1553,6 @@ sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } - { - name = "_types_history___history_4.7.8.tgz"; - path = fetchurl { - name = "_types_history___history_4.7.8.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz"; - sha1 = "49348387983075705fe8f4e02fb67f7daaec4934"; - }; - } { name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; path = fetchurl { @@ -1482,27 +1586,27 @@ }; } { - name = "_types_jest___jest_26.0.15.tgz"; + name = "_types_jest___jest_26.0.21.tgz"; path = fetchurl { - name = "_types_jest___jest_26.0.15.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz"; - sha1 = "12e02c0372ad0548e07b9f4e19132b834cb1effe"; + name = "_types_jest___jest_26.0.21.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.21.tgz"; + sha1 = "3a73c2731e7e4f0fbaea56ce7ff8c79cf812bd24"; }; } { - name = "_types_jquery___jquery_3.5.4.tgz"; + name = "_types_jquery___jquery_3.5.5.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.5.4.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.4.tgz"; - sha1 = "e923f7d05ca790530f17f80a3b89bc28853fa17f"; + name = "_types_jquery___jquery_3.5.5.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.5.tgz"; + sha1 = "2c63f47c9c8d96693d272f5453602afd8338c903"; }; } { - name = "_types_json_schema___json_schema_7.0.6.tgz"; + name = "_types_json_schema___json_schema_7.0.7.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + name = "_types_json_schema___json_schema_7.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; }; } { @@ -1530,19 +1634,19 @@ }; } { - name = "_types_node___node_14.14.8.tgz"; + name = "_types_node___node_14.14.35.tgz"; path = fetchurl { - name = "_types_node___node_14.14.8.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz"; - sha1 = "2127bd81949a95c8b7d3240f3254352d72563aec"; + name = "_types_node___node_14.14.35.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz"; + sha1 = "42c953a4e2b18ab931f72477e7012172f4ffa313"; }; } { - name = "_types_node___node_12.19.5.tgz"; + name = "_types_node___node_12.20.6.tgz"; path = fetchurl { - name = "_types_node___node_12.19.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.5.tgz"; - sha1 = "9be3946136e818597c71c62d04240d0602c645d4"; + name = "_types_node___node_12.20.6.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.6.tgz"; + sha1 = "7b73cce37352936e628c5ba40326193443cfba25"; }; } { @@ -1570,51 +1674,59 @@ }; } { - name = "_types_reach__router___reach__router_1.3.6.tgz"; + name = "_types_reach__router___reach__router_1.3.7.tgz"; path = fetchurl { - name = "_types_reach__router___reach__router_1.3.6.tgz"; - url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.6.tgz"; - sha1 = "413417ce74caab331c70ce6a03a4c825188e4709"; + name = "_types_reach__router___reach__router_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.7.tgz"; + sha1 = "de8ab374259ae7f7499fc1373b9697a5f3cd6428"; }; } { - name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_4.3.0.tgz"; + name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_5.0.0.tgz"; path = fetchurl { - name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-4.3.0.tgz"; - sha1 = "8e07becb4f11cfced4bd36038cb5bdf5c2658be5"; + name = "_types_react_copy_to_clipboard___react_copy_to_clipboard_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.0.tgz"; + sha1 = "38b035ca0c28334d3e0efaf3f319b81eea9690cd"; }; } { - name = "_types_react_dom___react_dom_16.9.9.tgz"; + name = "_types_react_dom___react_dom_16.9.12.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.9.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.9.tgz"; - sha1 = "d2d0a6f720a0206369ccbefff752ba37b9583136"; + name = "_types_react_dom___react_dom_16.9.12.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.12.tgz"; + sha1 = "55cd6b17e73922edb9545e5355a0016c1734e6f4"; }; } { - name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz"; + name = "_types_react_resize_detector___react_resize_detector_5.0.0.tgz"; path = fetchurl { - name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-4.2.0.tgz"; - sha1 = "ee8802e25cfb34439aa7f52626932ea62dc5792e"; + name = "_types_react_resize_detector___react_resize_detector_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-5.0.0.tgz"; + sha1 = "18ac4e6d518581bec6345845b7f08232f4cca8a5"; }; } { - name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz"; + name = "_types_react_test_renderer___react_test_renderer_17.0.1.tgz"; path = fetchurl { - name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.3.tgz"; - sha1 = "96bab1860904366f4e848b739ba0e2f67bcae87e"; + name = "_types_react_test_renderer___react_test_renderer_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-17.0.1.tgz"; + sha1 = "3120f7d1c157fba9df0118dae20cb0297ee0e06b"; }; } { - name = "_types_react___react_16.9.56.tgz"; + name = "_types_react___react_17.0.3.tgz"; path = fetchurl { - name = "_types_react___react_16.9.56.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.56.tgz"; - sha1 = "ea25847b53c5bec064933095fc366b1462e2adf0"; + name = "_types_react___react_17.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz"; + sha1 = "ba6e215368501ac3826951eef2904574c262cc79"; + }; + } + { + name = "_types_react___react_16.14.5.tgz"; + path = fetchurl { + name = "_types_react___react_16.14.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.5.tgz"; + sha1 = "2c39b5cadefaf4829818f9219e5e093325979f4d"; }; } { @@ -1626,19 +1738,27 @@ }; } { - name = "_types_sanitize_html___sanitize_html_1.27.0.tgz"; + name = "_types_sanitize_html___sanitize_html_1.27.1.tgz"; path = fetchurl { - name = "_types_sanitize_html___sanitize_html_1.27.0.tgz"; - url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.0.tgz"; - sha1 = "77702dc856f16efecc005014c1d2e45b1f2cbc56"; + name = "_types_sanitize_html___sanitize_html_1.27.1.tgz"; + url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.1.tgz"; + sha1 = "1fc4b67edd6296eeb366960d13cd01f5d6bffdcd"; }; } { - name = "_types_sinon___sinon_9.0.8.tgz"; + name = "_types_scheduler___scheduler_0.16.1.tgz"; path = fetchurl { - name = "_types_sinon___sinon_9.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.8.tgz"; - sha1 = "1ed0038d356784f75b086104ef83bfd4130bb81b"; + name = "_types_scheduler___scheduler_0.16.1.tgz"; + url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz"; + sha1 = "18845205e86ff0038517aab7a18a62a6b9f71275"; + }; + } + { + name = "_types_sinon___sinon_9.0.11.tgz"; + path = fetchurl { + name = "_types_sinon___sinon_9.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.11.tgz"; + sha1 = "7af202dda5253a847b511c929d8b6dda170562eb"; }; } { @@ -1674,11 +1794,11 @@ }; } { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha1 = "dd3e6699ba3237f0348cd085e4698780204842f9"; }; } { @@ -1690,11 +1810,11 @@ }; } { - name = "_types_yargs___yargs_15.0.10.tgz"; + name = "_types_yargs___yargs_15.0.13.tgz"; path = fetchurl { - name = "_types_yargs___yargs_15.0.10.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.10.tgz"; - sha1 = "0fe3c8173a0d5c3e780b389050140c3f5ea6ea74"; + name = "_types_yargs___yargs_15.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz"; + sha1 = "34f7fec8b389d7f3c1fd08026a5763e072d3c6dc"; }; } { @@ -1969,6 +2089,14 @@ sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } + { + name = "acorn___acorn_8.1.0.tgz"; + path = fetchurl { + name = "acorn___acorn_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz"; + sha1 = "52311fd7037ae119cbb134309e901aa46295b3fe"; + }; + } { name = "address___address_1.1.2.tgz"; path = fetchurl { @@ -1978,11 +2106,11 @@ }; } { - name = "adjust_sourcemap_loader___adjust_sourcemap_loader_2.0.0.tgz"; + name = "adjust_sourcemap_loader___adjust_sourcemap_loader_3.0.0.tgz"; path = fetchurl { - name = "adjust_sourcemap_loader___adjust_sourcemap_loader_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz"; - sha1 = "6471143af75ec02334b219f54bc7970c52fb29a4"; + name = "adjust_sourcemap_loader___adjust_sourcemap_loader_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz"; + sha1 = "5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e"; }; } { @@ -2234,11 +2362,11 @@ }; } { - name = "array_includes___array_includes_3.1.1.tgz"; + name = "array_includes___array_includes_3.1.3.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; + name = "array_includes___array_includes_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz"; + sha1 = "c7f619b382ad2afaf5326cddfdc0afc61af7690a"; }; } { @@ -2329,14 +2457,6 @@ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; } - { - name = "assert___assert_1.4.1.tgz"; - path = fetchurl { - name = "assert___assert_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; - }; - } { name = "assert___assert_1.5.0.tgz"; path = fetchurl { @@ -2434,11 +2554,11 @@ }; } { - name = "axe_core___axe_core_4.1.0.tgz"; + name = "axe_core___axe_core_4.1.3.tgz"; path = fetchurl { - name = "axe_core___axe_core_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.0.tgz"; - sha1 = "93d395e6262ecdde5cb52a5d06533d0a0c7bb4cd"; + name = "axe_core___axe_core_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz"; + sha1 = "64a4c85509e0991f5168340edc4bedd1ceea6966"; }; } { @@ -2529,6 +2649,30 @@ sha1 = "156cd55d3f1228a5765774340937afc8398067dd"; }; } + { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz"; + sha1 = "a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1"; + }; + } + { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz"; + sha1 = "80449d9d6f2274912e05d9e182b54816904befd0"; + }; + } + { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz"; + sha1 = "0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f"; + }; + } { name = "babel_plugin_syntax_object_rest_spread___babel_plugin_syntax_object_rest_spread_6.13.0.tgz"; path = fetchurl { @@ -2642,11 +2786,11 @@ }; } { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; }; } { @@ -2666,19 +2810,19 @@ }; } { - name = "bn.js___bn.js_4.11.9.tgz"; + name = "bn.js___bn.js_4.12.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.9.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; - sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + name = "bn.js___bn.js_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; + sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; }; } { - name = "bn.js___bn.js_5.1.3.tgz"; + name = "bn.js___bn.js_5.2.0.tgz"; path = fetchurl { - name = "bn.js___bn.js_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; - sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; + name = "bn.js___bn.js_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz"; + sha1 = "358860674396c6997771a9d051fcc1b57d4ae002"; }; } { @@ -2706,11 +2850,11 @@ }; } { - name = "bootstrap___bootstrap_4.5.3.tgz"; + name = "bootstrap___bootstrap_4.6.0.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_4.5.3.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz"; - sha1 = "c6a72b355aaf323920be800246a6e4ef30997fe6"; + name = "bootstrap___bootstrap_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz"; + sha1 = "97b9f29ac98f98dfa43bf7468262d84392552fd7"; }; } { @@ -2818,11 +2962,11 @@ }; } { - name = "browserslist___browserslist_4.14.7.tgz"; + name = "browserslist___browserslist_4.16.3.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.14.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz"; - sha1 = "c071c1b3622c1c2e790799a37bb09473a4351cb6"; + name = "browserslist___browserslist_4.16.3.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz"; + sha1 = "340aa46940d7db878748567c5dea24a48ddf3717"; }; } { @@ -2914,11 +3058,11 @@ }; } { - name = "call_bind___call_bind_1.0.0.tgz"; + name = "call_bind___call_bind_1.0.2.tgz"; path = fetchurl { - name = "call_bind___call_bind_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz"; - sha1 = "24127054bb3f9bdcb4b1fb82418186072f77b8ce"; + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; }; } { @@ -2962,19 +3106,11 @@ }; } { - name = "camel_case___camel_case_4.1.1.tgz"; + name = "camel_case___camel_case_4.1.2.tgz"; path = fetchurl { - name = "camel_case___camel_case_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; - sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; - }; - } - { - name = "camelcase___camelcase_5.0.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz"; - sha1 = "03295527d58bd3cd4aa75363f35b2e8d97be2f42"; + name = "camel_case___camel_case_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; + sha1 = "9728072a954f805228225a6deea6b38461e1bd5a"; }; } { @@ -2994,11 +3130,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001204.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001159.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; - sha1 = "bebde28f893fa9594dadcaa7d6b8e2aa0299df20"; + name = "caniuse_lite___caniuse_lite_1.0.30001204.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz"; + sha1 = "256c85709a348ec4d175e847a3b515c66e79f2aa"; }; } { @@ -3058,11 +3194,19 @@ }; } { - name = "cheerio___cheerio_1.0.0_rc.3.tgz"; + name = "cheerio_select_tmp___cheerio_select_tmp_0.1.1.tgz"; path = fetchurl { - name = "cheerio___cheerio_1.0.0_rc.3.tgz"; - url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz"; - sha1 = "094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"; + name = "cheerio_select_tmp___cheerio_select_tmp_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz"; + sha1 = "55bbef02a4771710195ad736d5e346763ca4e646"; + }; + } + { + name = "cheerio___cheerio_1.0.0_rc.5.tgz"; + path = fetchurl { + name = "cheerio___cheerio_1.0.0_rc.5.tgz"; + url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.5.tgz"; + sha1 = "88907e1828674e8f9fee375188b27dadd4f0fa2f"; }; } { @@ -3074,11 +3218,11 @@ }; } { - name = "chokidar___chokidar_3.4.3.tgz"; + name = "chokidar___chokidar_3.5.1.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz"; - sha1 = "c1df38231448e45ca4ac588e6c79573ba6a57d5b"; + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; }; } { @@ -3209,6 +3353,14 @@ sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; }; } + { + name = "codemirror_promql___codemirror_promql_0.14.0.tgz"; + path = fetchurl { + name = "codemirror_promql___codemirror_promql_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.14.0.tgz"; + sha1 = "a5ad500e68a379ba6bded40ec0f9ff2940015bcd"; + }; + } { name = "collection_visit___collection_visit_1.0.0.tgz"; path = fetchurl { @@ -3250,11 +3402,11 @@ }; } { - name = "color_string___color_string_1.5.4.tgz"; + name = "color_string___color_string_1.5.5.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz"; - sha1 = "dd51cd25cfee953d138fe4002372cc3d0e504cb6"; + name = "color_string___color_string_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz"; + sha1 = "65474a8f0e7439625f3d27a6a19d89fc45223014"; }; } { @@ -3266,11 +3418,11 @@ }; } { - name = "colorette___colorette_1.2.1.tgz"; + name = "colorette___colorette_1.2.2.tgz"; path = fetchurl { - name = "colorette___colorette_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; - sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + name = "colorette___colorette_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; + sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; }; } { @@ -3346,11 +3498,11 @@ }; } { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.17.tgz"; path = fetchurl { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz"; - url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz"; - sha1 = "5b7bf4f7127ea2c19b750353d7ce6776a90ee088"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.17.tgz"; + url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz"; + sha1 = "6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab"; }; } { @@ -3482,35 +3634,35 @@ }; } { - name = "core_js_compat___core_js_compat_3.7.0.tgz"; + name = "core_js_compat___core_js_compat_3.9.1.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz"; - sha1 = "8479c5d3d672d83f1f5ab94cf353e57113e065ed"; + name = "core_js_compat___core_js_compat_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz"; + sha1 = "4e572acfe90aff69d76d8c37759d21a5c59bb455"; }; } { - name = "core_js_pure___core_js_pure_3.7.0.tgz"; + name = "core_js_pure___core_js_pure_3.9.1.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.7.0.tgz"; - sha1 = "28a57c861d5698e053f0ff36905f7a3301b4191e"; + name = "core_js_pure___core_js_pure_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.9.1.tgz"; + sha1 = "677b322267172bd490e4464696f790cbc355bec5"; }; } { - name = "core_js___core_js_2.6.11.tgz"; + name = "core_js___core_js_2.6.12.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.11.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; + name = "core_js___core_js_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; + sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; }; } { - name = "core_js___core_js_3.7.0.tgz"; + name = "core_js___core_js_3.9.1.tgz"; path = fetchurl { - name = "core_js___core_js_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.7.0.tgz"; - sha1 = "b0a761a02488577afbf97179e4681bf49568520f"; + name = "core_js___core_js_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz"; + sha1 = "cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"; }; } { @@ -3570,11 +3722,19 @@ }; } { - name = "cross_fetch___cross_fetch_3.0.6.tgz"; + name = "crelt___crelt_1.0.5.tgz"; path = fetchurl { - name = "cross_fetch___cross_fetch_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz"; - sha1 = "3a4040bc8941e653e0e9cf17f29ebcd177d3365c"; + name = "crelt___crelt_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz"; + sha1 = "57c0d52af8c859e354bace1883eb2e1eb182bb94"; + }; + } + { + name = "cross_fetch___cross_fetch_3.1.2.tgz"; + path = fetchurl { + name = "cross_fetch___cross_fetch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.2.tgz"; + sha1 = "ee0c2f18844c4fde36150c2a4ddc068d20c1bc41"; }; } { @@ -3657,14 +3817,6 @@ sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; }; } - { - name = "css_select___css_select_1.2.0.tgz"; - path = fetchurl { - name = "css_select___css_select_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz"; - sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; - }; - } { name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { @@ -3673,6 +3825,14 @@ sha1 = "6a34653356635934a81baca68d0255432105dbef"; }; } + { + name = "css_select___css_select_3.1.2.tgz"; + path = fetchurl { + name = "css_select___css_select_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-3.1.2.tgz"; + sha1 = "d52cbdc6fee379fba97fb0d3925abbd18af2d9d8"; + }; + } { name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { @@ -3682,19 +3842,11 @@ }; } { - name = "css_tree___css_tree_1.1.1.tgz"; + name = "css_tree___css_tree_1.1.2.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.1.tgz"; - sha1 = "30b8c0161d9fb4e9e2141d762589b6ec2faebd2e"; - }; - } - { - name = "css_what___css_what_2.1.3.tgz"; - path = fetchurl { - name = "css_what___css_what_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz"; - sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; + name = "css_tree___css_tree_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz"; + sha1 = "9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"; }; } { @@ -3705,6 +3857,14 @@ sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4"; }; } + { + name = "css_what___css_what_4.0.0.tgz"; + path = fetchurl { + name = "css_what___css_what_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz"; + sha1 = "35e73761cab2eeb3d3661126b23d7aa0e8432233"; + }; + } { name = "css.escape___css.escape_1.5.1.tgz"; path = fetchurl { @@ -3794,11 +3954,11 @@ }; } { - name = "csso___csso_4.1.1.tgz"; + name = "csso___csso_4.2.0.tgz"; path = fetchurl { - name = "csso___csso_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.1.1.tgz"; - sha1 = "e0cb02d6eb3af1df719222048e4359efd662af13"; + name = "csso___csso_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; + sha1 = "ea3a561346e8dc9f546d6febedd50187cf389529"; }; } { @@ -3834,11 +3994,11 @@ }; } { - name = "csstype___csstype_3.0.5.tgz"; + name = "csstype___csstype_3.0.7.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz"; - sha1 = "7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"; + name = "csstype___csstype_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz"; + sha1 = "2a5fb75e1015e84dd15692f71e89a1450290950b"; }; } { @@ -4042,11 +4202,11 @@ }; } { - name = "detect_node___detect_node_2.0.4.tgz"; + name = "detect_node___detect_node_2.0.5.tgz"; path = fetchurl { - name = "detect_node___detect_node_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; - sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + name = "detect_node___detect_node_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz"; + sha1 = "9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"; }; } { @@ -4178,19 +4338,11 @@ }; } { - name = "dom_serializer___dom_serializer_1.1.0.tgz"; + name = "dom_serializer___dom_serializer_1.2.0.tgz"; path = fetchurl { - name = "dom_serializer___dom_serializer_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz"; - sha1 = "5f7c828f1bfc44887dc2a315ab5c45691d544b58"; - }; - } - { - name = "dom_serializer___dom_serializer_0.1.1.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz"; - sha1 = "1ec4059e284babed36eec2941d4a970a189ce7c0"; + name = "dom_serializer___dom_serializer_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz"; + sha1 = "3433d9136aeb3c627981daa385fc7f32d27c48f1"; }; } { @@ -4210,11 +4362,11 @@ }; } { - name = "domelementtype___domelementtype_2.0.2.tgz"; + name = "domelementtype___domelementtype_2.1.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz"; - sha1 = "f3b6e549201e46f588b59463dd77187131fe6971"; + name = "domelementtype___domelementtype_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz"; + sha1 = "a851c080a6d1c3d94344aed151d99f669edf585e"; }; } { @@ -4250,11 +4402,11 @@ }; } { - name = "domutils___domutils_1.5.1.tgz"; + name = "domhandler___domhandler_4.0.0.tgz"; path = fetchurl { - name = "domutils___domutils_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + name = "domhandler___domhandler_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz"; + sha1 = "01ea7821de996d85f69029e81fa873c21833098e"; }; } { @@ -4266,19 +4418,19 @@ }; } { - name = "domutils___domutils_2.4.2.tgz"; + name = "domutils___domutils_2.5.0.tgz"; path = fetchurl { - name = "domutils___domutils_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.4.2.tgz"; - sha1 = "7ee5be261944e1ad487d9aa0616720010123922b"; + name = "domutils___domutils_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.5.0.tgz"; + sha1 = "42f49cffdabb92ad243278b331fd761c1c2d3039"; }; } { - name = "dot_case___dot_case_3.0.3.tgz"; + name = "dot_case___dot_case_3.0.4.tgz"; path = fetchurl { - name = "dot_case___dot_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz"; - sha1 = "21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"; + name = "dot_case___dot_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; + sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; }; } { @@ -4346,19 +4498,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.698.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.601.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.601.tgz"; - sha1 = "881824eaef0b2f97c89e1abb5835fdd224997d34"; + name = "electron_to_chromium___electron_to_chromium_1.3.698.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.698.tgz"; + sha1 = "5de813960f23581a268718a0058683dffa15d221"; }; } { - name = "elliptic___elliptic_6.5.3.tgz"; + name = "elliptic___elliptic_6.5.4.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz"; - sha1 = "cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"; + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; }; } { @@ -4378,11 +4530,11 @@ }; } { - name = "emoji_regex___emoji_regex_9.2.0.tgz"; + name = "emoji_regex___emoji_regex_9.2.2.tgz"; path = fetchurl { - name = "emoji_regex___emoji_regex_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.0.tgz"; - sha1 = "a26da8e832b16a9753309f25e35e3c0efb9a066a"; + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha1 = "840c8803b0d8047f4ff0cf963176b32d4ef3ed72"; }; } { @@ -4418,11 +4570,11 @@ }; } { - name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; - sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"; }; } { @@ -4433,6 +4585,14 @@ sha1 = "bdfa735299664dfafd34529ed4f8522a275fea56"; }; } + { + name = "entities___entities_2.2.0.tgz"; + path = fetchurl { + name = "entities___entities_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; + sha1 = "098dc90ebb83d8dffa089d55256b351d34c4da55"; + }; + } { name = "entities___entities_2.1.0.tgz"; path = fetchurl { @@ -4442,19 +4602,19 @@ }; } { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.6.tgz"; path = fetchurl { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.5.tgz"; - sha1 = "7a6f0093d3edd2f7025b36e7fbf290695473ee04"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.6.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.6.tgz"; + sha1 = "fd677a658d62661ac5afd7f7f541f141f8085901"; }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz"; - sha1 = "59c1b734b0927543e3d8dc477299ec957feb312d"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.0.tgz"; + sha1 = "afbb0485e8033aa50c744efb5f5711e64fbf1ad0"; }; } { @@ -4482,11 +4642,11 @@ }; } { - name = "errno___errno_0.1.7.tgz"; + name = "errno___errno_0.1.8.tgz"; path = fetchurl { - name = "errno___errno_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; - sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + name = "errno___errno_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz"; + sha1 = "8bb3e9c7d463be4976ff888f76b4809ebc2e811f"; }; } { @@ -4498,19 +4658,11 @@ }; } { - name = "es_abstract___es_abstract_1.17.7.tgz"; + name = "es_abstract___es_abstract_1.18.0.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.7.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; - sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; - }; - } - { - name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; - sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68"; + name = "es_abstract___es_abstract_1.18.0.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz"; + sha1 = "ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"; }; } { @@ -4585,6 +4737,14 @@ sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; }; } + { + name = "escodegen___escodegen_2.0.0.tgz"; + path = fetchurl { + name = "escodegen___escodegen_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; + sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; + }; + } { name = "eslint_config_prettier___eslint_config_prettier_6.15.0.tgz"; path = fetchurl { @@ -4674,11 +4834,11 @@ }; } { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz"; - sha1 = "168ab43154e2ea57db992a2cd097c828171f75c2"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz"; + sha1 = "7079cfa2497078905011e6f82e8dd8453d1371b7"; }; } { @@ -4706,11 +4866,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.23.1.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.21.5.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz"; - sha1 = "50b21a412b9574bfe05b21db176e8b7b3b15bff3"; + name = "eslint_plugin_react___eslint_plugin_react_7.23.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz"; + sha1 = "f1a2e844c0d1967c822388204a8bc4dee8415b11"; }; } { @@ -4778,11 +4938,11 @@ }; } { - name = "esquery___esquery_1.3.1.tgz"; + name = "esquery___esquery_1.4.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; - sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; }; } { @@ -4834,19 +4994,19 @@ }; } { - name = "events___events_3.2.0.tgz"; + name = "events___events_3.3.0.tgz"; path = fetchurl { - name = "events___events_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; - sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; }; } { - name = "eventsource___eventsource_1.0.7.tgz"; + name = "eventsource___eventsource_1.1.0.tgz"; path = fetchurl { - name = "eventsource___eventsource_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; - sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; + name = "eventsource___eventsource_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz"; + sha1 = "00e8ca7c92109e94b0ddf32dac677d841028cfaf"; }; } { @@ -4858,11 +5018,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.4.tgz"; + name = "exec_sh___exec_sh_0.3.6.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; - sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + name = "exec_sh___exec_sh_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz"; + sha1 = "ff264f9e325519a60cb5e273692943483cca63bc"; }; } { @@ -5194,11 +5354,19 @@ }; } { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; + name = "follow_redirects___follow_redirects_1.13.3.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; - sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; + name = "follow_redirects___follow_redirects_1.13.3.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz"; + sha1 = "e5598ad50174c1bc4e872301e82ac2cd97f90267"; + }; + } + { + name = "for_each___for_each_0.3.3.tgz"; + path = fetchurl { + name = "for_each___for_each_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; + sha1 = "69b447e88a0a5d32c3e7084f3f1710034b21376e"; }; } { @@ -5346,11 +5514,11 @@ }; } { - name = "fsevents___fsevents_2.1.3.tgz"; + name = "fsevents___fsevents_2.3.2.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; - sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; }; } { @@ -5362,11 +5530,11 @@ }; } { - name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; + name = "function.prototype.name___function.prototype.name_1.1.4.tgz"; path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz"; - sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45"; + name = "function.prototype.name___function.prototype.name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.4.tgz"; + sha1 = "e4ea839b9d3672ae99d0efd9f38d9191c5eaac83"; }; } { @@ -5378,11 +5546,11 @@ }; } { - name = "functions_have_names___functions_have_names_1.2.1.tgz"; + name = "functions_have_names___functions_have_names_1.2.2.tgz"; path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz"; - sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91"; + name = "functions_have_names___functions_have_names_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz"; + sha1 = "98d93991c39da9361f8e50b337c4f6e41f120e21"; }; } { @@ -5410,11 +5578,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; - sha1 = "94a9768fcbdd0595a1c9273aacf4c89d075631be"; + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; }; } { @@ -5466,11 +5634,11 @@ }; } { - name = "glob_parent___glob_parent_5.1.1.tgz"; + name = "glob_parent___glob_parent_5.1.2.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; }; } { @@ -5538,11 +5706,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + name = "graceful_fs___graceful_fs_4.2.6.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; }; } { @@ -5609,6 +5777,14 @@ sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; } + { + name = "has_bigints___has_bigints_1.0.1.tgz"; + path = fetchurl { + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + }; + } { name = "has_flag___has_flag_3.0.0.tgz"; path = fetchurl { @@ -5626,11 +5802,11 @@ }; } { - name = "has_symbols___has_symbols_1.0.1.tgz"; + name = "has_symbols___has_symbols_1.0.2.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; - sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; }; } { @@ -5754,11 +5930,11 @@ }; } { - name = "html_element_map___html_element_map_1.2.0.tgz"; + name = "html_element_map___html_element_map_1.3.0.tgz"; path = fetchurl { - name = "html_element_map___html_element_map_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz"; - sha1 = "dfbb09efe882806af63d990cf6db37993f099f22"; + name = "html_element_map___html_element_map_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.3.0.tgz"; + sha1 = "fcf226985d7111e6c2b958169312ec750d02f0d3"; }; } { @@ -5778,11 +5954,11 @@ }; } { - name = "html_entities___html_entities_1.3.1.tgz"; + name = "html_entities___html_entities_1.4.0.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; - sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; + name = "html_entities___html_entities_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz"; + sha1 = "cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"; }; } { @@ -5825,6 +6001,14 @@ sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; }; } + { + name = "htmlparser2___htmlparser2_6.0.1.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.0.1.tgz"; + sha1 = "422521231ef6d42e56bd411da8ba40aa36e91446"; + }; + } { name = "http_deceiver___http_deceiver_1.2.7.tgz"; path = fetchurl { @@ -5858,11 +6042,11 @@ }; } { - name = "http_parser_js___http_parser_js_0.5.2.tgz"; + name = "http_parser_js___http_parser_js_0.5.3.tgz"; path = fetchurl { - name = "http_parser_js___http_parser_js_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz"; - sha1 = "da2e31d237b393aae72ace43882dd7e270a8ff77"; + name = "http_parser_js___http_parser_js_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz"; + sha1 = "01d2709c79d41698bb01d4decc5e9da4e4a033d9"; }; } { @@ -5986,11 +6170,11 @@ }; } { - name = "import_fresh___import_fresh_3.2.2.tgz"; + name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz"; - sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e"; + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; }; } { @@ -6074,11 +6258,11 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { @@ -6106,11 +6290,11 @@ }; } { - name = "internal_slot___internal_slot_1.0.2.tgz"; + name = "internal_slot___internal_slot_1.0.3.tgz"; path = fetchurl { - name = "internal_slot___internal_slot_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; - sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + name = "internal_slot___internal_slot_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; + sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; }; } { @@ -6178,11 +6362,11 @@ }; } { - name = "is_arguments___is_arguments_1.0.4.tgz"; + name = "is_arguments___is_arguments_1.1.0.tgz"; path = fetchurl { - name = "is_arguments___is_arguments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + name = "is_arguments___is_arguments_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz"; + sha1 = "62353031dfbee07ceb34656a6bde59efecae8dd9"; }; } { @@ -6201,6 +6385,14 @@ sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; }; } + { + name = "is_bigint___is_bigint_1.0.1.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz"; + sha1 = "6923051dfcbc764278540b9ce0e6b3213aa5ebc2"; + }; + } { name = "is_binary_path___is_binary_path_1.0.1.tgz"; path = fetchurl { @@ -6218,11 +6410,11 @@ }; } { - name = "is_boolean_object___is_boolean_object_1.0.1.tgz"; + name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz"; - sha1 = "10edc0900dd127697a92f6f9807c7617d68ac48e"; + name = "is_boolean_object___is_boolean_object_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; + sha1 = "e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"; }; } { @@ -6234,11 +6426,11 @@ }; } { - name = "is_callable___is_callable_1.2.2.tgz"; + name = "is_callable___is_callable_1.2.3.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; - sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; + name = "is_callable___is_callable_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; + sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; }; } { @@ -6258,11 +6450,11 @@ }; } { - name = "is_core_module___is_core_module_2.1.0.tgz"; + name = "is_core_module___is_core_module_2.2.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz"; - sha1 = "a4cc031d9b1aca63eecbd18a650e13cb4eeab946"; + name = "is_core_module___is_core_module_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; + sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; }; } { @@ -6386,11 +6578,11 @@ }; } { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; - sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; }; } { @@ -6482,11 +6674,11 @@ }; } { - name = "is_regex___is_regex_1.1.1.tgz"; + name = "is_regex___is_regex_1.1.2.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; - sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; + name = "is_regex___is_regex_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz"; + sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251"; }; } { @@ -6954,11 +7146,11 @@ }; } { - name = "jquery___jquery_3.5.1.tgz"; + name = "jquery___jquery_3.6.0.tgz"; path = fetchurl { - name = "jquery___jquery_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz"; - sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"; + name = "jquery___jquery_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz"; + sha1 = "c72a09f15c1bdce142f49dbf1170bdf8adac2470"; }; } { @@ -6978,11 +7170,11 @@ }; } { - name = "js_yaml___js_yaml_3.14.0.tgz"; + name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; - sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } { @@ -7010,11 +7202,11 @@ }; } { - name = "jsdom___jsdom_16.4.0.tgz"; + name = "jsdom___jsdom_16.5.1.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; - sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + name = "jsdom___jsdom_16.5.1.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz"; + sha1 = "4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"; }; } { @@ -7106,11 +7298,11 @@ }; } { - name = "json5___json5_2.1.3.tgz"; + name = "json5___json5_2.2.0.tgz"; path = fetchurl { - name = "json5___json5_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; - sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; }; } { @@ -7146,11 +7338,11 @@ }; } { - name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"; - sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891"; + name = "jsx_ast_utils___jsx_ast_utils_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz"; + sha1 = "41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"; }; } { @@ -7289,6 +7481,30 @@ sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; }; } + { + name = "lezer_promql___lezer_promql_0.18.0.tgz"; + path = fetchurl { + name = "lezer_promql___lezer_promql_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/lezer-promql/-/lezer-promql-0.18.0.tgz"; + sha1 = "7eea8cb02f8203043560415d7a436e9903176ab2"; + }; + } + { + name = "lezer_tree___lezer_tree_0.13.2.tgz"; + path = fetchurl { + name = "lezer_tree___lezer_tree_0.13.2.tgz"; + url = "https://registry.yarnpkg.com/lezer-tree/-/lezer-tree-0.13.2.tgz"; + sha1 = "00f4671309b15c27b131f637e430ce2d4d5f7065"; + }; + } + { + name = "lezer___lezer_0.13.4.tgz"; + path = fetchurl { + name = "lezer___lezer_0.13.4.tgz"; + url = "https://registry.yarnpkg.com/lezer/-/lezer-0.13.4.tgz"; + sha1 = "f0396a3447c7a8f40391623f3f47a4d95559c42f"; + }; + } { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; path = fetchurl { @@ -7345,6 +7561,14 @@ sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; }; } + { + name = "loader_utils___loader_utils_2.0.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; + sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; + }; + } { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { @@ -7377,6 +7601,14 @@ sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; }; } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + } { name = "lodash.escape___lodash.escape_4.0.1.tgz"; path = fetchurl { @@ -7450,19 +7682,19 @@ }; } { - name = "lodash___lodash_4.17.20.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.20.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; - sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { - name = "loglevel___loglevel_1.7.0.tgz"; + name = "loglevel___loglevel_1.7.1.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; - sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; + name = "loglevel___loglevel_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz"; + sha1 = "005fde2f5e6e47068f935ff28573e125ef72f197"; }; } { @@ -7474,11 +7706,11 @@ }; } { - name = "lower_case___lower_case_2.0.1.tgz"; + name = "lower_case___lower_case_2.0.2.tgz"; path = fetchurl { - name = "lower_case___lower_case_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; - sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; + name = "lower_case___lower_case_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; + sha1 = "6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"; }; } { @@ -7489,6 +7721,14 @@ sha1 = "1da27e6710271947695daf6848e847f01d84b920"; }; } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } { name = "make_dir___make_dir_2.1.0.tgz"; path = fetchurl { @@ -7586,11 +7826,11 @@ }; } { - name = "merge_deep___merge_deep_3.0.2.tgz"; + name = "merge_deep___merge_deep_3.0.3.tgz"; path = fetchurl { - name = "merge_deep___merge_deep_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz"; - sha1 = "f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2"; + name = "merge_deep___merge_deep_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.3.tgz"; + sha1 = "1a2b2ae926da8b2ae93a0ac15d90cd1922766003"; }; } { @@ -7650,27 +7890,19 @@ }; } { - name = "mime_db___mime_db_1.44.0.tgz"; + name = "mime_db___mime_db_1.46.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + name = "mime_db___mime_db_1.46.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz"; + sha1 = "6267748a7f799594de3cbc8cde91def349661cee"; }; } { - name = "mime_db___mime_db_1.45.0.tgz"; + name = "mime_types___mime_types_2.1.29.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.45.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz"; - sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea"; - }; - } - { - name = "mime_types___mime_types_2.1.27.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.27.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + name = "mime_types___mime_types_2.1.29.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz"; + sha1 = "1d4ab77da64b91f5f72489df29236563754bb1b2"; }; } { @@ -7682,11 +7914,11 @@ }; } { - name = "mime___mime_2.4.6.tgz"; + name = "mime___mime_2.5.2.tgz"; path = fetchurl { - name = "mime___mime_2.4.6.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; - sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + name = "mime___mime_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; + sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; }; } { @@ -7802,19 +8034,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.32.tgz"; + name = "moment_timezone___moment_timezone_0.5.33.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.32.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.32.tgz"; - sha1 = "db7677cc3cc680fd30303ebd90b0da1ca0dfecc2"; - }; - } - { - name = "moment_timezone___moment_timezone_0.4.1.tgz"; - path = fetchurl { - name = "moment_timezone___moment_timezone_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz"; - sha1 = "81f598c3ad5e22cdad796b67ecd8d88d0f5baa06"; + name = "moment_timezone___moment_timezone_0.5.33.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz"; + sha1 = "b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"; }; } { @@ -7825,6 +8049,14 @@ sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3"; }; } + { + name = "moment___moment_2.24.0.tgz"; + path = fetchurl { + name = "moment___moment_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; + sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; + }; + } { name = "moo___moo_0.5.1.tgz"; path = fetchurl { @@ -7865,6 +8097,14 @@ sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; }; } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } { name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; path = fetchurl { @@ -7881,6 +8121,14 @@ sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; }; } + { + name = "mutationobserver_shim___mutationobserver_shim_0.3.7.tgz"; + path = fetchurl { + name = "mutationobserver_shim___mutationobserver_shim_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz"; + sha1 = "8bf633b0c0b0291a1107255ed32c13088a8c5bf3"; + }; + } { name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { @@ -7914,11 +8162,11 @@ }; } { - name = "nearley___nearley_2.19.7.tgz"; + name = "nearley___nearley_2.20.1.tgz"; path = fetchurl { - name = "nearley___nearley_2.19.7.tgz"; - url = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.7.tgz"; - sha1 = "eafbe3e2d8ccfe70adaa5c026ab1f9709c116218"; + name = "nearley___nearley_2.20.1.tgz"; + url = "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz"; + sha1 = "246cd33eff0d012faf197ff6774d7ac78acdd474"; }; } { @@ -7954,19 +8202,19 @@ }; } { - name = "nise___nise_4.0.4.tgz"; + name = "nise___nise_4.1.0.tgz"; path = fetchurl { - name = "nise___nise_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/nise/-/nise-4.0.4.tgz"; - sha1 = "d73dea3e5731e6561992b8f570be9e363c4512dd"; + name = "nise___nise_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz"; + sha1 = "8fb75a26e90b99202fa1e63f448f58efbcdedaf6"; }; } { - name = "no_case___no_case_3.0.3.tgz"; + name = "no_case___no_case_3.0.4.tgz"; path = fetchurl { - name = "no_case___no_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; - sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; + name = "no_case___no_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; + sha1 = "d361fd5c9800f558551a8369fc0dcd4662b6124d"; }; } { @@ -8010,19 +8258,19 @@ }; } { - name = "node_notifier___node_notifier_5.4.3.tgz"; + name = "node_notifier___node_notifier_5.4.5.tgz"; path = fetchurl { - name = "node_notifier___node_notifier_5.4.3.tgz"; - url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.3.tgz"; - sha1 = "cb72daf94c93904098e28b9c590fd866e464bd50"; + name = "node_notifier___node_notifier_5.4.5.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.5.tgz"; + sha1 = "0cbc1a2b0f658493b4025775a13ad938e96091ef"; }; } { - name = "node_releases___node_releases_1.1.67.tgz"; + name = "node_releases___node_releases_1.1.71.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.67.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz"; - sha1 = "28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"; + name = "node_releases___node_releases_1.1.71.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz"; + sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"; }; } { @@ -8089,6 +8337,14 @@ sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; }; } + { + name = "nth_check___nth_check_2.0.0.tgz"; + path = fetchurl { + name = "nth_check___nth_check_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz"; + sha1 = "1bb4f6dac70072fc313e8c9cd1417b5074c0a125"; + }; + } { name = "num2fraction___num2fraction_1.2.2.tgz"; path = fetchurl { @@ -8130,27 +8386,27 @@ }; } { - name = "object_hash___object_hash_2.0.3.tgz"; + name = "object_hash___object_hash_2.1.1.tgz"; path = fetchurl { - name = "object_hash___object_hash_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz"; - sha1 = "d12db044e03cd2ca3d77c0570d87225b02e1e6ea"; + name = "object_hash___object_hash_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz"; + sha1 = "9447d0279b4fcf80cff3259bf66a1dc73afabe09"; }; } { - name = "object_inspect___object_inspect_1.8.0.tgz"; + name = "object_inspect___object_inspect_1.9.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; - sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; + name = "object_inspect___object_inspect_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz"; + sha1 = "c90521d74e1127b67266ded3394ad6116986533a"; }; } { - name = "object_is___object_is_1.1.3.tgz"; + name = "object_is___object_is_1.1.5.tgz"; path = fetchurl { - name = "object_is___object_is_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; - sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; + name = "object_is___object_is_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; + sha1 = "b9deeaa5fc7f1846a0faecdceec138e5778f53ac"; }; } { @@ -8161,14 +8417,6 @@ sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; }; } - { - name = "object_path___object_path_0.11.4.tgz"; - path = fetchurl { - name = "object_path___object_path_0.11.4.tgz"; - url = "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz"; - sha1 = "370ae752fbf37de3ea70a861c23bba8915691949"; - }; - } { name = "object_visit___object_visit_1.0.1.tgz"; path = fetchurl { @@ -8186,27 +8434,27 @@ }; } { - name = "object.entries___object.entries_1.1.2.tgz"; + name = "object.entries___object.entries_1.1.3.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; - sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; + name = "object.entries___object.entries_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz"; + sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6"; }; } { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; + name = "object.fromentries___object.fromentries_2.0.4.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; - sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; + name = "object.fromentries___object.fromentries_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz"; + sha1 = "26e1ba5c4571c5c6f0890cef4473066456a120b8"; }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha1 = "1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"; }; } { @@ -8218,11 +8466,11 @@ }; } { - name = "object.values___object.values_1.1.1.tgz"; + name = "object.values___object.values_1.1.3.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + name = "object.values___object.values_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz"; + sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee"; }; } { @@ -8266,11 +8514,11 @@ }; } { - name = "open___open_7.3.0.tgz"; + name = "open___open_7.4.2.tgz"; path = fetchurl { - name = "open___open_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz"; - sha1 = "45461fdee46444f3645b6e14eb3ca94b82e1be69"; + name = "open___open_7.4.2.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz"; + sha1 = "b8147e26dcf3e426316c730089fd71edd29c2321"; }; } { @@ -8442,11 +8690,11 @@ }; } { - name = "param_case___param_case_3.0.3.tgz"; + name = "param_case___param_case_3.0.4.tgz"; path = fetchurl { - name = "param_case___param_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; - sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; + name = "param_case___param_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; + sha1 = "7d17fe4aa12bde34d4a77d91acfb6219caad01c5"; }; } { @@ -8482,11 +8730,11 @@ }; } { - name = "parse_json___parse_json_5.1.0.tgz"; + name = "parse_json___parse_json_5.2.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; - sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; }; } { @@ -8497,6 +8745,14 @@ sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; }; } + { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + path = fetchurl { + name = "parse5_htmlparser2_tree_adapter___parse5_htmlparser2_tree_adapter_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; + sha1 = "2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"; + }; + } { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { @@ -8514,19 +8770,11 @@ }; } { - name = "parse5___parse5_5.1.1.tgz"; + name = "parse5___parse5_6.0.1.tgz"; path = fetchurl { - name = "parse5___parse5_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; - sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; - }; - } - { - name = "parse5___parse5_3.0.3.tgz"; - path = fetchurl { - name = "parse5___parse5_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz"; - sha1 = "042f792ffdd36851551cf4e9e066b3874ab45b5c"; + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; }; } { @@ -8538,11 +8786,11 @@ }; } { - name = "pascal_case___pascal_case_3.1.1.tgz"; + name = "pascal_case___pascal_case_3.1.2.tgz"; path = fetchurl { - name = "pascal_case___pascal_case_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz"; - sha1 = "5ac1975133ed619281e88920973d2cd1f279de5f"; + name = "pascal_case___pascal_case_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; + sha1 = "b48e0ef2b98e205e7c1dae747d0b1508237660eb"; }; } { @@ -9338,11 +9586,11 @@ }; } { - name = "postcss_selector_not___postcss_selector_not_4.0.0.tgz"; + name = "postcss_selector_not___postcss_selector_not_4.0.1.tgz"; path = fetchurl { - name = "postcss_selector_not___postcss_selector_not_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz"; - sha1 = "c68ff7ba96527499e832724a2674d65603b645c0"; + name = "postcss_selector_not___postcss_selector_not_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz"; + sha1 = "263016eef1cf219e0ade9a913780fc1f48204cbf"; }; } { @@ -9458,11 +9706,11 @@ }; } { - name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; + name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; path = fetchurl { - name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; - sha1 = "cd89f79bbcef21e3d21eb0da68ffe93f803e884b"; + name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha1 = "356256f643804773c82f64723fe78c92c62beaeb"; }; } { @@ -9770,11 +10018,11 @@ }; } { - name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz"; + name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.3.tgz"; path = fetchurl { - name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz"; - sha1 = "d82a437e081e68dfca3761fbd57dbf2abdda1316"; + name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.3.tgz"; + sha1 = "2a0623b1115a1d8c84144e9434d3342b5af41ab4"; }; } { @@ -9794,11 +10042,11 @@ }; } { - name = "react_error_overlay___react_error_overlay_6.0.8.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.9.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.8.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.8.tgz"; - sha1 = "474ed11d04fc6bda3af643447d85e9127ed6b5de"; + name = "react_error_overlay___react_error_overlay_6.0.9.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz"; + sha1 = "3c743010c9359608c375ecd6bc76f35d93995b0a"; }; } { @@ -9810,11 +10058,11 @@ }; } { - name = "react_is___react_is_17.0.1.tgz"; + name = "react_is___react_is_17.0.2.tgz"; path = fetchurl { - name = "react_is___react_is_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; - sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + name = "react_is___react_is_17.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; + sha1 = "e691d4a8e9c789365655539ab372762b0efb54f0"; }; } { @@ -9826,11 +10074,11 @@ }; } { - name = "react_popper___react_popper_1.3.7.tgz"; + name = "react_popper___react_popper_1.3.11.tgz"; path = fetchurl { - name = "react_popper___react_popper_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz"; - sha1 = "f6a3471362ef1f0d10a4963673789de1baca2324"; + name = "react_popper___react_popper_1.3.11.tgz"; + url = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.11.tgz"; + sha1 = "a2cc3f0a67b75b66cfa62d2c409f9dd1fcc71ffd"; }; } { @@ -9842,11 +10090,11 @@ }; } { - name = "react_scripts___react_scripts_3.4.3.tgz"; + name = "react_scripts___react_scripts_3.4.4.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz"; - sha1 = "21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"; + name = "react_scripts___react_scripts_3.4.4.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.4.tgz"; + sha1 = "eef024ed5c566374005e3f509877350ba99d08a7"; }; } { @@ -9874,11 +10122,11 @@ }; } { - name = "reactstrap___reactstrap_8.7.1.tgz"; + name = "reactstrap___reactstrap_8.9.0.tgz"; path = fetchurl { - name = "reactstrap___reactstrap_8.7.1.tgz"; - url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.7.1.tgz"; - sha1 = "9631db8460a83a4d40fbee61abdd577b4f1a7069"; + name = "reactstrap___reactstrap_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.9.0.tgz"; + sha1 = "bca4afa3f5cd18899ef9b33d877a141886d5abae"; }; } { @@ -10018,19 +10266,19 @@ }; } { - name = "regex_parser___regex_parser_2.2.10.tgz"; + name = "regex_parser___regex_parser_2.2.11.tgz"; path = fetchurl { - name = "regex_parser___regex_parser_2.2.10.tgz"; - url = "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.10.tgz"; - sha1 = "9e66a8f73d89a107616e63b39d4deddfee912b37"; + name = "regex_parser___regex_parser_2.2.11.tgz"; + url = "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz"; + sha1 = "3b37ec9049e19479806e878cabe7c1ca83ccfe58"; }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; }; } { @@ -10066,11 +10314,11 @@ }; } { - name = "regjsparser___regjsparser_0.6.4.tgz"; + name = "regjsparser___regjsparser_0.6.9.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.4.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; - sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; + name = "regjsparser___regjsparser_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz"; + sha1 = "b489eef7c9a2ce43727627011429cf833a7183e6"; }; } { @@ -10090,11 +10338,11 @@ }; } { - name = "renderkid___renderkid_2.0.4.tgz"; + name = "renderkid___renderkid_2.0.5.tgz"; path = fetchurl { - name = "renderkid___renderkid_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.4.tgz"; - sha1 = "d325e532afb28d3f8796ffee306be8ffd6fc864c"; + name = "renderkid___renderkid_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz"; + sha1 = "483b1ac59c6601ab30a7a596a5965cabccfdd0a5"; }; } { @@ -10194,11 +10442,11 @@ }; } { - name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; + name = "resolve_url_loader___resolve_url_loader_3.1.2.tgz"; path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz"; - sha1 = "28931895fa1eab9be0647d3b2958c100ae3c0bf0"; + name = "resolve_url_loader___resolve_url_loader_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz"; + sha1 = "235e2c28e22e3e432ba7a5d4e305c59a58edfc08"; }; } { @@ -10226,11 +10474,19 @@ }; } { - name = "resolve___resolve_1.19.0.tgz"; + name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; - sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "resolve___resolve_2.0.0_next.3.tgz"; + path = fetchurl { + name = "resolve___resolve_2.0.0_next.3.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; + sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; }; } { @@ -10346,11 +10602,11 @@ }; } { - name = "rxjs___rxjs_6.6.3.tgz"; + name = "rxjs___rxjs_6.6.6.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.6.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz"; - sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552"; + name = "rxjs___rxjs_6.6.6.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz"; + sha1 = "14d8417aa5a07c5e633995b525e1e3c0dec03b70"; }; } { @@ -10506,11 +10762,11 @@ }; } { - name = "semver___semver_7.3.2.tgz"; + name = "semver___semver_7.3.5.tgz"; path = fetchurl { - name = "semver___semver_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; - sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; }; } { @@ -10658,11 +10914,11 @@ }; } { - name = "side_channel___side_channel_1.0.3.tgz"; + name = "side_channel___side_channel_1.0.4.tgz"; path = fetchurl { - name = "side_channel___side_channel_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz"; - sha1 = "cdc46b057550bbab63706210838df5d4c19519c3"; + name = "side_channel___side_channel_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; + sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; }; } { @@ -10682,11 +10938,11 @@ }; } { - name = "sinon___sinon_9.2.1.tgz"; + name = "sinon___sinon_9.2.4.tgz"; path = fetchurl { - name = "sinon___sinon_9.2.1.tgz"; - url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.1.tgz"; - sha1 = "64cc88beac718557055bd8caa526b34a2231be6d"; + name = "sinon___sinon_9.2.4.tgz"; + url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.4.tgz"; + sha1 = "e55af4d3b174a4443a8762fa8421c2976683752b"; }; } { @@ -10802,11 +11058,11 @@ }; } { - name = "source_map_url___source_map_url_0.4.0.tgz"; + name = "source_map_url___source_map_url_0.4.1.tgz"; path = fetchurl { - name = "source_map_url___source_map_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + name = "source_map_url___source_map_url_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; + sha1 = "0af66605a745a5a2f91cf1bbf8a7afbc283dec56"; }; } { @@ -10850,11 +11106,11 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha1 = "e9c18a410e5ed7e12442a549fbd8afa767038d65"; }; } { @@ -10922,11 +11178,11 @@ }; } { - name = "stack_utils___stack_utils_1.0.3.tgz"; + name = "stack_utils___stack_utils_1.0.4.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.3.tgz"; - sha1 = "db7a475733b5b8bf6521907b18891d29006f7751"; + name = "stack_utils___stack_utils_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz"; + sha1 = "4b600971dcfc6aed0cbdf2a8268177cc916c87c8"; }; } { @@ -11018,43 +11274,43 @@ }; } { - name = "string_width___string_width_4.2.0.tgz"; + name = "string_width___string_width_4.2.2.tgz"; path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; }; } { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; - sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + name = "string.prototype.matchall___string.prototype.matchall_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz"; + sha1 = "608f255e93e072107f5de066f81a2dfb78cf6b29"; }; } { - name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz"; + name = "string.prototype.trim___string.prototype.trim_1.2.4.tgz"; path = fetchurl { - name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz"; - sha1 = "f538d0bacd98fc4297f0bef645226d5aaebf59f3"; + name = "string.prototype.trim___string.prototype.trim_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz"; + sha1 = "6014689baf5efaf106ad031a5fa45157666ed1bd"; }; } { - name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; - sha1 = "6ddd9a8796bc714b489a3ae22246a208f37bfa46"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; }; } { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; - sha1 = "22d45da81015309cd0cdd79787e8919fc5c613e7"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; }; } { @@ -11153,6 +11409,14 @@ sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; }; } + { + name = "style_mod___style_mod_4.0.0.tgz"; + path = fetchurl { + name = "style_mod___style_mod_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.0.tgz"; + sha1 = "97e7c2d68b592975f2ca7a63d0dd6fcacfe35a01"; + }; + } { name = "stylehacks___stylehacks_4.0.3.tgz"; path = fetchurl { @@ -11234,19 +11498,19 @@ }; } { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; + name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.0.tgz"; path = fetchurl { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.1.2.tgz"; - sha1 = "3c9906ca6e5d563faa0b81b2fdc6aa79cad9c0be"; + name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.0.tgz"; + url = "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.0.tgz"; + sha1 = "f13dcfec6c41b37c5fe509f08bd513590c64411f"; }; } { - name = "tempusdominus_core___tempusdominus_core_5.0.3.tgz"; + name = "tempusdominus_core___tempusdominus_core_5.19.0.tgz"; path = fetchurl { - name = "tempusdominus_core___tempusdominus_core_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/tempusdominus-core/-/tempusdominus-core-5.0.3.tgz"; - sha1 = "808642e47a83f45d7ef18c1597fd7b1d413d69e5"; + name = "tempusdominus_core___tempusdominus_core_5.19.0.tgz"; + url = "https://registry.yarnpkg.com/tempusdominus-core/-/tempusdominus-core-5.19.0.tgz"; + sha1 = "ccbd2c35109b0a4b96c61513e53e0175ec4896bd"; }; } { @@ -11426,11 +11690,11 @@ }; } { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + name = "tough_cookie___tough_cookie_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha1 = "d822234eeca882f991f0f908824ad2622ddbece4"; }; } { @@ -11482,11 +11746,19 @@ }; } { - name = "tsutils___tsutils_3.17.1.tgz"; + name = "tslib___tslib_2.1.0.tgz"; path = fetchurl { - name = "tsutils___tsutils_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; + name = "tslib___tslib_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; + sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; + }; + } + { + name = "tsutils___tsutils_3.21.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.21.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; + sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; }; } { @@ -11562,11 +11834,11 @@ }; } { - name = "type___type_2.1.0.tgz"; + name = "type___type_2.5.0.tgz"; path = fetchurl { - name = "type___type_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; - sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; + name = "type___type_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz"; + sha1 = "0a2e78c2e77907b252abe5f298c1b01c63f0db3d"; }; } { @@ -11586,11 +11858,19 @@ }; } { - name = "typescript___typescript_3.9.7.tgz"; + name = "typescript___typescript_3.9.9.tgz"; path = fetchurl { - name = "typescript___typescript_3.9.7.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; - sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; + name = "typescript___typescript_3.9.9.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz"; + sha1 = "e69905c54bc0681d0518bd4d587cc6f2d0b1a674"; + }; + } + { + name = "unbox_primitive___unbox_primitive_1.0.0.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz"; + sha1 = "eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f"; }; } { @@ -11706,11 +11986,11 @@ }; } { - name = "uri_js___uri_js_4.4.0.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; - sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -11730,11 +12010,11 @@ }; } { - name = "url_parse___url_parse_1.4.7.tgz"; + name = "url_parse___url_parse_1.5.1.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.4.7.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; - sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; + name = "url_parse___url_parse_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz"; + sha1 = "d5fa9890af8a5e1f274a2c98376510f6425f6e3b"; }; } { @@ -11769,6 +12049,14 @@ sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; }; } + { + name = "util.promisify___util.promisify_1.1.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz"; + sha1 = "77832f57ced2c9478174149cae9b96e9918cd54b"; + }; + } { name = "util.promisify___util.promisify_1.0.1.tgz"; path = fetchurl { @@ -11818,11 +12106,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; }; } { @@ -11873,6 +12161,14 @@ sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } + { + name = "w3c_keyname___w3c_keyname_2.2.4.tgz"; + path = fetchurl { + name = "w3c_keyname___w3c_keyname_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz"; + sha1 = "4ade6916f6290224cdbd1db8ac49eab03d0eef6b"; + }; + } { name = "w3c_xmlserializer___w3c_xmlserializer_1.1.2.tgz"; path = fetchurl { @@ -11954,11 +12250,11 @@ }; } { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.3.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz"; + sha1 = "0639372b143262e2b84ab95d3b91a7597061c2c5"; }; } { @@ -12034,11 +12330,11 @@ }; } { - name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz"; + name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; - sha1 = "605a2cd0a7146e5db141e29d1c62ab84c0c4c868"; + name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; + sha1 = "dced24f37f2624ed0281725d51d0e2e3fe677f8c"; }; } { @@ -12073,6 +12369,14 @@ sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837"; }; } + { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + }; + } { name = "which_module___which_module_2.0.0.tgz"; path = fetchurl { @@ -12298,11 +12602,11 @@ }; } { - name = "ws___ws_7.4.0.tgz"; + name = "ws___ws_7.4.4.tgz"; path = fetchurl { - name = "ws___ws_7.4.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.0.tgz"; - sha1 = "a5dd76a24197940d4a8bb9e0e152bb4503764da7"; + name = "ws___ws_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz"; + sha1 = "383bc9742cb202292c9077ceab6f6047b17f2d59"; }; } { @@ -12322,11 +12626,11 @@ }; } { - name = "xregexp___xregexp_4.4.0.tgz"; + name = "xregexp___xregexp_4.4.1.tgz"; path = fetchurl { - name = "xregexp___xregexp_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.0.tgz"; - sha1 = "29660f5d6567cd2ef981dd4a50cb05d22c10719d"; + name = "xregexp___xregexp_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.4.1.tgz"; + sha1 = "c84a88fa79e9ab18ca543959712094492185fe65"; }; } { @@ -12338,11 +12642,11 @@ }; } { - name = "y18n___y18n_4.0.0.tgz"; + name = "y18n___y18n_4.0.1.tgz"; path = fetchurl { - name = "y18n___y18n_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; - sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + name = "y18n___y18n_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz"; + sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4"; }; } { @@ -12362,11 +12666,11 @@ }; } { - name = "yaml___yaml_1.10.0.tgz"; + name = "yaml___yaml_1.10.2.tgz"; path = fetchurl { - name = "yaml___yaml_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; - sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; }; } { diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 5c980f7e401..dd3405d3531 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.14"; + version = "4.15"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "sha256-8Ql9qmQ0iXwVm8EAl4tRNHwDOQQWEIRdCvoSgVFyn/w="; + sha256 = "sha256-tpOk5asoEaioVPYN4KYq+786lSux0EeVLJrgEyH4SiU="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; homepage = "http://www.squid-cache.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz raskin ]; }; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 257bb21b42b..4e1e25f19e8 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -29,5 +29,8 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ ]; + + # https://github.com/unfs3/unfs3/issues/13 + broken = true; }; } diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 44f207e3b86..c3c0eb50785 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.4.1"; + version = "2.4.2"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "1dqf5ia66kjsnfad2xkm8w6jgs976mf9x0dcd73jybqfgs4j09kj"; + sha256 = "1n39flqqqjih0lc86vxdzbp44x4rqj5292if2fsa8y1xxlvyqmns"; }; outputs = [ "out" ]; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index a83da568126..190f396009a 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.11.8"; # also update communityModules + version = "0.11.9"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "1y38a33wab2vv9pz04blmn6m66wg4pixilh8x60jsx6mk0xih3w3"; + sha256 = "02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "f210f242cf17"; - sha256 = "0ls45zfhhv8k1aywq3fvrh4ab7g4g1z1ma9mbcf2ch73m6aqhbyl"; + rev = "c149edb37349"; + sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1"; }; buildInputs = [ diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 0f21b55b85b..654476bd5ae 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.10"; + version = "0.8.11"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-ETB8BirlEqro8CUdRM+AsZ/ugFa/fj52wCV9pInvMB0="; + sha256 = "sha256-GVV+532dPrXkQ3X2+wa4u6aCPBvQAIiypeoqzJqvk9Y="; }; postPatch = '' @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { }; passthru = { - shellPath = "/bin/osh"; + shellPath = "/bin/osh"; }; } diff --git a/pkgs/tools/X11/opentabletdriver/shell.nix b/pkgs/tools/X11/opentabletdriver/shell.nix index 526fa4a4432..4367d22e9df 100644 --- a/pkgs/tools/X11/opentabletdriver/shell.nix +++ b/pkgs/tools/X11/opentabletdriver/shell.nix @@ -1,9 +1,9 @@ -{ pkgs ? import ../../../../. {} }: +{ pkgs ? import ../../../../. { } }: with pkgs; mkShell { - buildInputs = [ + packages = [ common-updater-scripts curl dotnetCorePackages.sdk_5_0 diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 58b2852baca..63ef7646959 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -3,30 +3,10 @@ rec { ansible = ansible_2_10; - # The python module stays at v2.9.x until the related package set has caught up. Therefore v2.10 gets an override - # for now. - ansible_2_10 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.10.0"; - - # TODO: migrate to fetchurl, when release becomes available on releases.ansible.com - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "0k9rs5ajx0chaq0xr1cj4x7fr5n8kd4y856miss6k01iv2m7yx42"; - }; - })); + ansible_2_10 = python3Packages.toPythonApplication python3Packages.ansible-base; + # End of support 2021/10/02, End of life 2021/12/31 ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; - ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.8.14"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "19ga0c9qs2b216qjg5k2yknz8ksjn8qskicqspg2d4b8x2nr1294"; - }; - })); + ansible_2_8 = throw "Ansible 2.8 went end of life on 2021/01/03 and has subsequently been dropped"; } diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index e9e039cfbd4..46989bc24fb 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.0.5"; + version = "4.1.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tpk5Avx2bRQlhOnHpmpDG14X9nk3x68TST+VtIW8rL8="; + sha256 = "sha256-Ns02Yi0FJPOCpjr1P5c1KOkRZ8saxQzXg/Zn5vYLztU="; }; - vendorSha256 = "sha256-O9SEVyBFnmyrQCmccXLyeOqlTwWHzICTLVKGO7rerjI="; + vendorSha256 = "sha256-aFaeRhg+aLOmS7VFbgdxaEtZcBKn9zCVINad6ahpDCo="; doCheck = false; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index ac4d2799e49..c945ae5557a 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,18 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1xb6s78q0fba45595d868vmbxdb41060jbygypfa5hvvcz8d8ayk"; + sha256 = "1ag8h8gj3cld2qxqdrrqdwrz3d9d5m4c2wkx7b78vjpimv76qx5d"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "19ywvp7nm91rc32r7dzb6yf3ss74m3s01fh2xqnmdg382jjlzdby"; + sha256 = "1mm9lvbgszr5d6gs1qqn63012mgxq94xxkcc400fgfx3apzpkbpj"; }; }.${system}; in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "339.0.0"; + version = "340.0.0"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); diff --git a/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch b/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch new file mode 100644 index 00000000000..d0ed0bb5b83 --- /dev/null +++ b/pkgs/tools/archivers/arc_unpacker/add-missing-import.patch @@ -0,0 +1,22 @@ +From 29c0b393283395c69ecdd747e960301e95c93bcf Mon Sep 17 00:00:00 2001 +From: Felix Rath +Date: Sat, 15 May 2021 13:07:38 +0200 +Subject: [PATCH] add missing import + +`std::logic_error` is used in this file, which resides in ``, but was not imported before. This caused the build to fail, see, e.g., https://hydra.nixos.org/build/141997371/log. +--- + src/algo/crypt/lcg.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/algo/crypt/lcg.cc b/src/algo/crypt/lcg.cc +index 6c2a7945..66630a08 100644 +--- a/src/algo/crypt/lcg.cc ++++ b/src/algo/crypt/lcg.cc +@@ -17,6 +17,7 @@ + + #include "algo/crypt/lcg.h" + #include ++#include + + using namespace au; + using namespace au::algo::crypt; diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix index dcd5243d713..c6259cf11b0 100644 --- a/pkgs/tools/archivers/arc_unpacker/default.nix +++ b/pkgs/tools/archivers/arc_unpacker/default.nix @@ -18,22 +18,37 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper catch ]; buildInputs = [ boost libpng libjpeg zlib openssl libwebp ]; + patches = [ + # Add a missing `` import that caused the build to fail. + # Failure: https://hydra.nixos.org/build/141997371/log + # Also submitted as an upstream PR: https://github.com/vn-tools/arc_unpacker/pull/194 + ./add-missing-import.patch + ]; + postPatch = '' cp ${catch}/include/catch/catch.hpp tests/test_support/catch.h ''; checkPhase = '' + runHook preCheck + pushd .. ./build/run_tests popd + + runHook postCheck ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/doc/arc_unpacker $out/libexec/arc_unpacker cp arc_unpacker $out/libexec/arc_unpacker/arc_unpacker cp ../GAMELIST.{htm,js} $out/share/doc/arc_unpacker cp -r ../etc $out/libexec/arc_unpacker makeWrapper $out/libexec/arc_unpacker/arc_unpacker $out/bin/arc_unpacker + + runHook postInstall ''; doCheck = true; @@ -41,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to extract files from visual novel archives"; homepage = "https://github.com/vn-tools/arc_unpacker"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ midchildan ]; }; } diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 815bf823d58..e9409221069 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -2,18 +2,18 @@ coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.14"; + version = "0.5.4.17"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px"; + sha256 = "00adrjpxqlaccrwjf65w3vhxfswdj0as8aj263c6f9b85llypc5v"; }; - nativeBuildInputs = [ pkg-config makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 intltool libxslt ]; + nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; + buildInputs = [ gtk3 libxslt ]; postFixup = '' wrapProgram $out/bin/xarchiver \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = "https://github.com/ib/xarchiver"; maintainers = [ lib.maintainers.domenkozar ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index b9ed3eca919..c218aa7e4e1 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -105,13 +105,13 @@ in pythonPackages.buildPythonApplication rec { # unstable does not require bs1770gain[2]. # [1]: https://discourse.beets.io/t/forming-a-beets-core-team/639 # [2]: https://github.com/NixOS/nixpkgs/pull/90504 - version = "unstable-2021-04-17"; + version = "unstable-2021-05-13"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "50163b373f527d1b1f8b2442240ca547e846744e"; - sha256 = "sha256-l7drav4Qx2JCF+F5OA0s641idcKM3S4Yx2lM2evJQWE="; + rev = "1faa41f8c558d3f4415e5e48cf4513d50b466d34"; + sha256 = "sha256-P0bV7WNqCYe9+3lqnFmAoRlb2asdsBUjzRMc24RngpU="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 3a10881b605..c70b907c792 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -12,61 +12,41 @@ # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts # Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.12 +# https://github.com/coqui-ai/TTS/releases/tag/v0.0.13 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 python3Packages.buildPythonApplication rec { pname = "tts"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-0M9wcdBmuTK+NvEGsXEdoYiVFjw8G2MRUwmi1PJgmzI="; + sha256 = "1sh7sjkh7ihbkqc7sl4hnzci0n7gv4s140dykpb1havaqyfhjn8l"; }; - patches = [ - # https://github.com/coqui-ai/TTS/pull/435 - (fetchpatch { - url = "https://github.com/coqui-ai/TTS/commit/97f98e4c4584ef14ed2f4885aa02c162d9364a00.patch"; - sha256 = "sha256-DAZYOOAe+6TYBF5ukFq5HRwm49askEvNEivuwb/oCWM="; - }) - ]; - preBuild = '' - # numba jit tries to write to its cache directory - export HOME=$TMPDIR - # we only support pytorch models right now - sed -i -e '/tensorflow/d' requirements.txt - - sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt setup.py - sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt setup.py - sed -i -e 's!bokeh==[^"]*!bokeh!' requirements.txt setup.py - sed -i -e 's!numba==[^"]*!numba!' requirements.txt setup.py - sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt setup.py - sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt setup.py - # Not required for building/installation but for their development/ci workflow - sed -i -e '/black/d' requirements.txt - sed -i -e '/isor/d' requirements.txt - sed -i -e '/pylint/d' requirements.txt - sed -i -e '/cardboardlint/d' requirements.txt setup.py + sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt + sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt + sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt + sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt ''; - nativeBuildInputs = [ python3Packages.cython ]; + nativeBuildInputs = with python3Packages; [ + cython + ]; propagatedBuildInputs = with python3Packages; [ - attrdict - bokeh flask - fuzzywuzzy gdown inflect jieba librosa matplotlib + pandas phonemizer pypinyin pysbd @@ -88,22 +68,30 @@ python3Packages.buildPythonApplication rec { ) ''; - checkInputs = with python3Packages; [ pytestCheckHook ]; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; disabledTests = [ # RuntimeError: fft: ATen not compiled with MKL support "test_torch_stft" "test_stft_loss" "test_multiscale_stft_loss" - # AssertionErrors that I feel incapable of debugging - "test_phoneme_to_sequence" - "test_text2phone" + # assert tensor(1.1904e-07, dtype=torch.float64) <= 0 "test_parametrized_gan_dataset" + # RuntimeError: expected scalar type Double but found Float + "test_speaker_embedding" + # Requires network acccess to download models + "test_synthesize" ]; preCheck = '' # use the installed TTS in $PYTHONPATH instead of the one from source to also have cython modules. mv TTS{,.old} + export PATH=$out/bin:$PATH + + # numba tries to write to HOME directory + export HOME=$TMPDIR ''; disabledTestPaths = [ diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix index d05257f1d08..d764644bab1 100644 --- a/pkgs/tools/audio/volctl/default.nix +++ b/pkgs/tools/audio/volctl/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "volctl"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "buzz"; repo = pname; rev = "v${version}"; - sha256 = "02scfscf4mdrphzrd7cbwbhpig9bhvaws8qk4zc81z8vvf3mcfv2"; + sha256 = "1cx27j83pz2qffnzb85fbl1x6pp3irv1kbw7g1hri7kaw6ky4xiz"; }; postPatch = '' diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 9c9356371b6..5b2a3a7c819 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210507"; + version = "1.1.0-dev-20210513"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-Tbxbsh40Lel4kGnCIWyNRge15Y71ao+oUixClBdj4f4="; + sha256 = "sha256-epDwZpdyPreufPwiSFadmMjtZ9nq9mQsQt+Asm5rx8Y="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index 4ab54593ed8..f4cc746a24f 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -5,6 +5,7 @@ , pkg-config , libdmtx , imagemagick +, Foundation }: stdenv.mkDerivation rec { @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libdmtx imagemagick ]; + buildInputs = [ libdmtx imagemagick ] + ++ lib.optional stdenv.isDarwin Foundation; meta = { description = "Data matrix command-line utilities"; diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index d72b0fdef1f..8bc82547eeb 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "113i11sgna82i4c4zk66qmbypmnmzh0lzp4kkgqnxxcdvyj00rb8"; + sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo="; }; - cargoSha256 = "12z7y303fmga91daf2w356qiqdqa7b8dz6nrrpnjdf0slyz0w3x4"; + cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 6a253a493fc..cd0be4fa99b 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, libiconv }: rustPlatform.buildRustPackage rec { @@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw="; + buildInputs = lib.optional stdenv.isDarwin libiconv; + meta = with lib; { description = "A high performance code minimap render"; homepage = "https://github.com/wfxr/code-minimap"; diff --git a/pkgs/tools/misc/foma/default.nix b/pkgs/tools/misc/foma/default.nix index 2bde606adbe..e75aaca50f6 100644 --- a/pkgs/tools/misc/foma/default.nix +++ b/pkgs/tools/misc/foma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, zlib, flex, bison, readline }: +{ lib, stdenv, fetchFromGitHub, zlib, flex, bison, readline, darwin }: stdenv.mkDerivation rec { pname = "foma"; @@ -13,9 +13,14 @@ stdenv.mkDerivation rec { sourceRoot = "source/foma"; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison ] + ++ lib.optional stdenv.isDarwin darwin.cctools; buildInputs = [ zlib readline ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + patchPhase = '' substituteInPlace Makefile \ --replace '-ltermcap' ' ' \ diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 9bbbe1493f7..f661f2cf97d 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome +{ lib, stdenv, fetchurl, intltool, gettext, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: stdenv.mkDerivation rec { - name = "gparted-1.2.0"; + pname = "gparted"; + version = "1.3.0"; src = fetchurl { - url = "mirror://sourceforge/gparted/${name}.tar.gz"; - sha256 = "sha256-bJBxXSVNen7AIIspAHtkFg3Z+330xKp/jsLJ0jEUxxk="; + url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz"; + sha256 = "sha256-jcGAJF3Z6kXm4vS8aVEvGH4Ivn95nJioJaCwTBYcvSo="; }; # Tries to run `pkexec --version` to get version. diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index d06fc7aef69..2589b57821b 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.19.2"; + version = "1.20.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-3lWrSybYp3RrUnydosgsNkGQjrk7JvxuxjMslN4cGfk="; + sha256 = "sha256-G6ixqSIdDoM/OVlPfv2bI4MA/k0x3Jic/kFo5XEsN/M="; # 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/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix index c544bbd03a1..94720f11937 100644 --- a/pkgs/tools/misc/lorri/default.nix +++ b/pkgs/tools/misc/lorri/default.nix @@ -12,10 +12,10 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - version = "1.4.0"; - gitRev = "fee4ffac9ee16fc921d413789cc059b043f2db3d"; - sha256 = "sha256:0ix0k85ywlvkxsampajkq521d290gb0n60qwhnk6j0sc55yn558h"; - cargoSha256 = "sha256:1ngn4wnyh6cjnyg7mb48zvng0zn5fcn8s75y88nh91xq9x1bi2d9"; + version = "1.5.0"; + gitRev = "f4b6a135e2efb18b3a679e3946d4d070a1c45a2c"; + sha256 = "0irgzw7vwhvm97nmylj44x2dnd8pwf47gvlgw7fj58fj67a0l8fr"; + cargoSha256 = "18l7yxciqcvagsg9lykilfhr104a4qqdydjkjysxgd197xalxgzr"; in (rustPlatform.buildRustPackage rec { pname = "lorri"; diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index b97a0e42ee0..df425162d84 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -1,23 +1,26 @@ { lib, stdenv, fetchFromGitHub }: -# Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of -# adding this to services.udev.packages on NixOS +# Although we copy in the udev rules here, you probably just want to use +# logitech-udev-rules instead of adding this to services.udev.packages on NixOS -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ltunify"; - version = "unstable-20180330"; + version = "0.3"; src = fetchFromGitHub { - owner = "Lekensteyn"; - repo = "ltunify"; - rev = "f664d1d41d5c4beeac5b81e485c3498f13109db7"; - sha256 = "07sqhih9jmm7vgiwqsjzihd307cj7l096sxjl25p7nwr1q4180wv"; + owner = "Lekensteyn"; + repo = "ltunify"; + rev = "v${version}"; + sha256 = "sha256-9avri/2H0zv65tkBsIi9yVxx3eVS9oCkVCCFdjXqSgI="; }; makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; meta = with lib; { description = "Tool for working with Logitech Unifying receivers and devices"; + longDescription = '' + This tool requires either to be run with root/sudo or alternatively to have the udev rules files installed. On NixOS this can be achieved by setting `hardware.logitech.wireless.enable`. + ''; homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index dd2ce37b439..61078e7edfe 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-sqEodshg6nm3O4RK63ht8u6FU98bF/1i6frS50oyZY8="; + sha256 = "sha256-0dCIHgoyNgpxbrPDv26oLdU+npcIgpCQdpX4HzS0vN0="; }; # Substitute instead of wrapping because the resulting file is diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 40913193163..432eab680c8 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g4w14fktJB8TItgm3nSgG+lpdXdNTpX52J+FsIbU+YY="; + sha256 = "sha256-8vrLvP8NevVpmqxqJHsySGXRTDX45c8FrfB7W7fdQvg="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-9wpr1gs9EehmFzCW2kKDx+LKoDUC27fmhjpcH/fIcyY="; + cargoSha256 = "sha256-lIZsYhyef9LsGME01Kb5TGamGpLyZiPrdIb+jUqvbOg="; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index a06a0004a89..42624df8a06 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.9.0"; + version = "6.9.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FW0vGwMHUgFSMggZoT+koSkub4xSKeQ+PNlvFjGIy7o="; + sha256 = "sha256-FaN1/S/VzHnaQp+UOmvNGaWDEFijVEI7GWkAmnln3jE="; }; - cargoSha256 = "sha256-+JNQITHP5rwbfavBeb4/IUo5FThhKcKDRwGeT5m6k5k="; + cargoSha256 = "sha256-Vq2gorQJbLfxKWKbYYOVaHPN0uITbGs1CgkwBtPwSrk="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index dcb9e056e9b..cc6d5f8c45b 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,27 +2,24 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.4.18"; + version = "0.21.5.11"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "16xmg2d9rfmm5l1dxj3dydijpv3kwswrqsbj1sihyyka4s915g61"; + sha256 = "0ifv717ywq2y0s6m9rkry1fnsr3mg9n2b2zcwaf9r5cxpw90bmym"; }; propagatedBuildInputs = [ python3Packages.psutil ]; checkInputs = with python3Packages; [ mock - pytest + pytestCheckHook ]; - # Run tests, skipping `test_user_specified` since its result depends on the - # mount path. - checkPhase = '' - pytest -k 'not test_user_specified' - ''; + # Skip `test_user_specified` since its result depends on the mount path. + disabledTests = [ "test_user_specified" ]; meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 9aaa2117776..920f4aff439 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.8.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-armEkYiRQ2RvKFUtNlnMejkNSLJOEQpFzUPduNJatMo="; + sha256 = "sha256-aqiJPYoG1Yi5bK0gos+2OoycrrqdIY2GjpQGE1PK1bw="; }; - cargoSha256 = "sha256-68UfDlQ1KuGZwcuSNeOCwULxS+Ei16lEydrO4CssD3Y="; + cargoSha256 = "sha256-j9eZ2kHK9Mxxcv/yuriJ55xs2waCaWT5XQOSlA+WZXE="; nativeBuildInputs = [ installShellFiles ]; @@ -23,9 +23,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd $pname \ - --bash <($out/bin/zellij generate-completion bash) \ - --fish <($out/bin/zellij generate-completion fish) \ - --zsh <($out/bin/zellij generate-completion zsh) + --bash <($out/bin/zellij setup --generate-completion bash) \ + --fish <($out/bin/zellij setup --generate-completion fish) \ + --zsh <($out/bin/zellij setup --generate-completion zsh) ''; meta = with lib; { diff --git a/pkgs/tools/networking/calendar-cli/default.nix b/pkgs/tools/networking/calendar-cli/default.nix new file mode 100644 index 00000000000..497b77b57ac --- /dev/null +++ b/pkgs/tools/networking/calendar-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "calendar-cli"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "tobixen"; + repo = "calendar-cli"; + rev = "v${version}"; + sha256 = "0qjld2m7hl3dx90491pqbjcja82c1f5gwx274kss4lkb8aw0kmlv"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + icalendar + caldav + pytz + tzlocal + six + ]; + + # tests require networking + doCheck = false; + + meta = with lib; { + description = "Simple command-line CalDav client"; + homepage = "https://github.com/tobixen/calendar-cli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 333a28dd390..24968c64a09 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "4.0"; + version = "4.1"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - sha256 = "09f6w2x5h5kamb4rhcbaz911q1f730qdalgsn8s48yjyqlafl9xy"; + sha256 = "sha256-7Xby0/k0esYiGpGtS9VT3QVlrBiM10kNCAHQj3FxFkw="; }; postPatch = '' diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 1ce22c2ee2a..66c5598d020 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "croc"; - version = "9.1.3"; + version = "9.1.4"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "rVR2KfrK7M74kZUm5q23Lbj7hTLCN+p12RBaf3JAEXM="; + sha256 = "16HmRluhqCr6Gt+x8PSCU4W9pUJp89l4GO29uI+ZzkI="; }; vendorSha256 = "sha256-f0KiXHspGX96k5ViCwI62Qs+rHowpqm+gLy7/iqdnE4="; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 8acf4a93fba..ddcb8579318 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -4,24 +4,25 @@ , rustPlatform , installShellFiles , perl +, libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-ySpkWAhLS4jPFviKnzcnW7vuUFyojTBhooq7CFz/y3w="; + sha256 = "sha256-bNvgENyBa+BOY7QVPbBGKFKqYd9JNek+fyPnCT9+PUs="; }; - cargoSha256 = "sha256-KWh++MHaCJpJq7mS2lRCUh0nN+e8McKWcTknUC8VFuo="; + cargoSha256 = "sha256-FDiIM1LlWEFmiIvebdCsznkB7egspNKhY6xUXB838g8="; nativeBuildInputs = [ installShellFiles perl ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage ${pname}.1 diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index e6f3a2f1088..673ff7f83a3 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "getmail6"; - version = "6.15"; + version = "6.16"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0cvwvlhilrqlcvza06lsrm5l1yazzvym3s5kcjxcm9cminfaf4qb"; + sha256 = "1y373nzbffjjjs43441cn3wrb0yq1mw2vqixhizbzdacrs45xbfa"; }; doCheck = false; diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 8113f842438..93e1415b91c 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "1.31"; + version = "1.32"; outputs = [ "out" "dev" ]; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "033y3vggjxn1c7mw75j452idp7arrdv51axs727f7l3c5lnxqdjy"; + sha256 = "sha256-bJ7Qgau5soPiptrhcMZ8rWxfprRCTeR7OjQ5HZQ9hbc="; }; patches = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index a16e74819a6..ec5099c5f6e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -196,19 +196,12 @@ in rec { nixStable = callPackage common (rec { pname = "nix"; - version = "2.3.10"; + version = "2.3.11"; src = fetchurl { url = "https://nixos.org/releases/nix/${pname}-${version}/${pname}-${version}.tar.xz"; - sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; + sha256 = "89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128"; }; - patches = [( - fetchpatch { - url = "https://github.com/NixOS/nix/pull/4316.patch"; - sha256 = "0bqlm4n9sac9prgr9xlfng92arisp1hiqvc9pfh4fibsppkgdfc5"; - } - )]; - inherit storeDir stateDir confDir boehmgc; }); @@ -225,6 +218,13 @@ in rec { }; inherit storeDir stateDir confDir boehmgc; + + patches = [ + (fetchpatch { + url = "https://github.com/NixOS/nix/commit/8c7e043de2f673bc355d83f1e873baa93f30be62.patch"; + sha256 = "sha256-aTcUnZXheewnyCT7yQKnTqQDKS2uDoN9plMQgxJH8Ag="; + }) + ]; }); nixExperimental = nixUnstable.overrideAttrs (prev: { diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index cf6c965452d..682912b5a0c 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.43" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.44" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index b6735820ad7..788649ea102 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 08fd394933eadca2b90e4de4ecce7f478af1f161 - ref: refs/tags/6.0.43 + revision: dbc17d32977b2e36ead8dafff4f41c607a8bec88 + ref: refs/tags/6.0.44 specs: - metasploit-framework (6.0.43) + metasploit-framework (6.0.44) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -80,6 +80,7 @@ GIT sinatra sqlite3 sshkey + swagger-blocks thin tzinfo tzinfo-data @@ -124,13 +125,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.452.0) + aws-partitions (1.455.0) aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.235.0) + aws-sdk-ec2 (1.236.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.52.0) @@ -268,7 +269,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.3.0) + puma (5.3.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -289,7 +290,7 @@ GEM thor (>= 0.19.0, < 2.0) rake (13.0.3) rb-readline (0.5.5) - recog (2.3.19) + recog (2.3.20) nokogiri redcarpet (3.5.1) reline (0.2.5) @@ -367,6 +368,7 @@ GEM tilt (~> 2.0) sqlite3 (1.4.2) sshkey (2.0.0) + swagger-blocks (3.0.0) thin (1.8.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f5622bcfeef..49bf1027094 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.43"; + version = "6.0.44"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-dj+8DodQnCJjwhxTD/TjccJvSA8KSjiwiX65V6CIpuQ="; + sha256 = "sha256-6uhqAJ7nlBROdhda9yU2IlAHZrnpKo0kpKoixXJeJYY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 13d391390dd..8a008743135 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55"; + sha256 = "01i0qysphs0fl7gxg23bbsyn8iwgnaif6lvbfg6rdn6gp6qc8qgx"; type = "gem"; }; - version = "1.452.0"; + version = "1.455.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,10 +134,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kcnfr5rw80d46hwp185jniqvbrxcdjy7srh24x7gjm2gpxmm234"; + sha256 = "1x4gq4s5d9834n2p5gm1qchm8jvin1ipirc20z1j5lszjxxpy3c2"; type = "gem"; }; - version = "1.235.0"; + version = "1.236.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -554,12 +554,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "08fd394933eadca2b90e4de4ecce7f478af1f161"; - sha256 = "1r56i2h5gfbyi6q3hjha1x46zhkiwgs0ylqwq9ij572hhw7bqgvn"; + rev = "dbc17d32977b2e36ead8dafff4f41c607a8bec88"; + sha256 = "11i5brrca8malhj8sap9p5k0fl126qjzfnhpfr719577kq06ms7a"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.43"; + version = "6.0.44"; }; metasploit-model = { groups = ["default"]; @@ -846,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1"; + sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i"; type = "gem"; }; - version = "5.3.0"; + version = "5.3.1"; }; racc = { groups = ["default"]; @@ -946,10 +946,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i"; + sha256 = "11hc55mdl2d4kb8vrbazydxdnzr5l7dd4v5spqrrgnmp2d7rq3az"; type = "gem"; }; - version = "2.3.19"; + version = "2.3.20"; }; redcarpet = { groups = ["default"]; @@ -1281,6 +1281,16 @@ }; version = "2.0.0"; }; + swagger-blocks = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bycg5si4pr69b0qqiqzhwcich90mvmn0v0gs39slvxg5nv3h28k"; + type = "gem"; + }; + version = "3.0.0"; + }; thin = { groups = ["default"]; platforms = []; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index d8b99c51de2..5e308fd25ca 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.6p1"; + version = "1.9.7"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - sha256 = "sha256-qenNwFj6/rnNPr+4ZMgXVeUk2YqgIhUnY/JbzoyjypA="; + sha256 = "sha256-K758LWaZuE2VDvmkPwnU2We4vCRLc7wJXEICBo3b5Uk="; }; prePatch = '' diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index e838e2931c7..d6e2dc4dd1f 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform +, libiconv , Security }: @@ -17,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-L1MKoVacVKcpEG2IfS+eENxFZNiSaTDTxfFbFlvzYl8="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "A utility that makes sweeping changes to large, shared code bases"; diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/tools/text/wrap/default.nix new file mode 100644 index 00000000000..e228f946a8c --- /dev/null +++ b/pkgs/tools/text/wrap/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper, courier-prime }: + +buildGoModule rec { + pname = "wrap"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "Wraparound"; + repo = "wrap"; + rev = "v${version}"; + sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "03q5a5lm8zj1523gxkbc0y6a3mjj1z2h7nrr2qcz8nlghvp4cfaz"; + + patches = [ + (fetchpatch { + name = "courier-prime-variants.patch"; + url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch"; + sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5"; + }) + ]; + + postInstall = '' + wrapProgram $out/bin/wrap --prefix XDG_DATA_DIRS : ${courier-prime}/share/ + ''; + + meta = with lib; { + description = "A Fountain export tool with some extras"; + homepage = "https://github.com/Wraparound/wrap"; + license = licenses.gpl3Only; + maintainers = [ maintainers.austinbutler ]; + }; +} diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 370d54adde9..47256f9f7ee 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoreconfHook , gettext , libtool @@ -25,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "1igabfy3fd7qndihmkfk9incc15pjxpxh2cn5pfw5fxfwrpjrarn"; }; + patches = [ + # Not included in 0.9.17.1, but will be in the next version. + (fetchpatch { + name = "no-poppler-splash.patch"; + url = "https://github.com/jwilk/pdf2djvu/commit/2ec7eee57a47bbfd296badaa03dc20bf71b50201.patch"; + sha256 = "03kap7k2j29r16qgl781cxpswzg3r2yn513cqycgl0vax2xj3gly"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 6a9a2cb464c..f19ddaebdfa 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchurl, emacs, texlive, ghostscript }: let auctex = stdenv.mkDerivation ( rec { - version = "12.3"; - # Make this a valid tex(live-new) package; # the pkgs attribute is provided with a hack below. pname = "auctex"; + version = "12.3"; tlType = "run"; - outputs = [ "out" "tex" ]; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1pd99hbhci3l1n0lmzn803svqwl47kld6172gwkwjmwlnqqgxm1g"; + hash = "sha256-L9T+MLaUV8knf+IE0+g8hHK89QDI/kqBDXREBhdMqd0="; }; - buildInputs = [ emacs texlive.combined.scheme-basic ghostscript ]; + buildInputs = [ + emacs + ghostscript + texlive.combined.scheme-basic + ]; preConfigure = '' mkdir -p "$tex" @@ -27,11 +29,11 @@ let auctex = stdenv.mkDerivation ( rec { "--with-texmf-dir=\${tex}" ]; - meta = { - description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; + meta = with lib; { homepage = "https://www.gnu.org/software/auctex"; - platforms = lib.platforms.unix; - license = lib.licenses.gpl3; + description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs"; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf82e86c9d..040ec5fb463 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1473,7 +1473,9 @@ in SDL = SDL_sixel; }; - gremlin-console = callPackage ../applications/misc/gremlin-console { }; + gremlin-console = callPackage ../applications/misc/gremlin-console { + openjdk = openjdk11; + }; grex = callPackage ../tools/misc/grex { inherit (darwin.apple_sdk.frameworks) Security; @@ -2012,6 +2014,8 @@ in boost = pkgs.boost.override { python = python3; }; }; + calendar-cli = callPackage ../tools/networking/calendar-cli { }; + candle = libsForQt5.callPackage ../applications/misc/candle { }; capstone = callPackage ../development/libraries/capstone { }; @@ -5359,6 +5363,8 @@ in gtkperf = callPackage ../development/tools/misc/gtkperf { }; + gtk-frdp = callPackage ../development/libraries/gtk-frdp {}; + gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; gtmess = callPackage ../applications/networking/instant-messengers/gtmess { @@ -5861,6 +5867,8 @@ in jq = callPackage ../development/tools/jq { }; + jiq = callPackage ../development/tools/misc/jiq { }; + jql = callPackage ../development/tools/jql { }; jo = callPackage ../development/tools/jo { }; @@ -9045,6 +9053,8 @@ in tthsum = callPackage ../applications/misc/tthsum { }; + ttp = with python3.pkgs; toPythonApplication ttp; + chaps = callPackage ../tools/security/chaps { }; trace-cmd = callPackage ../os-specific/linux/trace-cmd { }; @@ -9708,6 +9718,8 @@ in wpgtk = callPackage ../tools/X11/wpgtk { }; + wrap = callPackage ../tools/text/wrap { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -11867,14 +11879,14 @@ in duktape = callPackage ../development/interpreters/duktape { }; evcxr = callPackage ../development/interpreters/evcxr { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; beam = callPackage ./beam-packages.nix { }; beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; inherit (beam.interpreters) - erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 + erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; @@ -14955,7 +14967,9 @@ in cairomm = callPackage ../development/libraries/cairomm { }; - cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { }; + cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; pango = callPackage ../development/libraries/pango { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; @@ -19314,9 +19328,7 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { - buildGoPackage = buildGo115Package; - }; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; @@ -19336,6 +19348,7 @@ in prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-jitsi-exporter = callPackage ../servers/monitoring/prometheus/jitsi-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; + prometheus-kea-exporter = callPackage ../servers/monitoring/prometheus/kea-exporter.nix { }; prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; @@ -22787,7 +22800,8 @@ in dmrconfig = callPackage ../applications/radio/dmrconfig { }; - dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { + dmtx-utils = callPackage ../tools/graphics/dmtx-utils { + inherit (darwin.apple_sdk.frameworks) Foundation; }; inherit (callPackage ../applications/virtualization/docker {}) @@ -22889,7 +22903,9 @@ in jdk = jdk11; }); - ecpdap = callPackage ../development/tools/ecpdap { }; + ecpdap = callPackage ../development/tools/ecpdap { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; @@ -23167,7 +23183,7 @@ in # A build without gui components and other utilites not needed for end user # libraries gnuradioMinimal = gnuradio.override { - wrap = false; + doWrap = false; unwrapped = gnuradio.unwrapped.override { volk = volk.override { # So it will not reference python @@ -23197,7 +23213,7 @@ in # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. gnuradio3_8Minimal = gnuradio3_8.override { - wrap = false; + doWrap = false; unwrapped = gnuradio3_8.unwrapped.override { volk = volk.override { enableModTool = false; @@ -23226,7 +23242,7 @@ in # A build without gui components and other utilites not needed if gnuradio is # used as a c++ library. gnuradio3_7Minimal = gnuradio3_7.override { - wrap = false; + doWrap = false; unwrapped = gnuradio3_7.unwrapped.override { volk = volk.override { enableModTool = false; @@ -24103,7 +24119,7 @@ in }; imagemagick6 = callPackage ../applications/graphics/ImageMagick/6.x.nix { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; ghostscript = null; }; @@ -25961,7 +25977,7 @@ in rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -26768,6 +26784,8 @@ in gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { }; + neovide = callPackage ../applications/editors/neovim/neovide { }; + neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { }; vis = callPackage ../applications/editors/vis { @@ -28934,7 +28952,9 @@ in bppsuite = callPackage ../applications/science/biology/bppsuite { }; - cd-hit = callPackage ../applications/science/biology/cd-hit { }; + cd-hit = callPackage ../applications/science/biology/cd-hit { + inherit (llvmPackages) openmp; + }; cmtk = callPackage ../applications/science/biology/cmtk { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index ac9d4ab524e..688d1607240 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -14,6 +14,21 @@ rec { # Standard Erlang versions, using the generic builder. + # R24 + erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix { + wxGTK = wxGTK30; + # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 + parallelBuild = true; + autoconf = buildPackages.autoconf269; + inherit wxSupport; + }; + erlangR24_odbc = erlangR24.override { odbcSupport = true; }; + erlangR24_javac = erlangR24.override { javacSupport = true; }; + erlangR24_odbc_javac = erlangR24.override { + javacSupport = true; + odbcSupport = true; + }; + # R23 erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { wxGTK = wxGTK30; @@ -126,6 +141,7 @@ rec { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; + erlangR24 = packagesWith interpreters.erlangR24; erlangR23 = packagesWith interpreters.erlangR23; erlangR22 = packagesWith interpreters.erlangR22; erlangR21 = packagesWith interpreters.erlangR21; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae318b1d3f9..7bcdf6190c8 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21787,6 +21787,8 @@ let url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz"; sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"; }; + # libbtparse.so: cannot open shared object file (aarch64 only) + patches = [ ../development/perl-modules/TextBibTeX-use-lib-on-aarch64.patch ]; perlPreHook = "export LD=$CC"; perlPostHook = lib.optionalString stdenv.isDarwin '' oldPath="$(pwd)/btparse/src/libbtparse.dylib" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7d9f32ab6f..bc88020a7f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -409,7 +409,11 @@ in { ansi2html = callPackage ../development/python-modules/ansi2html { }; - ansible = callPackage ../development/python-modules/ansible { }; + ansible = callPackage ../development/python-modules/ansible/legacy.nix { }; + + ansible-base = callPackage ../development/python-modules/ansible/base.nix { }; + + ansible-collections = callPackage ../development/python-modules/ansible/collections.nix { }; ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; @@ -1475,6 +1479,8 @@ in { colored = callPackage ../development/python-modules/colored { }; + colored-traceback = callPackage ../development/python-modules/colored-traceback { }; + coloredlogs = callPackage ../development/python-modules/coloredlogs { }; colorful = callPackage ../development/python-modules/colorful { }; @@ -2725,6 +2731,8 @@ in { glasgow = callPackage ../development/python-modules/glasgow { }; + glcontext = callPackage ../development/python-modules/glcontext { }; + glob2 = callPackage ../development/python-modules/glob2 { }; globre = callPackage ../development/python-modules/globre { }; @@ -3579,6 +3587,8 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + jxmlease = callPackage ../development/python-modules/jxmlease { }; + k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; @@ -5885,6 +5895,8 @@ in { pynest2d = callPackage ../development/python-modules/pynest2d { }; + pynetbox = callPackage ../development/python-modules/pynetbox { }; + pynetdicom = callPackage ../development/python-modules/pynetdicom { }; pynisher = callPackage ../development/python-modules/pynisher { }; @@ -6881,6 +6893,8 @@ in { pyx = callPackage ../development/python-modules/pyx { }; + pyxb = callPackage ../development/python-modules/pyxb { }; + pyxbe = callPackage ../development/python-modules/pyxbe { }; pyxdg = callPackage ../development/python-modules/pyxdg { }; @@ -8265,6 +8279,8 @@ in { trytond = callPackage ../development/python-modules/trytond { }; + ttp = callPackage ../development/python-modules/ttp { }; + tunigo = callPackage ../development/python-modules/tunigo { }; tubeup = callPackage ../development/python-modules/tubeup { }; @@ -8858,6 +8874,8 @@ in { yanc = callPackage ../development/python-modules/yanc { }; + yangson = callPackage ../development/python-modules/yangson { }; + yapf = callPackage ../development/python-modules/yapf { }; yappi = callPackage ../development/python-modules/yappi { };