diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index d4cab056c7..16e4baa966 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -31,6 +31,8 @@ Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `sha25 Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this case can be full the git commit id (SHA1 hash) or a tag name like `refs/tags/v1.0`. +Additionally the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout. + ## `fetchfossil` Used with Fossil. Expects `url` to a Fossil archive, `rev`, and `sha256`. @@ -49,6 +51,8 @@ A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are m `fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred. +`fetchFromGitHub` uses `fetchzip` to download the source archive generated by GitHub for the specified revision. If `leaveDotGit`, `deepClone` or `fetchSubmodules` are set to `true`, `fetchFromGitHub` will use `fetchgit` instead. Refer to its section for documentation of these options. + ## `fetchFromGitLab` This is used with GitLab repositories. The arguments expected are very similar to fetchFromGitHub above. diff --git a/third_party/nixpkgs/doc/manual.xml b/third_party/nixpkgs/doc/manual.xml index 8cecb01fc2..b0490ec74a 100644 --- a/third_party/nixpkgs/doc/manual.xml +++ b/third_party/nixpkgs/doc/manual.xml @@ -19,7 +19,7 @@ - + Builders diff --git a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md index d7a07a621b..ee090c8211 100644 --- a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md @@ -16,7 +16,7 @@ Nixpkgs follows the [conventions of GNU autoconf](https://gcc.gnu.org/onlinedocs In Nixpkgs, these three platforms are defined as attribute sets under the names `buildPlatform`, `hostPlatform`, and `targetPlatform`. They are always defined as attributes in the standard environment. That means one can access them like: ```nix -{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform... +{ stdenv, fooDep, barDep, ... }: ...stdenv.buildPlatform... ``` `buildPlatform` @@ -99,15 +99,26 @@ Some examples will make this table clearer. Suppose there's some package that is Some frequently encountered problems when packaging for cross-compilation should be answered here. Ideally, the information above is exhaustive, so this section cannot provide any new information, but it is ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem. Feel free to add to this list! +#### My package fails to find a binutils command (`cc`/`ar`/`ld` etc.) {#cross-qa-fails-to-find-binutils} +Many packages assume that an unprefixed binutils (`cc`/`ar`/`ld` etc.) is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefix. For instance, instead of `cc`, use `${stdenv.cc.targetPrefix}cc`. + +```nix +makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; +``` + +#### How do I avoid compiling a GCC cross-compiler from source? {#cross-qa-avoid-compiling-gcc-cross-compiler} +On less powerful machines, it can be inconvenient to cross-compile a package only to find out that GCC has to be compiled from source, which could take up to several hours. Nixpkgs maintains a limited [cross-related jobset on Hydra](https://hydra.nixos.org/jobset/nixpkgs/cross-trunk), which tests cross-compilation to various platforms from build platforms "x86\_64-darwin", "x86\_64-linux", and "aarch64-linux". See `pkgs/top-level/release-cross.nix` for the full list of target platforms and packages. For instance, the following invocation fetches the pre-built cross-compiled GCC for `armv6l-unknown-linux-gnueabihf` and builds GNU Hello from source. + +```ShellSession +$ nix-build '' -A pkgsCross.raspberryPi.hello +``` + #### What if my package's build system needs to build a C program to be run under the build environment? {#cross-qa-build-c-program-in-build-environment} Add the following to your `mkDerivation` invocation. ```nix depsBuildBuild = [ buildPackages.stdenv.cc ]; ``` -#### My package fails to find `ar`. {#cross-qa-fails-to-find-ar} -Many packages assume that an unprefixed `ar` is available, but Nix doesn't provide one. It only provides a prefixed one, just as it only does for all the other binutils programs. It may be necessary to patch the package to fix the build system to use a prefixed `ar`. - #### My package's testsuite needs to run host platform code. {#cross-testsuite-runs-host-code} Add the following to your `mkDerivation` invocation. diff --git a/third_party/nixpkgs/doc/stdenv/platform-notes.chapter.md b/third_party/nixpkgs/doc/stdenv/platform-notes.chapter.md new file mode 100644 index 0000000000..03e61e333f --- /dev/null +++ b/third_party/nixpkgs/doc/stdenv/platform-notes.chapter.md @@ -0,0 +1,62 @@ +# Platform Notes {#chap-platform-notes} + +## Darwin (macOS) {#sec-darwin} + +Some common issues when packaging software for Darwin: + +- The Darwin `stdenv` uses clang instead of gcc. When referring to the compiler `$CC` or `cc` will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like `makeFlags = [ "CC=cc" ];` or by patching the build scripts. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + buildPhase = '' + $CC -o hello hello.c + ''; + } + ``` + +- On Darwin, libraries are linked using absolute paths, libraries are resolved by their `install_name` at link time. Sometimes packages won’t set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running `install_name_tool -id` during the `fixupPhase`. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + makeFlags = lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; + } + ``` + +- Even if the libraries are linked using absolute paths and resolved via their `install_name` correctly, tests can sometimes fail to run binaries. This happens because the `checkPhase` runs before the libraries are installed. + + This can usually be solved by running the tests after the `installPhase` or alternatively by using `DYLD_LIBRARY_PATH`. More information about this variable can be found in the *dyld(1)* manpage. + + ``` + dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib + Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq + Reason: image not found + ./tests/jqtest: line 5: 75779 Abort trap: 6 + ``` + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + doInstallCheck = true; + installCheckTarget = "check"; + } + ``` + +- Some packages assume xcode is available and use `xcrun` to resolve build tools like `clang`, etc. This causes errors like `xcode-select: error: no developer tools were found at '/Applications/Xcode.app'` while the build doesn’t actually depend on xcode. + + ```nix + stdenv.mkDerivation { + name = "libfoo-1.2.3"; + # ... + prePatch = '' + substituteInPlace Makefile \ + --replace '/usr/bin/xcrun clang' clang + ''; + } + ``` + + The package `xcbuild` can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. diff --git a/third_party/nixpkgs/doc/stdenv/platform-notes.xml b/third_party/nixpkgs/doc/stdenv/platform-notes.xml deleted file mode 100644 index cc8efaece1..0000000000 --- a/third_party/nixpkgs/doc/stdenv/platform-notes.xml +++ /dev/null @@ -1,83 +0,0 @@ - - Platform Notes -
- Darwin (macOS) - - - Some common issues when packaging software for Darwin: - - - - - - The Darwin stdenv uses clang instead of gcc. When referring to the compiler $CC or cc will work in both cases. Some builds hardcode gcc/g++ in their build scripts, that can usually be fixed with using something like makeFlags = [ "CC=cc" ]; or by patching the build scripts. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - buildPhase = '' - $CC -o hello hello.c - ''; -} - - - - - On Darwin, libraries are linked using absolute paths, libraries are resolved by their install_name at link time. Sometimes packages won't set this correctly causing the library lookups to fail at runtime. This can be fixed by adding extra linker flags or by running install_name_tool -id during the fixupPhase. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - makeFlags = lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib"; -} - - - - - Even if the libraries are linked using absolute paths and resolved via their install_name correctly, tests can sometimes fail to run binaries. This happens because the checkPhase runs before the libraries are installed. - - - This can usually be solved by running the tests after the installPhase or alternatively by using DYLD_LIBRARY_PATH. More information about this variable can be found in the - dyld - 1 manpage. - - -dyld: Library not loaded: /nix/store/7hnmbscpayxzxrixrgxvvlifzlxdsdir-jq-1.5-lib/lib/libjq.1.dylib -Referenced from: /private/tmp/nix-build-jq-1.5.drv-0/jq-1.5/tests/../jq -Reason: image not found -./tests/jqtest: line 5: 75779 Abort trap: 6 - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - doInstallCheck = true; - installCheckTarget = "check"; -} - - - - - Some packages assume xcode is available and use xcrun to resolve build tools like clang, etc. This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app' while the build doesn't actually depend on xcode. - - -stdenv.mkDerivation { - name = "libfoo-1.2.3"; - # ... - prePatch = '' - substituteInPlace Makefile \ - --replace '/usr/bin/xcrun clang' clang - ''; -} - - - The package xcbuild can be used to build projects that really depend on Xcode. However, this replacement is not 100% compatible with Xcode and can occasionally cause issues. - - - -
-
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 747ce84754..9518b1c44b 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -82,6 +82,12 @@ githubId = 882455; name = "Elliot Cameron"; }; + _414owen = { + email = "owen@owen.cafe"; + github = "414owen"; + githubId = 1714287; + name = "Owen Shepherd"; + }; _6AA4FD = { email = "f6442954@gmail.com"; github = "6AA4FD"; @@ -1597,12 +1603,6 @@ githubId = 89596; name = "Florian Friesdorf"; }; - charvp = { - email = "nixpkgs@cvpetegem.be"; - github = "charvp"; - githubId = 42220376; - name = "Charlotte Van Petegem"; - }; chattered = { email = "me@philscotted.com"; name = "Phil Scott"; @@ -1711,6 +1711,12 @@ githubId = 2245737; name = "Christopher Mark Poole"; }; + chvp = { + email = "nixpkgs@cvpetegem.be"; + github = "chvp"; + githubId = 42220376; + name = "Charlotte Van Petegem"; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; @@ -3291,6 +3297,12 @@ githubId = 10528737; name = "Severin Fürbringer"; }; + fufexan = { + email = "fufexan@protonmail.com"; + github = "fufexan"; + githubId = 36706276; + name = "Fufezan Mihai"; + }; funfunctor = { email = "eocallaghan@alterapraxis.com"; name = "Edward O'Callaghan"; @@ -5890,6 +5902,12 @@ githubId = 22836301; name = "Mateusz Mazur"; }; + mbaeten = { + email = "mbaeten@users.noreply.github.com"; + github = "mbaeten"; + githubId = 2649304; + name = "M. Baeten"; + }; mbakke = { email = "mbakke@fastmail.com"; github = "mbakke"; @@ -8319,6 +8337,12 @@ githubId = 2320433; name = "Sam Boosalis"; }; + sbruder = { + email = "nixos@sbruder.de"; + github = "sbruder"; + githubId = 15986681; + name = "Simon Bruder"; + }; scalavision = { email = "scalavision@gmail.com"; github = "scalavision"; @@ -8878,7 +8902,7 @@ name = "Guillaume Loetscher"; }; sternenseemann = { - email = "post@lukasepple.de"; + email = "sternenseemann@systemli.org"; github = "sternenseemann"; githubId = 3154475; name = "Lukas Epple"; @@ -9324,7 +9348,7 @@ name = "Jan Beinke"; }; thesola10 = { - email = "thesola10@bobile.fr"; + email = "me@thesola.io"; github = "thesola10"; githubId = 7287268; keys = [{ diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/networking.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/networking.xml index 02cf811e0b..8369e9c9c8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/networking.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/networking.xml @@ -15,5 +15,6 @@ + diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml index 04fa1643d0..9c70cf3520 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/profiles/clone-config.xml @@ -16,6 +16,6 @@ On images where the installation media also becomes an installation target, copying over configuration.nix should be disabled by setting installer.cloneConfig to false. - For example, this is done in sd-image-aarch64.nix. + For example, this is done in sd-image-aarch64-installer.nix. diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml new file mode 100644 index 0000000000..d760bb3a4d --- /dev/null +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/renaming-interfaces.xml @@ -0,0 +1,67 @@ +
+ Renaming network interfaces + + + NixOS uses the udev + predictable naming scheme + to assign names to network interfaces. This means that by default + cards are not given the traditional names like + eth0 or eth1, whose order can + change unpredictably across reboots. Instead, relying on physical + locations and firmware information, the scheme produces names like + ens1, enp2s0, etc. + + + + These names are predictable but less memorable and not necessarily + stable: for example installing new hardware or changing firmware + settings can result in a + name change. + If this is undesirable, for example if you have a single ethernet + card, you can revert to the traditional scheme by setting + to + false. + + +
+ Assigning custom names + + In case there are multiple interfaces of the same type, it’s better to + assign custom names based on the device hardware address. For + example, we assign the name wan to the interface + with MAC address 52:54:00:12:01:01 using a + netword link unit: + + + systemd.network.links."10-wan" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "wan"; + }; + + + Note that links are directly read by udev, not networkd, + and will work even if networkd is disabled. + + + Alternatively, we can use a plain old udev rule: + + + services.udev.initrdRules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", \ + ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="wan" + ''; + + + + The rule must be installed in the initrd using + services.udev.initrdRules, not the usual + services.udev.extraRules option. This is to avoid race + conditions with other programs controlling the interface. + +
+ +
diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml index 4957b70094..019e5098a8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing-virtualbox-guest.xml @@ -83,17 +83,12 @@ VirtualBox settings (Machine / Settings / Shared Folders, then click on the "Add" icon). Add the following to the /etc/nixos/configuration.nix to auto-mount them. If you do - not add "nofail", the system will not boot properly. The - same goes for disabling rngd which is normally used to get - randomness but this does not work in virtual machines. + not add "nofail", the system will not boot properly. { config, pkgs, ...} : { - security.rngd.enable = false; // otherwise vm will not boot - ... - fileSystems."/virtualboxshare" = { fsType = "vboxsf"; device = "nameofthesharedfolder"; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index 6dd14d6051..ca4b468e35 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -91,6 +91,21 @@ + + + If you are using to assign + custom names to network interfaces, this may stop working due to a change + in the initialisation of dhcpcd and systemd networkd. To avoid this, either + move them to or see the new + Assigning custom names section + of the NixOS manual for an example using networkd links. + + + + + The systemConfig kernel parameter is no longer added to boot loader entries. It has been unused since September 2010, but if do have a system generation from that era, you will now be unable to boot into them. + + systemd-journal2gelf no longer parses json and expects the receiving system to handle it. How to achieve this with Graylog is described in this GitHub issue. @@ -494,6 +509,15 @@ self: super: services.flashpolicyd module. + + + The security.rngd module has been removed. + It was disabled by default in 20.09 as it was functionally redundant + with krngd in the linux kernel. It is not necessary for any device that the kernel recognises + as an hardware RNG, as it will automatically run the krngd task to periodically collect random + data from the device and mix it into the kernel's RNG. + + diff --git a/third_party/nixpkgs/nixos/modules/config/swap.nix b/third_party/nixpkgs/nixos/modules/config/swap.nix index 4bb66e9b51..59bc9e9d11 100644 --- a/third_party/nixpkgs/nixos/modules/config/swap.nix +++ b/third_party/nixpkgs/nixos/modules/config/swap.nix @@ -185,8 +185,6 @@ in { description = "Initialisation of swap device ${sw.device}"; wantedBy = [ "${realDevice'}.swap" ]; before = [ "${realDevice'}.swap" ]; - # If swap is encrypted, depending on rngd resolves a possible entropy starvation during boot - after = mkIf (config.security.rngd.enable && sw.randomEncryption.enable) [ "rngd.service" ]; path = [ pkgs.util-linux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup; script = diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix index 2882fbcc73..a669d61571 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix @@ -1,7 +1,14 @@ -{ pkgs, ... }: - +{ config, ... }: { - imports = [ ./sd-image-aarch64.nix ]; - - boot.kernelPackages = pkgs.linuxPackages_latest; + imports = [ + ../sd-card/sd-image-aarch64-new-kernel-installer.nix + ]; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-aarch64-new-kernel.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-aarch64-new-kernel-installer.nix, instead. + '' + ]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index e4ec2d6240..76c1509b8f 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -1,80 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix + ../sd-card/sd-image-aarch64-installer.nix ]; - - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; - - boot.consoleLogLevel = lib.mkDefault 7; - - # The serial ports listed here are: - # - ttyS0: for Tegra (Jetson TX1) - # - ttyAMA0: for QEMU's -machine virt - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"]; - - boot.initrd.availableKernelModules = [ - # Allows early (earlier) modesetting for the Raspberry Pi - "vc4" "bcm2835_dma" "i2c_bcm2835" - # Allows early (earlier) modesetting for Allwinner SoCs - "sun4i_drm" "sun8i_drm_hdmi" "sun8i_mixer" - ]; - - sdImage = { - populateFirmwareCommands = let - configTxt = pkgs.writeText "config.txt" '' - [pi3] - kernel=u-boot-rpi3.bin - - [pi4] - kernel=u-boot-rpi4.bin - enable_gic=1 - armstub=armstub8-gic.bin - - # Otherwise the resolution will be weird in most cases, compared to - # what the pi3 firmware does by default. - disable_overscan=1 - - [all] - # Boot in 64-bit mode. - arm_64bit=1 - - # U-Boot needs this to work, regardless of whether UART is actually used or not. - # Look in arch/arm/mach-bcm283x/Kconfig in the U-Boot tree to see if this is still - # a requirement in the future. - enable_uart=1 - - # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel - # when attempting to show low-voltage or overtemperature warnings. - avoid_warnings=1 - ''; - in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) - - # Add the config - cp ${configTxt} firmware/config.txt - - # Add pi3 specific files - cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin - - # Add pi4 specific files - cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin - cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin - cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/ - ''; - populateRootCommands = '' - mkdir -p ./files/boot - ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot - ''; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-aarch64.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-aarch64-installer.nix, instead. + '' + ]; }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index d2ba611532..6ee0eb9e9b 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -1,57 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix + ../sd-card/sd-image-armv7l-multiplatform-installer.nix ]; - - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; - - boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_latest; - # The serial ports listed here are: - # - ttyS0: for Tegra (Jetson TK1) - # - ttymxc0: for i.MX6 (Wandboard) - # - ttyAMA0: for Allwinner (pcDuino3 Nano) and QEMU's -machine virt - # - ttyO0: for OMAP (BeagleBone Black) - # - ttySAC2: for Exynos (ODROID-XU3) - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; - - sdImage = { - populateFirmwareCommands = let - configTxt = pkgs.writeText "config.txt" '' - # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel - # when attempting to show low-voltage or overtemperature warnings. - avoid_warnings=1 - - [pi2] - kernel=u-boot-rpi2.bin - - [pi3] - kernel=u-boot-rpi3.bin - - # U-Boot used to need this to work, regardless of whether UART is actually used or not. - # TODO: check when/if this can be removed. - enable_uart=1 - ''; - in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) - cp ${pkgs.ubootRaspberryPi2}/u-boot.bin firmware/u-boot-rpi2.bin - cp ${pkgs.ubootRaspberryPi3_32bit}/u-boot.bin firmware/u-boot-rpi3.bin - cp ${configTxt} firmware/config.txt - ''; - populateRootCommands = '' - mkdir -p ./files/boot - ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot - ''; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-armv7l-multiplatform.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-armv7l-multiplatform-installer.nix, instead. + '' + ]; }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index 40a01f9617..747440ba9c 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -1,46 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { imports = [ - ../../profiles/base.nix - ../../profiles/installation-device.nix - ./sd-image.nix + ../sd-card/sd-image-raspberrypi-installer.nix ]; - - boot.loader.grub.enable = false; - boot.loader.generic-extlinux-compatible.enable = true; - - boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_rpi1; - - sdImage = { - populateFirmwareCommands = let - configTxt = pkgs.writeText "config.txt" '' - # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel - # when attempting to show low-voltage or overtemperature warnings. - avoid_warnings=1 - - [pi0] - kernel=u-boot-rpi0.bin - - [pi1] - kernel=u-boot-rpi1.bin - ''; - in '' - (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) - cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin firmware/u-boot-rpi0.bin - cp ${pkgs.ubootRaspberryPi}/u-boot.bin firmware/u-boot-rpi1.bin - cp ${configTxt} firmware/config.txt - ''; - populateRootCommands = '' - mkdir -p ./files/boot - ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot - ''; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-raspberrypi.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-raspberrypi-installer.nix, instead. + '' + ]; }; - - # the installation media is also the installation target, - # so we don't want to provide the installation configuration.nix. - installer.cloneConfig = false; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index 5bdec7de86..79db1fa29b 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -1,8 +1,14 @@ -# To build, use: -# nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix -A config.system.build.sdImage -{ config, lib, pkgs, ... }: - +{ config, ... }: { - imports = [ ./sd-image-aarch64.nix ]; - boot.kernelPackages = pkgs.linuxPackages_rpi4; + imports = [ + ../sd-card/sd-image-raspberrypi4-installer.nix + ]; + config = { + warnings = [ + '' + .../cd-dvd/sd-image-raspberrypi4.nix is deprecated and will eventually be removed. + Please switch to .../sd-card/sd-image-raspberrypi4-installer.nix, instead. + '' + ]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix index b811ae07eb..e2d6dcb3fe 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/sd-image.nix @@ -1,245 +1,14 @@ -# This module creates a bootable SD card image containing the given NixOS -# configuration. The generated image is MBR partitioned, with a FAT -# /boot/firmware partition, and ext4 root partition. The generated image -# is sized to fit its contents, and a boot script automatically resizes -# the root partition to fit the device on the first boot. -# -# The firmware partition is built with expectation to hold the Raspberry -# Pi firmware and bootloader, and be removed and replaced with a firmware -# build for the target SoC for other board families. -# -# The derivation for the SD image will be placed in -# config.system.build.sdImage - -{ config, lib, pkgs, ... }: - -with lib; - -let - rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({ - inherit (config.sdImage) storePaths; - compressImage = true; - populateImageCommands = config.sdImage.populateRootCommands; - volumeLabel = "NIXOS_SD"; - } // optionalAttrs (config.sdImage.rootPartitionUUID != null) { - uuid = config.sdImage.rootPartitionUUID; - }); -in +{ config, ... }: { imports = [ - (mkRemovedOptionModule [ "sdImage" "bootPartitionID" ] "The FAT partition for SD image now only holds the Raspberry Pi firmware files. Use firmwarePartitionID to configure that partition's ID.") - (mkRemovedOptionModule [ "sdImage" "bootSize" ] "The boot files for SD image have been moved to the main ext4 partition. The FAT partition now only holds the Raspberry Pi firmware files. Changing its size may not be required.") + ../sd-card/sd-image.nix ]; - - options.sdImage = { - imageName = mkOption { - default = "${config.sdImage.imageBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.img"; - description = '' - Name of the generated image file. - ''; - }; - - imageBaseName = mkOption { - default = "nixos-sd-image"; - description = '' - Prefix of the name of the generated image file. - ''; - }; - - storePaths = mkOption { - type = with types; listOf package; - example = literalExample "[ pkgs.stdenv ]"; - description = '' - Derivations to be included in the Nix store in the generated SD image. - ''; - }; - - firmwarePartitionID = mkOption { - type = types.str; - default = "0x2178694e"; - description = '' - Volume ID for the /boot/firmware partition on the SD card. This value - must be a 32-bit hexadecimal number. - ''; - }; - - firmwarePartitionName = mkOption { - type = types.str; - default = "FIRMWARE"; - description = '' - Name of the filesystem which holds the boot firmware. - ''; - }; - - rootPartitionUUID = mkOption { - type = types.nullOr types.str; - default = null; - example = "14e19a7b-0ae0-484d-9d54-43bd6fdc20c7"; - description = '' - UUID for the filesystem on the main NixOS partition on the SD card. - ''; - }; - - firmwareSize = mkOption { - type = types.int; - # As of 2019-08-18 the Raspberry pi firmware + u-boot takes ~18MiB - default = 30; - description = '' - Size of the /boot/firmware partition, in megabytes. - ''; - }; - - populateFirmwareCommands = mkOption { - example = literalExample "'' cp \${pkgs.myBootLoader}/u-boot.bin firmware/ ''"; - description = '' - Shell commands to populate the ./firmware directory. - All files in that directory are copied to the - /boot/firmware partition on the SD image. - ''; - }; - - populateRootCommands = mkOption { - example = literalExample "''\${config.boot.loader.generic-extlinux-compatible.populateCmd} -c \${config.system.build.toplevel} -d ./files/boot''"; - description = '' - Shell commands to populate the ./files directory. - All files in that directory are copied to the - root (/) partition on the SD image. Use this to - populate the ./files/boot (/boot) directory. - ''; - }; - - postBuildCommands = mkOption { - example = literalExample "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''"; - default = ""; - description = '' - Shell commands to run after the image is built. - Can be used for boards requiring to dd u-boot SPL before actual partitions. - ''; - }; - - compressImage = mkOption { - type = types.bool; - default = true; - description = '' - Whether the SD image should be compressed using - zstd. - ''; - }; - - }; - config = { - fileSystems = { - "/boot/firmware" = { - device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}"; - fsType = "vfat"; - # Alternatively, this could be removed from the configuration. - # The filesystem is not needed at runtime, it could be treated - # as an opaque blob instead of a discrete FAT32 filesystem. - options = [ "nofail" "noauto" ]; - }; - "/" = { - device = "/dev/disk/by-label/NIXOS_SD"; - fsType = "ext4"; - }; - }; - - sdImage.storePaths = [ config.system.build.toplevel ]; - - system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, - mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation { - name = config.sdImage.imageName; - - nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ]; - - inherit (config.sdImage) compressImage; - - buildCommand = '' - mkdir -p $out/nix-support $out/sd-image - export img=$out/sd-image/${config.sdImage.imageName} - - echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system - if test -n "$compressImage"; then - echo "file sd-image $img.zst" >> $out/nix-support/hydra-build-products - else - echo "file sd-image $img" >> $out/nix-support/hydra-build-products - fi - - echo "Decompressing rootfs image" - zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img - - # Gap in front of the first partition, in MiB - gap=8 - - # Create the image file sized to fit /boot/firmware and /, plus slack for the gap. - rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }') - firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512)) - imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024)) - truncate -s $imageSize $img - - # type=b is 'W95 FAT32', type=83 is 'Linux'. - # The "bootable" partition is where u-boot will look file for the bootloader - # information (dtbs, extlinux.conf file). - sfdisk $img <zstd. + ''; + }; + + }; + + config = { + fileSystems = { + "/boot/firmware" = { + device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}"; + fsType = "vfat"; + # Alternatively, this could be removed from the configuration. + # The filesystem is not needed at runtime, it could be treated + # as an opaque blob instead of a discrete FAT32 filesystem. + options = [ "nofail" "noauto" ]; + }; + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + }; + }; + + sdImage.storePaths = [ config.system.build.toplevel ]; + + system.build.sdImage = pkgs.callPackage ({ stdenv, dosfstools, e2fsprogs, + mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation { + name = config.sdImage.imageName; + + nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ]; + + inherit (config.sdImage) compressImage; + + buildCommand = '' + mkdir -p $out/nix-support $out/sd-image + export img=$out/sd-image/${config.sdImage.imageName} + + echo "${pkgs.stdenv.buildPlatform.system}" > $out/nix-support/system + if test -n "$compressImage"; then + echo "file sd-image $img.zst" >> $out/nix-support/hydra-build-products + else + echo "file sd-image $img" >> $out/nix-support/hydra-build-products + fi + + echo "Decompressing rootfs image" + zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img + + # Gap in front of the first partition, in MiB + gap=8 + + # Create the image file sized to fit /boot/firmware and /, plus slack for the gap. + rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }') + firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512)) + imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024)) + truncate -s $imageSize $img + + # type=b is 'W95 FAT32', type=83 is 'Linux'. + # The "bootable" partition is where u-boot will look file for the bootloader + # information (dtbs, extlinux.conf file). + sfdisk $img <udev rules to include in the initrd + only. They'll be written into file + 99-local.rules. Thus they are read and applied + after the essential initrd rules. + ''; + }; + + extraRules = mkOption { + default = ""; + example = '' + ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="0825", ENV{PULSE_IGNORE}="1" + ''; + type = types.lines; description = '' Additional udev rules. They'll be written into file 99-local.rules. Thus they are @@ -284,6 +298,13 @@ in boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ]; + boot.initrd.extraUdevRulesCommands = optionalString (cfg.initrdRules != "") + '' + cat <<'EOF' > $out/99-local.rules + ${cfg.initrdRules} + EOF + ''; + environment.etc = { "udev/rules.d".source = udevRules; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etesync-dav.nix b/third_party/nixpkgs/nixos/modules/services/misc/etesync-dav.nix new file mode 100644 index 0000000000..9d7cfda371 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/etesync-dav.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.etesync-dav; +in + { + options.services.etesync-dav = { + enable = mkEnableOption "etesync-dav"; + + host = mkOption { + type = types.str; + default = "localhost"; + description = "The server host address."; + }; + + port = mkOption { + type = types.port; + default = 37358; + description = "The server host port."; + }; + + apiUrl = mkOption { + type = types.str; + default = "https://api.etesync.com/"; + description = "The url to the etesync API."; + }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified port."; + }; + + sslCertificate = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/etesync.crt"; + description = '' + Path to server SSL certificate. It will be copied into + etesync-dav's data directory. + ''; + }; + + sslCertificateKey = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/etesync.key"; + description = '' + Path to server SSL certificate key. It will be copied into + etesync-dav's data directory. + ''; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + systemd.services.etesync-dav = { + description = "etesync-dav - A CalDAV and CardDAV adapter for EteSync"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.etesync-dav ]; + environment = { + ETESYNC_LISTEN_ADDRESS = cfg.host; + ETESYNC_LISTEN_PORT = toString cfg.port; + ETESYNC_URL = cfg.apiUrl; + ETESYNC_DATA_DIR = "/var/lib/etesync-dav"; + }; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + StateDirectory = "etesync-dav"; + ExecStart = "${pkgs.etesync-dav}/bin/etesync-dav"; + ExecStartPre = mkIf (cfg.sslCertificate != null || cfg.sslCertificateKey != null) ( + pkgs.writers.writeBash "etesync-dav-copy-keys" '' + ${optionalString (cfg.sslCertificate != null) '' + cp ${toString cfg.sslCertificate} $STATE_DIRECTORY/etesync.crt + ''} + ${optionalString (cfg.sslCertificateKey != null) '' + cp ${toString cfg.sslCertificateKey} $STATE_DIRECTORY/etesync.key + ''} + '' + ); + Restart = "on-failure"; + RestartSec = "30min 1s"; + }; + }; + }; + } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index d10bffd914..31e4b6ad29 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -191,9 +191,8 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ] ++ optional (!hasDefaultGatewaySet) "network-online.target"; - wants = [ "network.target" "systemd-udev-settle.service" ]; + wants = [ "network.target" ]; before = [ "network-online.target" ]; - after = [ "systemd-udev-settle.service" ]; restartTriggers = [ exitHook ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index afc2a6d1c7..72965c267a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -113,7 +113,6 @@ in "~@memlock" "~@resources" "~@setuid" - "~@sync" "~@timer" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix index dc37f9bee4..4fe720bf04 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix @@ -82,11 +82,8 @@ in { X-RestartIfChanged=false ''; - systemd.units."autovt@.service".unit = pkgs.runCommand "unit" { preferLocalBuild = true; } - '' - mkdir -p $out - ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service - ''; + systemd.suppressedSystemUnits = [ "autovt@.service" ]; + systemd.units."kmsconvt@.service".aliases = [ "autovt@.service" ]; systemd.services.systemd-vconsole-setup.enable = false; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 304712d0ef..62906d5e6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -44,7 +44,7 @@ in ''; description = '' Configuration for Miniflux, refer to - + for documentation on the supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index e3c5adb973..f79eb64b5a 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -183,14 +183,20 @@ in "systemd-udev-settle.service" ]; systemd.services.display-manager.conflicts = [ - "getty@tty${gdm.initialVT}.service" - # TODO: Add "plymouth-quit.service" so GDM can control when plymouth quits. - # Currently this breaks switching configurations while using plymouth. + "getty@tty${gdm.initialVT}.service" + "plymouth-quit.service" ]; systemd.services.display-manager.onFailure = [ "plymouth-quit.service" ]; + # Prevent nixos-rebuild switch from bringing down the graphical + # session. (If multi-user.target wants plymouth-quit.service which + # conflicts display-manager.service, then when nixos-rebuild + # switch starts multi-user.target, display-manager.service is + # stopped so plymouth-quit.service can be started.) + systemd.services.plymouth-quit.wantedBy = lib.mkForce []; + systemd.services.display-manager.serviceConfig = { # Restart = "always"; - already defined in xserver.nix KillMode = "mixed"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 854684b87f..5ffffb95ed 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -109,7 +109,7 @@ addEntry() { exit 1 fi fi - echo " APPEND systemConfig=$path init=$path/init $extraParams" + echo " APPEND init=$path/init $extraParams" } tmpFile="$target/extlinux/extlinux.conf.tmp.$$" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl index 6e354f013f..e016765474 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -102,10 +102,10 @@ if (stat($bootPath)->dev != stat("/nix/store")->dev) { # Discover information about the location of the bootPath struct(Fs => { - device => '$', - type => '$', - mount => '$', -}); + device => '$', + type => '$', + mount => '$', + }); sub PathInMount { my ($path, $mount) = @_; my @splitMount = split /\//, $mount; @@ -154,16 +154,16 @@ sub GetFs { return $bestFs; } struct (Grub => { - path => '$', - search => '$', -}); + path => '$', + search => '$', + }); my $driveid = 1; sub GrubFs { my ($dir) = @_; my $fs = GetFs($dir); my $path = substr($dir, length($fs->mount)); if (substr($path, 0, 1) ne "/") { - $path = "/$path"; + $path = "/$path"; } my $search = ""; @@ -251,8 +251,8 @@ my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; if ($grubVersion == 1) { $conf .= " - default $defaultEntry - timeout $timeout + default $defaultEntry + timeout $timeout "; if ($splashImage) { copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath: $!\n"; @@ -302,51 +302,51 @@ else { if ($copyKernels == 0) { $conf .= " - " . $grubStore->search; + " . $grubStore->search; } # FIXME: should use grub-mkconfig. $conf .= " - " . $grubBoot->search . " - if [ -s \$prefix/grubenv ]; then - load_env - fi + " . $grubBoot->search . " + if [ -s \$prefix/grubenv ]; then + load_env + fi - # ‘grub-reboot’ sets a one-time saved entry, which we process here and - # then delete. - if [ \"\${next_entry}\" ]; then - set default=\"\${next_entry}\" - set next_entry= - save_env next_entry - set timeout=1 - else - set default=$defaultEntry - set timeout=$timeout - fi + # ‘grub-reboot’ sets a one-time saved entry, which we process here and + # then delete. + if [ \"\${next_entry}\" ]; then + set default=\"\${next_entry}\" + set next_entry= + save_env next_entry + set timeout=1 + else + set default=$defaultEntry + set timeout=$timeout + fi - # Setup the graphics stack for bios and efi systems - if [ \"\${grub_platform}\" = \"efi\" ]; then - insmod efi_gop - insmod efi_uga - else - insmod vbe - fi + # Setup the graphics stack for bios and efi systems + if [ \"\${grub_platform}\" = \"efi\" ]; then + insmod efi_gop + insmod efi_uga + else + insmod vbe + fi "; if ($font) { copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath: $!\n"; $conf .= " - insmod font - if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then - insmod gfxterm - if [ \"\${grub_platform}\" = \"efi\" ]; then - set gfxmode=$gfxmodeEfi - set gfxpayload=$gfxpayloadEfi - else - set gfxmode=$gfxmodeBios - set gfxpayload=$gfxpayloadBios - fi - terminal_output gfxterm - fi + insmod font + if loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/converted-font.pf2; then + insmod gfxterm + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=$gfxpayloadEfi + else + set gfxmode=$gfxmodeBios + set gfxpayload=$gfxpayloadBios + fi + terminal_output gfxterm + fi "; } if ($splashImage) { @@ -363,14 +363,14 @@ else { } copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " - insmod " . substr($suffix, 1) . " - if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then - set color_normal=white/black - set color_highlight=black/white - else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue - fi + insmod " . substr($suffix, 1) . " + if background_image --mode '$splashMode' " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/background$suffix; then + set color_normal=white/black + set color_highlight=black/white + else + set menu_color_normal=cyan/blue + set menu_color_highlight=white/blue + fi "; } @@ -380,21 +380,21 @@ else { # Copy theme rcopy($theme, "$bootPath/theme") or die "cannot copy $theme to $bootPath\n"; $conf .= " - # Sets theme. - set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt - export theme - # Load theme fonts, if any - "; + # Sets theme. + set theme=" . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/theme.txt + export theme + # Load theme fonts, if any + "; - find( { wanted => sub { - if ($_ =~ /\.pf2$/i) { - $font = File::Spec->abs2rel($File::Find::name, $theme); - $conf .= " - loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font - "; - } - }, no_chdir => 1 }, $theme ); - } + find( { wanted => sub { + if ($_ =~ /\.pf2$/i) { + $font = File::Spec->abs2rel($File::Find::name, $theme); + $conf .= " + loadfont " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/theme/$font + "; + } + }, no_chdir => 1 }, $theme ); + } } $conf .= "$extraConfig\n"; @@ -433,25 +433,25 @@ sub addEntry { # Include second initrd with secrets if (-e -x "$path/append-initrd-secrets") { - my $initrdName = basename($initrd); - my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; + my $initrdName = basename($initrd); + my $initrdSecretsPath = "$bootPath/kernels/$initrdName-secrets"; - mkpath(dirname($initrdSecretsPath), 0, 0755); - my $oldUmask = umask; - # Make sure initrd is not world readable (won't work if /boot is FAT) - umask 0137; - my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); - system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; - # Check whether any secrets were actually added - if (-e $initrdSecretsPathTemp && ! -z _) { - rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; - $copied{$initrdSecretsPath} = 1; - $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; - } else { - unlink $initrdSecretsPathTemp; - rmdir dirname($initrdSecretsPathTemp); - } - umask $oldUmask; + mkpath(dirname($initrdSecretsPath), 0, 0755); + my $oldUmask = umask; + # Make sure initrd is not world readable (won't work if /boot is FAT) + umask 0137; + my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX"); + system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets: $!\n"; + # Check whether any secrets were actually added + if (-e $initrdSecretsPathTemp && ! -z _) { + rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place: $!\n"; + $copied{$initrdSecretsPath} = 1; + $initrd .= " " . ($grubBoot->path eq "/" ? "" : $grubBoot->path) . "/kernels/$initrdName-secrets"; + } else { + unlink $initrdSecretsPathTemp; + rmdir dirname($initrdSecretsPathTemp); + } + umask $oldUmask; } my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef; @@ -459,9 +459,8 @@ sub addEntry { # FIXME: $confName my $kernelParams = - "systemConfig=" . Cwd::abs_path($path) . " " . - "init=" . Cwd::abs_path("$path/init") . " " . - readFile("$path/kernel-params"); + "init=" . Cwd::abs_path("$path/init") . " " . + readFile("$path/kernel-params"); my $xenParams = $xen && -e "$path/xen-params" ? readFile("$path/xen-params") : ""; if ($grubVersion == 1) { @@ -503,9 +502,9 @@ foreach my $link (@links) { my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); if ($cfgName) { $entryName = $cfgName; @@ -530,8 +529,8 @@ sub addProfile { sub nrFromGen { my ($x) = @_; $x =~ /\/\w+-(\d+)-link/; return $1; } my @links = sort - { nrFromGen($b) <=> nrFromGen($a) } - (glob "$profile-*-link"); + { nrFromGen($b) <=> nrFromGen($a) } + (glob "$profile-*-link"); my $curEntry = 0; foreach my $link (@links) { @@ -542,9 +541,9 @@ sub addProfile { } my $date = strftime("%F", localtime(lstat($link)->mtime)); my $version = - -e "$link/nixos-version" - ? readFile("$link/nixos-version") - : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); + -e "$link/nixos-version" + ? readFile("$link/nixos-version") + : basename((glob(dirname(Cwd::abs_path("$link/kernel")) . "/lib/modules/*"))[0]); addEntry("NixOS - Configuration " . nrFromGen($link) . " ($date - $version)", $link); } @@ -566,7 +565,7 @@ $extraPrepareConfig =~ s/\@bootPath\@/$bootPath/g; # Run extraPrepareConfig in sh if ($extraPrepareConfig ne "") { - system((get("shell"), "-c", $extraPrepareConfig)); + system((get("shell"), "-c", $extraPrepareConfig)); } # write the GRUB config. @@ -627,13 +626,13 @@ foreach my $fn (glob "$bootPath/kernels/*") { # struct(GrubState => { - name => '$', - version => '$', - efi => '$', - devices => '$', - efiMountPoint => '$', - extraGrubInstallArgs => '@', -}); + name => '$', + version => '$', + efi => '$', + devices => '$', + efiMountPoint => '$', + extraGrubInstallArgs => '@', + }); # If you add something to the state file, only add it to the end # because it is read line-by-line. sub readGrubState { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh index 2a1ec479fe..bd3fc64999 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script-builder.sh @@ -49,7 +49,6 @@ addEntry() { echo "#!/bin/sh" echo "# $name" echo "# created by init-script-builder.sh" - echo "export systemConfig=$(readlink -f $path)" echo "exec $stage2" )" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 97e824fe62..6bee900c68 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -101,7 +101,7 @@ def write_entry(profile, generation, machine_id): entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) generation_dir = os.readlink(system_dir(profile, generation)) tmp_path = "%s.tmp" % (entry_file) - kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) + kernel_params = "init=%s/init " % generation_dir with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index 3b01bc00ba..914d3e62eb 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -1553,9 +1553,6 @@ in wantedBy = [ "multi-user.target" ]; aliases = [ "dbus-org.freedesktop.network1.service" ]; restartTriggers = map (x: x.source) (attrValues unitFiles); - # prevent race condition with interface renaming (#39069) - requires = [ "systemd-udev-settle.service" ]; - after = [ "systemd-udev-settle.service" ]; }; systemd.services.systemd-networkd-wait-online = { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix index 662576888f..ef91689994 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix @@ -38,6 +38,14 @@ in enable = mkEnableOption "Plymouth boot splash screen"; + font = mkOption { + default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; + type = types.path; + description = '' + Font file made available for displaying text on the splash screen. + ''; + }; + themePackages = mkOption { default = [ nixosBreezePlymouth ]; type = types.listOf types.package; @@ -113,7 +121,7 @@ in mkdir -p $out/lib/plymouth/renderers # module might come from a theme - cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth + cp ${themesEnv}/lib/plymouth/{text,details,label,$moduleName}.so $out/lib/plymouth cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers mkdir -p $out/share/plymouth/themes @@ -133,6 +141,17 @@ in cp -r themes/* $out/share/plymouth/themes cp ${cfg.logo} $out/share/plymouth/logo.png + + mkdir -p $out/share/fonts + cp ${cfg.font} $out/share/fonts + mkdir -p $out/etc/fonts + cat > $out/etc/fonts/fonts.conf < + + + $out/share/fonts + + EOF ''; boot.initrd.extraUtilsCommandsTest = '' @@ -154,6 +173,7 @@ in ln -s $extraUtils/share/plymouth/logo.png /etc/plymouth/logo.png ln -s $extraUtils/share/plymouth/themes /etc/plymouth/themes ln -s $extraUtils/lib/plymouth /etc/plymouth/plugins + ln -s $extraUtils/etc/fonts /etc/fonts plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session plymouth show-splash diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index 44287f3cf0..4074f2e023 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -205,13 +205,22 @@ let ''; # */ + # Networkd link files are used early by udev to set up interfaces early. + # This must be done in stage 1 to avoid race conditions between udev and + # network daemons. linkUnits = pkgs.runCommand "link-units" { allowedReferences = [ extraUtils ]; preferLocalBuild = true; - } '' + } ('' mkdir -p $out cp -v ${udev}/lib/systemd/network/*.link $out/ - ''; + '' + ( + let + links = filterAttrs (n: v: hasSuffix ".link" n) config.systemd.network.units; + files = mapAttrsToList (n: v: "${v.unit}/${n}") links; + in + concatMapStringsSep "\n" (file: "cp -v ${file} $out/") files + )); udevRules = pkgs.runCommand "udev-rules" { allowedReferences = [ extraUtils ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash b/third_party/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash new file mode 100644 index 0000000000..4a86019611 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash @@ -0,0 +1,36 @@ +#!/usr/bin/env bash + +set -euo pipefail + +WGET() { + wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google' "$@" +} + +# When dealing with cryptographic keys, we want to keep things private. +umask 077 +mkdir -p /root/.ssh + +echo "Fetching authorized keys..." +WGET -O /tmp/auth_keys http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys + +# Read keys one by one, split in case Google decided +# to append metadata (it does sometimes) and add to +# authorized_keys if not already present. +touch /root/.ssh/authorized_keys +while IFS='' read -r line || [[ -n "$line" ]]; do + keyLine=$(echo -n "$line" | cut -d ':' -f2) + IFS=' ' read -r -a array <<<"$keyLine" + if [[ ${#array[@]} -ge 3 ]]; then + echo "${array[@]:0:3}" >>/tmp/new_keys + echo "Added ${array[*]:2} to authorized_keys" + fi +done withLastfm; +assert withLastfm -> withCD; + +mkDerivation rec { + pname = "pragha"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "pragha-music-player"; + repo = "pragha"; + rev = "v${version}"; + sha256 = "sha256:0n8gx8amg5l9g4w7s4agjf8mlmpgjydgzx3vryp9lzzs9xrd5vqh"; + }; + + nativeBuildInputs = [ + intltool + pkg-config + xfce.xfce4-dev-tools + desktop-file-utils + installShellFiles + ]; + + buildInputs = with gst_all_1; [ + dbus-glib + gstreamer + gst-plugins-base + gtk3 + hicolor-icon-theme + libpeas + pcre + qtbase + sqlite + taglib + zlib + ] + ++ lib.optionals withGstPlugins [ gst-plugins-good gst-plugins-bad gst-plugins-ugly ] + ++ lib.optionals withCD [ libcddb libcdio libcdio-paranoia ] + ++ lib.optional withGudev libgudev + ++ lib.optional withKeybinder keybinder3 + ++ lib.optional withLibnotify libnotify + ++ lib.optional withLastfm liblastfmSF + ++ lib.optional withGlyr glyr + ++ lib.optional withLibsoup libsoup + ++ lib.optional withMtp libmtp + ++ lib.optional withXfce4ui xfce.libxfce4ui + ++ lib.optional withTotemPlParser totem-pl-parser + # ++ lib.optional withGrilo grilo + # ++ lib.optional withRygel rygel + ; + + CFLAGS = [ "-DHAVE_PARANOIA_NEW_INCLUDES" ]; + + NIX_CFLAGS_COMPILE = "-I${lib.getDev gst_all_1.gst-plugins-base}/include/gstreamer-1.0"; + + postInstall = '' + qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + + install -m 444 data/${pname}.desktop $out/share/applications + install -d $out/share/pixmaps + installManPage data/${pname}.1 + ''; + + meta = with lib; { + description = "A lightweight GTK+ music manager - fork of Consonance Music Manager"; + homepage = "https://pragha-music-player.github.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mbaeten ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix index c0ca16a284..9b28de9440 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.bluej.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix index 5f7d602264..d684c1ef94 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -113,6 +113,21 @@ jam-mode = callPackage ./jam-mode { }; + llvm-mode = trivialBuild { + pname = "llvm-mode"; + inherit (external.llvmPackages.llvm) src version; + + dontConfigure = true; + buildPhase = '' + cp utils/emacs/*.el . + ''; + + meta = { + inherit (external.llvmPackages.llvm.meta) homepage license; + description = "Major mode for the LLVM assembler language."; + }; + }; + org-mac-link = callPackage ./org-mac-link { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index 619bde5987..70e253dd6d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -159,10 +159,14 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { '' + lib.optionalString (nativeComp && withNS) '' ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp '' + lib.optionalString nativeComp '' - $out/bin/emacs --batch \ - -l comp --eval "(mapatoms (lambda (s) \ - (when (subr-primitive-p (symbol-function s)) \ - (comp-trampoline-compile s))))" + echo "Generating native-compiled trampolines..." + # precompile trampolines in parallel, but avoid spawning one process per trampoline. + # 1000 is a rough lower bound on the number of trampolines compiled. + $out/bin/emacs --batch --eval "(mapatoms (lambda (s) \ + (when (subr-primitive-p (symbol-function s)) (print s))))" \ + | xargs -n $((1000/NIX_BUILD_CORES + 1)) -P $NIX_BUILD_CORES \ + $out/bin/emacs --batch -l comp --eval "(while argv \ + (comp-trampoline-compile (intern (pop argv))))" mkdir -p $out/share/emacs/native-lisp $out/bin/emacs --batch \ --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix index 324d8b13f2..34f489bfba 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A simple integrated development environment for Java"; homepage = "https://www.greenfoot.org/"; license = licenses.gpl2ClasspathPlus; - maintainers = [ maintainers.charvp ]; + maintainers = [ maintainers.chvp ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix index 950229baee..98b77338b9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix @@ -1,7 +1,7 @@ -{ pkgs, parinfer-rust, rep }: +{ pkgs, parinfer-rust, rep, kak-lsp }: { - inherit parinfer-rust rep; + inherit parinfer-rust rep kak-lsp; case-kak = pkgs.callPackage ./case.kak.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix index c32130986b..661bec463a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/spacevim/default.nix @@ -1,5 +1,5 @@ { ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub -, lib, stdenv, formats, spacevim_config ? import ./init.nix }: +, lib, stdenv, formats, runCommand, spacevim_config ? import ./init.nix }: let format = formats.toml {}; @@ -10,28 +10,37 @@ let # ~/.cache/vimfiles/repos vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; }; }; - spacevimdir = format.generate "init.toml" spacevim_config; + spacevimdir = runCommand "SpaceVim.d" { } '' + mkdir -p $out + cp ${format.generate "init.toml" spacevim_config} $out/init.toml + ''; in stdenv.mkDerivation rec { pname = "spacevim"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; rev = "v${version}"; - sha256 = "1xw4l262x7wzs1m65bddwqf3qx4254ykddsw3c3p844pb3mzqhh7"; + sha256 = "sha256-QQdtjEdbuzmf0Rw+u2ZltLihnJt8LqkfTrLDWLAnCLE="; }; nativeBuildInputs = [ makeWrapper vim-customized]; buildInputs = [ vim-customized ]; buildPhase = '' + runHook preBuild # generate the helptags vim -u NONE -c "helptags $(pwd)/doc" -c q + runHook postBuild ''; - patches = [ ./helptags.patch ]; + patches = [ + # Don't generate helptags at runtime into read-only $SPACEVIMDIR + ./helptags.patch + ]; installPhase = '' + runHook preInstall mkdir -p $out/bin cp -r $(pwd) $out/SpaceVim @@ -40,6 +49,7 @@ in stdenv.mkDerivation rec { makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \ --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \ --prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]} + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch b/third_party/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch index e8b31c5741..bc0f9140c7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/spacevim/helptags.patch @@ -2,7 +2,7 @@ diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 16688680..fcafd6f7 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim -@@ -1255,13 +1255,6 @@ function! SpaceVim#end() abort +@@ -1355,13 +1355,6 @@ function! SpaceVim#end() abort let &helplang = 'jp' endif "" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index 0e65d3199a..616a0b7135 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.9.1"; + version = "2.11.1"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "1ls6n1a8vjgwkb40drpc3rapjligaf9fp218539fnwvhv26div69"; + sha256 = "0aigngfi5dbjihn43c6sg865i1ybfzj0w81zclzy8r9nqiqq0wma"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -23,15 +23,19 @@ perlPackages.buildPerlPackage rec { [ librsvg sane-backends sane-frontends ] ++ (with perlPackages; [ Gtk3 + Gtk3ImageView Gtk3SimpleList Cairo CairoGObject Glib GlibObjectIntrospection GooCanvas2 + GraphicsTIFF + IPCSystemSimple LocaleCodes LocaleGettext - PDFAPI2 + PDFBuilder + ImagePNGLibpng ImageSane SetIntSpan PerlMagick @@ -93,9 +97,21 @@ perlPackages.buildPerlPackage rec { xvfb_run file tesseract # tests are expecting tesseract 3.x precisely - ]; + ] ++ (with perlPackages; [ + TestPod + ]); checkPhase = '' + # Temporarily disable a dubiously failing test: + # t/169_import_scan.t ........................... 1/1 + # # Failed test 'variable-height scan imported with expected size' + # # at t/169_import_scan.t line 50. + # # got: '179' + # # expected: '296' + # # Looks like you failed 1 test of 1. + # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100) + rm t/169_import_scan.t + xvfb-run -s '-screen 0 800x600x24' \ make test ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 709d166720..3103ace802 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.12-3"; + version = "0.9.13"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-IK4BuZKM2U8vz7m8waJhoh3tQ539wGLcIDNiYGUou24="; + hash = "sha256-VdbdmpLiQGVFH3q6baE2yuuKz11Tn0gMpkGDI9KI3HQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index e12c2c90de..ffdcf021b0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.6.0"; + version = "1.6.2"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P2LR42Qn5bBF5xcfCbxiGFBwkW/kAKVGiyED37OdZLo="; + sha256 = "sha256-4Ae8lzaec7JeYfmeLleatUS/xQUjea7O4XJ9DOgJIMs="; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix index d3f3eb6fcf..5b310373ee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "coolreader"; - version = "3.2.49"; + version = "3.2.51"; src = fetchFromGitHub { owner = "buggins"; repo = pname; rev = "cr${version}"; - sha256 = "10i3w4zjlilz3smjzbwm50d91ns3w0wlgmsf38fn2lv76zczv8ia"; + sha256 = "sha256-rRWZHkuSNhAHwxKjpRgcNXO9vs/MDAgEuhRs8mRPjP4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 5ea01dfa19..fad86b8974 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "8.5"; + version = "8.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-ygBM8HtCF8d4KVOakP4ssFyTgAsPQDfjAMJaEqo+Ml4="; + sha256 = "sha256-RAqTwi65YskQhsjlHxQqy50R5s8z2yriWLkrg5J/eTc="; }; patches = (substituteAll { diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 35246a45da..a4c32b9b93 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.80.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0xs9y5lj0mya6ag625x8j91mn9l9r13gxaqxyvl1fl40y2yjz1zm"; + sha256 = "sha256-9YroUxcLixu+MNL37JByCulCHv0WxWGwqBQ/+FGtZLw="; }; - vendorSha256 = "172mcs8p43bsdkd2hxg9qn6018fh8f36kxx0vgnq5q6fqsb6s1f6"; + vendorSha256 = "sha256-5gQyoLirXajkzxKxzcuPnjECL2mJPiHS65lYkyIpKs8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix index c7e87dbbfd..af259c199d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -34,6 +34,8 @@ , withKeePassNetworking ? true , withKeePassTouchID ? true , withKeePassFDOSecrets ? true + +, nixosTests }: with lib; @@ -118,6 +120,8 @@ stdenv.mkDerivation rec { wrapQtApp $out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC ''; + passthru.tests = nixosTests.keepassxc; + meta = { description = "Password manager to store your passwords safely and auto-type them into your everyday websites and applications"; longDescription = "A community fork of KeePassX, which is itself a port of KeePass Password Safe. The goal is to extend and improve KeePassX with new features and bugfixes to provide a feature-rich, fully cross-platform and modern open-source password manager. Accessible via native cross-platform GUI, CLI, and browser integration with the KeePassXC Browser Extension (https://github.com/keepassxreboot/keepassxc-browser)."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix index 86208c484a..bdb589d8f9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "reddsaver"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "reddsaver"; rev = "v${version}"; - sha256 = "0wiyzbl9vqx5aq3lpaaqkm3ivj77lqd8bmh8ipgshdflgm1z6yvp"; + sha256 = "0kww3abgvxr7azr7yb8aiw28fz13qb4sn3x7nnz1ihmd4yczi9fg"; }; - cargoSha256 = "0kw5gk7pf4xkmjffs2jxm6sc4chybns88cii2wlgpyvgn4c3cwaa"; + cargoSha256 = "09xm22vgmd3dc0wr6n3jczxvhwpcsijwfbv50dz1lnsx57g8mgmd"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - # package does not contain tests as of v0.3.0 + # package does not contain tests as of v0.3.1 docCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix index 4e69f9cce1..6115544e79 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null, plugins ? [] }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [] }: symlinkJoin { name = "rofi-${rofi-unwrapped.version}"; @@ -7,16 +7,23 @@ symlinkJoin { rofi-unwrapped.out ] ++ (lib.forEach plugins (p: p.out)); - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ gdk-pixbuf ]; + preferLocalBuild = true; passthru.unwrapped = rofi-unwrapped; + + dontWrapGApps = true; + postBuild = '' rm -rf $out/bin mkdir $out/bin ln -s ${rofi-unwrapped}/bin/* $out/bin - rm $out/bin/rofi + + gappsWrapperArgsHook makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \ + ''${gappsWrapperArgs[@]} \ --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ ${lib.optionalString (plugins != []) ''--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}''} \ ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix index 58dede6489..69d7836e76 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/swappy/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , meson , ninja , wayland @@ -9,22 +11,26 @@ , scdoc , libnotify , glib +, wrapGAppsHook +, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "swappy"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "jtheoof"; repo = pname; rev = "v${version}"; - sha256 = "1bm184fbzylymh4kr7n8gy9plsdxif8xahc1zmkgdg1a0kwgws2x"; + sha256 = "12z643c7vzffhjsxaz1lak99i4nwm688pha0hh4pg69jf5wz5xx3"; }; - nativeBuildInputs = [ glib meson ninja pkg-config scdoc ]; + nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; - buildInputs = [ cairo pango gtk libnotify wayland glib ]; + buildInputs = [ + cairo pango gtk libnotify wayland glib hicolor-icon-theme + ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix index afbf5b364e..2f0a58b8e4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, p7zip, libXxf86vm }: +{ 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. +, jdk8 +# it can run on the latest stable jre fine though +, jre +, ant +, gtk3 +, gsettings-desktop-schemas +, p7zip +, libXxf86vm +}: let @@ -27,23 +42,29 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - patchPhase = '' + postPatch = '' patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so ''; - buildInputs = [ ant jdk makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; + buildInputs = [ ant jdk8 makeWrapper p7zip gtk3 gsettings-desktop-schemas ]; buildPhase = '' + runHook preBuild + ant furniture textures help mkdir -p $out/share/{java,applications} mv "build/"*.jar $out/share/java/. ant + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp install/${module}-${version}.jar $out/share/java/. @@ -59,6 +80,8 @@ let --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}" + + runHook postInstall ''; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix index 08bc5b90fd..a008b49ba7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sweethome3d/editors.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings-desktop-schemas, sweethome3dApp }: +{ lib +, stdenv +, fetchcvs +, 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. +, jdk8 +# it can run on the latest stable jre fine though +, jre +, ant +, gtk3 +, gsettings-desktop-schemas +, sweethome3dApp }: let @@ -23,15 +35,19 @@ let categories = "Graphics;2DGraphics;3DGraphics;"; }; - buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; + buildInputs = [ ant jdk8 makeWrapper gtk3 gsettings-desktop-schemas ]; - patchPhase = '' + postPatch = '' sed -i -e 's,../SweetHome3D,${application.src},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 = '' - ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk}/lib + runHook preBuild + + ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk8}/lib + + runHook postBuild ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index 530d60c763..9c1e778bdf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.9.10"; + version = "0.10.4"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-NQzZhWoLeDF7iTgIljbVi0ULAe7DeIn45Cu6bgFCfKQ="; + sha256 = "1rs6xpnmqzp45jkdzi8x06i8764gk7zl86sp6s0hiirbfqf7vwsy"; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-9qfqQ7zFw+EwY7o35Y6RhBJ8h5eXnTAsdbqo/w0zO5w="; + cargoSha256 = "0xblxsp7jgqbb3kr5k7yy6ziz18a8wlkrhls0vz9ak2n0ngddg3r"; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index f5c35d530e..97b27d5ff1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ticker"; - version = "3.0.0"; + version = "3.1.7"; src = fetchFromGitHub { owner = "achannarasappa"; repo = "ticker"; rev = "v${version}"; - sha256 = "sha256-k4ahoaEI2HBoEcRQscpitp2tWsiWmSYaErnth99xOqw="; + sha256 = "sha256-OA01GYp6E0zsEwkUUtvpmvl0y/YTXChl0pwIKozB4Qg="; }; - vendorSha256 = "sha256-8Ew+K/uTFoBAhPQwebtjl6bJPiSEE3PaZCYZsQLOMkw="; + vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo="; # Tests require internet doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index 1215a7b9a4..214d2775c0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F9PyJ2uvnKPcjHS4VeuVJuK48HiqqCG8kFzphGW4QyA="; + sha256 = "sha256-Gxrz0RNv7sEIfl0Ac5eLVXvbbxIWIL31mDOZrgY88ps="; }; - cargoSha256 = "sha256-0JSsCtAsqukFuwtbVS1L2jgLNBjquFBInjsJ1XVocjc="; + cargoSha256 = "sha256-9UlEmc9gbZDWelOPD3jZAIkVKNk9jMq5Ljzwur1UiGs="; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index a1ea1d64c6..8b5f410308 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { --replace "/bin/sh" "${bash}/bin/sh" \ --replace "cat" "${coreutils}/bin/cat" \ --replace "chattr" "${e2fsprogs}/bin/chattr" \ - --replace "mv" "${coreutils}/bin/mv" \ + --replace "mv " "${coreutils}/bin/mv " \ --replace "pkill" "${procps}/bin/pkill" done @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { --replace "/bin/sh" "${bash}/bin/sh" \ --replace "/opt/" "$out/opt/" \ --replace "chattr" "${e2fsprogs}/bin/chattr" \ - --replace "mv" "${coreutils}/bin/mv" + --replace "mv " "${coreutils}/bin/mv " done substituteInPlace $out/lib/systemd/system/appgatedriver.service \ @@ -174,7 +174,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Appgate SDP (Software Defined Perimeter) desktop client"; - homepage = https://www.appgate.com/support/software-defined-perimeter-support; + homepage = "https://www.appgate.com/support/software-defined-perimeter-support"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ ymatsiuk ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 35e3c7056c..a236e50218 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "88.0.4324.150", - "sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf", - "sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0", + "version": "88.0.4324.182", + "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h", + "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b", "deps": { "gn": { "version": "2020-11-05", @@ -55,8 +55,8 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" }, "ungoogled-patches": { - "rev": "88.0.4324.150-1", - "sha256": "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y" + "rev": "88.0.4324.182-1", + "sha256": "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 96a4e15adf..ed88bf587d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -51,27 +51,6 @@ let alsaSupport = browser.alsaSupport or false; pipewireSupport = browser.pipewireSupport or false; - # FIXME: This should probably be an assertion now? - plugins = - let - removed = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - in if removed != [] then - throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." - else - [] - ; - nativeMessagingHosts = ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) @@ -164,7 +143,24 @@ let # # ############################# - in stdenv.mkDerivation { + # TODO: remove this after the next release (21.03) + configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ + "enableAdobeFlash" + "enableAdobeReader" + "enableBluejeans" + "enableDjvu" + "enableFriBIDPlugin" + "enableGoogleTalkPlugin" + "enableMPlayer" + "enableVLC" + "icedtea" + "jre" + ]; + pluginsError = + "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; + + in if configPlugins != [] then throw pluginsError else + (stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { @@ -262,12 +258,9 @@ let makeWrapper "$oldExe" \ "$out${browser.execdir or "/bin"}/${browserName}${nameSuffix}" \ - --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ - --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix PATH ':' "${xdg-utils}/bin" \ - --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ @@ -351,9 +344,6 @@ let preferLocalBuild = true; - # Let each plugin tell us (through its `mozillaPlugin') attribute - # where to find the plugin in its tree. - plugins = map (x: x + x.mozillaPlugin) plugins; libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs; gtk_modules = map (x: x + x.gtkModule) gtk_modules; @@ -362,14 +352,9 @@ let disallowedRequisites = [ stdenv.cc ]; meta = browser.meta // { - description = - browser.meta.description - + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins)) - + ")"; + description = browser.meta.description; hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }; -in - lib.makeOverridable wrapper + }); +in lib.makeOverridable wrapper diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 767ac70c56..d82c6b4574 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1xxw6zk0lk4is220lydcx57mrsw6pk2rirsp4wjzvawjlv7wdv25"; + sha256 = "1yrjgjagh7jfzgvnj9wr71mk34x7yf66fwyby73f1pfi2cg49nhp"; }; vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index d11461366b..23f4dfe14c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -15,10 +15,10 @@ buildGoModule rec { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lSvYiTh67gK9kJls7VsayV8T3H6RzFEEKe49BOWnUBw="; + sha256 = "sha256-QhAN30ge0dbC9dGT1yP4o0VgrcS9+g+r6YJ07ZjPJtg="; }; - vendorSha256 = "sha256-qywiaNoO3pI7sfyPbwWR8BLd86RvJ2xSWwCJUsm3RkM="; + vendorSha256 = "sha256-bX1GfKbAbdEAnW3kPNsbF/cJWufxvuhm//G88qJ3u08="; nativeBuildInputs = [ makeWrapper ]; @@ -30,6 +30,9 @@ buildGoModule rec { "-X github.com/AkihiroSuda/nerdctl/pkg/version.Revision=" ]; + # Many checks require a containerd socket and running nerdctl after it's built + doCheck = false; + postInstall = '' wrapProgram $out/bin/nerdctl \ --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ @@ -39,6 +42,9 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck + # nerdctl expects XDG_RUNTIME_DIR to be set + export XDG_RUNTIME_DIR=$TMPDIR + $out/bin/nerdctl --help # --version will error without containerd.sock access $out/bin/nerdctl --help | grep "${version}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 7f7f34d1cb..ccbe9d9a7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.9"; + version = "0.18.10"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bsLqTpBhYeDMAv8vmnbjz+bmkyGqX3V7OkOwCprftC0="; + sha256 = "sha256-SvvvHGR3UPyV61MaoFB68SaZKUT3ItYOPT1a7AddxlY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 2af3e8fe56..1b8ff4622f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I1PaDHPocQuoSOyfnxDWwIR+7S9l/odX4SCeAae/jv8="; + sha256 = "sha256-el94Iq7/+1FfGpqbhKEO6FGpaCxoueoc/+Se+WfT+G0="; }; - vendorSha256 = "sha256-H0i5MoVX5O0CgHOvefDEyzBWvBZvJZUrC9xBq9CHgeE="; + vendorSha256 = "sha256-MSHg1RWjbXm1pf6HTyJL4FcnLuacL9fO1F6zbouVkWg="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index e8a76b3d49..2223b8f549 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -19,23 +19,27 @@ rustPlatform.buildRustPackage rec { pname = "newsflash"; - version = "1.1.1"; + version = "1.2.2"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd"; + hash = "sha256-TeheK14COX1NIrql74eI8Wx4jtpUP1eO5mugT5LzlPY="; }; - cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26"; + cargoHash = "sha256-Fbj4sabrwpfa0QNEN4l91y/6AuPIKu7QPzYNUO6RtU0="; patches = [ + # Post install tries to generate an icon cache & update the + # desktop database. The gtk setup hook drop-icon-theme-cache.sh + # would strip out the icon cache and the desktop database wouldn't + # be included in $out. They will generated by xdg.mime.enable & + # gtk.iconCache.enable instead. ./no-post-install.patch ]; postPatch = '' - chmod +x build-aux/cargo.sh patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index e58e73fdc8..a18a5198d0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -1,19 +1,19 @@ { lib, fetchurl, appimageTools }: - let pname = "deltachat-electron"; - version = "1.3.0"; + version = "1.14.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "1xyp8cg11px8rras12sncjmq85alyvz7ycw1v1py8w8rlz60wkij"; + sha256 = "0w00qr8wwrxwa2g71biyz42k8y5y766m6k876bnzq927vcjilq6b"; }; appimageContents = appimageTools.extract { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; extraInstallCommands = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index a2d12124db..667e8cdaec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "169xyd44jyfh5njwmhsmkah8njfgnp9q9c2b13p0ry5saicwm5h5"; + sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca"; }; - vendorSha256 = "1l8qnz0qy90zpywfx7pbkqpxg7rkvc9j622zcmkf38kdc1z6w20a"; + vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx"; doCheck = false; @@ -54,8 +54,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://maunium.net/go/gomuks/"; description = "A terminal based Matrix client written in Go"; - license = licenses.gpl3; - maintainers = with maintainers; [ charvp emily ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ chvp emily ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix index c54b442881..1b648108e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs"; - version = "0.7.0"; + version = "0.8.0"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3"; + sha256 = "sha256-uK3+Ekr5AM6mmGmjFSj1Rotm5pbH657BYUlP9B39WEw="; }; # tarball contains multiple files/directories diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 7eaefdd91c..a9cea58902 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,52 +1,135 @@ -{ lib, config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook -, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, gumbo -, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkg-config, poppler, python, shared-mime-info -, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical -# Build options -# TODO: A flag to build the manual. -# TODO: Plugins that complain about their missing dependencies, even when -# provided: -# gdata requires libgdata -# geolocation requires libchamplain -, enableLdap ? false -, enableNetworkManager ? config.networking.networkmanager.enable or false +{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex +, curl, gtk2, gtk3, pkg-config, python2, python3, shared-mime-info +, glib-networking, gsettings-desktop-schemas + +# Use the experimental gtk3 branch. +, useGtk3 ? false + +# Package compatibility: old parameters whose name were not directly derived , enablePgp ? true -, enablePluginArchive ? false -, enablePluginLitehtmlViewer ? false , enablePluginNotificationDialogs ? true , enablePluginNotificationSounds ? true -, enablePluginPdf ? false -, enablePluginPython ? false -, enablePluginRavatar ? false -, enablePluginRssyl ? false -, enablePluginSmime ? false -, enablePluginSpamassassin ? false -, enablePluginSpamReport ? false -, enablePluginVcalendar ? false -, enableSpellcheck ? false +, enablePluginPdf ? true +, enablePluginRavatar ? true +, enableSpellcheck ? true + +# Arguments to include external libraries +, enableLibSM ? true, libSM +, enableGnuTLS ? true, gnutls +, enableEnchant ? enableSpellcheck, enchant +, enableDbus ? true, dbus, dbus-glib +, enableLdap ? true, openldap +, enableNetworkManager ? true, networkmanager +, enableLibetpan ? true, libetpan +, enableValgrind ? true, valgrind +, enableSvg ? true, librsvg + +# Configure claws-mail's plugins +, enablePluginAcpiNotifier ? true +, enablePluginAddressKeeper ? true +, enablePluginArchive ? true, libarchive +, enablePluginAttRemover ? true +, enablePluginAttachWarner ? true +, enablePluginBogofilter ? true +, enablePluginBsfilter ? true +, enablePluginClamd ? true +, enablePluginDillo ? true +, enablePluginFetchInfo ? true +, enablePluginLibravatar ? enablePluginRavatar +, enablePluginLitehtmlViewer ? true, gumbo +, enablePluginMailmbox ? true +, enablePluginManageSieve ? true +, enablePluginNewMail ? true +, enablePluginNotification ? (enablePluginNotificationDialogs || enablePluginNotificationSounds), libcanberra-gtk2, libcanberra-gtk3, libnotify +, enablePluginPdfViewer ? enablePluginPdf, poppler +, enablePluginPerl ? true, perl +, enablePluginPython ? true +, enablePluginPgp ? enablePgp, gnupg, gpgme +, enablePluginRssyl ? true, libxml2 +, enablePluginSmime ? true +, enablePluginSpamassassin ? true +, enablePluginSpamReport ? true +, enablePluginTnefParse ? true, libytnef +, enablePluginVcalendar ? true, libical }: with lib; -stdenv.mkDerivation rec { - pname = "claws-mail"; - version = "3.17.8"; +let + version = if useGtk3 then "3.99.0" else "3.17.8"; - src = fetchurl { - url = "https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "sha256-zbeygUmV1vSpw7HwvBRn7Vw88qXg2hcwqqJaisyv3a8="; + # The official release uses gtk2 and contains the version tag. + gtk2src = { + sha256 = "0l4f8q11iyj8pi120lrapgq51k5j64xf0jlczkzbm99rym752ch5"; }; + # The corresponding commit in the gtk3 branch. + gtk3src = { + sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k"; + }; + + python = if useGtk3 then python3 else python2; + pythonPkgs = if useGtk3 + then + with python.pkgs; [ python wrapPython pygobject3 ] + else + with python.pkgs; [ python wrapPython pygtk pygobject2 ]; + + features = [ + { flags = [ "acpi_notifier-plugin" ]; enabled = enablePluginAcpiNotifier; } + { flags = [ "address_keeper-plugin" ]; enabled = enablePluginAddressKeeper; } + { flags = [ "archive-plugin" ]; enabled = enablePluginArchive; deps = [ libarchive ]; } + { flags = [ "att_remover-plugin" ]; enabled = enablePluginAttRemover; } + { flags = [ "attachwarner-plugin" ]; enabled = enablePluginAttachWarner; } + { flags = [ "bogofilter-plugin" ]; enabled = enablePluginBogofilter; } + { flags = [ "bsfilter-plugin" ]; enabled = enablePluginBsfilter; } + { flags = [ "clamd-plugin" ]; enabled = enablePluginClamd; } + { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } + { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } + { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } + { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } + { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } + { flags = [ "ldap" ]; enabled = enableLdap; deps = [ openldap ]; } + { flags = [ "libetpan" ]; enabled = enableLibetpan; deps = [ libetpan ]; } + { flags = [ "libravatar-plugin" ]; enabled = enablePluginLibravatar; } + { flags = [ "libsm" ]; enabled = enableLibSM; deps = [ libSM ]; } + { flags = [ "litehtml_viewer-plugin" ]; enabled = enablePluginLitehtmlViewer; deps = [ gumbo ]; } + { flags = [ "mailmbox-plugin" ]; enabled = enablePluginMailmbox; } + { flags = [ "managesieve-plugin" ]; enabled = enablePluginManageSieve; } + { flags = [ "networkmanager" ]; enabled = enableNetworkManager; deps = [ networkmanager ]; } + { flags = [ "newmail-plugin" ]; enabled = enablePluginNewMail; } + { flags = [ "notification-plugin" ]; enabled = enablePluginNotification; deps = [ libnotify ] ++ [(if useGtk3 then libcanberra-gtk3 else libcanberra-gtk2)]; } + { flags = [ "pdf_viewer-plugin" ]; enabled = enablePluginPdfViewer; deps = [ poppler ]; } + { flags = [ "perl-plugin" ]; enabled = enablePluginPerl; deps = [ perl ]; } + { flags = [ "pgpcore-plugin" "pgpinline-plugin" "pgpmime-plugin" ]; enabled = enablePluginPgp; deps = [ gnupg gpgme ]; } + { flags = [ "python-plugin" ]; enabled = enablePluginPython; } + { flags = [ "rssyl-plugin" ]; enabled = enablePluginRssyl; deps = [ libxml2 ]; } + { flags = [ "smime-plugin" ]; enabled = enablePluginSmime; } + { flags = [ "spam_report-plugin" ]; enabled = enablePluginSpamReport; } + { flags = [ "spamassassin-plugin" ]; enabled = enablePluginSpamassassin; } + { flags = [ "svg" ]; enabled = enableSvg; deps = [ librsvg ]; } + { flags = [ "tnef_parse-plugin" ]; enabled = enablePluginTnefParse; deps = [ libytnef ]; } + { flags = [ "valgrind" ]; enabled = enableValgrind; deps = [ valgrind ]; } + { flags = [ "vcalendar-plugin" ]; enabled = enablePluginVcalendar; deps = [ libical ]; } + ]; +in stdenv.mkDerivation rec { + pname = "claws-mail"; + inherit version; + + src = fetchgit ({ + rev = version; + url = "git://git.claws-mail.org/claws.git"; + } // (if useGtk3 then gtk3src else gtk2src)); + outputs = [ "out" "dev" ]; - patches = [ - ./mime.patch - ]; + patches = [ ./mime.patch ]; preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib + # generate version without .git + [ -e version ] || echo "echo ${version}" > version ''; postPatch = '' @@ -54,51 +137,30 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook python.pkgs.wrapPython ]; - propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config bison flex wrapGAppsHook ]; + propagatedBuildInputs = pythonPkgs; buildInputs = - [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas - libetpan perl glib-networking libSM libytnef - ] - ++ optional enableSpellcheck enchant - ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] - ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra-gtk2 - ++ optional enablePluginNotificationDialogs libnotify - ++ optional enablePluginLitehtmlViewer gumbo - ++ optional enablePluginRssyl libxml2 - ++ optional enableNetworkManager networkmanager - ++ optional enableLdap openldap - ++ optional enablePluginPdf poppler - ++ optional enablePluginVcalendar libical; + [ curl gsettings-desktop-schemas glib-networking ] + ++ [(if useGtk3 then gtk3 else gtk2)] + ++ concatMap (f: optionals f.enabled f.deps) (filter (f: f ? deps) features) + ; configureFlags = - optional (!enableLdap) "--disable-ldap" - ++ optional (!enableNetworkManager) "--disable-networkmanager" - ++ optionals (!enablePgp) [ - "--disable-pgpcore-plugin" - "--disable-pgpinline-plugin" - "--disable-pgpmime-plugin" - ] - ++ optional (!enablePluginArchive) "--disable-archive-plugin" - ++ optional (!enablePluginLitehtmlViewer) "--disable-litehtml_viewer-plugin" - ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" - ++ optional (!enablePluginPython) "--disable-python-plugin" - ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" - ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" - ++ optional (!enablePluginSmime) "--disable-smime-plugin" - ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin" - ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin" - ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" - ++ optional (!enableSpellcheck) "--disable-enchant"; + [ + "--disable-manual" # Missing docbook-tools, e.g., docbook2html + "--disable-compface" # Missing compface library + "--disable-jpilot" # Missing jpilot library + + "--disable-gdata-plugin" # Complains about missing libgdata, even when provided + "--disable-fancy-plugin" # Missing libwebkit-1.0 library + ] ++ + (map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features); enableParallelBuilding = true; - pythonPath = with python.pkgs; [ pygobject2 pygtk ]; - preFixup = '' - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $pythonPkgs" gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") ''; @@ -112,6 +174,6 @@ stdenv.mkDerivation rec { homepage = "https://www.claws-mail.org/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin orivej ]; + maintainers = with maintainers; [ fpletz globin orivej oxzi ajs124 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix deleted file mode 100644 index d522309244..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib, config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex -, curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme -, libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkg-config, poppler, python, shared-mime-info, webkitgtk -, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical -# Build options -# TODO: A flag to build the manual. -# TODO: Plugins that complain about their missing dependencies, even when -# provided: -# gdata requires libgdata -# geolocation requires libchamplain -, enableLdap ? false -, enableNetworkManager ? config.networking.networkmanager.enable or false -, enablePgp ? true -, enablePluginArchive ? false -, enablePluginFancy ? true -, enablePluginNotificationDialogs ? true -, enablePluginNotificationSounds ? true -, enablePluginPdf ? false -, enablePluginPython ? false -, enablePluginRavatar ? false -, enablePluginRssyl ? false -, enablePluginSmime ? false -, enablePluginSpamassassin ? false -, enablePluginSpamReport ? false -, enablePluginVcalendar ? false -, enableSpellcheck ? false -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "claws-mail-gtk3"; - version = "3.99.0"; - - src = fetchgit { - url = "git://git.claws-mail.org/claws.git"; - rev = version; - sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k"; - }; - - outputs = [ "out" "dev" ]; - - patches = [ ./mime.patch ]; - - preConfigure = '' - # autotools check tries to dlopen libpython as a requirement for the python plugin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib - # generate version without .git - [ -e version ] || echo "echo ${version}" > version - ''; - - postPatch = '' - substituteInPlace src/procmime.c \ - --subst-var-by MIMEROOTDIR ${shared-mime-info}/share - ''; - - nativeBuildInputs = [ autoreconfHook bison flex pkg-config wrapGAppsHook python.pkgs.wrapPython ]; - propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; - - buildInputs = - [ curl dbus dbus-glib gtk3 gnutls gsettings-desktop-schemas - libetpan perl glib-networking libSM libytnef - ] - ++ optional enableSpellcheck enchant - ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] - ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra-gtk3 - ++ optional enablePluginNotificationDialogs libnotify - ++ optional enablePluginFancy libsoup - ++ optional enablePluginRssyl libxml2 - ++ optional enableNetworkManager networkmanager - ++ optional enableLdap openldap - ++ optional enablePluginPdf poppler - ++ optional enablePluginFancy webkitgtk - ++ optional enablePluginVcalendar libical; - - configureFlags = - optional (!enableLdap) "--disable-ldap" - ++ optional (!enableNetworkManager) "--disable-networkmanager" - ++ optionals (!enablePgp) [ - "--disable-pgpcore-plugin" - "--disable-pgpinline-plugin" - "--disable-pgpmime-plugin" - ] - ++ optional (!enablePluginArchive) "--disable-archive-plugin" - ++ optional (!enablePluginFancy) "--disable-fancy-plugin" - ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin" - ++ optional (!enablePluginPython) "--disable-python-plugin" - ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin" - ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin" - ++ optional (!enablePluginSmime) "--disable-smime-plugin" - ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin" - ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin" - ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin" - ++ optional (!enableSpellcheck) "--disable-enchant"; - - enableParallelBuilding = true; - - pythonPath = with python.pkgs; [ pygobject2 pygtk ]; - - preFixup = '' - buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH") - ''; - - postInstall = '' - mkdir -p $out/share/applications - cp claws-mail.desktop $out/share/applications - ''; - - NIX_CFLAGS_COMPILE = [ "-Wno-deprecated-declarations" ]; - - meta = { - description = "The user-friendly, lightweight, and fast email client"; - homepage = "https://www.claws-mail.org/"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin orivej ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index b8aaabca0f..f6bea3c835 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.3"; + version = "3.38.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kfshljvkpbh965rjlyy1qjjm0ic3rdxisyy9c5jjvv2qlk65b3z"; + sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index b1905359cd..f9027285c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -63,12 +63,11 @@ let defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; - - name = "thunderbird-bin-${version}"; in stdenv.mkDerivation { - inherit name; + pname = "thunderbird-bin"; + inherit version; src = fetchurl { url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; @@ -169,7 +168,8 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit name writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + inherit writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; + name = "thunderbird-bin-${version}"; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 7e7206883d..7382e1aba4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "1vg236vc2v4g47lb68hb1vy3phamhsyb383fdbblh3vc4vf46j8a"; + sha256 = "1g3sjkc6p9w3mm7lnr513zwjh7y945hx311b6g068q2lywisqf0x"; }; modRoot = "./agent"; diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix index bdd90fecb8..b1b24c3e6c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/freeoffice.nix @@ -5,9 +5,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. , officeVersion ? { - version = "980"; + version = "982"; edition = "2018"; - sha256 = "19pgil86aagiz6z4kx22gd4cxbbmrx42ix42arkfb6p6hav1plby"; + hash = "sha256-euoZfAaDDTXzoaNLc/YdTngreTiYOBi7sGU161GP83w="; } , ... } @ args: @@ -19,7 +19,7 @@ callPackage ./generic.nix (args // rec { suiteName = "FreeOffice"; src = fetchurl { - inherit (officeVersion) sha256; + inherit (officeVersion) hash; url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix index a80eaa459c..56a951919e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, makeWrapper, copyDesktopItems # Dynamic Libraries , curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix index d0eb2ffdc9..9228037e8b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/third_party/nixpkgs/pkgs/applications/office/softmaker/softmaker_office.nix @@ -6,9 +6,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. , officeVersion ? { - version = "1020"; + version = "1030"; edition = "2021"; - sha256 = "1v227pih1p33x7axsw7wz8pz5walpbqnk0iqng711ixk883nqxn5"; + hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE="; } , ... } @ args: @@ -20,7 +20,7 @@ callPackage ./generic.nix (args // rec { suiteName = "SoftMaker Office"; src = fetchurl { - inherit (officeVersion) sha256; + inherit (officeVersion) hash; url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 739b003bbe..91673ed146 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.89"; + version = "5.0.95"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl"; + sha256 = "16rahl14clgnl7gzpw7rxx23yxbw1nbrz219q051zkjkkw5ai8lv"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc ]; - patchPhase = '' + postPatch = '' sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js ''; @@ -103,33 +103,36 @@ stdenv.mkDerivation rec { mimeType = "text/plain"; }; - installPhase = - '' - mkdir -p "$prefix/usr/lib/zotero-bin-${version}" - cp -r * "$prefix/usr/lib/zotero-bin-${version}" - mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" + installPhase = '' + runHook preInstall - # install desktop file and icons. - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications/ - for size in 16 32 48 256; do - install -Dm444 chrome/icons/default/default$size.png \ - $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png - done + mkdir -p "$prefix/usr/lib/zotero-bin-${version}" + cp -r * "$prefix/usr/lib/zotero-bin-${version}" + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" - for executable in \ - zotero-bin plugin-container \ - updater minidump-analyzer - do - if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/zotero-bin-${version}/$executable" - fi - done - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/zotero-bin-${version}/{}" \; + # install desktop file and icons. + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications/ + for size in 16 32 48 256; do + install -Dm444 chrome/icons/default/default$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png + done + + for executable in \ + zotero-bin plugin-container \ + updater minidump-analyzer + do + if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/zotero-bin-${version}/$executable" + fi + done + find . -executable -type f -exec \ + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/zotero-bin-${version}/{}" \; + + runHook postInstall ''; preFixup = '' @@ -141,7 +144,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.linux; + maintainers = with maintainers; [ i077 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index e0790b8b1a..0c5b81452f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1178"; + version = "1179"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "sha256-LihTYXiYCHAFZaWDb2MqN+RvHayGSyZd3vJf4TVCu3A="; + sha256 = "sha256-949oiE7ZNkCOJuOK/huPkCN0c4TlVaTskkBe0joc0HU="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix index c5449171ff..db6cf2600c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/calc/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.12.8.1"; + version = "2.12.8.2"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-TwVcuGaWIgzEc34DFEGFcmckXrwZ4ruRqselJClz15o="; + sha256 = "sha256-yKe4PASm7qWH/nYv8BtYbi9m3xPpA0SZ02Hahj8DJC8="; }; - patchPhase = '' + postPatch = '' substituteInPlace Makefile \ --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \ --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' @@ -41,7 +41,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C-style arbitrary precision calculator"; homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; - license = licenses.lgpl21; + # The licensing situation depends on readline (see section 3 of the LGPL) + # If linked against readline then GPLv2 otherwise LGPLv2.1 + license = with licenses; if enableReadline then gpl2Only else lgpl21Only; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/cbc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/cbc/default.nix index b75f3d3f78..1909e4bb1d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/cbc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/cbc/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation rec { pname = "cbc"; - version = "2.10.3"; + version = "2.10.4"; + + # Note: Cbc 2.10.5 contains Clp 1.17.5 which hits this bug + # that breaks or-tools https://github.com/coin-or/Clp/issues/130 src = fetchurl { url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz"; - sha256 = "1zzcg40ky5v96s7br2hqlkqdspwrn43kf3757g6c35wl29bq6f5d"; + sha256 = "0zq66j1vvpslswhzi9yfgkv6vmg7yry4pdmfgqaqw2vhyqxnsy39"; }; - configureFlags = [ "-C" ]; + # or-tools has a hard dependency on Cbc static libraries, so we build both + configureFlags = [ "-C" "--enable-static" ]; enableParallelBuilding = true; @@ -24,7 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.epl10; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; - broken = stdenv.isAarch64; # Missing after 2.10.0 description = "A mixed integer programming solver"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix b/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix index c6bfd6361f..b15eebf871 100644 --- a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix @@ -3,11 +3,11 @@ with lib; stdenv.mkDerivation { pname = "aliza"; - version = "1.98.32"; + version = "1.98.43"; src = fetchurl { # See https://www.aliza-dicom-viewer.com/download - url = "https://drive.google.com/uc?export=download&id=1nggavPhY_633T-AW9PdkcAgbWtzv3QKG"; - sha256 = "00vbgv8ca9ckgkicyyngrb01yhhcqc8hygg2bls7b44c47hcc8zz"; + url = "https://drive.google.com/uc?export=download&id=1HiDYUVN30oSWZWt3HBp7gNRBCLLtJM1I"; + sha256 = "0d70q67j2q0wdn4m2fxljqb97jwmscqgg3rm1rkb77fi2ik206ra"; name = "aliza.rpm"; }; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index 71986e6ec6..b14b874d60 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "8alCFtr+3aJsqQ2Ra8u5/SRHfDvMq2kRvRCKo/zwMK0="; + sha256 = "sha256-VXV6w4OnhJBmvMKl7CynbhI9LclTKaSr+5DhHXMwSsc="; }; - cargoSha256 = "kqRlxieChnhWtYYf67gi+2bncIzO56xpnv2uLjcINVM="; + cargoSha256 = "sha256-PWnNTMNZKxsfS1OAXe4G3zjfg5gK1SMTc0JJrW90iSM="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 5e105ad9dd..37c10bf2f9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "1qxv2k8lxcxpqx46ka7f042xk90xns5w9lc4009cxmsqvcdba03a"; + sha256 = "11186pdgaw5p4iv10dqcnynf5pws2v9nhqqqca7z5b7m20fpfjl7"; }; buildInputs = [ git gettext ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix index d22657d651..e60acf87da 100644 --- a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix @@ -1,32 +1,26 @@ { lib, python3 }: -let - py = python3.override { - packageOverrides = self: super: { - PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { - version = "6.0.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "05f8r3b2pdqbl76hwi5sv2xdi1r7g9lgm69x8ja5g22mn7ysmghm"; - }; - }); - }; - }; +with python3.pkgs; -in with py.pkgs; buildPythonApplication rec { +buildPythonApplication rec { pname = "catt"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1vq1wg79b7855za6v6bsfgypm0v3b4wakap4rash45mhzbgjj0kq"; + sha256 = "sha256-6RUeinHhAvvSz38hHQP5/MXNiY00rCM8k2ONaFYbwPc="; }; propagatedBuildInputs = [ - youtube-dl PyChromecast click ifaddr requests + click + ifaddr + PyChromecast + requests + youtube-dl ]; doCheck = false; # attempts to access various URLs + pythonImportsCheck = [ "catt" ]; meta = with lib; { description = "Cast All The Things allows you to send videos from many, many online sources to your Chromecast"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 695109fd8a..1d84da72c9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -40,13 +40,8 @@ buildGoPackage rec { installPhase = '' install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] - ''; - - # completion installed separately so it can be overridden in docker - # can be moved to installPhase when docker uses containerd >= 1.4 - postInstall = '' - installShellFiles --bash contrib/autocomplete/ctr - installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + installShellCompletion --bash contrib/autocomplete/ctr + installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete ''; passthru.tests = { inherit (nixosTests) docker; }; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git index a2dad2f698..f2df9d9a86 100755 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/nix-prefetch-git @@ -149,7 +149,19 @@ checkout_hash(){ fi clean_git fetch -t ${builder:+--progress} origin || return 1 - clean_git checkout -b "$branchName" "$hash" || return 1 + + local object_type=$(git cat-file -t "$hash") + if [[ "$object_type" == "commit" ]]; then + clean_git checkout -b "$branchName" "$hash" || return 1 + elif [[ "$object_type" == "tree" ]]; then + clean_git config user.email "nix-prefetch-git@localhost" + clean_git config user.name "nix-prefetch-git" + local commit_id=$(git commit-tree "$hash" -m "Commit created from tree hash $hash") + clean_git checkout -b "$branchName" "$commit_id" || return 1 + else + echo "Unrecognized git object type: $object_type" + return 1 + fi } # Fetch only a branch/tag and checkout it. diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix index 66671dd0a6..3f355d10f8 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchgithub/default.nix @@ -1,17 +1,19 @@ { lib, fetchgit, fetchzip }: { owner, repo, rev, name ? "source" -, fetchSubmodules ? false, private ? false +, fetchSubmodules ? false, leaveDotGit ? null +, deepClone ? false, private ? false , githubBase ? "github.com", varPrefix ? null , ... # For hash agility -}@args: assert private -> !fetchSubmodules; +}@args: let baseUrl = "https://${githubBase}/${owner}/${repo}"; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; + useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone; # We prefer fetchzip in cases we don't need submodules as the hash # is more stable in that case. - fetcher = if fetchSubmodules then fetchgit else fetchzip; + fetcher = if useFetchGit then fetchgit else fetchzip; privateAttrs = lib.optionalAttrs private { netrcPhase = '' if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then @@ -26,8 +28,14 @@ let ''; netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; }; - fetcherArgs = (if fetchSubmodules - then { inherit rev fetchSubmodules; url = "${baseUrl}.git"; } + fetcherArgs = (if useFetchGit + then { + inherit rev deepClone fetchSubmodules; url = "${baseUrl}.git"; + } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else ({ url = "${baseUrl}/archive/${rev}.tar.gz"; } // privateAttrs) ) // passthruAttrs // { inherit name; }; -in fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; } +in + +assert private -> !useFetchGit; + +fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; } diff --git a/third_party/nixpkgs/pkgs/build-support/go/garble.nix b/third_party/nixpkgs/pkgs/build-support/go/garble.nix index 27277d1b99..da1e3152ba 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/garble.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/garble.nix @@ -1,4 +1,5 @@ -{ buildGoModule +{ stdenv +, buildGoModule , fetchFromGitHub , lib }: @@ -15,6 +16,15 @@ buildGoModule rec { vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek="; + preBuild = '' + # https://github.com/burrowers/garble/issues/184 + substituteInPlace testdata/scripts/tiny.txt \ + --replace "{6,8}" "{4,8}" + '' + lib.optionalString (!stdenv.isx86_64) '' + # The test assumex amd64 assembly + rm testdata/scripts/asm.txt + ''; + meta = { description = "Obfuscate Go code by wrapping the Go toolchain"; homepage = "https://github.com/burrowers/garble/"; diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix new file mode 100644 index 0000000000..ee315427e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/orchis/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-themes-extra, gtk-engine-murrine +, accentColor ? "default" }: + +stdenv.mkDerivation rec { + pname = "orchis"; + version = "2021-01-22"; + + src = fetchFromGitHub { + repo = "Orchis-theme"; + owner = "vinceliuice"; + rev = version; + sha256 = "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc"; + }; + + nativeBuildInputs = [ gtk3 ]; + + buildInputs = [ gnome-themes-extra ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + preInstall = '' + mkdir -p $out/share/themes + ''; + + installPhase = '' + runHook preInstall + bash install.sh -d $out/share/themes -t ${accentColor} + runHook postInstall + ''; + + meta = with lib; { + description = "A Material Design theme for GNOME/GTK based desktop environments."; + homepage = "https://github.com/vinceliuice/Orchis-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.fufexan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 93a036228c..82c40fc429 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ficf4i4njqrx3dn5rdkvpvcys5mwfma4zkgfmfkq964jxpwzqvw"; + sha256 = "EPviPyw85CdTmk4wekYWlNOHCyMgBGT3BbfYGvmTyFk="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index 78a335f1b7..4f72492923 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ka1GxukX3HR40fMeiiXHguyPKrpGngG2tXDColR7eQA="; + sha256 = "sha256-ujQ7emfGhzpRGeZ6RGZ57hFX4aIflTcwE9IEUMYb/ZI="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-/l54ezS68loljKNh7AdYMIuCiyIbsMI3jqD9ktjZLfc="; + cargoSha256 = "sha256-/SudEQynLkLl7Y731Uqm9AkEugTCnq4PFFRQcwz+qL8="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix index 2720ad6cf0..3060e6d4e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -11,9 +11,9 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + version = "1.14.15"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.15"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; @@ -258,5 +258,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; + knownVulnerabilities = [ + "Support for Go 1.14 ended with the release of Go 1.16: https://golang.org/doc/devel/release.html#policy" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix index 284ddd6451..1326310405 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -11,9 +11,9 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + version = "1.15.8"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.8"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix index 15e1279eba..8267e9745d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.16.nix @@ -11,9 +11,9 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + version = "1.16"; + + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16"; + inherit version; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.4.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.4.nix deleted file mode 100644 index ec3fd97da9..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.4.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross -, pkg-config -, pcre -, Security }: - -let - libc = if stdenv ? cross then libcCross else stdenv.cc.libc; -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.4-bootstrap-${builtins.substring 0 7 revision}"; - revision = "bdd4b9503e47c2c38a9d0a9bb2f5d95ec5ff8ef6"; - - src = fetchurl { - url = "https://github.com/golang/go/archive/${revision}.tar.gz"; - sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre ]; - depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; - - hardeningDisable = [ "all" ]; - - # The tests try to do stuff with 127.0.0.1 and localhost - __darwinAllowLocalNetworking = true; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go - patchShebangs ./ # replace /bin/bash - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - '' + lib.optionalString stdenv.isLinux '' - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - # Find the loader dynamically - LOADER="$(find ${lib.getLib libc}/lib -name ld-linux\* | head -n 1)" - - # Replace references to the loader - find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; - ''; - - patches = [ - ./remove-tools-1.4.patch - ]; - - GOOS = if stdenv.isDarwin then "darwin" else "linux"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.hostPlatform.system == "i686-linux" then "386" - else if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" - else if stdenv.isAarch32 then "arm" - else throw "Unsupported system"; - GOARM = lib.optionalString (stdenv.hostPlatform.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 0; - - # The go build actually checks for CC=*/clang and does something different, so we don't - # just want the generic `cc` here. - CC = if stdenv.isDarwin then "clang" else "cc"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - ''; - - meta = with lib; { - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix b/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix index 8b8df28e1b..2bdf6a4950 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/2-dev.nix @@ -11,9 +11,7 @@ let inherit (lib) optionals optionalString; - go_bootstrap = callPackage ./bootstrap.nix { - inherit Security; - }; + go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix new file mode 100644 index 0000000000..9a0dc34354 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchurl, version, hashes }: +let + toGoKernel = platform: + if platform.isDarwin then "darwin" + else platform.parsed.kernel.name; + + toGoCPU = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "powerpc64le" = "ppc64le"; + }.${platform.parsed.cpu.name} or (throw "Unsupported CPU ${platform.parsed.cpu.name}"); + + toGoPlatform = platform: "${toGoKernel platform}-${toGoCPU platform}"; + + platform = toGoPlatform stdenv.hostPlatform; +in +stdenv.mkDerivation rec { + name = "go-${version}-${platform}-bootstrap"; + + src = fetchurl { + url = "https://golang.org/dl/go${version}.${platform}.tar.gz"; + sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}"); + }; + + # We must preserve the signature on Darwin + dontStrip = stdenv.hostPlatform.isDarwin; + + installPhase = '' + mkdir -p $out/share/go $out/bin + mv bin/* $out/bin + cp -r . $out/share/go + ${lib.optionalString stdenv.isLinux ('' + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/bin/go + '')} + '' ; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap.nix index 12ef9a25a4..71573b0bdd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap.nix @@ -1,17 +1,15 @@ -{ stdenv, srcOnly, fetchurl, callPackage, Security }: - -let -go_bootstrap = if stdenv.isAarch64 then - srcOnly { - name = "go-1.8-linux-arm64-bootstrap"; - src = fetchurl { - url = "https://cache.xor.us/go-1.8-linux-arm64-bootstrap.tar.xz"; - sha256 = "0sk6g03x9gbxk2k1djnrgy8rzw1zc5f6ssw0hbxk6kjr85lpmld6"; - }; - } -else - callPackage ./1.4.nix { - inherit Security; +{ callPackage }: +callPackage ./binary.nix { + version = "1.16"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8"; + darwin-arm64 = "4dac57c00168d30bbd02d95131d5de9ca88e04f2c5a29a404576f30ae9b54810"; + linux-386 = "ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa"; + linux-amd64 = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"; + linux-arm64 = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098"; + linux-armv6l = "d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd"; + linux-ppc64le = "27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6"; + linux-s390x = "be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe"; }; -in - go_bootstrap +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/print-hashes.sh b/third_party/nixpkgs/pkgs/development/compilers/go/print-hashes.sh new file mode 100755 index 0000000000..97be7d189a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/print-hashes.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +set -euo pipefail + +BASEURL=https://golang.org/dl/ +VERSION=${1:-} + +if [[ -z $VERSION ]] +then + echo "No version supplied" + exit -1 +fi + +curl -s "${BASEURL}?mode=json&include=all" | \ + jq '.[] | select(.version == "go'${VERSION}'")' | \ + jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch b/third_party/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch deleted file mode 100644 index 807ab8e089..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/go/remove-tools-1.4.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go -index 3b511b1..a46ebd8 100644 ---- a/misc/makerelease/makerelease.go -+++ b/misc/makerelease/makerelease.go -@@ -65,9 +65,6 @@ const ( - // These must be the command that cmd/go knows to install to $GOROOT/bin - // or $GOROOT/pkg/tool. - var toolPaths = []string{ -- "golang.org/x/tools/cmd/cover", -- "golang.org/x/tools/cmd/godoc", -- "golang.org/x/tools/cmd/vet", - } - - var preBuildCleanFiles = []string{ -diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c -index b6c61b4..2006bc2 100644 ---- a/src/cmd/dist/build.c -+++ b/src/cmd/dist/build.c -@@ -210,7 +210,9 @@ init(void) - workdir = xworkdir(); - xatexit(rmworkdir); - -- bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); -+ xgetenv(&b, "GOTOOLDIR"); -+ if (b.len == 0) -+ bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch); - tooldir = btake(&b); - - bfree(&b); -diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go -index b71feb7..8468ea8 100644 ---- a/src/cmd/go/pkg.go -+++ b/src/cmd/go/pkg.go -@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{ - "cmd/pack": toTool, - "cmd/pprof": toTool, - "cmd/yacc": toTool, -- "golang.org/x/tools/cmd/cover": toTool, -- "golang.org/x/tools/cmd/godoc": toBin, -- "golang.org/x/tools/cmd/vet": toTool, -+ "nixos.org/x/tools/cmd/cover": toTool, -+ "nixos.org/x/tools/cmd/godoc": toBin, -+ "nixos.org/x/tools/cmd/vet": toTool, - "code.google.com/p/go.tools/cmd/cover": stalePath, - "code.google.com/p/go.tools/cmd/godoc": stalePath, - "code.google.com/p/go.tools/cmd/vet": stalePath, -diff --git a/src/go/build/build.go b/src/go/build/build.go -index 311ecb0..f151d8f 100644 ---- a/src/go/build/build.go -+++ b/src/go/build/build.go -@@ -1367,7 +1367,7 @@ func init() { - } - - // ToolDir is the directory containing build tools. --var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH) -+var ToolDir = runtime.GOTOOLDIR() - - // IsLocalImport reports whether the import path is - // a local import path, like ".", "..", "./foo", or "../foo". -diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index 6cc5df8..9a9a964 100644 ---- a/src/runtime/extern.go -+++ b/src/runtime/extern.go -@@ -152,6 +152,17 @@ func GOROOT() string { - return defaultGoroot - } - -+// GOTOOLDIR returns the root of the Go tree. -+// It uses the GOTOOLDIR environment variable, if set, -+// or else the root used during the Go build. -+func GOTOOLDIR() string { -+ s := gogetenv("GOTOOLDIR") -+ if s != "" { -+ return s -+ } -+ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH -+} -+ - // Version returns the Go tree's version string. - // It is either the commit hash and date at the time of the build or, - // when possible, a release tag like "go1.3". diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index f03f4a6dcc..2f3ea3a453 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1408,7 +1408,12 @@ self: super: { # 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests: # https://github.com/haskell/haskell-language-server/issues/610 # https://github.com/haskell/haskell-language-server/issues/611 - haskell-language-server = dontCheck super.haskell-language-server; + haskell-language-server = overrideCabal (dontCheck super.haskell-language-server) { + # 2020-02-19: Override is necessary because of wrong bound on upstream, remove after next hackage update + preConfigure = '' + substituteInPlace haskell-language-server.cabal --replace "hls-explicit-imports-plugin ==0.1.0.1" "hls-explicit-imports-plugin ==0.1.0.0" + ''; + }; # 2021-02-08: Jailbreaking because of # https://github.com/haskell/haskell-language-server/issues/1329 @@ -1502,6 +1507,8 @@ self: super: { # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; + hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_1; }); + # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; @@ -1581,4 +1588,7 @@ self: super: { # Test suite fails, upstream not reachable for simple fix (not responsive on github) vivid-osc = dontCheck super.vivid-osc; vivid-supercollider = dontCheck super.vivid-supercollider; + + # Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8 + yarn-lock = doJailbreak super.yarn-lock; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index c162740b8d..60d3f42324 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -92,11 +92,4 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; - - # Agda 2.6.1.2 only declares a transformers dependency for ghc < 8.10.3. - # https://github.com/agda/agda/issues/5109 - Agda = appendPatch super.Agda (pkgs.fetchpatch { - url = "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch"; - sha256 = "1g34g8a09j73h89pk4cdmri0nb0qg664hkff45amcr9kyz14a9f3"; - }); } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e03c9425ed..e0fde52b01 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -75,8 +75,10 @@ default-package-overrides: - gi-gdkx11 < 4 - ghcide < 0.7.4 # for hls 0.9.0 - hls-explicit-imports-plugin < 0.1.0.1 # for hls 0.9.0 + - hls-plugin-api < 0.7.1.0 # for hls 0.9.0 + - hls-retrie-plugin < 0.1.1.1 # for hls 0.9.0 - # Stackage Nightly 2021-02-10 + # Stackage Nightly 2021-02-12 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -211,38 +213,38 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.20.0.1 - - amqp-utils ==0.4.4.1 + - amqp-utils ==0.4.5.0 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 + - ap-normalize ==0.1.0.0 - apecs ==0.9.2 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.5 - api-field-json-th ==0.1.0.2 - api-maker ==0.1.0.0 - - ap-normalize ==0.1.0.0 + - app-settings ==0.2.0.12 - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.9.0.0 - apportionment ==0.0.0.3 - approximate ==0.3.2 - approximate-equality ==1.1.0.2 - - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - - ascii ==1.0.1.2 - - ascii-case ==1.0.0.2 - - ascii-char ==1.0.0.6 - - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.2 - - ascii-predicates ==1.0.0.2 + - ascii ==1.0.1.4 + - ascii-case ==1.0.0.4 + - ascii-char ==1.0.0.8 + - ascii-group ==1.0.0.4 + - ascii-predicates ==1.0.0.4 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.2 - - ascii-th ==1.0.0.2 + - ascii-superset ==1.0.1.4 + - ascii-th ==1.0.0.4 + - asciidiagram ==1.3.3.3 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -258,7 +260,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atomic-primops ==0.8.4 - atomic-write ==0.2.0.7 - - attoparsec ==0.13.2.4 + - attoparsec ==0.13.2.5 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 @@ -270,8 +272,8 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.20 - auto-update ==0.1.6 + - autoexporter ==1.1.20 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 @@ -279,6 +281,11 @@ default-package-overrides: - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 + - base-orphans ==0.8.4 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 - base16 ==0.3.0.1 - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.3.0 @@ -292,12 +299,7 @@ default-package-overrides: - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 - base64-string ==0.2 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - basement ==0.0.11 - - base-orphans ==0.8.4 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -310,8 +312,8 @@ default-package-overrides: - bibtex ==0.1.0.6 - bifunctors ==5.5.10 - bimap ==0.4.0 - - bimaps ==0.1.0.2 - bimap-server ==0.1.0.1 + - bimaps ==0.1.0.2 - bin ==0.1 - binary-conduit ==1.3.1 - binary-ext ==2.0.4 @@ -331,8 +333,8 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.0 + - bitset-word8 ==0.1.1.2 - bitvec ==1.0.3.0 - bitwise-enum ==1.0.0.3 - blake2 ==0.3.0 @@ -358,8 +360,8 @@ default-package-overrides: - boring ==0.1.3 - both ==0.1.1.1 - bound ==2.0.3 - - BoundedChan ==1.0.3.0 - bounded-queue ==1.0.0 + - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 @@ -377,10 +379,10 @@ default-package-overrides: - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byteable ==0.1.1 - byte-count-reader ==0.10.1.2 - - bytedump ==1.0 - byte-order ==0.1.2.0 + - byteable ==0.1.1 + - bytedump ==1.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 @@ -396,6 +398,7 @@ default-package-overrides: - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.7 + - ca-province-codes ==1.0.0.0 - cabal-appimage ==0.3.0.2 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 @@ -408,13 +411,12 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 - - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 + - cased ==0.1.0.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -475,12 +477,12 @@ default-package-overrides: - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - - code-page ==0.2.1 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 + - code-page ==0.2.1 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 - Color ==0.3.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -527,8 +529,8 @@ default-package-overrides: - conferer-aeson ==1.0.0.0 - conferer-hspec ==1.0.0.0 - conferer-warp ==1.0.0.0 - - ConfigFile ==1.1.4 - config-ini ==0.2.4.0 + - ConfigFile ==1.1.4 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.5 @@ -536,8 +538,8 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraints ==0.12 - constraint-tuples ==0.1.2 + - constraints ==0.12 - construct ==0.3 - contravariant ==1.5.3 - contravariant-extras ==0.3.5.2 @@ -565,8 +567,13 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - cryptocompare ==0.1.2 - crypto-enigma ==0.1.1.6 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 + - cryptocompare ==0.1.2 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -575,11 +582,6 @@ default-package-overrides: - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -604,7 +606,7 @@ default-package-overrides: - data-accessor-mtl ==0.2.0.4 - data-accessor-template ==0.2.1.16 - data-accessor-transformers ==0.2.1.7 - - data-ascii ==1.0.0.4 + - data-ascii ==1.0.0.6 - data-binary-ieee754 ==0.4.4 - data-bword ==0.1.0.1 - data-checked ==0.3 @@ -616,7 +618,6 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 - - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.3.1 @@ -635,6 +636,7 @@ default-package-overrides: - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 + - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 @@ -653,8 +655,8 @@ default-package-overrides: - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 - - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.2.2 + - deriveJsonNoPrefix ==0.1.0.1 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - derulo ==1.0.10 @@ -663,17 +665,17 @@ default-package-overrides: - dhall-json ==1.7.5 - dhall-lsp-server ==1.0.13 - dhall-yaml ==1.2.5 + - di-core ==1.0.4 + - di-monad ==1.3.1 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 - - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - di-monad ==1.3.1 - - directory-tree ==0.12.1 - direct-sqlite ==2.3.26 + - directory-tree ==0.12.1 - dirichlet ==0.1.0.2 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -685,6 +687,8 @@ default-package-overrides: - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - doctemplates ==0.9 @@ -693,8 +697,6 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doldol ==0.4.1.2 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - dot ==0.3 - dotenv ==0.8.0.7 - dotgen ==0.4.3 @@ -734,10 +736,10 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.7 - - elm2nix ==0.2.1 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 + - elm2nix ==0.2.1 - elynx ==0.5.0.1 - elynx-markov ==0.5.0.1 - elynx-nexus ==0.5.0.1 @@ -749,9 +751,9 @@ default-package-overrides: - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 + - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 - - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envparse ==0.4.1 - envy ==2.1.0.0 @@ -773,25 +775,25 @@ default-package-overrides: - essence-of-live-coding-quickcheck ==0.2.4 - etc ==0.4.1.0 - eve ==0.1.9.0 + - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 - - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 - - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 - exception-via ==0.1.0.0 + - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 + - exp-pairs ==0.2.1.0 - experimenter ==0.1.0.4 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - - exp-pairs ==0.2.1.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 @@ -818,10 +820,10 @@ default-package-overrides: - fgl ==5.7.0.3 - file-embed ==0.0.13.0 - file-embed-lzma ==0 - - filelock ==0.1.1.5 - - filemanip ==0.3.6.3 - file-modules ==0.1.2.4 - file-path-th ==0.1.0.0 + - filelock ==0.1.1.5 + - filemanip ==0.3.6.3 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -851,9 +853,9 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 - - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.9 - fold-debounce-conduit ==0.2.0.5 + - foldable1 ==0.1.0.0 - foldl ==1.4.10 - folds ==0.7.5 - follow-file ==0.0.3 @@ -867,10 +869,10 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.5 - free-categories ==0.2.0.2 + - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 - - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -886,8 +888,8 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.2.0 - fuzzy-time ==0.1.0.0 + - fuzzyset ==0.2.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -903,8 +905,8 @@ default-package-overrides: - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - GenericPretty ==1.2.2 - generic-random ==1.3.0.1 + - GenericPretty ==1.2.2 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 @@ -938,9 +940,6 @@ default-package-overrides: - ghc-core ==0.5.6 - ghc-events ==0.15.1 - ghc-exactprint ==0.6.3.4 - - ghcid ==0.8.7 - - ghci-hexcalc ==0.1.1.0 - - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.10.4.20210206 - ghc-lib-parser ==8.10.4.20210206 - ghc-lib-parser-ex ==8.10.0.19 @@ -952,9 +951,12 @@ default-package-overrides: - ghc-tcplugins-extra ==0.4.1 - ghc-trace-events ==0.1.2.1 - ghc-typelits-extra ==0.4.2 - - ghc-typelits-knownnat ==0.7.4 + - ghc-typelits-knownnat ==0.7.5 - ghc-typelits-natnormalise ==0.7.3 - ghc-typelits-presburger ==0.5.2.0 + - ghci-hexcalc ==0.1.1.0 + - ghcid ==0.8.7 + - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -972,9 +974,10 @@ default-package-overrides: - gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.3 + - gi-pango ==1.0.23 + - gi-xlib ==2.0.9 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - github-release ==1.3.6 @@ -983,7 +986,6 @@ default-package-overrides: - github-webhooks ==0.15.0 - gitlab-haskell ==0.2.5 - gitrev ==1.3.1 - - gi-xlib ==2.0.9 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -998,14 +1000,14 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 + - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 - graphviz ==2999.20.1.0 - - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.2.0.0 - - greskell-core ==0.1.3.5 + - greskell ==1.2.0.1 + - greskell-core ==0.1.3.6 - greskell-websocket ==0.1.2.5 - groom ==0.1.2.1 - group-by-date ==0.1.0.4 @@ -1086,9 +1088,9 @@ default-package-overrides: - hgeometry ==0.11.0.0 - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 + - hi-file-parser ==0.1.0.0 - hidapi ==0.1.5 - hie-bios ==0.7.2 - - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1127,15 +1129,16 @@ default-package-overrides: - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 - - hsass ==0.8.0 - hs-bibutils ==6.10.0.0 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 + - hs-php-session ==0.0.9.3 + - hsass ==0.8.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.1 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1163,13 +1166,12 @@ default-package-overrides: - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 - - hspec-need-env ==0.1.0.5 + - hspec-need-env ==0.1.0.6 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 - - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1183,7 +1185,6 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1195,13 +1196,14 @@ default-package-overrides: - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 - - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-query ==0.1.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 + - http2 ==2.0.5 + - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.1.0 - HUnit-approx ==1.1.1.1 @@ -1214,7 +1216,6 @@ default-package-overrides: - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - hw-dsv ==0.4.1.0 - - hweblib ==0.6.3 - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 @@ -1239,6 +1240,7 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 + - hweblib ==0.6.3 - hxt ==9.3.1.21 - hxt-charproperties ==9.5.0.0 - hxt-css ==0.1.0.3 @@ -1322,13 +1324,13 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - iterable ==3.0 - it-has ==0.2.0.0 + - iterable ==3.0 + - ix-shapable ==0.1.0 - ixset-typed ==0.5 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 - - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 @@ -1339,9 +1341,9 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-feed ==1.0.12 - - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 + - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1420,9 +1422,9 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 + - lift-generics ==0.2 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 - - lift-generics ==0.2 - line ==4.0.1 - linear ==1.21.4 - linear-circuit ==0.1.0.2 @@ -1431,11 +1433,11 @@ default-package-overrides: - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 - - ListLike ==4.7.4 - list-predicate ==0.1.0.1 - - listsafe ==0.1.0.1 - list-singleton ==1.0.0.5 - list-t ==1.0.4 + - ListLike ==4.7.4 + - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.3.1 - little-rio ==0.2.2 @@ -1468,8 +1470,8 @@ default-package-overrides: - machines ==0.7.1 - magic ==1.1 - magico ==0.0.2.1 - - mainland-pretty ==0.7.0.1 - main-tester ==0.2.0.1 + - mainland-pretty ==0.7.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 @@ -1481,9 +1483,9 @@ default-package-overrides: - massiv-persist ==0.1.0.0 - massiv-serialise ==0.1.0.0 - massiv-test ==0.1.6.1 - - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 + - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1495,9 +1497,9 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.4.0.0 - mcmc-types ==1.0.3 + - med-module ==0.1.2.1 - medea ==1.2.0 - median-stream ==0.7.0.0 - - med-module ==0.1.2.1 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1526,12 +1528,12 @@ default-package-overrides: - mime-mail ==0.5.0 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 + - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.0 - minio-hs ==1.5.3 - miniutter ==0.5.1.1 - - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 @@ -1543,8 +1545,8 @@ default-package-overrides: - mmark-ext ==0.2.1.2 - mmorph ==1.1.4 - mnist-idx ==0.1.2.8 - - mockery ==0.3.5 - mock-time ==0.1.0 + - mockery ==0.3.5 - mod ==0.1.2.1 - model ==0.5 - modern-uri ==0.3.3.1 @@ -1554,9 +1556,7 @@ default-package-overrides: - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 - - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monadlist ==0.0.2 - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 - monad-logger-logstash ==0.1.0.0 @@ -1565,26 +1565,28 @@ default-package-overrides: - monad-memo ==0.5.3 - monad-metrics ==0.2.2.0 - monad-par ==0.3.5 - - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 + - monad-parallel ==0.7.2.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 - - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 + - monadic-arrays ==0.2.2 + - monadlist ==0.0.2 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 + - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.16.0 - morpheus-graphql-client ==0.16.0 @@ -1597,14 +1599,14 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multiarg ==0.30.0.10 - multi-containers ==0.1.1 + - multiarg ==0.30.0.10 - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 - murmur-hash ==0.1.0.9 + - murmur3 ==1.0.4 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1652,16 +1654,16 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 + - no-value ==1.0.0.0 + - non-empty ==0.3.2 + - non-empty-sequence ==0.2.0.4 + - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonemptymap ==0.0.6.0 - - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 - - non-negative ==0.1.2 + - nonemptymap ==0.0.6.0 - not-gloss ==0.7.7.0 - - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.3 @@ -1677,9 +1679,9 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 + - o-clock ==1.2.0.1 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 - - o-clock ==1.2.0.1 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1692,9 +1694,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 + - open-browser ==0.2.1.0 - OpenAL ==1.7.0.5 - openapi3 ==3.0.1.0 - - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1758,10 +1760,10 @@ default-package-overrides: - pattern-arrows ==0.0.2 - pava ==0.1.1.0 - pcg-random ==0.1.3.7 - - pcre2 ==1.1.4 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 + - pcre2 ==1.1.4 - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 @@ -1784,12 +1786,12 @@ default-package-overrides: - persistent-test ==2.0.3.5 - persistent-typed-db ==0.1.0.2 - pg-harness-client ==0.6.0 - - pgp-wordlist ==0.1.0.3 - pg-transact ==0.3.1.1 + - pgp-wordlist ==0.1.0.3 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pinboard ==0.10.2.0 - - pipes ==4.3.14 + - pipes ==4.3.15 - pipes-aeson ==0.4.1.8 - pipes-attoparsec ==0.5.1.5 - pipes-binary ==0.4.2 @@ -1824,6 +1826,7 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 + - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.3.3 - postgresql-libpq ==0.9.4.3 @@ -1832,28 +1835,27 @@ default-package-overrides: - postgresql-simple ==0.6.4 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 - - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prairie ==0.0.1.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 - - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-diff ==0.2.0.3 - pretty-hex ==1.1 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==4.0.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 + - prettyclass ==1.0.0.0 - prettyprinter ==1.7.0 - prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1.1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==4.0.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 @@ -1867,14 +1869,20 @@ default-package-overrides: - product-profunctors ==0.11.0.2 - profiterole ==0.1 - profunctors ==5.5.2 - - projectroot ==0.2.0.1 - project-template ==0.2.1.0 + - projectroot ==0.2.0.1 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 + - proto-lens ==0.7.0.0 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - proto3-wire ==1.1.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 @@ -1882,12 +1890,6 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - - proto-lens ==0.7.0.0 - - proto-lens-optparse ==0.1.1.7 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1934,37 +1936,38 @@ default-package-overrides: - random-source ==0.3.0.8 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - Ranged-sets ==0.4.0 - range-set-list ==0.1.3.1 + - Ranged-sets ==0.4.0 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.13 - rate-limit ==1.4.2 + - ratel ==1.0.13 - ratel-wai ==1.1.4 - rattle ==0.2 + - raw-strings-qq ==1.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - - raw-strings-qq ==1.1 - rcu ==0.2.4 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 - - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 + - readable ==0.3.1 - reanimate ==1.1.3.2 - reanimate-svg ==0.13.0.0 - rebase ==1.6.1 - record-dot-preprocessor ==0.2.7 - record-hasfield ==1.0 - - records-sop ==0.1.0.3 - record-wrangler ==0.1.1.0 + - records-sop ==0.1.0.3 - recursion-schemes ==5.2.1 - reducers ==3.12.3 - - refact ==0.3.0.2 - ref-fd ==0.4.0.2 + - ref-tf ==0.4.0.2 + - refact ==0.3.0.2 - refined ==0.6.2 - reflection ==2.1.6 - reform ==0.2.7.4 @@ -1972,7 +1975,6 @@ default-package-overrides: - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.4 - RefSerialize ==0.4.0 - - ref-tf ==0.4.0.2 - regex ==1.1.0.0 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 @@ -2030,15 +2032,15 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 - - safecopy ==0.10.3.1 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 - - safeio ==0.0.5.0 - safe-json ==1.1.1.1 - safe-money ==0.9 - - SafeSemaphore ==0.10.1 - safe-tensor ==0.2.1.0 + - safecopy ==0.10.3.1 + - safeio ==0.0.5.0 + - SafeSemaphore ==0.10.1 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.1 @@ -2076,8 +2078,8 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.3.5 - semigroups ==0.19.1 - - semirings ==0.6 - semiring-simple ==1.0.0.1 + - semirings ==0.6 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2123,9 +2125,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 + - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 - shortcut-links ==0.5.1.1 @@ -2196,16 +2198,16 @@ default-package-overrides: - splitmix ==0.1.0.3 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 + - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.0 - - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - squeather ==0.6.0.0 - srcloc ==0.5.1.2 - stache ==2.2.0 - - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 + - stackcollapse-ghc ==0.0.1.3 - stateref ==0.3 - StateVar ==1.2.1 - static-text ==0.2.0.6 @@ -2220,8 +2222,8 @@ default-package-overrides: - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.4 - stm-lifted ==2.5.0.0 - - STMonadTrans ==0.4.5 - stm-split ==0.0.2.1 + - STMonadTrans ==0.4.5 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6 @@ -2242,7 +2244,6 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 - - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 @@ -2250,8 +2251,9 @@ default-package-overrides: - string-interpolate ==0.3.0.2 - string-qq ==0.0.4 - string-random ==0.1.4.0 - - stringsearch ==0.3.6.6 - string-transform ==1.1.1 + - stringbuilder ==0.5.1 + - stringsearch ==0.3.6.6 - stripe-concepts ==1.0.2.4 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 @@ -2276,10 +2278,10 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 + - systemd ==2.3.0 - tabular ==0.2.2.8 - taffybar ==3.2.3 - tagchup ==0.4.1.1 @@ -2346,7 +2348,6 @@ default-package-overrides: - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 - - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2357,8 +2358,9 @@ default-package-overrides: - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.11 - - tfp ==1.0.1.1 + - textlocal ==0.1.0.5 - tf-random ==0.5 + - tfp ==1.0.1.1 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1.1 @@ -2366,10 +2368,6 @@ default-package-overrides: - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - th-env ==0.1.0.2 - - these ==1.1.1.1 - - these-lens ==1.0.1.1 - - these-optics ==1.0.1.1 - - these-skinny ==0.7.4 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2377,33 +2375,37 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 - - thread-hierarchy ==0.3.0.2 - - thread-local-storage ==0.2 - - threads ==0.5.1.6 - - thread-supervisor ==0.2.0.0 - - threepenny-gui ==0.9.0.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.9 - - throttle-io-stream ==0.2.0.1 - - through-text ==0.1.0.0 - - throwable-exceptions ==0.1.0.9 - th-strict-compat ==0.1.0.1 - th-test-utils ==1.1.0 - th-utilities ==0.2.4.1 + - these ==1.1.1.1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 + - these-skinny ==0.7.4 + - thread-hierarchy ==0.3.0.2 + - thread-local-storage ==0.2 + - thread-supervisor ==0.2.0.0 + - threads ==0.5.1.6 + - threepenny-gui ==0.9.0.0 + - throttle-io-stream ==0.2.0.1 + - through-text ==0.1.0.0 + - throwable-exceptions ==0.1.0.9 - thyme ==0.3.5.5 - tidal ==1.6.1 - tile ==0.3.0.0 - time-compat ==1.9.5 - - timeit ==2.0 - - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - timerep ==2.0.1.0 - - timer-wheel ==0.3.0 - time-units ==1.0.0 + - timeit ==2.0 + - timelens ==0.2.0.2 + - timer-wheel ==0.3.0 + - timerep ==2.0.1.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2439,14 +2441,10 @@ default-package-overrides: - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 + - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 - - typecheck-plugin-nat-simple ==0.1.0.2 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2456,12 +2454,16 @@ default-package-overrides: - type-level-natural-number ==2.0 - type-level-numbers ==0.1.1.1 - type-map ==0.1.6.0 - - type-natural ==1.0.0.0 + - type-natural ==1.1.0.0 - type-of-html ==1.6.2.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - typerep-map ==0.3.3.0 - type-spec ==0.4.0.0 + - typecheck-plugin-nat-simple ==0.1.0.2 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 + - typerep-map ==0.3.3.0 - tzdata ==0.2.20201021.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 @@ -2602,18 +2604,18 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.0.0.5 - - witherable-class ==0 - - within ==0.2.0.1 - with-location ==0.1.0 - with-utf8 ==1.0.2.1 + - witherable-class ==0 + - within ==0.2.0.1 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word24 ==2.0.1 - - word8 ==0.1.3 - word-trie ==0.3.0 - word-wrap ==0.4.1 + - word24 ==2.0.1 + - word8 ==0.1.3 - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.3 @@ -2640,7 +2642,6 @@ default-package-overrides: - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 - - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 - xml-html-qq ==0.1.0.1 @@ -2650,6 +2651,7 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 + - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.3 @@ -2657,11 +2659,12 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.2 + - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 - yesod-auth-oauth2 ==0.6.1.7 - - yesod-bin ==1.6.0.6 + - yesod-bin ==1.6.1 - yesod-core ==1.6.18.8 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 @@ -2674,7 +2677,6 @@ default-package-overrides: - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 - yesod-websockets ==0.3.0.2 - - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2689,9 +2691,9 @@ default-package-overrides: - zio ==0.1.0.2 - zip ==1.7.0 - zip-archive ==0.4.1 + - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 - zippers ==0.3 - - zip-stream ==0.2.0.1 - zlib ==0.6.2.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -2808,6 +2810,33 @@ package-maintainers: - zre utdemir: - nix-tree + turion: + - rhine + - rhine-gloss + - essence-of-live-coding + - essence-of-live-coding-gloss + - essence-of-live-coding-pulse + - essence-of-live-coding-quickcheck + - Agda + - dunai + - finite-typelits + - pulse-simple + - simple-affine-space + sternenseemann: + # also maintain upstream package + - spacecookie + - gopher-proxy + # other packages I can help out for + - systemd + - fast-logger + - Euterpea2 + - utc + - socket + - gitit + - yarn-lock + - yarn2nix + poscat: + - hinit unsupported-platforms: alsa-mixer: [ x86_64-darwin ] @@ -6418,7 +6447,6 @@ broken-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples - - hinit - hinquire - hinstaller - hint-server @@ -6954,6 +6982,7 @@ broken-packages: - iban - ical - iCalendar + - ice40-prim - IcoGrid - iconv-typed - ide-backend @@ -7329,7 +7358,6 @@ broken-packages: - keyvaluehash - keyword-args - khph - - ki - kicad-data - kickass-torrents-dump-parser - kickchan @@ -9400,7 +9428,6 @@ broken-packages: - regex-tdfa-pipes - regex-tdfa-quasiquoter - regex-tdfa-rc - - regex-tdfa-text - regex-tdfa-unittest - regex-tdfa-utf8 - regex-tre @@ -11460,7 +11487,6 @@ broken-packages: - xml-conduit-stylist - xml-enumerator - xml-enumerator-combinators - - xml-extractors - xml-html-conduit-lens - xml-monad - xml-parsec @@ -11539,8 +11565,6 @@ broken-packages: - yandex-translate - yaop - yap - - yarn-lock - - yarn2nix - yarr - yarr-image-io - yavie diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 4e23ab80c1..21aa86ee5a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -207,6 +207,7 @@ self: super: builtins.intersectAttrs super { network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw + pixiv = dontCheck super.pixiv; raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw riak = dontCheck super.riak; # http://hydra.cryp.to/build/498763/log/raw scotty-binding-play = dontCheck super.scotty-binding-play; @@ -226,6 +227,7 @@ self: super: builtins.intersectAttrs super { http-client-tls = dontCheck super.http-client-tls; http-conduit = dontCheck super.http-conduit; transient-universe = dontCheck super.transient-universe; + telegraph = dontCheck super.telegraph; typed-process = dontCheck super.typed-process; js-jquery = dontCheck super.js-jquery; hPDB-examples = dontCheck super.hPDB-examples; @@ -806,4 +808,8 @@ self: super: builtins.intersectAttrs super { # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); + + # hadolint enables static linking by default in the cabal file, so we have to explicitly disable it. + # https://github.com/hadolint/hadolint/commit/e1305042c62d52c2af4d77cdce5d62f6a0a3ce7b + hadolint = disableCabalFlag super.hadolint "static"; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 6928bba47f..b4fcf554bb 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -824,7 +824,7 @@ self: { description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ abbradar ]; + maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; "Agda-executable" = callPackage @@ -17052,15 +17052,15 @@ self: { "Rattus" = callPackage ({ mkDerivation, base, Cabal, containers, ghc, ghc-prim - , simple-affine-space + , simple-affine-space, transformers }: mkDerivation { pname = "Rattus"; - version = "0.4"; - sha256 = "1sgr33yq5l43k3b8nwx7m6wrygv5k8d8yigzms3p6pq5pk3g5sq1"; + version = "0.5"; + sha256 = "1dh6ln8awqhgnk7hqh4zdkv4pqy3wmsqbmqrd016raf8vjbc1i3m"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base containers ghc ghc-prim simple-affine-space + base containers ghc ghc-prim simple-affine-space transformers ]; testHaskellDepends = [ base containers ]; description = "A modal FRP language"; @@ -20805,8 +20805,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.12"; - sha256 = "0j46hhwfqbry6w8l8wj0p486rsyvxkk6dbvhd1sjkha6cy5cvar4"; + version = "0.4"; + sha256 = "1v4m9b13p0sf3gs8qvdgkai4r9kb6sszw2qdyxrn6i4nq62f19zq"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21177,12 +21177,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_11_0_0" = callPackage + "Win32_2_11_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.11.0.0"; - sha256 = "179v0jypafjnh98gl8wr6z6pq1r5h740xzm2b6axd2d33zlnacfm"; + version = "2.11.1.0"; + sha256 = "18rsfx3ca8r7y4ifxn1mggn8j6ppgkn698wsq0pwqb63riva09rk"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -21983,16 +21983,18 @@ self: { "Z-IO" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hashable - , hspec, hspec-discover, HUnit, primitive, QuickCheck + , hspec, hspec-discover, HUnit, microlens, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, unix-time , unordered-containers, Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.6.1.0"; - sha256 = "0m0qvamvixxm9yd45393j44mnnlnw2672gcdv7kaqw4hjczlddmq"; + version = "0.6.2.0"; + sha256 = "0d004yi1i45ccqhl4vqw6h4qxav693vas359gs76bz04wdbqgrah"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base containers exceptions primitive stm time unix-time + base containers exceptions microlens primitive stm time unix-time unordered-containers Z-Data ]; libraryToolDepends = [ hspec-discover ]; @@ -24399,6 +24401,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson_1_5_6_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat + , base-compat-batteries, base-orphans, base16-bytestring + , bytestring, containers, data-fix, deepseq, Diff, directory, dlist + , filepath, generic-deriving, ghc-prim, hashable, hashable-time + , integer-logarithms, primitive, QuickCheck, quickcheck-instances + , scientific, strict, tagged, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, th-abstraction, these + , time, time-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.5.6.0"; + sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; + libraryHaskellDepends = [ + attoparsec base base-compat-batteries bytestring containers + data-fix deepseq dlist ghc-prim hashable primitive scientific + strict tagged template-haskell text th-abstraction these time + time-compat unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers data-fix Diff directory dlist filepath + generic-deriving ghc-prim hashable hashable-time integer-logarithms + QuickCheck quickcheck-instances scientific strict tagged tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + these time time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -24505,6 +24540,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "aeson-combinators_0_0_4_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, doctest, fail, hspec, scientific, text, time + , time-compat, unordered-containers, utf8-string, uuid-types + , vector, void + }: + mkDerivation { + pname = "aeson-combinators"; + version = "0.0.4.1"; + sha256 = "1nvw5n7kfqrrci76350zd3mqvssb775ka4044kxgw0bhdzy3gcpg"; + libraryHaskellDepends = [ + aeson base bytestring containers fail scientific text time + time-compat unordered-containers uuid-types vector void + ]; + testHaskellDepends = [ + aeson base bytestring doctest hspec text utf8-string + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion deepseq text + ]; + description = "Aeson combinators for dead simple JSON decoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aeson-commit" = callPackage ({ mkDerivation, aeson, aeson-qq, base, mtl, tasty, tasty-hspec , text @@ -29602,8 +29662,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.4.4.1"; - sha256 = "1vs0p7pc6z9mfjd2vns66wnhl8v1n9rbgabyjw0v832m2pwizzmj"; + version = "0.4.5.0"; + sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29615,15 +29675,15 @@ self: { license = lib.licenses.gpl3; }) {}; - "amqp-utils_0_4_5_0" = callPackage + "amqp-utils_0_4_5_1" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers , data-default-class, directory, hinotify, magic, network, process , text, time, tls, unix, utf8-string, x509-system }: mkDerivation { pname = "amqp-utils"; - version = "0.4.5.0"; - sha256 = "0iwjgsai5bxfwqjlqcvykihd3zfj7wivx83sb07rqykjxqyhhsk9"; + version = "0.4.5.1"; + sha256 = "15bsp34wqblmds51gvrliqfm4jax3swk7i58ichaliq454cn16ap"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -31874,10 +31934,10 @@ self: { }: mkDerivation { pname = "approx"; - version = "0.1.0.0"; - sha256 = "1vc6k0w4zr355gfvprb5syh5jpmkdvp6wjibi4l95q9zwwdwhjn2"; + version = "0.1.0.1"; + sha256 = "0vzi0ai7lf7ji2lbf9v412fvrins7acy0dqs4j8ylfd1chck1w99"; revision = "1"; - editedCabalFile = "0k34bjsazp4wbv7zzmvh5vnqv7yzyq20h99q30mcrn4g2bvpc0q1"; + editedCabalFile = "0kj9qqfv8fzg5b6l33avflxjlmd52wjsjridff1d5n071dnif37y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31890,7 +31950,7 @@ self: { base containers hashable QuickCheck text time unordered-containers vector ]; - description = "Easy-to-use reasonable way of emulating approximate in Haskell"; + description = "Easy-to-use emulation of approximate, ranges and tolerances in Haskell"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; @@ -31949,6 +32009,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "approximate_0_3_3" = callPackage + ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq + , ghc-prim, hashable, lens, log-domain, pointed, safecopy + , semigroupoids, semigroups, vector + }: + mkDerivation { + pname = "approximate"; + version = "0.3.3"; + sha256 = "1hvgx5m83zzpy2l0bbs39yvybhsxlq9919hp7wn27n5j0lk7wplk"; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq ghc-prim hashable lens + log-domain pointed safecopy semigroupoids semigroups vector + ]; + description = "Approximate discrete values and numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "approximate-equality" = callPackage ({ mkDerivation, base, type-level-natural-number }: mkDerivation { @@ -33295,23 +33373,6 @@ self: { }) {}; "ascii" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-group - , ascii-predicates, ascii-superset, ascii-th, base, bytestring - , data-ascii, text - }: - mkDerivation { - pname = "ascii"; - version = "1.0.1.2"; - sha256 = "051q0gamgvgd4j1bzqxww7qy4syx21s0vqhfihwlb2ypxf2s2fqa"; - libraryHaskellDepends = [ - ascii-case ascii-char ascii-group ascii-predicates ascii-superset - ascii-th base bytestring data-ascii text - ]; - description = "The ASCII character set and encoding"; - license = lib.licenses.asl20; - }) {}; - - "ascii_1_0_1_4" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-group , ascii-predicates, ascii-superset, ascii-th, base, bytestring , data-ascii, text @@ -33326,7 +33387,6 @@ self: { ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-art-to-unicode" = callPackage @@ -33345,17 +33405,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.2"; - sha256 = "1qs1rccslixsg4szgp7y98sqhhn0asp9qmk9vfrwdjfipmf3z72p"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-case"; @@ -33364,21 +33413,9 @@ self: { libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.6"; - sha256 = "049xccazgjb1zzqbzpgcw77hsl5j3j8l7f0268wxjy87il3wfnx3"; - libraryHaskellDepends = [ base hashable ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_8" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; @@ -33387,7 +33424,6 @@ self: { libraryHaskellDepends = [ base hashable ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33418,17 +33454,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.2"; - sha256 = "19l50ksqa7jdsl0pmrmy8q8jbgmb1j3hr63jjzys220f0agsgcwr"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-group"; @@ -33437,7 +33462,6 @@ self: { libraryHaskellDepends = [ ascii-char base hashable ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -33456,17 +33480,6 @@ self: { }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.0.2"; - sha256 = "0dzrxqhq7vqplg4aanc4kindwpizv3d777ri81sj1m1zn3vzvrrq"; - libraryHaskellDepends = [ ascii-char base ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, base }: mkDerivation { pname = "ascii-predicates"; @@ -33475,7 +33488,6 @@ self: { libraryHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -33523,19 +33535,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.2"; - sha256 = "0hx5kh6h239hqrnqyda55769jfbxjxcr4mihya1djl7ls1fy493v"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_4" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; @@ -33546,7 +33545,6 @@ self: { ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33568,20 +33566,6 @@ self: { }) {}; "ascii-th" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell - }: - mkDerivation { - pname = "ascii-th"; - version = "1.0.0.2"; - sha256 = "1dmr2g4kx14qad62awk4pv3izx5gm8bmzvs03gn3xrbzssjb8pvc"; - libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell - ]; - description = "Template Haskell support for ASCII"; - license = lib.licenses.asl20; - }) {}; - - "ascii-th_1_0_0_4" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell }: mkDerivation { @@ -33593,7 +33577,6 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -33816,8 +33799,8 @@ self: { pname = "asn1-encoding"; version = "0.9.6"; sha256 = "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"; - revision = "1"; - editedCabalFile = "19nq8g1v323p47cqlc4m9r6li35dd3cmcd7k486jw24cijkdjm9n"; + revision = "2"; + editedCabalFile = "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97"; libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; testHaskellDepends = [ asn1-types base bytestring hourglass mtl tasty tasty-quickcheck @@ -33992,6 +33975,8 @@ self: { pname = "assoc"; version = "1.0.2"; sha256 = "0kqlizznjy94fm8zr1ng633yxbinjff7cnsiaqs7m33ix338v66q"; + revision = "1"; + editedCabalFile = "17ycclzwnysca80frsyyb6sdd2r5p83lkgwxjjnjg6j62pvf8958"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = lib.licenses.bsd3; @@ -34222,6 +34207,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "async_2_2_3" = callPackage + ({ mkDerivation, base, hashable, HUnit, stm, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "async"; + version = "2.2.3"; + sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hashable stm ]; + testHaskellDepends = [ + base HUnit stm test-framework test-framework-hunit + ]; + description = "Run IO operations asynchronously and wait for their results"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "async-ajax" = callPackage ({ mkDerivation, async, base, ghcjs-ajax, text }: mkDerivation { @@ -34996,36 +35000,6 @@ self: { }) {}; "attoparsec" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, criterion, deepseq, directory, filepath, ghc-prim - , http-types, parsec, QuickCheck, quickcheck-unicode, scientific - , tasty, tasty-quickcheck, text, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.2.4"; - sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; - revision = "1"; - editedCabalFile = "0jlipzz2b1jb8yw22rvnhvbnadzcdf3wkwn4svl3j4m6858s0har"; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring deepseq QuickCheck quickcheck-unicode - scientific tasty tasty-quickcheck text transformers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers criterion deepseq - directory filepath ghc-prim http-types parsec scientific text - transformers unordered-containers vector - ]; - description = "Fast combinator parsing for bytestrings and text"; - license = lib.licenses.bsd3; - }) {}; - - "attoparsec_0_13_2_5" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, criterion, deepseq, directory, filepath, ghc-prim , http-types, parsec, QuickCheck, quickcheck-unicode, scientific @@ -35051,7 +35025,6 @@ self: { ]; description = "Fast combinator parsing for bytestrings and text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-arff" = callPackage @@ -40578,8 +40551,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "4"; - editedCabalFile = "07jwyndphnfr20ihagncpl8rr7i62hxf0b9m2bdahyzvz0yzdsl2"; + revision = "5"; + editedCabalFile = "1h2d37szfrcwn9rphnijn4q9l947b0wwqjs1aqmm62xkhbad7jf6"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -42782,6 +42755,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "bits_0_5_3" = callPackage + ({ mkDerivation, base, bytes, mtl, transformers }: + mkDerivation { + pname = "bits"; + version = "0.5.3"; + sha256 = "0avcm2635nvgghr7nbci66s4l5q4k6ag81hla1xai58b159anyq0"; + libraryHaskellDepends = [ base bytes mtl transformers ]; + description = "Various bit twiddling and bitwise serialization primitives"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "bits-atomic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47313,6 +47298,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "bytes_0_17_1" = callPackage + ({ mkDerivation, base, binary, binary-orphans, bytestring, cereal + , containers, hashable, mtl, scientific, text, time, transformers + , transformers-compat, unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.17.1"; + sha256 = "1qmps8vvg98wfm9xm734hwzi56bsk8r1zc6vx20rlhc79krv5s9s"; + libraryHaskellDepends = [ + base binary binary-orphans bytestring cereal containers hashable + mtl scientific text time transformers transformers-compat + unordered-containers void + ]; + description = "Sharing code for serialization between binary and cereal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -47376,15 +47380,23 @@ self: { broken = true; }) {}; - "bytestring_0_11_0_0" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }: + "bytestring_0_11_1_0" = callPackage + ({ mkDerivation, base, deepseq, dlist, ghc-prim, integer-gmp + , random, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , transformers + }: mkDerivation { pname = "bytestring"; - version = "0.11.0.0"; - sha256 = "03fwkbn52946y2l1ddrqq1jp8l9bhgi0gwxpz1wqqsn6n2vz5rrj"; - revision = "1"; - editedCabalFile = "0qhx61v75cqpgrb88h5gpc4a6vg17dgrw555q2kgi2hvip61z5lr"; + version = "0.11.1.0"; + sha256 = "1a29kwczd1hcpir691x936i9c5ys9d7m1lyby48djs9w54ksy1jw"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; + testHaskellDepends = [ + base deepseq dlist ghc-prim tasty tasty-hunit tasty-quickcheck + transformers + ]; + benchmarkHaskellDepends = [ + base deepseq dlist random tasty-bench + ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -50659,8 +50671,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.10.0.0"; - sha256 = "054cy2rr2hg0brrbxff4my3q2fzr1qk7ik2xyip65dq54958ibqk"; + version = "0.10.0.1"; + sha256 = "1p5vx7gcswz08f790swb8pi2ckbphqr76j8gav4rvrbalscd3zvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51567,8 +51579,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; - revision = "1"; - editedCabalFile = "1ph8rf91z4nf1ryrh9s4gd1kq98jlgk2manwddkpch8k0n9xvfk4"; + revision = "2"; + editedCabalFile = "1y08lhkh6c6421g3nwwkrrv3r36l75x9j2hnm5khagjpm5njjzma"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -53160,6 +53172,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "charset_0_3_8" = callPackage + ({ mkDerivation, array, base, bytestring, containers + , unordered-containers + }: + mkDerivation { + pname = "charset"; + version = "0.3.8"; + sha256 = "1rw6y2insgljbi5l1nwqwv9v865sswjly9rvwipd8zajkgks7aks"; + libraryHaskellDepends = [ + array base bytestring containers unordered-containers + ]; + description = "Fast unicode character sets based on complemented PATRICIA tries"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "charsetdetect" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -57105,6 +57133,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "cmdargs_0_10_21" = callPackage + ({ mkDerivation, base, filepath, process, template-haskell + , transformers + }: + mkDerivation { + pname = "cmdargs"; + version = "0.10.21"; + sha256 = "0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath process template-haskell transformers + ]; + description = "Command line argument processing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cmdargs-browser" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , http-types, js-jquery, process, text, transformers, wai @@ -57525,8 +57571,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.14"; - sha256 = "1vkjnyzcl44h9b24k1h5mz61gdz42bs64ifxwijx8a2a72mwmaa6"; + version = "0.1.3.17"; + sha256 = "1x289bmzrj1yrr934b51v3amldhjdanjv4kxnay89n8avix899yw"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58039,8 +58085,8 @@ self: { }: mkDerivation { pname = "coinbase-pro"; - version = "0.8.0.0"; - sha256 = "021c05qkrvgxlylvrrlb81bjxl49v5varn0fi5wqs5sda15766n3"; + version = "0.9.0.0"; + sha256 = "1wnjpm49gy75nl3m01bablchbk7clsgf4x53xqx5k2bsvn1xd1n1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59543,6 +59589,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "compensated_0_8_2" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad + , criterion, deepseq, distributive, hashable, lens, log-domain + , safecopy, semigroupoids, semigroups, vector + }: + mkDerivation { + pname = "compensated"; + version = "0.8.2"; + sha256 = "0mqy5c5wh4m3l78fbd20vnllpsn383q07kxl6j62iakcyhr1264p"; + libraryHaskellDepends = [ + base bifunctors binary bytes cereal comonad deepseq distributive + hashable lens log-domain safecopy semigroupoids semigroups vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Compensated floating-point arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "competition" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -61869,14 +61934,15 @@ self: { , base-unicode-symbols, bytestring, Cabal, case-insensitive , deepseq, directory, dlist, filepath, mtl, network-uri , optparse-applicative, process, profunctors, semigroupoids - , semigroups, text, transformers, unordered-containers, yaml + , semigroups, text, transformers, unordered-containers, vector + , yaml }: mkDerivation { pname = "configuration-tools"; - version = "0.5.0"; - sha256 = "0pgx2wzzqxgafgf3qjys05hp89lz4fwczsx0i581n8ngs3p4i0wh"; - revision = "1"; - editedCabalFile = "0srscnmj5dhaq0djx0lhcggl53ipn6pw8vgsvgzhhjrbmnn2zb2p"; + version = "0.6.0"; + sha256 = "1lncsh3dfl8iz1yr2b0mmpcdyww3cbr3jglp85iqmpvzv66m2kbg"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base bytestring Cabal directory filepath process ]; @@ -61885,8 +61951,9 @@ self: { bytestring Cabal case-insensitive deepseq directory dlist filepath mtl network-uri optparse-applicative process profunctors semigroupoids semigroups text transformers unordered-containers - yaml + vector yaml ]; + executableHaskellDepends = [ base base-unicode-symbols Cabal mtl ]; testHaskellDepends = [ base base-unicode-symbols bytestring Cabal mtl text transformers unordered-containers yaml @@ -62442,6 +62509,26 @@ self: { license = lib.licenses.bsd2; }) {}; + "constraints_0_13" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, transformers, transformers-compat + , type-equality + }: + mkDerivation { + pname = "constraints"; + version = "0.13"; + sha256 = "143558jykvya7y8134dx30g6nh27q5s61nbq369p69igd1aayncj"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl transformers + transformers-compat type-equality + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "Constraint manipulation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "constraints-deriving" = callPackage ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths , path, path-io @@ -65292,6 +65379,8 @@ self: { pname = "criterion"; version = "1.5.9.0"; sha256 = "0qhlylhra1d3vzk6miqv0gdrn10gw03bdwv8b4bfmdzgpf0zgqr1"; + revision = "1"; + editedCabalFile = "140444pqw65vsqpa168c13cljb66rdgvq41mxnvds296wxq2yz7i"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -65315,6 +65404,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "criterion-cmp" = callPackage + ({ mkDerivation, ansi-terminal, base, boxes, bytestring, cassava + , containers, filepath, optparse-applicative, vector + }: + mkDerivation { + pname = "criterion-cmp"; + version = "0.1.0.0"; + sha256 = "0p9l9c89bg1n7xjdq3npvknlfb36gkvpgwhq7i0qd2g20ysdxppd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base boxes bytestring cassava containers filepath + optparse-applicative vector + ]; + description = "A simple tool for comparing in Criterion benchmark results"; + license = lib.licenses.bsd3; + }) {}; + "criterion-compare" = callPackage ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams , clay, colour, containers, data-default, filepath, lens, lucid @@ -68511,22 +68618,6 @@ self: { }) {}; "data-ascii" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , hashable, semigroups, text - }: - mkDerivation { - pname = "data-ascii"; - version = "1.0.0.4"; - sha256 = "17pb1kmqln7cswsc4c7xipq619aj2y0kjhrcm23r8b39c0g02scy"; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive hashable semigroups - text - ]; - description = "Type-safe, bytestring-based ASCII values"; - license = lib.licenses.bsd3; - }) {}; - - "data-ascii_1_0_0_6" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , hashable, semigroups, text }: @@ -68540,7 +68631,6 @@ self: { ]; description = "Type-safe, bytestring-based ASCII values"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-aviary" = callPackage @@ -72034,6 +72124,29 @@ self: { license = lib.licenses.mit; }) {}; + "deferred-folds_0_9_16" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.16"; + sha256 = "0727pknxn5vib9ri7h39d6gbqxgczqcfdmqaqj9i0lv6wbwn5ar1"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -73617,8 +73730,8 @@ self: { pname = "dhall"; version = "1.38.0"; sha256 = "0ifxi9i7ply640s2cgljjczvmblgz0ryp2p9yxgng3qm5ai58229"; - revision = "1"; - editedCabalFile = "067hh41cnmjskf3y3kzlwsisw6v5bh9mbmhg5jfapm1y5xp6gw9r"; + revision = "2"; + editedCabalFile = "13ppbn4kcrfls9fm9sqjwa4hb4nj8q6fqfxj3a62vck7qc1rbvn0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73660,6 +73773,8 @@ self: { pname = "dhall-bash"; version = "1.0.36"; sha256 = "0hg45xjl1pcla9xbds40qrxcx2h6b4ysw8kbx8hpnaqaazr2jrw0"; + revision = "1"; + editedCabalFile = "1jc74gydr3yx01xp1a69a3g9mbfqyzsmv1053xm51bcxxv6p6z9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73703,8 +73818,8 @@ self: { pname = "dhall-docs"; version = "1.0.4"; sha256 = "0x6x5b9kh0in35jsgj2dghyxsqjdjrw7s9kngyjcn7v2ycklcifl"; - revision = "2"; - editedCabalFile = "1y8aaph8zg3lp53apvkg0s6zviz3sa82qq1dnbqn6xjgb1dqjr7z"; + revision = "3"; + editedCabalFile = "116m74khdfx57ghrid1myqyj8acrhzhnjzjmxnsn3yghdan29797"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73770,8 +73885,8 @@ self: { pname = "dhall-json"; version = "1.7.5"; sha256 = "1fpkp8xkcw2abcigypyl0ji6910jyshlqwhf48yfwn6dsgbyw6iy"; - revision = "1"; - editedCabalFile = "0vl9vb84r1fz80jvqxaq4624pk67hxkm3vsx5j0l3bz8mk439yzn"; + revision = "2"; + editedCabalFile = "0181ma0qzkcfg4g5fcyivmjfn542m9cmq74r6hxilfjvfzhk7fqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73821,8 +73936,8 @@ self: { pname = "dhall-lsp-server"; version = "1.0.13"; sha256 = "0cj51xdmpp0w7ndzbz4yn882agvhbnsss3myqlhfi4y91lb8f1ak"; - revision = "2"; - editedCabalFile = "1gmcfp6i36y00z4gyllcq62rgpjz2x7fgdy4n6d24ygczpqbwy9k"; + revision = "4"; + editedCabalFile = "04m040956j49qr8hzlj2jj101pjj6n0f5g5hhf5m73y1bww43ahf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73965,6 +74080,8 @@ self: { pname = "dhall-yaml"; version = "1.2.5"; sha256 = "0fax4p85344yrzk1l21j042mm02p0idp396vkq71x3dpiniq0mwf"; + revision = "1"; + editedCabalFile = "034rykrnmsnc9v9hsblkzjp26b8wv265sd31gwhqxy2358y4s33h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74669,6 +74786,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "diagrams-solve_0_1_3" = callPackage + ({ mkDerivation, base, deepseq, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "diagrams-solve"; + version = "0.1.3"; + sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base deepseq tasty tasty-hunit tasty-quickcheck + ]; + description = "Pure Haskell solver routines used by diagrams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, filepath, hashable @@ -79255,6 +79389,18 @@ self: { broken = true; }) {}; + "drama" = callPackage + ({ mkDerivation, base, criterion, ki, transformers, unagi-chan }: + mkDerivation { + pname = "drama"; + version = "0.1.0.1"; + sha256 = "0ssmw1yci4369hvpdc5f4ng6s4m7m2lgn9sp6jbgj90izwg0px8w"; + libraryHaskellDepends = [ base ki transformers unagi-chan ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Simple actor library for Haskell"; + license = lib.licenses.bsd3; + }) {}; + "draw-poker" = callPackage ({ mkDerivation, base, random-shuffle, safe }: mkDerivation { @@ -80016,6 +80162,7 @@ self: { testHaskellDepends = [ base tasty tasty-hunit transformers ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "dunai-core" = callPackage @@ -81121,6 +81268,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "echo_0_1_4" = callPackage + ({ mkDerivation, base, process }: + mkDerivation { + pname = "echo"; + version = "0.1.4"; + sha256 = "0hqfdd4kvpp59cjjv790bkf72yqr9xjfqlbjcrdsc9a8j3r1pzn9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process ]; + description = "A cross-platform, cross-console way to handle echoing terminal input"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ecma262" = callPackage ({ mkDerivation, base, containers, data-default, lens, parsec, safe , transformers @@ -82991,6 +83152,25 @@ self: { broken = true; }) {}; + "elynx_0_5_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.5.0.2"; + sha256 = "1hky4amw78ciblr6alcxp79dshsc5wqswp16hbqdry132xps9dw3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -83013,6 +83193,28 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-markov_0_5_0_2" = callPackage + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, primitive, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.5.0.2"; + sha256 = "0wlcq3q26lgwixhsq1afz9i3phr2sncwc0r6m4adminh9m1zdr5z"; + libraryHaskellDepends = [ + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random primitive statistics vector + ]; + testHaskellDepends = [ + base containers elynx-tools hmatrix hspec mwc-random vector + ]; + benchmarkHaskellDepends = [ base ]; + description = "Simulate molecular sequences along trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { @@ -83025,6 +83227,19 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-nexus_0_5_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, hspec }: + mkDerivation { + pname = "elynx-nexus"; + version = "0.5.0.2"; + sha256 = "1y7ndj216w58s85bfgp4vg7zi1asj6br68k000hy4a8cchjprlp9"; + libraryHaskellDepends = [ attoparsec base bytestring ]; + testHaskellDepends = [ base hspec ]; + description = "Import and export Nexus files"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive @@ -83045,6 +83260,27 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-seq_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, mwc-random, parallel, primitive + , vector, vector-th-unbox, word8 + }: + mkDerivation { + pname = "elynx-seq"; + version = "0.5.0.2"; + sha256 = "11nl8gw05gvd6j7dflqzi21kixmm0jalpqv9x9f6bb7qwdv1xak2"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers matrices mwc-random + parallel primitive vector vector-th-unbox word8 + ]; + testHaskellDepends = [ + base bytestring elynx-tools hspec matrices vector + ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tools" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, fast-logger @@ -83067,6 +83303,29 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "elynx-tools_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, monad-control, monad-logger, mwc-random + , optparse-applicative, primitive, template-haskell, text, time + , transformers, transformers-base, vector, zlib + }: + mkDerivation { + pname = "elynx-tools"; + version = "0.5.0.2"; + sha256 = "1q62f0b0fk6g2a4w5bbbpldv0awk7cn2q544xcxplanpr3fmaj8v"; + libraryHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 deepseq directory fast-logger hmatrix + monad-control monad-logger mwc-random optparse-applicative + primitive template-haskell text time transformers transformers-base + vector zlib + ]; + description = "Tools for ELynx"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + }) {}; + "elynx-tree" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, deepseq, double-conversion, elynx-nexus @@ -83094,6 +83353,33 @@ self: { broken = true; }) {}; + "elynx-tree_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, criterion, deepseq, double-conversion, elynx-nexus + , elynx-tools, hspec, math-functions, microlens, mwc-random + , parallel, primitive, QuickCheck, statistics + }: + mkDerivation { + pname = "elynx-tree"; + version = "0.5.0.2"; + sha256 = "1ywqbc80hq4dprzrrq9gyi7h2624i2mgpd43pv045dldh7dqhygn"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers deepseq + double-conversion elynx-nexus math-functions mwc-random parallel + primitive statistics + ]; + testHaskellDepends = [ + attoparsec base bytestring containers elynx-tools hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion elynx-tools microlens mwc-random parallel + ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -84900,6 +85186,32 @@ self: { broken = true; }) {}; + "ersatz_0_4_9" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , data-default, fail, lens, mtl, parsec, process, semigroups + , temporary, transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.9"; + sha256 = "1pnqz7zvkfw70pjhhs5lm965iydrj8cgbj685fh50fpm0wapnmfd"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers fail lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base ]; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -85163,6 +85475,7 @@ self: { ]; description = "General purpose live coding framework"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-gloss" = callPackage @@ -85178,6 +85491,7 @@ self: { ]; description = "General purpose live coding framework - Gloss backend"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-gloss-example" = callPackage @@ -85211,6 +85525,7 @@ self: { ]; description = "General purpose live coding framework - pulse backend"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-pulse-example" = callPackage @@ -85245,6 +85560,7 @@ self: { ]; description = "General purpose live coding framework - QuickCheck integration"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "essence-of-live-coding-warp" = callPackage @@ -85732,17 +86048,23 @@ self: { "evdev" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, extra - , libevdev, monad-loops, time, unix + , filepath-bytestring, libevdev, monad-loops, rawfilepath, tasty + , tasty-hunit, tasty-quickcheck, time, unix }: mkDerivation { pname = "evdev"; - version = "2.0.0.1"; - sha256 = "0ryq50g7z70rnv07pnvwssl0qrvhbljkq9yk1z8gj9kvqdsw9cmg"; + version = "2.1.0"; + sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3"; libraryHaskellDepends = [ - base bytestring containers extra monad-loops time unix + base bytestring containers extra filepath-bytestring monad-loops + rawfilepath time unix ]; libraryPkgconfigDepends = [ libevdev ]; libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring containers extra filepath-bytestring monad-loops + rawfilepath tasty tasty-hunit tasty-quickcheck time unix + ]; description = "Bindings to libevdev"; license = lib.licenses.bsd3; }) {inherit (pkgs) libevdev;}; @@ -85755,6 +86077,8 @@ self: { pname = "evdev-streamly"; version = "0.0.1.0"; sha256 = "1bzmxkg5y7w6v5l6q5vzhr19j5vwbx4p4qxdq72f7f714ihn8nyp"; + revision = "1"; + editedCabalFile = "02xnb49zwr39ziq2xrwnnddzxr1ppwig441i3074g1w0ng5cf2gj"; libraryHaskellDepends = [ base bytestring containers evdev extra posix-paths rawfilepath streamly streamly-fsnotify unix @@ -86722,8 +87046,8 @@ self: { }: mkDerivation { pname = "exh"; - version = "1.0.0"; - sha256 = "0s5br96spx4v67mvl09w4kpcwvps65zp6qx5qpvrq63a0ncclp7l"; + version = "1.0.2"; + sha256 = "10pvr8ya2f7arp8cqi4g97dpqin1h8n0xmnihqszchcils0v2ayn"; libraryHaskellDepends = [ aeson base bytestring conduit containers html-conduit http-client in-other-words language-javascript megaparsec optics-core optics-th @@ -88588,6 +88912,8 @@ self: { pname = "fast-logger"; version = "3.0.2"; sha256 = "0ilbjz09vw35jzfvkiqjy6zjbci2l60wcyjzfysrbxzk24qxmb5z"; + revision = "1"; + editedCabalFile = "1w8nsnjnpaxz8hm66gmh18msmc9hsafpladwy4ihvydb421fqpq2"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -88596,6 +88922,28 @@ self: { testToolDepends = [ hspec-discover ]; description = "A fast logging system"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; + }) {}; + + "fast-logger_3_0_3" = callPackage + ({ mkDerivation, array, auto-update, base, bytestring, directory + , easy-file, filepath, hspec, hspec-discover, text, unix-compat + , unix-time + }: + mkDerivation { + pname = "fast-logger"; + version = "3.0.3"; + sha256 = "0s7hsbii1km7dqkxa27v2fw553wqx6x00204s6iapv2k20ra0qsp"; + libraryHaskellDepends = [ + array auto-update base bytestring directory easy-file filepath text + unix-compat unix-time + ]; + testHaskellDepends = [ base bytestring directory hspec ]; + testToolDepends = [ hspec-discover ]; + description = "A fast logging system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "fast-math" = callPackage @@ -91255,6 +91603,7 @@ self: { libraryHaskellDepends = [ base deepseq ]; description = "A type inhabited by finitely many values, indexed by type-level naturals"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "finito" = callPackage @@ -93136,6 +93485,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "fmr" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fmr"; + version = "0.1"; + sha256 = "1hwi4f027pv1sy6pmanc0488xdy398iv50yapivyk2l9kipfnq3q"; + libraryHaskellDepends = [ base ]; + description = "Fake monadic records library"; + license = lib.licenses.bsd3; + }) {}; + "fmt" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, call-stack , containers, criterion, deepseq, doctest, doctest-discover @@ -93312,8 +93672,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "foldable-ix"; - version = "0.1.0.0"; - sha256 = "1lvf1n8mnv3imlry4nqdv8c2c930yic0raqs2awnbmyyy1c6fc79"; + version = "0.2.0.0"; + sha256 = "1xbdwnvbg4phkqrcb9izabff85dhdj004nnbgk53f50if9sv4463"; libraryHaskellDepends = [ base ]; description = "Functions to find out the indices of the elements in the Foldable structures"; license = lib.licenses.mit; @@ -93492,6 +93852,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "folds_0_7_6" = callPackage + ({ mkDerivation, adjunctions, base, bifunctors, comonad + , constraints, contravariant, data-reify, distributive, lens, mtl + , pointed, profunctors, reflection, semigroupoids, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "folds"; + version = "0.7.6"; + sha256 = "06sy3arl37k7qz6zm2rscpvzl9za165214f5bgjppj7zdv0qkc3v"; + configureFlags = [ "-f-test-hlint" ]; + libraryHaskellDepends = [ + adjunctions base bifunctors comonad constraints contravariant + data-reify distributive lens mtl pointed profunctors reflection + semigroupoids transformers unordered-containers vector + ]; + description = "Beautiful Folding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "folds-common" = callPackage ({ mkDerivation, base, containers, folds, tasty, tasty-quickcheck }: @@ -96451,8 +96832,8 @@ self: { pname = "functor-classes-compat"; version = "1"; sha256 = "0vrnl5crr7d2wsm4ryx26g98j23dpk7x5p31xrbnckd78i7zj4gg"; - revision = "6"; - editedCabalFile = "0r0h3hp182w9ndhr5lrvhzl1vyj2f3vvh32fpdnbxb8xkkhx55sa"; + revision = "7"; + editedCabalFile = "0dagdnlb3wfrli6adpy4fjlgdc982pjgwcnq2sb7p3zm86ngi07v"; libraryHaskellDepends = [ base containers hashable unordered-containers vector ]; @@ -96460,6 +96841,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "functor-classes-compat_1_0_1" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + , vector + }: + mkDerivation { + pname = "functor-classes-compat"; + version = "1.0.1"; + sha256 = "0p6kwj1yimis0rg2gihwkgxkjj1psxy38hxa94gz5pd638314hi3"; + libraryHaskellDepends = [ + base containers hashable unordered-containers vector + ]; + description = "Data.Functor.Classes instances for core packages"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "functor-combinators" = callPackage ({ mkDerivation, assoc, base, bifunctors, comonad, constraints , containers, contravariant, dependent-sum, deriving-compat, free @@ -101437,26 +101834,6 @@ self: { }) {}; "ghc-typelits-knownnat" = callPackage - ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; - version = "0.7.4"; - sha256 = "1i3kwq8i3p4i2jmmq8irycs0z3g69qy4i5smh14kbcz3pl35x71l"; - libraryHaskellDepends = [ - base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck - ]; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_7_5" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck , template-haskell, transformers @@ -101474,7 +101851,6 @@ self: { ]; description = "Derive KnownNat constraints from other KnownNat constraints"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage @@ -101493,6 +101869,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_7_4" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra + , integer-gmp, tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.7.4"; + sha256 = "0d8wwb1i6jj11cylf2n42r08hfygv9gwy89xyxp4kdclyw9mfwrp"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra integer-gmp transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty @@ -101825,65 +102218,65 @@ self: { broken = true; }) {shake-bench = null;}; - "ghcide_0_7_4_0" = callPackage + "ghcide_0_7_5_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, Diff - , directory, dlist, extra, filepath, fingertree, fuzzy, ghc - , ghc-boot, ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hiedb, hls-plugin-api, hp2pretty, hslogger, implicit-hie-cradle - , lens, lsp-test, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck + , containers, cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, extra, filepath + , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check + , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb + , hls-plugin-api, hp2pretty, hslogger, implicit-hie + , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl + , network-uri, opentelemetry, optparse-applicative, parallel + , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unordered-containers - , utf8-string, vector, yaml + , tasty-rerun, text, time, transformers, unix, unliftio + , unliftio-core, unordered-containers, utf8-string, vector, yaml }: mkDerivation { pname = "ghcide"; - version = "0.7.4.0"; - sha256 = "00f2p18g6w7vf2a344fr4k0rg7spnbri76d1by7403g1daqwkar9"; + version = "0.7.5.0"; + sha256 = "157h7jliwf25yjip9hfc5lghifqgqz3ckj894fnmx7pw4jfwyc2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq Diff directory dlist extra filepath fingertree - fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths - Glob haddock-library hashable haskell-lsp haskell-lsp-types + data-default deepseq dependent-map dependent-sum Diff directory + dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens mtl network-uri opentelemetry parallel - prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie - rope-utf16-splay safe safe-exceptions shake sorted-list - sqlite-simple stm syb text time transformers unix - unordered-containers utf8-string vector + implicit-hie-cradle lens lsp lsp-types mtl network-uri + opentelemetry parallel prettyprinter prettyprinter-ansi-terminal + regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake + sorted-list sqlite-simple stm syb text time transformers unix + unliftio unliftio-core unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable haskell-lsp haskell-lsp-types heapsize - hie-bios hiedb hls-plugin-api lens lsp-test optparse-applicative - process safe-exceptions shake text unordered-containers + filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api + lens lsp lsp-test lsp-types optparse-applicative process + safe-exceptions shake text unordered-containers ]; testHaskellDepends = [ aeson base binary bytestring containers data-default directory extra filepath ghc ghc-typelits-knownnat haddock-library - haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test - network-uri optparse-applicative process QuickCheck - quickcheck-instances record-dot-preprocessor record-hasfield - rope-utf16-splay safe safe-exceptions shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text + hls-plugin-api lens lsp lsp-test lsp-types network-uri + optparse-applicative process QuickCheck quickcheck-instances + record-dot-preprocessor record-hasfield rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text ]; + testToolDepends = [ implicit-hie ]; benchmarkHaskellDepends = [ aeson base directory extra filepath optparse-applicative shake shake-bench text yaml ]; - benchmarkToolDepends = [ hp2pretty ]; + benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -102176,17 +102569,17 @@ self: { "ghcprofview" = callPackage ({ mkDerivation, aeson, base, containers, ghc-prof, gi-gtk - , haskell-gi-base, regex-tdfa, regex-tdfa-text, scientific, text + , haskell-gi-base, mtl, regex-tdfa, scientific, text }: mkDerivation { pname = "ghcprofview"; - version = "0.1.0.0"; - sha256 = "103186dik439sdzz1w6dr98s1sfghjxdkp51mh18wrcwdbdb9r3a"; + version = "0.1.0.1"; + sha256 = "0lk5ky0vrymzhdzfrdvq25kpphg69f1m6524jhr57dnss5syz1iv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base containers ghc-prof gi-gtk haskell-gi-base regex-tdfa - regex-tdfa-text scientific text + aeson base containers ghc-prof gi-gtk haskell-gi-base mtl + regex-tdfa scientific text ]; description = "GHC .prof files viewer"; license = lib.licenses.bsd3; @@ -104469,6 +104862,7 @@ self: { ]; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "gitlab-api" = callPackage @@ -105553,8 +105947,8 @@ self: { }: mkDerivation { pname = "gltf-codec"; - version = "0.1.0.2"; - sha256 = "07zf9lzin22clixmvgvam6h995jfq2wzqz4498qv60jlcj88zzmh"; + version = "0.1.0.3"; + sha256 = "0kgkzskn2k9zgihrb1v9xy5yfjlggmpj15g1bdgx7faipksaa3fb"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring scientific text unordered-containers vector @@ -108739,6 +109133,7 @@ self: { ]; description = "proxy gopher over http"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "gopherbot" = callPackage @@ -110405,27 +110800,6 @@ self: { }) {}; "greskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover - , exceptions, greskell-core, hashable, hint, hspec, semigroups - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "greskell"; - version = "1.2.0.0"; - sha256 = "0rljpnq690jxqlkbp7ksx5i91r2hrmqvppp5s6sgp373sw9kzkwb"; - libraryHaskellDepends = [ - aeson base exceptions greskell-core hashable semigroups text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover greskell-core hint - hspec text unordered-containers - ]; - description = "Haskell binding for Gremlin graph query language"; - license = lib.licenses.bsd3; - }) {}; - - "greskell_1_2_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , exceptions, greskell-core, hashable, hint, hspec, semigroups , text, transformers, unordered-containers, vector @@ -110444,31 +110818,9 @@ self: { ]; description = "Haskell binding for Gremlin graph query language"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; - version = "0.1.3.5"; - sha256 = "08jpgnsnmh9zbm1pw768ik28vhl3m4jz75l8cbxb3whfgwk5vyy4"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_3_6" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, hspec-discover, QuickCheck , scientific, semigroups, text, unordered-containers, uuid, vector @@ -110488,7 +110840,6 @@ self: { testToolDepends = [ doctest doctest-discover hspec-discover ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "greskell-websocket" = callPackage @@ -115796,8 +116147,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.1"; - sha256 = "1166ccqpjwr331chf7hi4n42m2frahpf93ardfjgv8x6d0p5pfss"; + version = "2.4.1.1"; + sha256 = "164pjybk054a3h3ydfakzibngpmp8a4cbzg0sip9slfb739nz25j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -117059,6 +117410,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable_1_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, HUnit + , integer-gmp, QuickCheck, random, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, unix + }: + mkDerivation { + pname = "hashable"; + version = "1.3.1.0"; + sha256 = "1i57iibad5gjk88yq1svi35mjcbgjmms7jzd28wva8f598x84qc0"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp text + ]; + testHaskellDepends = [ + base bytestring ghc-prim HUnit QuickCheck random test-framework + test-framework-hunit test-framework-quickcheck2 text unix + ]; + description = "A class for types that can be converted to a hash value"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashable-accelerate" = callPackage ({ mkDerivation, accelerate, base, template-haskell }: mkDerivation { @@ -117140,6 +117512,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "hashable-time_0_2_1" = callPackage + ({ mkDerivation, base, hashable, time, time-compat }: + mkDerivation { + pname = "hashable-time"; + version = "0.2.1"; + sha256 = "1zw2gqagpbwq1hgx5rlvy6mhsnb15cxg3pmhawwv0ylfihmx2yxh"; + libraryHaskellDepends = [ base hashable time time-compat ]; + description = "Hashable instances for Data.Time"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hashabler" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp , primitive, template-haskell, text @@ -118337,6 +118721,8 @@ self: { pname = "haskell-language-server"; version = "0.9.0.0"; sha256 = "0wzwadmrw57dqp9mszr4nmcnrwa01kav70z0wqkh8g2ag0kv3nfm"; + revision = "7"; + editedCabalFile = "11dfc9887aq521ywm0m5gpmihvvkypkr3y1cfk6afg210ij6ka40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120179,14 +120565,14 @@ self: { "haskellish" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, mtl - , template-haskell + , template-haskell, text }: mkDerivation { pname = "haskellish"; - version = "0.2.3.1"; - sha256 = "0285mk3s1gl0xxwcqd22v800pcg75ml676nzs5pb96ybfniqksl0"; + version = "0.2.4.3"; + sha256 = "09hxl72ivd7dc1fcwdd5w081crc4b8yinxddxcydb9ak0dg7hj26"; libraryHaskellDepends = [ - base containers haskell-src-exts mtl template-haskell + base containers haskell-src-exts mtl template-haskell text ]; description = "For parsing Haskell-ish languages"; license = lib.licenses.bsd3; @@ -120666,8 +121052,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.42.2"; - sha256 = "03xys3m0cdkjbabcrgc96sdb8ws3rrzq794ggnkwigwzgnav0gm0"; + version = "0.46.6"; + sha256 = "13qqq08bh1a07zvd5rkfgyvh2ln0261q2hybjkjigw05mhrblf5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120711,8 +121097,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.42.1"; - sha256 = "17yfbd4vp9xx551bybpkiiv6w1x8067xmyrfff7zak3glzb3piva"; + version = "0.46.6"; + sha256 = "0a71gg790ix0z1q99m7cri4bpql222yprmj0vnvmacprnbihw77n"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -123861,6 +124247,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "heaps_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "heaps"; + version = "0.4"; + sha256 = "1zbw0qrlnhb42v04phzwmizbpwg21wnpl7p4fbr9xsasp7w9scl9"; + libraryHaskellDepends = [ base ]; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "heapsize" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-heap , hashable, hashtables, primitive, transformers @@ -127033,6 +127431,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "hie-bios_0_7_3" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, extra, file-embed, filepath, ghc, hslogger + , hspec-expectations, optparse-applicative, process, tasty + , tasty-expected-failure, tasty-hunit, temporary, text, time + , transformers, unix-compat, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.7.3"; + sha256 = "0njgxy8dx43smqk4wv3zg0c8a7llbgnz4fbil9dw53yx2xncgapi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory extra file-embed + filepath ghc hslogger process temporary text time transformers + unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base directory filepath ghc optparse-applicative + ]; + testHaskellDepends = [ + base directory extra filepath ghc hspec-expectations tasty + tasty-expected-failure tasty-hunit temporary text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hie-compat" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot, transformers @@ -127749,23 +128180,23 @@ self: { "hinit" = callPackage ({ mkDerivation, base, Cabal, containers, directory, exceptions - , fused-effects, generic-lens, Glob, haskeline, lens, megaparsec - , mustache, optparse-applicative, parser-combinators, path, path-io + , fused-effects, Glob, haskeline, megaparsec, mustache, optics-core + , optparse-applicative, parser-combinators, path, path-io , prettyprinter, prettyprinter-ansi-terminal, process , quickcheck-text, spdx-license, string-interpolate, text, time , tomland }: mkDerivation { pname = "hinit"; - version = "0.2.0"; - sha256 = "1iklwj1kzv7nbb4bnrj0idfb0k26jjpw51mkbib73j4jpciah01v"; + version = "0.2.1"; + sha256 = "10lhx18g50f24l867kjqgb2qpky3vvx7w7s4sc3pidr3hc0ams3g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base Cabal containers directory exceptions fused-effects - generic-lens Glob haskeline lens megaparsec mustache - optparse-applicative parser-combinators path path-io prettyprinter + base Cabal containers directory exceptions fused-effects Glob + haskeline megaparsec mustache optics-core optparse-applicative + parser-combinators path path-io prettyprinter prettyprinter-ansi-terminal process spdx-license string-interpolate text time tomland ]; @@ -127775,8 +128206,7 @@ self: { ]; description = "Generic project initialization tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ poscat ]; }) {}; "hinotify_0_3_9" = callPackage @@ -129481,18 +129911,17 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-explicit-imports-plugin_0_1_0_1" = callPackage + "hls-explicit-imports-plugin_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , haskell-lsp-types, hls-plugin-api, shake, text - , unordered-containers + , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "0.1.0.1"; - sha256 = "0n36yk21wh9wklp8bnrg4b6qck2nf34m8p3fpilwpnzfchk6wr1y"; + version = "0.1.0.2"; + sha256 = "0cfkb7ph6ryakybjxmyf6cc615p57wzv6ys2zy4fak1iib8bzwyx"; libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide haskell-lsp-types - hls-plugin-api shake text unordered-containers + aeson base containers deepseq ghc ghcide hls-plugin-api lsp + lsp-types shake text unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -129554,6 +129983,26 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-plugin-api_0_7_1_0" = callPackage + ({ mkDerivation, aeson, base, containers, data-default + , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger + , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix + , unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "0.7.1.0"; + sha256 = "036lrij56fzd3rbrxrxpvmq2ng0yp4qrnrl8k6g60p5sf9abqzc2"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hslogger lens lsp opentelemetry process regex-tdfa + shake text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types @@ -129573,6 +130022,25 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-retrie-plugin_0_1_1_1" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie + , safe-exceptions, shake, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-retrie-plugin"; + version = "0.1.1.1"; + sha256 = "1k85wgnd5f1jqjd09y9gacc5w8kypy84qaly32411xsw4hfsil8a"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra ghc ghcide hashable + hls-plugin-api lsp lsp-types retrie safe-exceptions shake text + transformers unordered-containers + ]; + description = "Retrie integration plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, foldl, ghc , ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, retrie @@ -132308,6 +132776,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hp2pretty_0_10" = callPackage + ({ mkDerivation, array, attoparsec, base, containers, filepath + , floatshow, mtl, optparse-applicative, semigroups, text + }: + mkDerivation { + pname = "hp2pretty"; + version = "0.10"; + sha256 = "1irm8mvcib39r8imdx7y7jisp162i0rwk8w3irs2j746c8vhyv12"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array attoparsec base containers filepath floatshow mtl + optparse-applicative semigroups text + ]; + description = "generate pretty graphs from heap profiles"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hpack" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, cryptonite, deepseq, directory, filepath, Glob, hspec @@ -134192,6 +134679,18 @@ self: { broken = true; }) {}; + "hs-swisstable-hashtables-class" = callPackage + ({ mkDerivation, base, hashtables, swisstable }: + mkDerivation { + pname = "hs-swisstable-hashtables-class"; + version = "0.1.0.0"; + sha256 = "15zc24ai13x11ksyhsrs05v9vh93mdlmx9p3rg3lkllqjqy6b35m"; + libraryHaskellDepends = [ base hashtables swisstable ]; + testHaskellDepends = [ base hashtables swisstable ]; + description = "Data.HashTable.Class instance definition for Data.HashTable.ST.Swiss"; + license = lib.licenses.bsd3; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -134699,6 +135198,8 @@ self: { pname = "hsc2hs"; version = "0.68.7"; sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; + revision = "1"; + editedCabalFile = "0nzmlx0kdsq5231m6dbvdb5zssj1h4lkqplp8rb28z3yl5h6h3sa"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -135977,8 +136478,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "1"; - editedCabalFile = "1g58f8lxcrmv4wh0k48car5lcl5j0k9lwfq5nfkjj9f5gim5yrc8"; + revision = "2"; + editedCabalFile = "1bkv1rbbx0bhyvrmnsyspm30q48820a6rym0msxjdzp8r56rbm9w"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -136992,20 +137493,6 @@ self: { }) {}; "hspec-need-env" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-expectations - , setenv, transformers - }: - mkDerivation { - pname = "hspec-need-env"; - version = "0.1.0.5"; - sha256 = "0bgjhzc4m24sbmfyczq1r61gbgm5i1lsgyql88ki4flllscg4hsh"; - libraryHaskellDepends = [ base hspec-core hspec-expectations ]; - testHaskellDepends = [ base hspec hspec-core setenv transformers ]; - description = "Read environment variables for hspec tests"; - license = lib.licenses.bsd3; - }) {}; - - "hspec-need-env_0_1_0_6" = callPackage ({ mkDerivation, base, hspec, hspec-core, hspec-discover , hspec-expectations, setenv, transformers }: @@ -137018,7 +137505,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Read environment variables for hspec tests"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-parsec" = callPackage @@ -140092,6 +140578,8 @@ self: { pname = "http2"; version = "2.0.5"; sha256 = "1rg6dnkx2yxcdp87r1vdpyxacqv7jgxiq3bb1hjz45v5jk1xj676"; + revision = "1"; + editedCabalFile = "0xxi7gcldh3fvnh98khw9f2vm5w85sakbb6165s779nkvq7p8ak2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140112,6 +140600,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_2_0_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , directory, doctest, filepath, gauge, Glob, heaps, hspec + , http-types, mwc-random, network, network-byte-order, psqueues + , stm, text, time-manager, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "2.0.6"; + sha256 = "17m1avrppiz8i6qwjlgg77ha88sx8f8vvfa57z369aszhld6nx9a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager + ]; + testHaskellDepends = [ + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec + http-types network network-byte-order psqueues stm text + time-manager unordered-containers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -141168,6 +141688,8 @@ self: { pname = "hw-bits"; version = "0.7.2.1"; sha256 = "18l9r0yhddkzgbc2vvk0qr9brb5ih25zjfga3bddb5j8gpaaq65q"; + revision = "1"; + editedCabalFile = "14y67p3rsj97rzlh2cw7iy04gb6cfa977bjbr35vgkav0skbigbn"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector @@ -141955,6 +142477,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.4.1"; sha256 = "1s0lqwq0rjmjca6lshfnxqi0c7bzlyflhm45xw1xa9pvqci8439h"; + revision = "1"; + editedCabalFile = "0flhrgqgwgxwk6ik3k7322dn8ybyjzh6g1csg2d9bafldj7akcwv"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -143261,6 +143785,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "hyperloglog_0_4_4" = callPackage + ({ mkDerivation, approximate, base, binary, bits, bytes, cereal + , cereal-vector, comonad, deepseq, distributive, hashable, lens + , reflection, semigroupoids, semigroups, siphash, tagged, vector + }: + mkDerivation { + pname = "hyperloglog"; + version = "0.4.4"; + sha256 = "0iwjxv934vid7bzaxyqq4v7r52vdcqjxmw043dmxykwyzim59l3v"; + libraryHaskellDepends = [ + approximate base binary bits bytes cereal cereal-vector comonad + deepseq distributive hashable lens reflection semigroupoids + semigroups siphash tagged vector + ]; + description = "An approximate streaming (constant space) unique object counter"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hyperloglogplus" = callPackage ({ mkDerivation, base, bits, containers, HUnit, murmur-hash , semigroups, tasty, tasty-hunit, vector @@ -143329,6 +143872,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "hyphenation_0_8_1" = callPackage + ({ mkDerivation, base, bytestring, containers, text + , unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.8.1"; + sha256 = "0pzm9sfn1bw7yvwhby9a6d9z2ghcn91rcbj08x380gff31kn8lbx"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers text unordered-containers zlib + ]; + description = "Configurable Knuth-Liang hyphenation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -143674,6 +144234,24 @@ self: { broken = true; }) {}; + "ice40-prim" = callPackage + ({ mkDerivation, base, Cabal, clash-prelude, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, interpolate + }: + mkDerivation { + pname = "ice40-prim"; + version = "0.1.0.0"; + sha256 = "00l0kwwayf0bark2yqjrx8imr8997d5mrnhjf3zsayxk9a521j99"; + libraryHaskellDepends = [ + base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise interpolate + ]; + description = "Lattice iCE40 Primitive IP"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "icepeak" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, hashable, hspec, hspec-core, hspec-expectations @@ -146732,6 +147310,23 @@ self: { license = lib.licenses.mit; }) {}; + "inspection-testing_0_4_3_0" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.4.3.0"; + sha256 = "1pba3br5vd11svk9fpg5s977q55qlvhlf95nd5ay79bwdjm10hj3"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + description = "GHC plugin to do inspection testing"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -147299,6 +147894,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "intern_0_9_4" = callPackage + ({ mkDerivation, array, base, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "intern"; + version = "0.9.4"; + sha256 = "00c74apc2ap1pjxmzk1c975zzqrc94p69l7v1fvfakv87mbrg8j0"; + libraryHaskellDepends = [ + array base bytestring hashable text unordered-containers + ]; + description = "Efficient hash-consing for arbitrary data types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "internetmarke" = callPackage ({ mkDerivation, base, explicit-exception, HPDF, parsec, process , transformers, utility-ht @@ -147633,6 +148244,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "intervals_0_9_2" = callPackage + ({ mkDerivation, array, base, distributive, ghc-prim, QuickCheck }: + mkDerivation { + pname = "intervals"; + version = "0.9.2"; + sha256 = "1qibvgys8lw61x9na3iy3dcglyj9qyhcbfc00glnagl7cbk1shlv"; + libraryHaskellDepends = [ array base distributive ghc-prim ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Interval Arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "intmap-graph" = callPackage ({ mkDerivation, base, containers, text, vector, word8 }: mkDerivation { @@ -147847,6 +148471,8 @@ self: { pname = "invertible"; version = "0.2.0.7"; sha256 = "1ngcmy59cyrg5idcn8a4gxg6ipq88rhhwhdb09gra8jcraq9n7ii"; + revision = "1"; + editedCabalFile = "19xcczz26ji5xaws4ikvacqz991qgislj32hs8rlks07qw3qmnbn"; libraryHaskellDepends = [ base haskell-src-meta invariant lens partial-isomorphisms semigroupoids template-haskell transformers @@ -150702,6 +151328,22 @@ self: { license = lib.licenses.mit; }) {}; + "jira-wiki-markup_1_3_3" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "1.3.3"; + sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -153153,6 +153795,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "kan-extensions_5_2_2" = callPackage + ({ mkDerivation, adjunctions, array, base, comonad, containers + , contravariant, distributive, free, invariant, mtl, profunctors + , semigroupoids, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "kan-extensions"; + version = "5.2.2"; + sha256 = "184qhhjd24i15mcs4lq8fdb86pdg3g5nxhx1x41prigrmi6cxwrv"; + libraryHaskellDepends = [ + adjunctions array base comonad containers contravariant + distributive free invariant mtl profunctors semigroupoids tagged + transformers transformers-compat + ]; + description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kangaroo" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -154691,8 +155352,6 @@ self: { testHaskellDepends = [ base stm ]; description = "A lightweight, structured-concurrency library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "kibro" = callPackage @@ -155233,10 +155892,8 @@ self: { }: mkDerivation { pname = "kqueue"; - version = "0.2"; - sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h"; - revision = "3"; - editedCabalFile = "17wanwn4pmh6z6v7ncg50q4sgg87lllld50wa5j5mmb07q4c3mj7"; + version = "0.2.1"; + sha256 = "0svrswcglipmm47lnqi41hcsn1gvkcniva6qajwqxrdr0wvvhgdi"; libraryHaskellDepends = [ base directory filepath mtl time unix ]; libraryToolDepends = [ c2hs ]; description = "A binding to the kqueue event library"; @@ -157093,6 +157750,28 @@ self: { license = lib.licenses.gpl3; }) {}; + "language-docker_9_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , hspec, HUnit, megaparsec, prettyprinter, QuickCheck, split, text + , time + }: + mkDerivation { + pname = "language-docker"; + version = "9.1.3"; + sha256 = "00nr8fb981rkjzy2xhppvg9avsi377ww28d50rldm5wh7ax9s3w2"; + libraryHaskellDepends = [ + base bytestring containers data-default-class megaparsec + prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default-class hspec HUnit + megaparsec prettyprinter QuickCheck split text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-dockerfile" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath, free , Glob, hspec, HUnit, mtl, parsec, pretty, process, QuickCheck @@ -158784,8 +159463,8 @@ self: { ({ mkDerivation, base, containers, doctest, lens, markdown-unlit }: mkDerivation { pname = "lazy-priority-queue"; - version = "0.1.0.1"; - sha256 = "1v0jxf56wxlncw0nppmnm89j14hn8a81swr1y2sbk7gsqf73qd8v"; + version = "0.1.1"; + sha256 = "1b853cqc1wybwmnywh9jhcv382v43mfyqxskffizp1m10gii9ss5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -158793,7 +159472,7 @@ self: { testHaskellDepends = [ base doctest lens ]; testToolDepends = [ markdown-unlit ]; description = "Lazy-Spined Monadic Priority Queues"; - license = lib.licenses.bsd3; + license = lib.licenses.gpl3; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158924,6 +159603,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "lca_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lca"; + version = "0.4"; + sha256 = "0miji532qc725vprhnc5p3k4i6515i1fn1g0f7hm0gmq0hvvh51f"; + libraryHaskellDepends = [ base ]; + description = "O(log n) persistent online lowest common ancestor search without preprocessing"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lcs" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -159577,6 +160268,45 @@ self: { license = lib.licenses.bsd2; }) {}; + "lens_5" = callPackage + ({ mkDerivation, array, assoc, base, base-compat, base-orphans + , bifunctors, bytestring, call-stack, comonad, containers + , contravariant, criterion, deepseq, distributive, exceptions + , filepath, free, generic-deriving, ghc-prim, hashable, HUnit + , indexed-traversable, indexed-traversable-instances + , kan-extensions, mtl, parallel, profunctors, QuickCheck + , reflection, semigroupoids, simple-reflect, strict, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, th-abstraction, these + , transformers, transformers-compat, unordered-containers, vector + }: + mkDerivation { + pname = "lens"; + version = "5"; + sha256 = "06nvmg9aan4s4ldq3c2a4z15r29hsxyvbjid2yvskmlw5pvwpncy"; + libraryHaskellDepends = [ + array assoc base base-orphans bifunctors bytestring call-stack + comonad containers contravariant distributive exceptions filepath + free ghc-prim hashable indexed-traversable + indexed-traversable-instances kan-extensions mtl parallel + profunctors reflection semigroupoids strict tagged template-haskell + text th-abstraction these transformers transformers-compat + unordered-containers vector + ]; + testHaskellDepends = [ + base containers deepseq HUnit mtl QuickCheck simple-reflect + test-framework test-framework-hunit test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base base-compat bytestring comonad containers criterion deepseq + generic-deriving transformers unordered-containers vector + ]; + description = "Lenses, Folds and Traversals"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-accelerate" = callPackage ({ mkDerivation, accelerate, base, lens }: mkDerivation { @@ -159607,6 +160337,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "lens-action_0_2_5" = callPackage + ({ mkDerivation, base, comonad, contravariant, lens, mtl + , profunctors, semigroupoids, transformers + }: + mkDerivation { + pname = "lens-action"; + version = "0.2.5"; + sha256 = "02sv76far3y57p2pgcjsx5ffaai8rm4669qkp82l06vv964f0v2r"; + libraryHaskellDepends = [ + base comonad contravariant lens mtl profunctors semigroupoids + transformers + ]; + description = "Monadic Getters and Folds"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, doctest, generic-deriving, lens, scientific @@ -159630,6 +160377,23 @@ self: { license = lib.licenses.mit; }) {}; + "lens-aeson_1_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, lens + , scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "lens-aeson"; + version = "1.1.1"; + sha256 = "1g37c8p25by3hvy5lmq4rqyl9wxmxmci2h16rj4i5jcp7slf3mvg"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring lens scientific text + unordered-containers vector + ]; + description = "Law-abiding lenses for aeson"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "lens-core" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -159836,8 +160600,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "4"; - editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7"; + revision = "5"; + editedCabalFile = "0zv5r50xz8msrcwrvqym88pwihqcpmlk3vi493jdhik4n70cs0c6"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = lib.licenses.bsd3; @@ -160475,8 +161239,8 @@ self: { ({ mkDerivation, base, deepseq, hashable }: mkDerivation { pname = "libBF"; - version = "0.6"; - sha256 = "01dh44fj1fhg912hw6p0r1ng7spm59xpzwc1rps8p2lcsicj4gvw"; + version = "0.6.2"; + sha256 = "00axpwgwzqchma89fdp1dxk97palvgv4j1ag8dq1w4gl9yh5q0vx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base deepseq hashable ]; @@ -161365,8 +162129,8 @@ self: { ({ mkDerivation, base, bytestring, libtelnet }: mkDerivation { pname = "libtelnet"; - version = "0.1.0.0"; - sha256 = "0s2ldi4ikjdvki8r190mnkjd0jkahn8ln6gvqb8bn5d291j19nmc"; + version = "0.1.0.1"; + sha256 = "13g7wpibjncj9h6yva8gj9fqs8j806r1vnina78wgv8f980dqxks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -161379,8 +162143,8 @@ self: { ({ mkDerivation, base, bytestring, libversion }: mkDerivation { pname = "libversion"; - version = "0.1.0"; - sha256 = "0w5maaklglbxp7k0ah699w1mhjsjrpgw9n7axld319dpfdwhl94j"; + version = "0.1.1"; + sha256 = "0zxkwiacaznf30wgywmawmqrpvi4r1wwfh6pys82jgr0v8yla4v8"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ libversion ]; description = "Haskell binding to libversion"; @@ -162163,6 +162927,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "linear_1_21_5" = callPackage + ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes + , bytestring, cereal, containers, deepseq, distributive, ghc-prim + , hashable, HUnit, indexed-traversable, lens, random, reflection + , semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , transformers, transformers-compat, unordered-containers, vector + , void + }: + mkDerivation { + pname = "linear"; + version = "1.21.5"; + sha256 = "19pvz467wd8gss95qfi90xnd5fwm6dpdppr21g5n30x4m7niymn3"; + libraryHaskellDepends = [ + adjunctions base base-orphans binary bytes cereal containers + deepseq distributive ghc-prim hashable indexed-traversable lens + random reflection semigroupoids semigroups tagged template-haskell + transformers transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base binary bytestring deepseq HUnit reflection simple-reflect + test-framework test-framework-hunit vector + ]; + description = "Linear Algebra"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "linear-accelerate" = callPackage ({ mkDerivation, accelerate, base, Cabal, cabal-doctest , distributive, doctest, lens, linear @@ -164880,6 +165672,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "log-domain_0_13_1" = callPackage + ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq + , distributive, hashable, semigroupoids, semigroups, vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.13.1"; + sha256 = "0ipiiflzs1r7wm5k8b9cqn4l09rjdyks3pxnm4p3kmncd5s2ajsv"; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + semigroupoids semigroups vector + ]; + description = "Log-domain arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects , monad-control, text, transformers-base @@ -166236,8 +167045,8 @@ self: { }: mkDerivation { pname = "lsp"; - version = "1.0.0.1"; - sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1"; + version = "1.1.1.0"; + sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166311,27 +167120,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "lsp-test_0_12_0_0" = callPackage + "lsp-test_0_13_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix + , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl + , parser-combinators, process, some, text, time, transformers, unix , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.12.0.0"; - sha256 = "1zc43j7xyfxv2i9vinx82yhkrr6m4gz46jwn9p39k76ld6j8nzpd"; + version = "0.13.0.0"; + sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath Glob - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers + lens lsp-types mtl parser-combinators process some text time + transformers unix unordered-containers ]; testHaskellDepends = [ - aeson base data-default directory filepath haskell-lsp hspec lens + aeson base data-default directory filepath hspec lens lsp-types text unordered-containers ]; description = "Functional test framework for LSP servers"; @@ -166341,20 +167150,20 @@ self: { "lsp-types" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum-template, directory - , filepath, hashable, hslogger, lens, network-uri, rope-utf16-splay - , scientific, some, template-haskell, temporary, text - , unordered-containers + , data-default, deepseq, dependent-sum, dependent-sum-template + , directory, filepath, hashable, hslogger, lens, network-uri + , rope-utf16-splay, scientific, some, template-haskell, temporary + , text, unordered-containers }: mkDerivation { pname = "lsp-types"; - version = "1.0.0.1"; - sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27"; + version = "1.1.0.0"; + sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq - dependent-sum-template directory filepath hashable hslogger lens - network-uri rope-utf16-splay scientific some template-haskell - temporary text unordered-containers + dependent-sum dependent-sum-template directory filepath hashable + hslogger lens network-uri rope-utf16-splay scientific some + template-haskell temporary text unordered-containers ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; @@ -166504,6 +167313,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "lua" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit }: + mkDerivation { + pname = "lua"; + version = "1.0.0"; + sha256 = "0ly10sy9xlvalaximff287wd6hr3hxqicsx5alwpqbg9ajxlx798"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + description = "Lua, an embeddable scripting language"; + license = lib.licenses.mit; + }) {}; + "lua-bc" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, pretty, text, vector @@ -167446,6 +168267,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "machines_0_7_2" = callPackage + ({ mkDerivation, adjunctions, base, comonad, conduit, containers + , criterion, distributive, mtl, pipes, pointed, profunctors + , semigroupoids, semigroups, streaming, transformers + , transformers-compat, void + }: + mkDerivation { + pname = "machines"; + version = "0.7.2"; + sha256 = "0pgsa67j9l1zmazlqdb5wg3cqsikyfvkq8yih7iwcqzkys5qssvr"; + libraryHaskellDepends = [ + adjunctions base comonad containers distributive mtl pointed + profunctors semigroupoids semigroups transformers + transformers-compat void + ]; + benchmarkHaskellDepends = [ + base conduit criterion mtl pipes streaming + ]; + description = "Networked stream transducers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "machines-amazonka" = callPackage ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core , amazonka-ec2, amazonka-s3, amazonka-sts, base @@ -172799,6 +173643,8 @@ self: { pname = "microstache"; version = "1.0.1.2"; sha256 = "1xdca11z5cy7vfy2dszhr6qvlrxw6pn0d9iri7mg56lvi02javik"; + revision = "1"; + editedCabalFile = "1l72cfbrr6kxh0z2dx2pghxl7ljlbmbk8s9wlgk35bjm925kkxfl"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -174491,6 +175337,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "mmorph_1_1_5" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "mmorph"; + version = "1.1.5"; + sha256 = "0bq9m3hlfax1826gg5yhih79x33rvfx59wdh8yf43azd7l74bys6"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Monad morphisms"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mmsyn2" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -174620,20 +175480,20 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn7ukr - , process, vector + ({ mkDerivation, base, directory, mmsyn2-array, mmsyn3 + , mmsyn7ukr-common, process }: mkDerivation { pname = "mmsyn7l"; - version = "0.8.0.0"; - sha256 = "0w1k89phzxyq2nwzr0vn313rlp0f7d62vhdvq113pqszbdbjh6gd"; + version = "0.9.0.0"; + sha256 = "0j8xi8jxak818sw310srxljrywggsa8ss1l4yw0razsa28h92nxq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn7ukr process vector + base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process ]; executableHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn7ukr process vector + base directory mmsyn2-array mmsyn3 mmsyn7ukr-common process ]; description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; license = lib.licenses.mit; @@ -174941,6 +175801,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "modern-uri_0_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-discover + , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck + , reflection, tagged, template-haskell, text, weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.3.4.0"; + sha256 = "1jb1bj2jgxhhvkc50h1c11c3zd66bpbi67b1h6b8773h0yiqffvk"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec mtl profunctors QuickCheck reflection tagged + template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + description = "Modern library for working with URIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -179190,8 +180077,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.5.0.0"; - sha256 = "15a950ig348h0fxfvzq4pj8s8rryn18cd26vmrcmx7s6w32zlzyr"; + version = "0.5.0.1"; + sha256 = "0r5kbi378iwg5b578dydvv4smy2xqn4y33h015fp5nyphxz83173"; libraryHaskellDepends = [ aeson base conduit http-types mtl mu-schema sop-core template-haskell text wai @@ -180853,6 +181740,8 @@ self: { pname = "mwc-random"; version = "0.15.0.1"; sha256 = "1p8c5g4hb72k90ai39rgpn6cr942i6636l1y0zfp9xgjb3v0a2q3"; + revision = "1"; + editedCabalFile = "1ay26mvzxqw6rzw3hkib1j12gk6fa2hsilz12q8vhp646bqqc744"; libraryHaskellDepends = [ base math-functions primitive random time vector ]; @@ -182877,8 +183766,6 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-mqtt-lens" = callPackage @@ -182895,8 +183782,6 @@ self: { ]; description = "Optics for net-mqtt"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-mqtt-rpc" = callPackage @@ -182918,8 +183803,6 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "net-spider" = callPackage @@ -183748,6 +184631,8 @@ self: { pname = "network-byte-order"; version = "0.1.6"; sha256 = "0pnwcg13k4qw82n0zc1xibyc24sc77y79j5a62pqdmjrnz4wrc7j"; + revision = "1"; + editedCabalFile = "0fpyfd1adg9fr7w6afxkx306c0kaz3ji3x78sl29v9j3mh4vdn13"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring doctest ]; description = "Network byte order utilities"; @@ -184528,8 +185413,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-types-icmp"; - version = "1.0.0.1"; - sha256 = "1j2z51jvrhh9nlnx9sfiabgascyp80ha1906hdm2d4w8xyrp7d1c"; + version = "1.0.0.2"; + sha256 = "1s449djcr78k8ywzypmc62d7lysm245ih60z4wi6p0kmyv1qcj75"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Types for representing ICMP and ICMPv6 messages"; @@ -186936,6 +187821,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_3_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async + , auto-update, base, bytestring, containers, directory, exceptions + , filepath, hedgehog, junit-xml, pretty-diff, pretty-show + , safe-exceptions, terminal-size, text, time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.3.1.0"; + sha256 = "0dg94blhrrnzh00kgjz5bclcwzx87ky2210nxx8902xx54x928vc"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async auto-update base bytestring + containers directory exceptions filepath hedgehog junit-xml + pretty-diff pretty-show safe-exceptions terminal-size text time + vector + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal async auto-update base bytestring + containers directory exceptions filepath hedgehog junit-xml + pretty-diff pretty-show safe-exceptions terminal-size text time + vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -190639,6 +191551,8 @@ self: { pname = "optics-extra"; version = "0.3"; sha256 = "15vnznmi4h9xrrp7dk6fqgz9cwlqlmdr2h4nx1n5q6hi2ic1bmm4"; + revision = "1"; + editedCabalFile = "0bizzsgmq7b337wpraavgss7r0c5vp2n2gwl8h4xa0qxx0d1wm1p"; libraryHaskellDepends = [ array base bytestring containers hashable indexed-profunctors mtl optics-core text transformers unordered-containers vector @@ -193878,8 +194792,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "2"; - editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6"; + revision = "3"; + editedCabalFile = "1lv3y3zrdfc09nsiqxg7mzcahgnqi6z9caspd4lvifhhfrqy2722"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = lib.licenses.bsd3; @@ -195507,6 +196421,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "patrol" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, http-client, http-types, network-uri, text, time + , uuid + }: + mkDerivation { + pname = "patrol"; + version = "0.0.1"; + sha256 = "08rxyx01mamvc3mfyzyqajfj7239sklz30fw4z8rvi2jrgisbpy7"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-types network-uri text time uuid + ]; + description = "Sentry SDK"; + license = lib.licenses.isc; + }) {}; + "patronscraper" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt }: mkDerivation { @@ -196863,8 +197794,8 @@ self: { pname = "perfect-vector-shuffle"; version = "0.1.1.1"; sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "4"; - editedCabalFile = "14q0773vxmkh4nwskiq85ch175jq12xms2lypaddglciykqs6ml6"; + revision = "5"; + editedCabalFile = "0lppvhpfpfzcpdm4fxmsps8s272gz3wd2h5xc1w1908b7qqln0rw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198714,8 +199645,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.1.0.0"; - sha256 = "0fd2pslmgm5bvv0yiza87vp61601pl1c69xa5snbgrnb2mlp6f98"; + version = "0.2.0.0"; + sha256 = "1382i77ci70ax7lvbkqqvg1wr2pp5irl8wxvypngr15czqgj7sca"; libraryHaskellDepends = [ base phonetic-languages-permutations-array subG ]; @@ -199693,29 +200624,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, criterion, exceptions, mmorph, mtl - , optparse-applicative, QuickCheck, test-framework - , test-framework-quickcheck2, transformers, void - }: - mkDerivation { - pname = "pipes"; - version = "4.3.14"; - sha256 = "11r8cqy98w1y0avgn53x1fzqxpdfg7wvwwkfppnk9yip0lkcp3yv"; - libraryHaskellDepends = [ - base exceptions mmorph mtl transformers void - ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - benchmarkHaskellDepends = [ - base criterion mtl optparse-applicative transformers - ]; - description = "Compositional pipelines"; - license = lib.licenses.bsd3; - }) {}; - - "pipes_4_3_15" = callPackage ({ mkDerivation, base, criterion, exceptions, mmorph, mtl , optparse-applicative, QuickCheck, test-framework , test-framework-quickcheck2, transformers, void @@ -199736,7 +200644,6 @@ self: { ]; description = "Compositional pipelines"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -199906,6 +200813,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-bytestring_2_1_7" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse + , stringsearch, transformers + }: + mkDerivation { + pname = "pipes-bytestring"; + version = "2.1.7"; + sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc"; + libraryHaskellDepends = [ + base bytestring pipes pipes-group pipes-parse stringsearch + transformers + ]; + description = "ByteString support for pipes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-bzip" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib , data-default, directory, hspec, MonadRandom, mtl, pipes @@ -200190,8 +201114,8 @@ self: { pname = "pipes-extras"; version = "1.0.15"; sha256 = "1cyb05bv5xkarab3090ikpjiqm79lr46n3nalplliz8jr4x67a82"; - revision = "2"; - editedCabalFile = "1aprq51r83v5qja9vy01s8d17bnncnvp1mw6h6maxgzh2xppim8b"; + revision = "3"; + editedCabalFile = "177l1fs1wgm34ifbx83xxf29m0ghq6z9skpkwm86qfln2hpikkj9"; libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -200566,6 +201490,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-parse_3_0_9" = callPackage + ({ mkDerivation, base, pipes, transformers }: + mkDerivation { + pname = "pipes-parse"; + version = "3.0.9"; + sha256 = "05cd0j1avkzmryf3869hfpvd9xmzbpz4kc65srswx36n06dkz5x3"; + libraryHaskellDepends = [ base pipes transformers ]; + description = "Parsing infrastructure for the pipes ecosystem"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-postgresql-simple" = callPackage ({ mkDerivation, async, base, bytestring, exceptions, mtl, pipes , pipes-concurrency, pipes-safe, postgresql-simple, stm, text @@ -200674,6 +201610,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "pipes-safe_2_3_3" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control, mtl + , pipes, primitive, transformers, transformers-base + }: + mkDerivation { + pname = "pipes-safe"; + version = "2.3.3"; + sha256 = "19gp93x5m1bnq240bj3v33pglf9r5gzji39fsjcazji837czghab"; + libraryHaskellDepends = [ + base containers exceptions monad-control mtl pipes primitive + transformers transformers-base + ]; + description = "Safety for the pipes ecosystem"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pipes-shell" = callPackage ({ mkDerivation, async, base, bytestring, directory, hspec, pipes , pipes-bytestring, pipes-safe, process, stm, stm-chans, text @@ -200934,6 +201887,21 @@ self: { broken = true; }) {}; + "pixel-printer" = callPackage + ({ mkDerivation, base, JuicyPixels, lens }: + mkDerivation { + pname = "pixel-printer"; + version = "0.1.0"; + sha256 = "1cx485lvd5z6895jv1iiq93kspch78w9m730ggw6nvf0rimvazyy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base JuicyPixels lens ]; + executableHaskellDepends = [ base JuicyPixels ]; + testHaskellDepends = [ base ]; + description = "A program for turning pixel art into 3D prints"; + license = lib.licenses.gpl3; + }) {}; + "pixela" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default-class , http-client, http-client-tls, http-types, split, text, time @@ -201746,8 +202714,8 @@ self: { }: mkDerivation { pname = "plugins"; - version = "1.6.1"; - sha256 = "004mfq0d10s26sgk12zrhgmxcfxnhvdyajr48scxf5rh1fv9440i"; + version = "1.6.2"; + sha256 = "1lgk25chpl6albf8pzq8q40di02rgv7g3bsf586a5pl2kdh2p2qq"; libraryHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random split @@ -206036,6 +207004,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "pretty-diff_0_4_0_0" = callPackage + ({ mkDerivation, base, data-default, Diff, tasty, tasty-hunit + , tasty-test-reporter, text + }: + mkDerivation { + pname = "pretty-diff"; + version = "0.4.0.0"; + sha256 = "10fsa49pd0d5rvl0093x2hrcbv44hq7xc9d2x369ygd6q7pxkbnz"; + libraryHaskellDepends = [ base data-default Diff text ]; + testHaskellDepends = [ + base data-default Diff tasty tasty-hunit tasty-test-reporter text + ]; + description = "Pretty printing a diff of two values"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pretty-display" = callPackage ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }: mkDerivation { @@ -206737,6 +207722,30 @@ self: { broken = true; }) {}; + "primitive-extras_0_9" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.9"; + sha256 = "04sb2q5r5z1sdj976p8p6hgx360agwxjqmcrgr8vcgyfgzphizfr"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "primitive-foreign" = callPackage ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { @@ -207757,14 +208766,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "profunctors_5_6_1" = callPackage + "profunctors_5_6_2" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , contravariant, distributive, tagged, transformers }: mkDerivation { pname = "profunctors"; - version = "5.6.1"; - sha256 = "1b2fgnhl3j790rra615q6y9xx97lip0smfg1c13ad1brvyjygps6"; + version = "5.6.2"; + sha256 = "0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"; libraryHaskellDepends = [ base base-orphans bifunctors comonad contravariant distributive tagged transformers @@ -209445,8 +210454,8 @@ self: { }: mkDerivation { pname = "ptr-poker"; - version = "0.1.1.3"; - sha256 = "1qrcsci4jccx4l1zlpqr202jl2dhpmcbbq94gfgdax80q8js3yrq"; + version = "0.1.1.4"; + sha256 = "1g9b3dixrgi1k8vg85mgdpnph1dz02xggwp61naak6j392kg6rkf"; libraryHaskellDepends = [ base bytestring scientific text ]; testHaskellDepends = [ hedgehog numeric-limits rerebase ]; benchmarkHaskellDepends = [ gauge rerebase ]; @@ -209752,6 +210761,7 @@ self: { librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {inherit (pkgs) libpulseaudio;}; "pulseaudio" = callPackage @@ -211735,6 +212745,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.25.2"; sha256 = "0ihqbarl2ddrfgq3mq09lswwn8213qpw13g49qxs5mjkcm6gbk3h"; + revision = "1"; + editedCabalFile = "0pmsq83jzf7gxr59h8j85121n6n0iqbl3smccl9v7n3gkp70kr2q"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time QuickCheck scientific splitmix strict @@ -213373,8 +214385,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "4"; - editedCabalFile = "08mq836ganl3sq6mfn3hrj6xm0h30klp21y7gbd9md2882agndrk"; + revision = "5"; + editedCabalFile = "1jai1pcs39ijdhxc8q36x1yayr8rsblhx3y88paf4bqxrks2vmrh"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -213441,6 +214453,24 @@ self: { license = lib.licenses.mit; }) {}; + "random-bytestring_0_1_4" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, cryptonite + , entropy, ghc-prim, mwc-random, pcg-random, primitive, random + }: + mkDerivation { + pname = "random-bytestring"; + version = "0.1.4"; + sha256 = "0f4n41gqxxggadysvx3vg2iq89z7i7692ccrfmiajq73lbp6y34j"; + libraryHaskellDepends = [ base bytestring mwc-random pcg-random ]; + benchmarkHaskellDepends = [ + async base bytestring criterion cryptonite entropy ghc-prim + mwc-random pcg-random primitive random + ]; + description = "Efficient generation of random bytestrings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "random-class" = callPackage ({ mkDerivation, base, primitive, transformers, util }: mkDerivation { @@ -214666,6 +215696,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "rcu_0_2_5" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion + , deepseq, fail, ghc-prim, optparse-applicative, parallel + , primitive, rdtsc, time, transformers + }: + mkDerivation { + pname = "rcu"; + version = "0.2.5"; + sha256 = "1p2cg6xy5cjdizqialv9y8qylwdri5fhby2xh04fnhpjapsrbc7l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base fail ghc-prim parallel primitive transformers + ]; + executableHaskellDepends = [ base transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq ghc-prim optparse-applicative + primitive rdtsc time transformers + ]; + description = "Read-Copy-Update for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rdf" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq , dlist, fgl, text, transformers @@ -217913,8 +218967,6 @@ self: { libraryHaskellDepends = [ array base regex-base regex-tdfa text ]; description = "Text interface for regex-tdfa"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "regex-tdfa-unittest" = callPackage @@ -221117,8 +222169,8 @@ self: { }: mkDerivation { pname = "rhbzquery"; - version = "0.4.2"; - sha256 = "1j9nxizi1wsgz5gamdn9izy4aq6ci41gbkvsw7bbpc8fnvv5gpd2"; + version = "0.4.3"; + sha256 = "13brargymd1c9b0csaprj85qdqg98bzj3z2smbb0v66myj48v6fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -221145,6 +222197,7 @@ self: { ]; description = "Functional Reactive Programming with type-level clocks"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "rhine-gloss" = callPackage @@ -221159,6 +222212,7 @@ self: { executableHaskellDepends = [ base ]; description = "Gloss backend for Rhine"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "rhythm-game-tutorial" = callPackage @@ -221645,6 +222699,39 @@ self: { license = lib.licenses.bsd3; }) {}; + "rio-process-pool" = callPackage + ({ mkDerivation, async, atomic-primops, base, containers, criterion + , data-default, hashable, HUnit, mtl, QuickCheck, rio, tasty + , tasty-html, tasty-hunit, tasty-quickcheck, text, unliftio + , unliftio-messagebox + }: + mkDerivation { + pname = "rio-process-pool"; + version = "1.0.0"; + sha256 = "09v95wyrsa6yg5q5zaf9gqmn2xhh1i1q2mmxq52xhpc8pqwj93b9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base containers data-default hashable mtl QuickCheck rio text + unliftio unliftio-messagebox + ]; + executableHaskellDepends = [ + async base containers data-default hashable mtl QuickCheck rio text + unliftio unliftio-messagebox + ]; + testHaskellDepends = [ + async atomic-primops base containers data-default hashable HUnit + mtl QuickCheck rio tasty tasty-html tasty-hunit tasty-quickcheck + text unliftio unliftio-messagebox + ]; + benchmarkHaskellDepends = [ + async base containers criterion data-default hashable mtl + QuickCheck rio text unliftio unliftio-messagebox + ]; + description = "A library for process pools coupled with asynchronous message queues"; + license = lib.licenses.bsd2; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -225392,16 +226479,16 @@ self: { , containers, crackNum, deepseq, directory, doctest, filepath , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck - , template-haskell, time, transformers, uniplate, z3 + , template-haskell, text, time, transformers, uniplate, z3 }: mkDerivation { pname = "sbv"; - version = "8.9"; - sha256 = "1h8bhi1pjlg0v16wwqcvil7gq98b6dn8ckzmrsgb8sc3qz0nxj51"; + version = "8.10"; + sha256 = "1j9hy840dl78rr1ixhlz24wwymbpiv46hpz8i6dd0gngrfha09ji"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base containers crackNum deepseq directory filepath mtl - pretty process QuickCheck random syb template-haskell time + pretty process QuickCheck random syb template-haskell text time transformers uniplate ]; testHaskellDepends = [ @@ -225412,7 +226499,7 @@ self: { testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ base bench-show containers crackNum deepseq directory filepath - gauge mtl process random silently syb time + gauge mtl process random silently syb text time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = lib.licenses.bsd3; @@ -227283,6 +228370,76 @@ self: { license = lib.licenses.bsd2; }) {}; + "sdp" = callPackage + ({ mkDerivation, base, data-default-class, ghc-prim }: + mkDerivation { + pname = "sdp"; + version = "0.2"; + sha256 = "1q9l87rvvx7bqbqx1675r2mvj3b2jf0ywa55xcv2ybsl621z52y0"; + libraryHaskellDepends = [ base data-default-class ghc-prim ]; + description = "Simple Data Processing"; + license = lib.licenses.bsd3; + }) {}; + + "sdp-deepseq" = callPackage + ({ mkDerivation, base, deepseq, sdp }: + mkDerivation { + pname = "sdp-deepseq"; + version = "0.2"; + sha256 = "127vzi2a65j5czipgybdhfxfzfzx3r0hrrag1nha40vdgsd3j7w4"; + libraryHaskellDepends = [ base deepseq sdp ]; + description = "DeepSeq SDP extension"; + license = lib.licenses.bsd3; + }) {}; + + "sdp-hashable" = callPackage + ({ mkDerivation, base, hashable, sdp }: + mkDerivation { + pname = "sdp-hashable"; + version = "0.2"; + sha256 = "0cl9a10ww93n64sq4mnc3m56y4add04s06gi8n9rmad93v3xfk3j"; + libraryHaskellDepends = [ base hashable sdp ]; + description = "Hashable instances for SDP"; + license = lib.licenses.bsd3; + }) {}; + + "sdp-quickcheck" = callPackage + ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, sdp + , sdp-deepseq, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "sdp-quickcheck"; + version = "0.2"; + sha256 = "1gmsn5vw8a0qgqkaya7689spmbgcrqqg9zxbkdf4xq38q94zvwvh"; + libraryHaskellDepends = [ base QuickCheck sdp ]; + testHaskellDepends = [ + base QuickCheck sdp test-framework test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base criterion ghc-prim QuickCheck sdp sdp-deepseq + ]; + description = "SDP QuickCheck support"; + license = lib.licenses.bsd3; + }) {}; + + "sdp4vector" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-instances, sdp + , sdp-quickcheck, test-framework, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "sdp4vector"; + version = "0.2"; + sha256 = "1d18zgwawn598sax2m6cvb5w1k1vpc8n6bfdrvn0wrm8i6fvn0bq"; + libraryHaskellDepends = [ base sdp vector ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances sdp sdp-quickcheck + test-framework test-framework-quickcheck2 vector + ]; + description = "SDP wrapper for Vector"; + license = lib.licenses.bsd3; + }) {}; + "sdr" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-to-vector , cairo, cereal, Chart, Chart-cairo, colour, containers, criterion @@ -231459,6 +232616,22 @@ self: { license = lib.licenses.mit; }) {}; + "servant-validate" = callPackage + ({ mkDerivation, base, containers, hspec, servant + , should-not-typecheck, text + }: + mkDerivation { + pname = "servant-validate"; + version = "0.1.0.0"; + sha256 = "0igcbcax6xxp0h1c4kjbgl2iw1gbadn5ccb1kx0cpp0lydszlv80"; + libraryHaskellDepends = [ base containers servant text ]; + testHaskellDepends = [ + base containers hspec servant should-not-typecheck text + ]; + description = "Chekc static properties of servant APIs"; + license = lib.licenses.bsd3; + }) {}; + "servant-waargonaut" = callPackage ({ mkDerivation, base, bytestring, http-media, http-types, lens , servant, servant-server, tasty, tasty-wai, text, transformers @@ -231717,14 +232890,39 @@ self: { license = lib.licenses.mit; }) {}; + "serversession_1_0_2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , containers, data-default, hashable, hspec, nonce, path-pieces + , persistent-test, QuickCheck, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "serversession"; + version = "1.0.2"; + sha256 = "02ynhgq6gn5ddx2yd8ns8ay0rrhzln2h6jrmnwk7x1fqqfvzx0jf"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring data-default hashable nonce + path-pieces persistent-test text time transformers + unordered-containers + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring containers data-default + hspec nonce path-pieces QuickCheck text time transformers + unordered-containers + ]; + description = "Secure, modular server-side sessions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "serversession-backend-acid-state" = callPackage ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy , serversession, unordered-containers }: mkDerivation { pname = "serversession-backend-acid-state"; - version = "1.0.3"; - sha256 = "1rkw5an7lwx05063caqjhvf449jxij2zrbymg64p600mngb1flq0"; + version = "1.0.4"; + sha256 = "1mchxnkrpa6grp8h5iji40fyhya2lvb433yby4iymaaakzgjs19z"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -231748,8 +232946,8 @@ self: { }: mkDerivation { pname = "serversession-backend-persistent"; - version = "1.0.4"; - sha256 = "074pxfv1yj6ffxp4bg0ia20w7ikdja3g3k1l93nnjcni13zddwn7"; + version = "1.0.5"; + sha256 = "1mcaqafyr5x0v475j7rs2z4059jggzfj8rky66ls0mlvd9br91s0"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cereal path-pieces persistent serversession tagged text time transformers @@ -231774,8 +232972,8 @@ self: { }: mkDerivation { pname = "serversession-backend-redis"; - version = "1.0.3"; - sha256 = "059nak15x4cbwmfbvfih6ndwa6i5jhcba22h9gz44f6s84vhljyf"; + version = "1.0.4"; + sha256 = "1rrz2p103271pyhdlbwim8vz91yl1qip0lagf74d277x74v9hyp5"; libraryHaskellDepends = [ base bytestring hedis path-pieces serversession tagged text time transformers unordered-containers @@ -233996,8 +235194,8 @@ self: { pname = "show-combinators"; version = "0.2.0.0"; sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9"; - revision = "1"; - editedCabalFile = "1pczjf7z43nzfgza9fa29flbmvkj07p4dw16v9bjv36i8dv6cjc7"; + revision = "2"; + editedCabalFile = "0n3xlpm41wpw1ybmacg9s7150nx00qrdlw2rq4fzz7iw7333cyjx"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -234376,8 +235574,8 @@ self: { }: mkDerivation { pname = "signable"; - version = "0.2"; - sha256 = "1p1g6jhxgskl890g84nw8d465pan9d3prbc4jvyn8502bx00w01s"; + version = "0.3"; + sha256 = "1bh4i93333s3yldn4nnl4xv4gb92ggdwap6im9f259cfg1v22d2q"; libraryHaskellDepends = [ asn1-encoding asn1-types base binary bytestring casing cryptonite memory microlens pem proto-lens proto-lens-runtime @@ -234617,6 +235815,7 @@ self: { ]; description = "A simple library for affine and vector spaces"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ turion ]; }) {}; "simple-atom" = callPackage @@ -237017,6 +238216,30 @@ self: { broken = true; }) {}; + "slynx_0_5_0_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , monad-logger, mwc-random, optparse-applicative, statistics, text + , transformers, vector + }: + mkDerivation { + pname = "slynx"; + version = "0.5.0.2"; + sha256 = "0qpw3h1lbz299gb2jdcsj7svhxsi9icqaws8xpik58a3hb0r8icb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix monad-logger mwc-random + optparse-applicative statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle molecular sequences"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -237133,8 +238356,8 @@ self: { }: mkDerivation { pname = "smallcheck-series"; - version = "0.7.0.0"; - sha256 = "11pb4k0y8fqfkq5ajspn5nnliskvk8qp02dzpcjrzqk27da2iwb6"; + version = "0.7.1.0"; + sha256 = "0c5cpnrxqfhrxgic6rk6vy3wj537k249fg0wzczwx30vdqzcmnkx"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; @@ -237980,6 +239203,8 @@ self: { pname = "snap-core"; version = "1.0.4.2"; sha256 = "0zxdhx4wk70bkn71574lyz3zhq79yy98rv05r4564rd100xw3fqs"; + revision = "1"; + editedCabalFile = "065v61clskzikywv0gy9n4fjaszi2fnjklal83kqbzhzzgkf83ng"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers directory filepath hashable HUnit io-streams lifted-base @@ -239573,6 +240798,7 @@ self: { ]; description = "An extensible socket library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "socket-activation" = callPackage @@ -240341,6 +241567,7 @@ self: { ]; description = "Gopher Library and Server Daemon"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "spacefill" = callPackage @@ -244651,6 +245878,34 @@ self: { broken = true; }) {}; + "stm-hamt_1_2_0_5" = callPackage + ({ mkDerivation, async, base, criterion, deferred-folds, focus + , free, hashable, list-t, mwc-random, mwc-random-monad, primitive + , primitive-extras, QuickCheck, quickcheck-instances, rebase + , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stm-hamt"; + version = "1.2.0.5"; + sha256 = "09hz5v2ldinyl6brrl87f46wg16y9d1fnwb5v8s17ph00sb95lgg"; + libraryHaskellDepends = [ + base deferred-folds focus hashable list-t primitive + primitive-extras transformers + ]; + testHaskellDepends = [ + deferred-folds focus QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + async criterion focus free list-t mwc-random mwc-random-monad + rebase + ]; + description = "STM-specialised Hash Array Mapped Trie"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "stm-incremental" = callPackage ({ mkDerivation, base, hspec, stm }: mkDerivation { @@ -246130,8 +247385,8 @@ self: { pname = "streamproc"; version = "1.6.2"; sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7"; - revision = "1"; - editedCabalFile = "19c51gks028x8mnywkx1nz0s6bwn2mxs5ddmaj2q8n9l5pvfkcgs"; + revision = "2"; + editedCabalFile = "1j3frdzhlvmggqq07b7kiz6h7mim64n2frsb2d3hzsjd7jym526j"; libraryHaskellDepends = [ base ]; description = "Stream Processer Arrow"; license = lib.licenses.bsd3; @@ -246569,6 +247824,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "string-interpolate_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, formatting + , haskell-src-exts, haskell-src-meta, hspec, hspec-core + , interpolate, neat-interpolation, QuickCheck, quickcheck-instances + , quickcheck-text, quickcheck-unicode, split, template-haskell + , text, text-conversions, unordered-containers, utf8-string + }: + mkDerivation { + pname = "string-interpolate"; + version = "0.3.1.0"; + sha256 = "0hyrcndhwd06phlmykyz7bklj5gnj4amcn11ckfvw0iws3sksl8d"; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta split + template-haskell text text-conversions utf8-string + ]; + testHaskellDepends = [ + base bytestring hspec hspec-core QuickCheck quickcheck-instances + quickcheck-text quickcheck-unicode template-haskell text + unordered-containers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq formatting interpolate + neat-interpolation QuickCheck text + ]; + description = "Haskell string/text/bytestring interpolation that just works"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -247145,6 +248429,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "structs_0_1_5" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "structs"; + version = "0.1.5"; + sha256 = "1qsj5w6g0lcvbrm0zs37f1yk3im1swhnb4j1mbpr3fyc3zswwbjf"; + libraryHaskellDepends = [ + base deepseq ghc-prim primitive template-haskell th-abstraction + ]; + testHaskellDepends = [ + base primitive QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -248967,6 +250271,28 @@ self: { broken = true; }) {}; + "swisstable" = callPackage + ({ mkDerivation, base, criterion, deepseq, hashable, hashtables + , primitive, QuickCheck, tasty, tasty-discover, tasty-hunit, vector + }: + mkDerivation { + pname = "swisstable"; + version = "0.1.0.2"; + sha256 = "0zffsavnxnwhzxgbwpqg38gnjywgfdk60hbg0wvpggk1zaw0ylr1"; + libraryHaskellDepends = [ base hashable primitive vector ]; + testHaskellDepends = [ + base hashable primitive QuickCheck tasty tasty-discover tasty-hunit + vector + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base criterion deepseq hashable hashtables primitive QuickCheck + vector + ]; + description = "SwissTable hash map"; + license = lib.licenses.bsd3; + }) {}; + "sws" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, hourglass @@ -250516,6 +251842,7 @@ self: { testHaskellDepends = [ base network unix ]; description = "Systemd facilities (Socket activation, Notify)"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "systemstats" = callPackage @@ -252087,6 +253414,23 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-expected-failure_0_12_3" = callPackage + ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden + , tasty-hedgehog, tasty-hunit, unbounded-delays + }: + mkDerivation { + pname = "tasty-expected-failure"; + version = "0.12.3"; + sha256 = "0zlgxs24d54byfhvwdg85xk1572zpjs71bjlxxrxcvralrfcq1yb"; + libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; + testHaskellDepends = [ + base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit + ]; + description = "Mark tasty tests as failure expected"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-fail-fast" = callPackage ({ mkDerivation, base, containers, directory, stm, tagged, tasty , tasty-golden, tasty-hunit, tasty-tap @@ -254568,8 +255912,8 @@ self: { pname = "test-framework"; version = "0.8.2.0"; sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"; - revision = "5"; - editedCabalFile = "18g92ajx3ghznd6k3ihj22ln29n676ailzwx3k0f1kj3bmpilnh6"; + revision = "6"; + editedCabalFile = "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers hostname old-locale random regex-posix time xml @@ -254680,8 +256024,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; - revision = "2"; - editedCabalFile = "1apgf91van2070m6jhj9w3h2xmr42r4kk0da9crq9994hd8zwny2"; + revision = "3"; + editedCabalFile = "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -255988,8 +257332,8 @@ self: { pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; - revision = "2"; - editedCabalFile = "17cb7p0qywf2dsrq3g8qb3ssknd9wl5k0nc2pxz9gc3l8rxpkw51"; + revision = "3"; + editedCabalFile = "1wjy98ihhipzr34b310sgjjq3cc12aydhckbrgr21kxkzwglm4nv"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -257180,6 +258524,8 @@ self: { pname = "these"; version = "1.1.1.1"; sha256 = "027m1gd7i6jf2ppfkld9qrv3xnxg276587pmx10z9phpdvswk66p"; + revision = "1"; + editedCabalFile = "1bzi28jvaxil9rc6z1hkf87pfjsa3r5gfc9n0ixffnnv519cd0g9"; libraryHaskellDepends = [ assoc base binary deepseq hashable ]; description = "An either-or-both data type"; license = lib.licenses.bsd3; @@ -258200,6 +259546,8 @@ self: { pname = "time-compat"; version = "1.9.5"; sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii"; + revision = "1"; + editedCabalFile = "1f6r8cyfgzpfg9nrsqbf99pi44fyds9wcmgwxb4s0zmlb5dbv1m5"; libraryHaskellDepends = [ base base-orphans deepseq time ]; testHaskellDepends = [ base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit @@ -259617,6 +260965,30 @@ self: { broken = true; }) {}; + "tlynx_0_5_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , monad-logger, mwc-random, optparse-applicative, parallel + , statistics, text, transformers, vector + }: + mkDerivation { + pname = "tlynx"; + version = "0.5.0.2"; + sha256 = "1d28xk346h92imp6lnmy0g9mql8nd1zna1mnfs6mqhf38l8sm0k4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async monad-logger mwc-random + optparse-applicative parallel statistics text transformers vector + ]; + executableHaskellDepends = [ base ]; + description = "Handle phylogenetic trees"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -260178,6 +261550,38 @@ self: { license = lib.licenses.mpl20; }) {}; + "tomland_1_3_2_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , hashable, hedgehog, hspec, hspec-golden, hspec-hedgehog + , hspec-megaparsec, markdown-unlit, megaparsec, mtl + , parser-combinators, text, time, transformers + , unordered-containers, validation-selective + }: + mkDerivation { + pname = "tomland"; + version = "1.3.2.0"; + sha256 = "0yj39mh4z3v3jqri38s3ylrglv657g3m7gqr2rz8ydlvx2draknc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec mtl + parser-combinators text time transformers unordered-containers + validation-selective + ]; + executableHaskellDepends = [ + base bytestring containers hashable text time unordered-containers + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + base bytestring containers directory hashable hedgehog hspec + hspec-golden hspec-hedgehog hspec-megaparsec megaparsec text time + unordered-containers + ]; + description = "Bidirectional TOML serialization"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -262523,6 +263927,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "trifecta_2_1_1" = callPackage + ({ mkDerivation, ansi-terminal, array, base, blaze-builder + , blaze-html, blaze-markup, bytestring, charset, comonad + , containers, deepseq, fingertree, ghc-prim, hashable + , indexed-traversable, lens, mtl, parsers, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck, reducers + , transformers, unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "2.1.1"; + sha256 = "1lhzi0xxvilvgjy3yf3f85wfmrks562hhsnl0kg1xwji36rgwp6y"; + libraryHaskellDepends = [ + ansi-terminal array base blaze-builder blaze-html blaze-markup + bytestring charset comonad containers deepseq fingertree ghc-prim + hashable indexed-traversable lens mtl parsers prettyprinter + prettyprinter-ansi-terminal profunctors reducers transformers + unordered-containers utf8-string + ]; + testHaskellDepends = [ base parsers QuickCheck ]; + description = "A modern parser combinator library with convenient diagnostics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "trigger" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, clock, directory , exceptions, filepath, formatting, fsnotify, Glob, hspec, process @@ -264702,33 +266131,6 @@ self: { }) {}; "type-natural" = callPackage - ({ mkDerivation, base, constraints, equational-reasoning, ghc - , ghc-typelits-knownnat, ghc-typelits-natnormalise - , ghc-typelits-presburger, integer-logarithms, QuickCheck - , quickcheck-instances, tasty, tasty-discover - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell - }: - mkDerivation { - pname = "type-natural"; - version = "1.0.0.0"; - sha256 = "04j37xqgd2690y0vlx6f24y7fa07vljkrlaq8x8azmka8lsmbdl0"; - libraryHaskellDepends = [ - base constraints equational-reasoning ghc ghc-typelits-knownnat - ghc-typelits-natnormalise ghc-typelits-presburger - integer-logarithms template-haskell - ]; - testHaskellDepends = [ - base equational-reasoning integer-logarithms QuickCheck - quickcheck-instances tasty tasty-discover tasty-expected-failure - tasty-hunit tasty-quickcheck template-haskell - ]; - testToolDepends = [ tasty-discover ]; - description = "Type-level natural and proofs of their properties"; - license = lib.licenses.bsd3; - }) {}; - - "type-natural_1_1_0_0" = callPackage ({ mkDerivation, base, constraints, equational-reasoning, ghc , ghc-typelits-knownnat, ghc-typelits-natnormalise , ghc-typelits-presburger, integer-logarithms, QuickCheck @@ -264752,7 +266154,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Type-level natural and proofs of their properties"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "type-of-html" = callPackage @@ -265802,6 +267203,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "ua-parser_0_7_6_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, criterion, data-default + , deepseq, file-embed, filepath, HUnit, pcre-light, tasty + , tasty-hunit, tasty-quickcheck, text, yaml + }: + mkDerivation { + pname = "ua-parser"; + version = "0.7.6.0"; + sha256 = "0sakvmmf6p2ca0dbkwqdj5cv93gp78srw0zc4f1skcgndkmxwk6l"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring data-default file-embed pcre-light text yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default file-embed filepath HUnit + pcre-light tasty tasty-hunit tasty-quickcheck text yaml + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion data-default deepseq file-embed + filepath pcre-light text yaml + ]; + description = "A library for parsing User-Agent strings, official Haskell port of ua-parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uacpid" = callPackage ({ mkDerivation, base, containers, directory, filepath, hslogger , mtl, network, process, regex-compat, time, time-locale-compat @@ -267937,8 +269364,8 @@ self: { }: mkDerivation { pname = "unliftio-messagebox"; - version = "1.0.2"; - sha256 = "0pl75f3wbcy31b4firqw0y2mdl3axjdwx0w1vckidprv8sncsrm7"; + version = "2.0.0"; + sha256 = "0gwykcv91hn2pwnpwyc9032h84rdid28x34n0896319hl1rg5w9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269357,6 +270784,7 @@ self: { ]; description = "A pragmatic time and date library"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "utf" = callPackage @@ -269794,8 +271222,8 @@ self: { pname = "uuid"; version = "1.3.13"; sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z"; - revision = "3"; - editedCabalFile = "1p2srrapgx1f3zkdjjzm5g0dyfpg1h2g056la85xmpyjs77la2rq"; + revision = "6"; + editedCabalFile = "06w8i9hi9ha84nmj6fcj44apzv61m3ryc0a1yxxqq5n8vznk2iya"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 cryptohash-sha1 entropy network-info random text time uuid-types @@ -269811,6 +271239,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "uuid_1_3_14" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptohash-md5 + , cryptohash-sha1, entropy, network-info, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, text, time, uuid-types + }: + mkDerivation { + pname = "uuid"; + version = "1.3.14"; + sha256 = "1msj296faldr9fiwjqi9ixx3xl638mg6ffk7axic14wf8b9zw73a"; + libraryHaskellDepends = [ + base binary bytestring cryptohash-md5 cryptohash-sha1 entropy + network-info random text time uuid-types + ]; + testHaskellDepends = [ + base bytestring QuickCheck random tasty tasty-hunit + tasty-quickcheck + ]; + description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uuid-aeson" = callPackage ({ mkDerivation, aeson, base, text, uuid }: mkDerivation { @@ -269914,8 +271364,8 @@ self: { pname = "uuid-types"; version = "1.0.3"; sha256 = "1zdka5jnm1h6k36w3nr647yf3b5lqb336g3fkprhd6san9x52xlj"; - revision = "3"; - editedCabalFile = "0znx08r25sgs5j7ix8i9aikhgad0kc9i6vgkg0g3jzxk5haal9sf"; + revision = "4"; + editedCabalFile = "0ipwfd5y8021ygpadjjhchw5irm0x27dlv1k2hf4znza5v7hadcn"; libraryHaskellDepends = [ base binary bytestring deepseq hashable random text ]; @@ -269929,6 +271379,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "uuid-types_1_0_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, ghc-byteorder + , hashable, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.4"; + sha256 = "01pc93z6in6g717mxkhl111qc842fz1c2z7ml6n5jhm7lg52ran2"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable random text + ]; + testHaskellDepends = [ + base binary bytestring ghc-byteorder QuickCheck tasty tasty-hunit + tasty-quickcheck + ]; + description = "Type definitions for Universally Unique Identifiers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "uulib" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -270697,6 +272168,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "vault_0_3_1_5" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + }: + mkDerivation { + pname = "vault"; + version = "0.3.1.5"; + sha256 = "181ksk1yixjg0jiggw5jvm8am8m8c7lim4xaixf8qnaqvxm6namc"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + description = "a persistent store for values of arbitrary types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vault-tool" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, text, unordered-containers @@ -271609,8 +273095,8 @@ self: { }: mkDerivation { pname = "vega-view"; - version = "0.3.1.6"; - sha256 = "0s9d3g47qnzcpi2p1z60axrr53jbc6q4qyma88qxsrf6ava115ar"; + version = "0.3.1.7"; + sha256 = "1181gfxyxf2m3m23xg89kmmp8aizrm9sm908ydbkw885idh2k5x0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -272981,8 +274467,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.9.1"; - sha256 = "1rdhkxrjxcvdx3hd74xcgx28nd8ca8la5kclbxwbgciby8plpymv"; + version = "3.10"; + sha256 = "10bdm8rxak8kdiiqnjl5yw3n14zjr5gj1m9bpiiz0cabf72x54xx"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -273011,8 +274497,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.4.1"; - sha256 = "1kd8v3l6c1szip8d7aw03s9vs5bnwbm66c98wbvmbmwc46rrkksh"; + version = "0.4.2"; + sha256 = "0mf1jf5xv31818c7rarvz0aqc1qxgh7fqfp893pryhwwcr8r2qqa"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -277594,6 +279080,31 @@ self: { license = lib.licenses.mpl20; }) {}; + "with-utf8_1_0_2_2" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, hedgehog + , HUnit, process, safe-exceptions, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix + }: + mkDerivation { + pname = "with-utf8"; + version = "1.0.2.2"; + sha256 = "04ymb90yli9sbdl750yh0nvpn6crnrb2axhx8hrswz5g86cabcmq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base safe-exceptions text ]; + executableHaskellDepends = [ + base directory filepath process safe-exceptions text th-env + ]; + testHaskellDepends = [ + base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog + tasty-hunit temporary text unix + ]; + testToolDepends = [ tasty-discover ]; + description = "Get your IO right on the first try"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "withdependencies" = callPackage ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl , profunctors @@ -280489,8 +282000,6 @@ self: { libraryHaskellDepends = [ base mtl transformers xml ]; description = "Extension to the xml package to extract data from parsed xml"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "xml-hamlet" = callPackage @@ -280616,6 +282125,8 @@ self: { pname = "xml-lens"; version = "0.3"; sha256 = "1i3b22sz7fkh9vjlfpwzz6fg57br8xq6q7zz76f66h6hymc284dz"; + revision = "1"; + editedCabalFile = "0is48y2k6lsdwd2cqwvhxfjs7q5qccis8vcmw7cws18cb7vjks1x"; libraryHaskellDepends = [ base case-insensitive containers lens text xml-conduit ]; @@ -282764,8 +284275,7 @@ self: { ]; description = "Represent and parse yarn.lock files"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "yarn2nix" = callPackage @@ -282803,8 +284313,7 @@ self: { ]; description = "Convert yarn.lock files to nix expressions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "yarr" = callPackage @@ -282839,6 +284348,23 @@ self: { broken = true; }) {inherit (pkgs) libdevil;}; + "yasi" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, template-haskell, text + }: + mkDerivation { + pname = "yasi"; + version = "0.1.1.1"; + sha256 = "0b3ajgxf8bk2pjfwqmf748x1yzyq9knjsya2xzkdrjs5vffg1j9k"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + description = "Yet another string interpolator"; + license = lib.licenses.cc0; + }) {}; + "yate" = callPackage ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific , template-haskell, text, unordered-containers, vector @@ -283706,33 +285232,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, directory, file-embed, filepath - , fsnotify, http-client, http-client-tls, http-reverse-proxy - , http-types, network, optparse-applicative, process - , project-template, say, split, stm, streaming-commons, tar, text - , time, transformers, transformers-compat, unliftio - , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.6.0.6"; - sha256 = "044xk75pymw6limz08zicxp4lw8jqf6f2ilj8i2qw2h419w3ry9f"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring Cabal conduit conduit-extra containers - data-default-class directory file-embed filepath fsnotify - http-client http-client-tls http-reverse-proxy http-types network - optparse-applicative process project-template say split stm - streaming-commons tar text time transformers transformers-compat - unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib - ]; - description = "The yesod helper executable"; - license = lib.licenses.mit; - }) {}; - - "yesod-bin_1_6_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, directory, file-embed, filepath , fsnotify, http-client, http-client-tls, http-reverse-proxy @@ -283757,7 +285256,6 @@ self: { ]; description = "The yesod helper executable"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage @@ -287256,6 +288754,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "zippers_0_3_1" = callPackage + ({ mkDerivation, base, criterion, fail, indexed-traversable, lens + , profunctors, semigroupoids, semigroups + }: + mkDerivation { + pname = "zippers"; + version = "0.3.1"; + sha256 = "17z1zi9zd6a8g7sp4zyimgwdvhjj27hj4znbm4ps0kp73gadb953"; + libraryHaskellDepends = [ + base fail indexed-traversable lens profunctors semigroupoids + semigroups + ]; + benchmarkHaskellDepends = [ base criterion lens ]; + description = "Traversal based zippers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "zippo" = callPackage ({ mkDerivation, base, mtl, yall }: mkDerivation { @@ -287793,6 +289309,29 @@ self: { broken = true; }) {}; + "zuul" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , directory, filepath, http-client, http-client-tls + , optparse-generic, tasty, tasty-hunit, text, xdg-basedir + }: + mkDerivation { + pname = "zuul"; + version = "0.1.0.0"; + sha256 = "1agacvixl6s3np8jizmy9vbpzhbb0am9hs8qlc5sqvbg98qr8x1v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base http-client http-client-tls text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base containers directory filepath + optparse-generic text xdg-basedir + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A zuul client library"; + license = lib.licenses.asl20; + }) {}; + "zxcvbn-c" = callPackage ({ mkDerivation, base }: mkDerivation { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix index 6ad25d24ea..72f3dd552d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -95,12 +95,12 @@ let null ; in mkDerivation rec { - version = "6.1.0"; + version = "6.2.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "0mqa1g3fq0q45mqc0didr8vl6bk7jzj6gjsf1522qqjq2r04xwvg"; + sha256 = "sha256-RX0f2oY0qDni/Xz8VbmL1W82tq5z0xu530Pd4wEsqnw="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix index f301fd15f0..460af1cc67 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , python-setup-hook , self @@ -31,9 +32,15 @@ let implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; executable = "pypy${if isPy3k then "3" else ""}"; - pythonForBuild = self; # Not possible to cross-compile with. sitePackages = "site-packages"; hasDistutilsCxxPatch = false; + + # Not possible to cross-compile with. + pythonOnBuildForBuild = throw "${pname} does not support cross compilation"; + pythonOnBuildForHost = self; + pythonOnBuildForTarget = throw "${pname} does not support cross compilation"; + pythonOnHostForHost = throw "${pname} does not support cross compilation"; + pythonOnTargetForTarget = throw "${pname} does not support cross compilation"; }; pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix index 95d1b873ed..f724c2e0ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,15 +2,19 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - version = "20200225.2"; + version = "20200923.3"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"; + sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl"; }; + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=17" + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 5180df6346..159b03a26e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + maintainers = with maintainers; [ raskin lethalman worldofpeace ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix index 59b0b080a5..b05e9ea039 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/4.x.nix @@ -55,7 +55,7 @@ assert cupsSupport -> cups != null; stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.0.2"; + version = "4.0.3"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "115w3mzwm1xsi1q85qvwfm2yxpsjs2rcajgddzbnwhjicyn0frv2"; + sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA="; }; nativeBuildInputs = [ @@ -226,7 +226,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; + maintainers = with maintainers; [ raskin lethalman worldofpeace ]; platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix index 329fa99fa1..da29c0e07e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hpx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = version; - sha256 = "1ld2k00500p107jarw379hsd1nlnm33972nv9c3ssfq619bj01c9"; + sha256 = "sha256-Fkntfk5AaWtS1x0fXfLSWW/9tvKcCBi1COqgNxurPmk="; }; buildInputs = [ boost hwloc gperftools ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 081b67b166..74098f7e00 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableCapabilities libcap; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" ] - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-asm"; + ++ lib.optional (stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--disable-asm"; # for darwin see https://dev.gnupg.org/T5157 # Necessary to generate correct assembly when compiling for aarch32 on # aarch64 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix index eac383fae0..c933d92f32 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsigcxx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch new file mode 100644 index 0000000000..e60a4ffa30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/aarch64-darwin.patch @@ -0,0 +1,33 @@ +From 8ac29b952e638ec1ea8c3734a3b91253e50c336d Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia +Date: Sun, 24 Jan 2021 21:10:29 -0800 +Subject: [PATCH 4/4] Hack to address build failure when using newer macOS SDKs + with older deployment targets + +Signed-off-by: Jeremy Huddleston Sequoia +--- + include/c11/threads_posix.h | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h +index 45cb6075e6e..355d725f7da 100644 +--- a/include/c11/threads_posix.h ++++ b/include/c11/threads_posix.h +@@ -382,7 +382,13 @@ tss_set(tss_t key, void *val) + + /*-------------------- 7.25.7 Time functions --------------------*/ + // 7.25.6.1 +-#ifndef HAVE_TIMESPEC_GET ++#if !defined(HAVE_TIMESPEC_GET) || defined(__APPLE__) ++ ++#ifdef __APPLE__ ++#include ++#define timespec_get(ts, b) mesa_timespec_get(ts, b) ++#endif ++ + static inline int + timespec_get(struct timespec *ts, int base) + { +-- +2.29.2 (Apple Git-129) + diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index 36a0b52f35..e7c87bbc2c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -65,6 +65,10 @@ stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) + ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. + # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 + ./aarch64-darwin.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix index 5646f4e02b..4c6906c9c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/datasets.nix @@ -70,8 +70,8 @@ in { name = "G4PARTICLEXS"; - version = "3.1"; - sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0"; + version = "3.1.1"; + sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6"; envvar = "PARTICLEXS"; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 159c746fec..8d2f2f1ef5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -21,6 +21,7 @@ # For enableQT. , qtbase +, wrapQtAppsHook # For enableXM. , motif @@ -48,12 +49,12 @@ let in stdenv.mkDerivation rec { - version = "10.7.0"; + version = "10.7.1"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz"; - sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz"; + sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj"; }; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; @@ -87,7 +88,13 @@ stdenv.mkDerivation rec { "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals enableQT [ + wrapQtAppsHook + ]; + + dontWrapQtApps = !enableQT; buildInputs = [ libGLU xlibsWrapper libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] @@ -101,6 +108,8 @@ stdenv.mkDerivation rec { postFixup = '' # Don't try to export invalid environment variables. sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh + '' + lib.optionalString enableQT '' + wrapQtAppsHook ''; setupHook = ./geant4-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index ce905bff17..7cacab9bdf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { mathastext pgf relsize + sansmath sfmath siunitx xcolor diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 53c117233d..2b6eb5705c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,40 +1,84 @@ -{ lib, stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which -, lsb-release, glog, protobuf, cbc, zlib -, ensureNewerSourcesForZipFilesHook, python, swig }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, abseil-cpp +, bzip2 +, zlib +, lsb-release +, which +, protobuf +, cbc +, ensureNewerSourcesForZipFilesHook +, python +, swig4 +}: stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.7"; + version = "8.1"; + disabled = python.pythonOlder "3.6"; # not supported upstream src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "06ig9a1afmzgzcg817y0rdq49ahll0q9y7bhhg9d89x6zy959ypv"; + sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg"; }; + patches = [ + # This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect + # USE_SCIP=OFF and then failing to find scip/scip.h + (fetchpatch { + url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch"; + sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0"; + }) + ]; + # The original build system uses cmake which does things like pull # in dependencies through git and Makefile creation time. We # obviously don't want to do this so instead we provide the # dependencies straight from nixpkgs and use the make build method. + + # Cbc is linked against bzip2 and declares this in its pkgs-config file, + # but this makefile doesn't use pkgs-config, so we also have to add lbz2 configurePhase = '' + substituteInPlace makefiles/Makefile.third_party.unix.mk \ + --replace 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK)' \ + 'COINUTILS_LNK = $(STATIC_COINUTILS_LNK) -lbz2' + cat < Makefile.local - UNIX_ABSL_DIR=${abseil-cpp} - UNIX_GFLAGS_DIR=${gflags} - UNIX_GLOG_DIR=${glog} - UNIX_PROTOBUF_DIR=${protobuf} - UNIX_CBC_DIR=${cbc} + UNIX_ABSL_DIR=${abseil-cpp} + UNIX_PROTOBUF_DIR=${protobuf} + UNIX_CBC_DIR=${cbc} + USE_SCIP=OFF EOF ''; + # Many of these 'samples' (which are really the tests) require using SCIP, and or-tools 8.1 + # will just crash if SCIP is not found because it doesn't fall back to using one of + # the available solvers: https://github.com/google/or-tools/blob/b77bd3ac69b7f3bb02f55b7bab6cbb4bab3917f2/ortools/linear_solver/linear_solver.cc#L427 + # We don't compile with SCIP because it does not have an open source license. + # See https://github.com/google/or-tools/issues/2395 + preBuild = '' + for file in ortools/linear_solver/samples/*.cc; do + if grep -q SCIP_MIXED_INTEGER_PROGRAMMING $file; then + substituteInPlace $file --replace SCIP_MIXED_INTEGER_PROGRAMMING CBC_MIXED_INTEGER_PROGRAMMING + fi; + done + + substituteInPlace ortools/linear_solver/samples/simple_mip_program.cc \ + --replace 'SCIP' 'CBC' + ''; makeFlags = [ "prefix=${placeholder "out"}" "PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py" ]; buildFlags = [ "cc" "pypi_archive" ]; - checkTarget = "test_cc"; doCheck = true; + checkTarget = "test_cc"; installTargets = [ "install_cc" ]; # The upstream install_python target installs to $HOME. @@ -43,14 +87,30 @@ stdenv.mkDerivation rec { (cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python') ''; + enableParallelBuilding = true; + nativeBuildInputs = [ - cmake lsb-release swig which zlib python + cmake + lsb-release + swig4 + which ensureNewerSourcesForZipFilesHook - python.pkgs.setuptools python.pkgs.wheel + python.pkgs.setuptools + python.pkgs.wheel + ]; + buildInputs = [ + zlib + bzip2 + python ]; propagatedBuildInputs = [ - abseil-cpp gflags glog protobuf cbc - python.pkgs.protobuf python.pkgs.six + abseil-cpp + protobuf + + python.pkgs.protobuf + python.pkgs.six + python.pkgs.absl-py + python.pkgs.mypy-protobuf ]; outputs = [ "out" "python" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/termbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/termbox/default.nix index e809240bcd..51c2ca1c80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/termbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/termbox/default.nix @@ -1,31 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, python3, wafHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "termbox"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitHub { - owner = "nsf"; + owner = "termbox"; repo = "termbox"; rev = "v${version}"; - sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs"; + sha256 = "075swv6ajx8m424dbmgbf6fs6nd5q004gjpvx48gkxmnf9spvykl"; }; - # patch which updates the `waf` version used to build - # to make the package buildable on Python 3.7 - patches = [ - (fetchpatch { - url = "https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch"; - sha256 = "1s5747v51sdwvpsg6k9y1j60yn9f63qnylkgy8zrsifjzzd5fzl6"; - }) - ]; - - nativeBuildInputs = [ python3 wafHook ]; + makeFlags = [ "prefix=${placeholder "out"}" ]; meta = with lib; { description = "Library for writing text-based user interfaces"; license = licenses.mit; - homepage = "https://github.com/nsf/termbox#readme"; - downloadPage = "https://github.com/nsf/termbox/releases"; + homepage = "https://github.com/termbox/termbox#readme"; + downloadPage = "https://github.com/termbox/termbox/releases"; maintainers = with maintainers; [ fgaz ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch new file mode 100644 index 0000000000..0937ac6e30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch @@ -0,0 +1,74 @@ +From 9b05a6f331506afa5aca8865677af83403d2a32d Mon Sep 17 00:00:00 2001 +From: Tadeo Kondrak +Date: Mon, 25 Jan 2021 11:17:44 -0700 +Subject: [PATCH] Call weak function to allow adding preloaded plugins after + compile + +--- + src/core/vscore.cpp | 19 +++++++++++++++++++ + src/core/vscore.h | 5 +++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp +index 2d29844d..35c509ed 100644 +--- a/src/core/vscore.cpp ++++ b/src/core/vscore.cpp +@@ -1229,6 +1229,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { + freeDepth--; + } + ++extern "C" { ++void __attribute__((weak)) VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data); ++ ++struct VSLoadPluginsNixCallbackData { ++ VSCore *core; ++ const char *filter; ++}; ++ ++static void VSLoadPluginsNixCallback(void *data, const char *path) { ++ auto callbackData = static_cast(data); ++ callbackData->core->loadAllPluginsInPath(path, callbackData->filter); ++} ++} ++ + VSCore::VSCore(int threads) : + coreFreed(false), + numFilterInstances(1), +@@ -1351,6 +1365,11 @@ VSCore::VSCore(int threads) : + } // If neither exists, an empty string will do. + #endif + ++ if (VSLoadPluginsNix != nullptr) { ++ VSLoadPluginsNixCallbackData data{this, filter.c_str()}; ++ VSLoadPluginsNix(VSLoadPluginsNixCallback, &data); ++ } ++ + VSMap *settings = readSettings(configFile); + const char *error = vs_internal_vsapi.getError(settings); + if (error) { +diff --git a/src/core/vscore.h b/src/core/vscore.h +index 74df8a84..3efac811 100644 +--- a/src/core/vscore.h ++++ b/src/core/vscore.h +@@ -582,6 +582,9 @@ public: + VSFunction() : functionData(nullptr), func(nullptr) {} + }; + ++extern "C" { ++static void VSLoadPluginsNixCallback(void *data, const char *path); ++} + + struct VSPlugin { + private: +@@ -683,6 +686,8 @@ public: + + explicit VSCore(int threads); + void freeCore(); ++ ++ friend void VSLoadPluginsNixCallback(void *data, const char *path); + }; + + #endif // VSCORE_H +-- +2.30.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 93f8d3c5ae..4265948c19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper +, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv , zimg, libass, python3, libiconv , ApplicationServices , ocrSupport ? false, tesseract ? null @@ -21,6 +22,10 @@ stdenv.mkDerivation rec { sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; + patches = [ + ./0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch + ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zimg libass @@ -36,12 +41,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { + passthru = rec { # If vapoursynth is added to the build inputs of mpv and then # used in the wrapping of it, we want to know once inside the # wrapper, what python3 version was used to build vapoursynth so # the right python3.sitePackages will be used there. inherit python3; + + withPlugins = import ./plugin-interface.nix { + inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand + vapoursynth makeWrapper withPlugins; + }; }; postInstall = '' @@ -54,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; - maintainers = with maintainers; [ rnhmjoj tadeokondrak ]; + maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix index f9ebed1975..26a1a6d680 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,43 +1,59 @@ -{ lib, mkDerivation, fetchFromBitbucket +{ lib, stdenv, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand , python3, vapoursynth , qmake, qtbase, qtwebsockets }: -mkDerivation rec { - pname = "vapoursynth-editor"; - version = "R19"; +let + unwrapped = mkDerivation rec { + pname = "vapoursynth-editor"; + version = "R19"; - src = fetchFromBitbucket { - owner = "mystery_keeper"; - repo = pname; - rev = lib.toLower version; - sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; + src = fetchFromBitbucket { + owner = "mystery_keeper"; + repo = pname; + rev = lib.toLower version; + sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase vapoursynth qtwebsockets ]; + + dontWrapQtApps = true; + + preConfigure = "cd pro"; + + preFixup = '' + cd ../build/release* + mkdir -p $out/bin + for bin in vsedit{,-job-server{,-watcher}}; do + mv $bin $out/bin + wrapQtApp $out/bin/$bin + done + ''; + + passthru = { inherit withPlugins; }; + + meta = with lib; { + description = "Cross-platform editor for VapourSynth scripts"; + homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; + license = licenses.mit; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase vapoursynth qtwebsockets ]; - - dontWrapQtApps = true; - - preConfigure = "cd pro"; - - preFixup = '' - cd ../build/release* + withPlugins = plugins: let + vapoursynthWithPlugins = vapoursynth.withPlugins plugins; + in runCommand "${unwrapped.name}-with-plugins" { + buildInputs = [ makeWrapper ]; + passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); }; + } '' mkdir -p $out/bin for bin in vsedit{,-job-server{,-watcher}}; do - mv $bin $out/bin - - wrapQtApp $out/bin/$bin \ - --prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} \ - --prefix LD_LIBRARY_PATH : ${vapoursynth}/lib + makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \ + --prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \ + --prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib done ''; - - meta = with lib; { - description = "Cross-platform editor for VapourSynth scripts"; - homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; - license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; - platforms = platforms.all; - }; -} +in + withPlugins [] diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix new file mode 100644 index 0000000000..55b2b03c89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -0,0 +1,112 @@ +{ lib, python3, buildEnv, writeText, runCommandCC, stdenv, runCommand +, vapoursynth, makeWrapper, withPlugins }: + +plugins: let + pythonEnvironment = python3.buildEnv.override { + extraLibs = plugins; + }; + + getRecursivePropagatedBuildInputs = pkgs: lib.flatten + (map + (pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) + pkgs); + + deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); + + pluginsEnv = buildEnv { + name = "vapoursynth-plugins-env"; + pathsToLink = [ "/lib/vapoursynth" ]; + paths = deepPlugins; + }; + + pluginLoader = let + source = writeText "vapoursynth-nix-plugins.c" '' + void VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data) { + ${lib.concatMapStringsSep "" (path: "load(data, \"${path}/lib/vapoursynth\");") deepPlugins} + } + ''; + in + runCommandCC "vapoursynth-plugin-loader" { + executable = true; + preferLocalBuild = true; + allowSubstitutes = false; + } '' + mkdir -p $out/lib + $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" + ''; + + ext = stdenv.targetPlatform.extensions.sharedLibrary; +in +runCommand "${vapoursynth.name}-with-plugins" { + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit python3; + withPlugins = plugins': withPlugins (plugins ++ plugins'); + }; +} '' + mkdir -p \ + $out/bin \ + $out/lib/pkgconfig \ + $out/lib/vapoursynth \ + $out/${python3.sitePackages} + + for textFile in \ + lib/pkgconfig/vapoursynth{,-script}.pc \ + lib/libvapoursynth.la \ + lib/libvapoursynth-script.la \ + ${python3.sitePackages}/vapoursynth.la + do + substitute ${vapoursynth}/$textFile $out/$textFile \ + --replace "${vapoursynth}" "$out" + done + + for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do + ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"} + done + + for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do + ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"} + done + + for binaryFile in \ + lib/libvapoursynth${ext} \ + lib/libvapoursynth-script${ext}.0.0.0 + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="$old_rpath:$out/lib" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + patchelf \ + --add-needed libvapoursynth-nix-plugins${ext} \ + $out/$binaryFile + done + + for binaryFile in \ + ${python3.sitePackages}/vapoursynth${ext} \ + bin/.vspipe-wrapped + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + done + + ln -s \ + ${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \ + $out/lib/libvapoursynth-nix-plugins${ext} + ln -s ${vapoursynth}/include $out/include + ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext} + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext}.0 + + makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \ + --prefix PYTHONPATH : $out/${python3.sitePackages} +'' diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 3893e3554e..829c2f67fd 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -22,6 +22,8 @@ , "cdktf-cli" , "clean-css-cli" , "clubhouse-cli" +, "coc-clangd" +, "coc-cmake" , "coc-css" , "coc-diagnostic" , "coc-emmet" @@ -39,6 +41,7 @@ , "coc-metals" , "coc-pairs" , "coc-prettier" +, "coc-pyright" , "coc-python" , "coc-r-lsp" , "coc-rls" @@ -48,6 +51,7 @@ , "coc-solargraph" , "coc-stylelint" , "coc-tabnine" +, "coc-texlab" , "coc-tslint" , "coc-tslint-plugin" , "coc-tsserver" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 5c028dcc47..6fa9a907f2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -229,13 +229,13 @@ let sha512 = "ZtyaBH1icCgqwIGb3zrtopV2D5Q8yxibkJzlaViM08eOhTQc7rACdYu0pfORFfhllvdMZ3aq69vifYHszY4gNA=="; }; }; - "@apollographql/apollo-tools-0.4.8" = { + "@apollographql/apollo-tools-0.4.9" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.4.8"; + version = "0.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.8.tgz"; - sha512 = "W2+HB8Y7ifowcf3YyPHgDI05izyRtOeZ4MqIr7LbTArtmJ0ZHULWpn84SGMW7NAvTV1tFExpHlveHhnXuJfuGA=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.9.tgz"; + sha512 = "M50pk8oo3CGTu4waGOklIX3YtTZoPfWG9K/G9WB8NpyQGA1OwYTiBFv94XqUtKElTDoFwoMXpMQd3Wy5dINvxA=="; }; }; "@apollographql/graphql-language-service-interface-2.0.2" = { @@ -355,15 +355,6 @@ let sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg=="; }; }; - "@babel/core-7.12.16" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.16.tgz"; - sha512 = "t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw=="; - }; - }; "@babel/core-7.12.17" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -391,15 +382,6 @@ let sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; }; }; - "@babel/generator-7.12.15" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.12.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.15.tgz"; - sha512 = "6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ=="; - }; - }; "@babel/generator-7.12.17" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -427,15 +409,6 @@ let sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.12.16" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.16.tgz"; - sha512 = "dBHNEEaZx7F3KoUYqagIhRIeqyyuI65xMndMZ3WwGwEBI609I4TleYQHcrS627vbKyNTXqShoN+fvYD9HuQxAg=="; - }; - }; "@babel/helper-compilation-targets-7.12.17" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; @@ -445,15 +418,6 @@ let sha512 = "5EkibqLVYOuZ89BSg2lv+GG8feywLuvMXNYgf0Im4MssE0mFWPztSpJbildNnUgw0bLI2EsIN4MpSHC2iUJkQA=="; }; }; - "@babel/helper-create-class-features-plugin-7.12.16" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.16.tgz"; - sha512 = "KbSEj8l9zYkMVHpQqM3wJNxS1d9h3U9vm/uE5tpjMbaj3lTp+0noe3KPsV5dSD9jxKnf9jO9Ip9FX5PKNZCKow=="; - }; - }; "@babel/helper-create-class-features-plugin-7.12.17" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; @@ -463,15 +427,6 @@ let sha512 = "I/nurmTxIxHV0M+rIpfQBF1oN342+yvl2kwZUrQuOClMamHF1w5tknfZubgNOLRoA73SzBFAdFcpb4M9HwOeWQ=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.16" = { - name = "_at_babel_slash_helper-create-regexp-features-plugin"; - packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.16.tgz"; - sha512 = "jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg=="; - }; - }; "@babel/helper-create-regexp-features-plugin-7.12.17" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; @@ -517,15 +472,6 @@ let sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.16" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz"; - sha512 = "zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ=="; - }; - }; "@babel/helper-member-expression-to-functions-7.12.17" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; @@ -544,15 +490,6 @@ let sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; }; }; - "@babel/helper-module-transforms-7.12.13" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; - sha512 = "acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA=="; - }; - }; "@babel/helper-module-transforms-7.12.17" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; @@ -634,15 +571,6 @@ let sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/helper-validator-option-7.12.16" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.16.tgz"; - sha512 = "uCgsDBPUQDvzr11ePPo4TVEocxj8RXjUVSC/Y8N1YpVAI/XDdUwGJu78xmlGhTxj2ntaWM7n9LQdRtyhOzT2YQ=="; - }; - }; "@babel/helper-validator-option-7.12.17" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; @@ -661,15 +589,6 @@ let sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw=="; }; }; - "@babel/helpers-7.12.13" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.13.tgz"; - sha512 = "oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ=="; - }; - }; "@babel/helpers-7.12.17" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; @@ -688,15 +607,6 @@ let sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww=="; }; }; - "@babel/parser-7.12.16" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.16.tgz"; - sha512 = "c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw=="; - }; - }; "@babel/parser-7.12.17" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -733,15 +643,6 @@ let sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.12.16" = { - name = "_at_babel_slash_plugin-proposal-dynamic-import"; - packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.16.tgz"; - sha512 = "yiDkYFapVxNOCcBfLnsb/qdsliroM+vc3LHiZwS4gh7pFjo5Xq3BDhYBNn3H3ao+hWPvqeeTdU+s+FIvokov+w=="; - }; - }; "@babel/plugin-proposal-dynamic-import-7.12.17" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; @@ -823,15 +724,6 @@ let sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.16" = { - name = "_at_babel_slash_plugin-proposal-optional-chaining"; - packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.16.tgz"; - sha512 = "O3ohPwOhkwji5Mckb7F/PJpJVJY3DpPsrt/F0Bk40+QMk9QpAIqeGusHWqu/mYqsM8oBa6TziL/2mbERWsUZjg=="; - }; - }; "@babel/plugin-proposal-optional-chaining-7.12.17" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; @@ -1255,15 +1147,6 @@ let sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.16" = { - name = "_at_babel_slash_plugin-transform-react-jsx"; - packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.16.tgz"; - sha512 = "dNu0vAbIk8OkqJfGtYF6ADk6jagoyAl+Ks5aoltbAlfoKv8d6yooi3j+kObeSQaCj9PgN6KMZPB90wWyek5TmQ=="; - }; - }; "@babel/plugin-transform-react-jsx-7.12.17" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; @@ -1300,15 +1183,6 @@ let sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; }; - "@babel/plugin-transform-runtime-7.12.15" = { - name = "_at_babel_slash_plugin-transform-runtime"; - packageName = "@babel/plugin-transform-runtime"; - version = "7.12.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.15.tgz"; - sha512 = "OwptMSRnRWJo+tJ9v9wgAf72ydXWfYSXWhnQjZing8nGZSDFqU1MBleKM3+DriKkcbv7RagA8gVeB0A1PNlNow=="; - }; - }; "@babel/plugin-transform-runtime-7.12.17" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; @@ -1363,13 +1237,13 @@ let sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; }; - "@babel/plugin-transform-typescript-7.12.16" = { + "@babel/plugin-transform-typescript-7.12.17" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.12.16"; + version = "7.12.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.16.tgz"; - sha512 = "88hep+B6dtDOiEqtRzwHp2TYO+CN8nbAV3eh5OpBGPsedug9J6y1JwLKzXRIGGQZDC8NlpxpQMIIxcfIW96Wgw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.17.tgz"; + sha512 = "1bIYwnhRoetxkFonuZRtDZPFEjl1l5r+3ITkxLC3mlMaFja+GQFo94b/WHEPjqWLU9Bc+W4oFZbvCGe9eYMu1g=="; }; }; "@babel/plugin-transform-unicode-escapes-7.12.13" = { @@ -1399,15 +1273,6 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.12.16" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.12.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.16.tgz"; - sha512 = "BXCAXy8RE/TzX416pD2hsVdkWo0G+tYd16pwnRV4Sc0fRwTLRS/Ssv8G5RLXUGQv7g4FG7TXkdDJxCjQ5I+Zjg=="; - }; - }; "@babel/preset-env-7.12.17" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; @@ -1444,13 +1309,13 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.16" = { + "@babel/preset-typescript-7.12.17" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.12.16"; + version = "7.12.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.16.tgz"; - sha512 = "IrYNrpDSuQfNHeqh7gsJsO35xTGyAyGkI1VxOpBEADFtxCqZ77a1RHbJqM3YJhroj7qMkNMkNtcw0lqeZUrzow=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.17.tgz"; + sha512 = "T513uT4VSThRcmWeqcLkITKJ1oGQho9wfWuhQm10paClQkp1qyd0Wf8mvC8Se7UYssMyRSj4tZYpVTkCmAK/mA=="; }; }; "@babel/register-7.12.13" = { @@ -1462,22 +1327,13 @@ let sha512 = "fnCeRXj970S9seY+973oPALQg61TRvAaW0nRDe1f4ytKqM3fZgsNXewTZWmqZedg74LFIRpg/11dsrPZZvYs2g=="; }; }; - "@babel/runtime-7.12.13" = { + "@babel/runtime-7.12.18" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.12.13"; + version = "7.12.18"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz"; - sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; - }; - }; - "@babel/runtime-7.12.17" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.12.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.17.tgz"; - sha512 = "nEvWif7aHm4O0lTT2p4kYCfYwsGSBiWA8XmAqovusBDKugpUy3BVggAjJL4iFWIwrFJktay2VLtAQl1/l8Xsow=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz"; + sha512 = "BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg=="; }; }; "@babel/runtime-7.12.5" = { @@ -1507,15 +1363,6 @@ let sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.12.13" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz"; - sha512 = "3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA=="; - }; - }; "@babel/traverse-7.12.17" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; @@ -1534,15 +1381,6 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.13" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz"; - sha512 = "oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ=="; - }; - }; "@babel/types-7.12.17" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2146,13 +1984,13 @@ let sha512 = "HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ=="; }; }; - "@fluentui/react-7.160.3" = { + "@fluentui/react-7.161.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.160.3"; + version = "7.161.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.160.3.tgz"; - sha512 = "gkBpKZS1AUDT5bRI55MfSK8WsrbFZasQFoO3pgsiD5DqAMClQtOUlXwNpllv4gkAewLkkducvJWn/7JGRDFqWg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.161.0.tgz"; + sha512 = "TZQvDVeOrZrkkcOvrg3+EwOJYE8M9UWn01BIIOULv4tjKnIpRreyKHr/nrG0Cbb0PYEmqxUex0CR+RFCqIYlpg=="; }; }; "@fluentui/react-focus-7.17.4" = { @@ -2308,13 +2146,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.7" = { + "@graphql-tools/merge-6.2.9" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.7"; + version = "6.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.7.tgz"; - sha512 = "9acgDkkYeAHpuqhOa3E63NZPCX/iWo819Q320sCCMkydF1xgx0qCRYz/V03xPdpQETKRqBG2i2N2csneeEYYig=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.9.tgz"; + sha512 = "4PPB2rOEjnN91CVltOIVdBOOTEsC+2sHzOVngSoqtgZxvLwcRKwivy3sBuL3WyucBonzpXlV97Q418njslYa/w=="; }; }; "@graphql-tools/schema-7.1.3" = { @@ -2344,13 +2182,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.3.0" = { + "@graphql-tools/utils-7.5.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.3.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.3.0.tgz"; - sha512 = "8MD5/jRsvbA4zSdI5bBRXvXh5pn208pSc+KGd0xjBVyY3m/tTFxl0hohDPC5hw6JcHnz8IfhpuuNfi8gm9I+5g=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.5.0.tgz"; + sha512 = "8f//RSqHmKRdg9A3GHlZdxzlVfF/938ZD9edXLW7EriSABg1BXu3veru9W02VqORypArb2S/Tyeyvsk2gForqA=="; }; }; "@graphql-tools/wrap-7.0.5" = { @@ -4090,13 +3928,13 @@ let sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-5.0.0" = { + "@octokit/openapi-types-5.1.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.0.0.tgz"; - sha512 = "QXpwbGjidE+XhgCEeXpffQk/XGiexgne8czTebwU359Eoko8FJzAED4aizrQlL9t4n6tMx/1Ka1vwZbP6rayFA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-5.1.0.tgz"; + sha512 = "bodZvSYgycbUuuKrC/anCBUExvaSSWzMMFz0xl7pcJujxnmGxvqvcFHktjx1ZOSyeNKLfYF0QCgibaHUGsZTng=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4180,13 +4018,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.9.0" = { + "@octokit/types-6.10.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.9.0"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.9.0.tgz"; - sha512 = "j4ms2ukvWciu8hSuIWtWK/LyOWMZ0ZsRcvPIVLBYyAkTKBKrMJyiyv2wawJnyphKyEOhRgIyu5Nmf4yPxp0tcg=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.10.0.tgz"; + sha512 = "aMDo10kglofejJ96edCBIgQLVuzMDyjxmhdgEcoUUD64PlHYSrNsAGqN0wZtoiX4/PCQ3JLA50IpkP1bcKD/cA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -4279,310 +4117,310 @@ let sha512 = "2TUGhTGkhgnxTciHCNAILPSeyXageJewRqfP9wOrx65sKd/jgvNYoY8nYf4EVWVMirDOxKDsmYgUkjdQrwb2dg=="; }; }; - "@ot-builder/bin-composite-types-1.0.1" = { + "@ot-builder/bin-composite-types-1.0.2" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.1.tgz"; - sha512 = "OwX0d7IN7LhgeWiPPftMTcGYVisMPWXuvuLQHdc7gO+1Sg/7+XbMwXbdYI1PvJwqNlqKPE5+yVesjgVtt1RRwQ=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.2.tgz"; + sha512 = "YWlWy5Btp4aSCX6stibMdAaB6Z7pgwimDXYlrgJ8HoXZkWmkWLXvpwPYw+zMWTNeWqOT+qAjnHacsl06ryZA6A=="; }; }; - "@ot-builder/bin-util-1.0.1" = { + "@ot-builder/bin-util-1.0.2" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.1.tgz"; - sha512 = "LN6iR+Y/gmRkRoxW6VV5U1SIDRu9zQ5ZshePQukp1+gdJQJBrhmCrreL4XEEOQ/3AC67yuj6pAPi70jagqKxyA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.2.tgz"; + sha512 = "YHT0oXrmq3taDdIIopV6YBsH8DkzSkkiKW6a/jMZTYYb0tRHgybpuqRUq5uoDNnkA0ntl7sx+nf8p4e4TOUpJQ=="; }; }; - "@ot-builder/cli-help-shower-1.0.1" = { + "@ot-builder/cli-help-shower-1.0.2" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.1.tgz"; - sha512 = "oCsKX1ecjd1L8uOmU1z0YziizRoOWN4NOhnDU+sLGtPYPnM9bOzKprfY6W99NFkTYu27N19glwFUPM/s0F+nNA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.2.tgz"; + sha512 = "7LJTbtkACJjwEBPWvkzCFnoK6H7HPYSFiXNFBL+p4ta9/z4OQM6AawvAdmmA/nVXA77WwTB4j2pPNJj6wjvQNQ=="; }; }; - "@ot-builder/cli-proc-1.0.1" = { + "@ot-builder/cli-proc-1.0.2" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.1.tgz"; - sha512 = "lR90Mb/Wmm2GZH0tBIGjfZhh/VxQl5YiwXVjQIo7UM5iFviHf44lYqVkn0vyE9D1IT5E/tA1OzDrjpIBG7WBKQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.2.tgz"; + sha512 = "JKG11KtIhj+n9FIbyzlE+8C3esEM0VrBUYhdm+q95DhG5b0Jvw0CoJBb9TpEK83jwYxJKbvVfoqOmtnJ5YJ2tA=="; }; }; - "@ot-builder/cli-shared-1.0.1" = { + "@ot-builder/cli-shared-1.0.2" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.1.tgz"; - sha512 = "I9Zd7gRiZdD+MFr13A9zH2CRvEkjZX91OfkDiAxpDM9ncKlnlZpbbIVp3nh0VCbUAad9lrdc+xI+MMwOEPKhIA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.2.tgz"; + sha512 = "zpNhTkSUpK41jrWBZworApKhqslOVijcyOCbmJ2EitFSkajoA0PeFmjeLak3LR5HoMNIoS8yYcPtzr/lTt7vXQ=="; }; }; - "@ot-builder/common-impl-1.0.1" = { + "@ot-builder/common-impl-1.0.2" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.1.tgz"; - sha512 = "v0r2tPYO8MTmx6Eo6cPGCXYZe2ScX4zA9xAfqvXn//h0sr4K11k3F6ELLDY64zKASOhITcWgznU3Prt3ubpkjg=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.2.tgz"; + sha512 = "73L6qruH8QcEGpGuYCzE6tFqlAX/9wKAbIEhJWjk1ymEBGXIkBzIbhTGXxyGAgYmrDwT23pwMIG9ozH/okauvw=="; }; }; - "@ot-builder/errors-1.0.1" = { + "@ot-builder/errors-1.0.2" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.1.tgz"; - sha512 = "66pRCyZq/uESMHTb6Wz3FYwUr6YYnuJ+sJMGyfvOCCvwZzlUYiZZ9r0lPjh/lvZ3j1UYFG6OvpIgUeBCqean9w=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.2.tgz"; + sha512 = "n1xUxFPmG+nM4BCM13vXNufkRtQ0dWHyTB3K5OtoYWoATle6ETfHiQk0S4k9IsIyjysVWUOvtRTPAO4hJA6csQ=="; }; }; - "@ot-builder/io-bin-cff-1.0.1" = { + "@ot-builder/io-bin-cff-1.0.2" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.1.tgz"; - sha512 = "rEuNFXtyU0/a2xpqTHajIZ8YgEkVdB7XImODrs308zlkHdaWL6akOUgBNr866qj6kVWEdfnXkcF0ZCaRJYrCzA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.2.tgz"; + sha512 = "N49Bj2EsaHPWfPAoM7zbzSpX+DniKHjpakVa6319F0lwY4FRUYqQPbvEEFDo8tgwDWDNuke1Rg4EQXCh4iENxQ=="; }; }; - "@ot-builder/io-bin-encoding-1.0.1" = { + "@ot-builder/io-bin-encoding-1.0.2" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.1.tgz"; - sha512 = "50IRjuNn2vJny5QXFcEp7EccfHEVZ8TTp4TdA6w6pyNtqxyUSHukrqJTpnO30jitNS+NRSqdoI9EHDgZh2Z5IQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.2.tgz"; + sha512 = "WFENprSBPDXmavzzKzegdjNKzhUCgDyoUEiIGpYCJqnylCW1/h8Ebw0HVt8Je3N4MZWT+9yah4+95C7wNNyYTA=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.1" = { + "@ot-builder/io-bin-ext-private-1.0.2" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.1.tgz"; - sha512 = "+vWNtsB9YDoM6bYcADfQEw5g9BIM1qbNlYDtntas/3BcEkjtMC2hUmHfkjPYJCaLpJSROUTqH9n+3Ih+OLgvRw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.2.tgz"; + sha512 = "L326SWioJmP9tN4rC7Cjg/UuKigraTREwZlhGPgFgvokTbJxBJOI5vYdAKBRWQoMauzqsq4a6+LZspmDehjIWg=="; }; }; - "@ot-builder/io-bin-font-1.0.1" = { + "@ot-builder/io-bin-font-1.0.2" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.1.tgz"; - sha512 = "GQ605nx70kUD3Mu+4RZ7+GyO5Yp6zGG4+Lrw6Fpmyd7aCTchCeYkHAIAuIUtzkTo/xKTg+MDQqHUK1a9V9hQpw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.2.tgz"; + sha512 = "QmDocVL2Omtvbb3SAZVajNDHK2/wEvP9jRnHiMTWMKLKy8Q1EaHhxhZNTMmcPji9aoMuYFDn9FFUCyCDhgyJMQ=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.1" = { + "@ot-builder/io-bin-glyph-store-1.0.2" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.1.tgz"; - sha512 = "O51k7dReVjls62SfpIh+bNv053dxqRq+fbHBwU2mXo/klKk+T7NIQvaWqZpomUFlY3nrNv9AOAlAHZzjkHyIeA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.2.tgz"; + sha512 = "GUoAfN1NFBDiHJ+vI1g4hmY6D+tDosOYWqnXYki9atBjH4biTxGB2qFAIz5WcNBZXeooQxjMb1eLt4zLl4gA3Q=="; }; }; - "@ot-builder/io-bin-layout-1.0.1" = { + "@ot-builder/io-bin-layout-1.0.2" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.1.tgz"; - sha512 = "dfdqHp77r5jixq0E/7v/PyrMWVKVtZPCEAa7QonPIfFxoG5a/nq9hzuXSLldg8GxuUXzEqV3waXB9sSo7KpOCg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.2.tgz"; + sha512 = "z6iC8jBSJ0sGszxxmyJ+esCZXdiLrUY9bCeqbx8UQWDa2DC9359okr6YHr9VPeiP8DN2ezT3g0DmXnKLzm/QgA=="; }; }; - "@ot-builder/io-bin-metadata-1.0.1" = { + "@ot-builder/io-bin-metadata-1.0.2" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.1.tgz"; - sha512 = "c5DMb048oMO3WKkeszVif5OVN1ZCEGexBjPBS06zIeRB3F0X+/ZjCjbtx6WWXRvF9DkZDrDMAFDmG3dAhtPvdA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.2.tgz"; + sha512 = "D2P4HXha0KM3MrTEu4/CSzJjT7jk0WD7qzopRk74z2dOc3O4qLQZ19fqSPUfBCpGWcaHF4u2QA+0Nuaw5oyyJg=="; }; }; - "@ot-builder/io-bin-metric-1.0.1" = { + "@ot-builder/io-bin-metric-1.0.2" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.1.tgz"; - sha512 = "vRodhi6NOZ3J91XtnhNRC/i4FyUhV4xFA3kavsJvuRa6kmubSmkqoH1xYGgIxvRxi3pRdfojGI9+a/usZ5DikA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.2.tgz"; + sha512 = "HpYj3YifEzfDfT640SE1UWqkmkrwqQMKjMqgivcMrfLRIkJwBIWW+oCZIoGlcvf9vY4CDDMmjPiQmZ2l43TrdQ=="; }; }; - "@ot-builder/io-bin-name-1.0.1" = { + "@ot-builder/io-bin-name-1.0.2" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.1.tgz"; - sha512 = "GnOPDSjIFG2uR2tbEondXqEt2ArISyTn7yXJbYM3AG4hdY52xn/mFcEvidgHEYLDDOkxuxoNTBDnbeCg3LxEyA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.2.tgz"; + sha512 = "pE+NBTv2NKg7d0eDbs1TVdLERZ+BUJy7AXMa9Hq7c8tRYOg3krk+Fa48joKPQWtdezVQYtTMc/TJBOcC3Ww5fQ=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.1" = { + "@ot-builder/io-bin-sfnt-1.0.2" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.1.tgz"; - sha512 = "5TjEG3bEthvgn/LlQT/c2wSiPUeY+7jmfPr6+7G839avl/31FwxYIbhCjrjWbg/ceuo8NNRxvmi7H+m1HwjcBg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.2.tgz"; + sha512 = "xXfccIbP1ZTSTp+r1ZZfq+S4HpNPe8Oy4sW0k5d92+rMSWmvImM2gm1v+PjC0A473QjyqZg7S9l3CPE+2qcbYw=="; }; }; - "@ot-builder/io-bin-ttf-1.0.1" = { + "@ot-builder/io-bin-ttf-1.0.2" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.1.tgz"; - sha512 = "nYRGtMLRDZdrSkCxp6sDjFeSeOEsCDTMFWBZrNSeRKINSvDmXpVJQCKLqx+TBZBykNb9Cf7+iCuNG5YfNUiEGg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.2.tgz"; + sha512 = "eCv/6sCAATeFoUwbQSw839RQz61z7nkMv/k075b56wBw8vPSqV6d/8zGkRKFjeE5ma+0PuuiYjH7FfDPCNV9uQ=="; }; }; - "@ot-builder/ot-1.0.1" = { + "@ot-builder/ot-1.0.2" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.1.tgz"; - sha512 = "l+nQjrTWO6De0OkX1ETC+7Pr8gArJL5L+2vhYdktiqe0tAC/odmu/dVINMenqOufC+DVzJLHhCyFNT/HrukGCA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.2.tgz"; + sha512 = "r4359lMQTpiQ2cHhxFuoonxo8rLFzUZw0NiEXTzCL0UxSu5kcGH7gDDGtHDdSB5a5W+qCNDLt/goD/FnYddlyg=="; }; }; - "@ot-builder/ot-encoding-1.0.1" = { + "@ot-builder/ot-encoding-1.0.2" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.1.tgz"; - sha512 = "eY1L/Waa9J7OAu5xaggvied4qKnJobpfELVcrDTdsR85F7JJQMdV2P1o9oRS0tzf6nHMfhkCihV5IlLqLxS1eQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.2.tgz"; + sha512 = "mZ7s/hEHYaGZFpKZ+FB9vynHrZWWObCvnuCtRvcp51DwF4J8/NCp5VT3n7/20BSfEnghQQjhpk6z2RzQD9k3mA=="; }; }; - "@ot-builder/ot-ext-private-1.0.1" = { + "@ot-builder/ot-ext-private-1.0.2" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.1.tgz"; - sha512 = "VTagNcyvtC9EmfVHDAni78dYX97k+Hd1/ruDRSPAJhttLA5xiLWah9xAuPeQtBcglFx7375N8qA9f6CQgFBrBA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.2.tgz"; + sha512 = "XRRjq69p/MWKJOWfeAWJnMWF/4RrMlDIz3sp/pMn5vUivysh6qcOoOHHwkD2MFKI9PysmDgMrYIyxnKvmQczMA=="; }; }; - "@ot-builder/ot-glyphs-1.0.1" = { + "@ot-builder/ot-glyphs-1.0.2" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.1.tgz"; - sha512 = "FZfcl61XFO393QOBZK8hzRAdavVHW5tUKEzkZzlnDWJEhlZNUTqycn+nJWc5rwfMtQnnJ4UQ1DdJDUTaDZ2VHQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.2.tgz"; + sha512 = "mTtKVG0n2O9KVFNBBgfitidkulXEA747tdQofa+mo6CZghFGgJaVSm4xXkqh0nv3TmuWPWcLUDzzXovrwSyaEg=="; }; }; - "@ot-builder/ot-layout-1.0.1" = { + "@ot-builder/ot-layout-1.0.2" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.1.tgz"; - sha512 = "1Kes3RWBnP+k6bCtQAASquh4zDHvJI7BcD+vS0FyerwvniarxGxw4CELmLN87xGrQBybmez/aftqXnRmhsjrRQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.2.tgz"; + sha512 = "FC/LkcZ1MB9cRdXMpOoYiC06tdLWWj1XdV4q8+L+q3wM0EGH8YzqHqoI9MXFpGlB9ucHC/FDWXybjXOYWFtQAA=="; }; }; - "@ot-builder/ot-metadata-1.0.1" = { + "@ot-builder/ot-metadata-1.0.2" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.1.tgz"; - sha512 = "YO6WGvXyhvSCmsGdkK/L37YzoMpFn6A8YoDgMJk4R0MPjoJuVta4srDv41RvOLVr9oDiYtiPFRw8BjkdEWrMbg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.2.tgz"; + sha512 = "WVZfIDb90XblRRuhK1EWsMePidBs96/uhv4T1/uNi8o8lhgdAszJo/qeOakhDqn29X3rWyYWZutAxVqx37GBsg=="; }; }; - "@ot-builder/ot-name-1.0.1" = { + "@ot-builder/ot-name-1.0.2" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.1.tgz"; - sha512 = "6L4SAwLALNOjifhX47HvXPkGKcX1HfpeGnzFtMDtgUi3muiYrKb3YJffV8vk8V1EQhiVTWJ1j7441SS6cY2m8g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.2.tgz"; + sha512 = "1mNhgVPmz88699vVMmyHp6SYUldRi0tmNLgzoH98Wrg4GghEGyu11fG7GMoT6HsrKxdXCysUZjWdMvsidfyoaw=="; }; }; - "@ot-builder/ot-sfnt-1.0.1" = { + "@ot-builder/ot-sfnt-1.0.2" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.1.tgz"; - sha512 = "jmojZ36QbcDUIXX+UPYlKtkxklKSlV35Cpa4P4vWVAISqocmX3fFIQ+Xz7Ub1XeLnkcIf86ruOrDyoSytF5NHg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.2.tgz"; + sha512 = "8jP3zzSP2u0kIj8JyMH9ZLJox97T6VC7dkiRwq9ekGMbxLa+5nWWh6DuAOSFfdlVyUK3I/4sl4aqSP7Lyp/hYw=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.1" = { + "@ot-builder/ot-standard-glyph-namer-1.0.2" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.1.tgz"; - sha512 = "yKgPw8neJZr/wa/mFWtPbi4sKTkfyYCo+Q0SONkjJLNchuI6i/w3ijX3EDf8R9/m4j65JhHKQ8wltKBnRgHlCQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.2.tgz"; + sha512 = "xTPAXBMQq1iILVphw9L7DW0KBQdeniQ1l+42oCDJK4XtKAOkSQZ7IQUBHD2rJjX2LmklEm/isLfLDIZxFezj9g=="; }; }; - "@ot-builder/prelude-1.0.1" = { + "@ot-builder/prelude-1.0.2" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.1.tgz"; - sha512 = "ocaoVx+QeYm5aYjzy+gD67cK1j/JGArqTjGXmo/ndjsBCvS9Ni9QpN4UEjoN2oz8rzr0sK4RhX9fJ7ufQ27gPA=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.2.tgz"; + sha512 = "h9JHlibcc4w6cTVcuIARxcmvH8JhuB0z6CcUj+s+7zfzlkQXghuOk6wgHzimcrxDDOZeRNmXJNG7RCqdDeAGiA=="; }; }; - "@ot-builder/primitive-1.0.1" = { + "@ot-builder/primitive-1.0.2" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.1.tgz"; - sha512 = "mRSNfNNf7qUmZJ23UJVK6VnITRKgGQC5X1I1DFlIve/YfTVe6SbH0AbBBcS4OsC/gXskLkywXX6rZChjSWDmTg=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.2.tgz"; + sha512 = "bf03EipsJQZH4+o9QW11B54DzN0QdEyg61xZdbK5PCaoEeb0ahYYtzkb/CZF6nw3UFEVtci3MQww8XZWpEgydQ=="; }; }; - "@ot-builder/rectify-1.0.1" = { + "@ot-builder/rectify-1.0.2" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.1.tgz"; - sha512 = "IBA/v+6ksxUADQEpk1Nbc0jRwXhZD2CNPz8xmtPPqnRAE3b8JpxIjmu6zhn1pRx0E0AvtPdMfAilhNis7IzY9g=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.2.tgz"; + sha512 = "tDbC/ap6X1JoJqTIlVsbWgi6IbVFZ5Fc+csNHI7B11/y5aY0Nz1Eupar+nnnoABtXNO3pWP0A3suY2z7U6B91A=="; }; }; - "@ot-builder/stat-glyphs-1.0.1" = { + "@ot-builder/stat-glyphs-1.0.2" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.1.tgz"; - sha512 = "YgsglcyhfAHNpbPXdPoZD4DhqbaHzAhtocJ/cblaOQr+uE7LD66890is1kJ4mrKUYV4Ei0uLZDyw9ngixZGteg=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.2.tgz"; + sha512 = "xFKPyM0zLRktvpTdzVQB+ffmzGbROJd4atcLKr+UB6hTSVcSiLBsOU+BQNeveb7Njz/mgAmFhnVkWO+2uSwIMA=="; }; }; - "@ot-builder/trace-1.0.1" = { + "@ot-builder/trace-1.0.2" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.1.tgz"; - sha512 = "UZ7Fi+A+LEnkjagFeCiPlzFKSrBtY04l/B2iXqlC4gyfmwOzKGe+A8B0kVfjheePhteUm4808Yx3e419o2EepQ=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.2.tgz"; + sha512 = "4+cOuSys8WTBOsvSXJqKgYlZu5TrukYpViSA3pbUnjWSJRmpGtwDtNiX62F8Wo/F+9pTIwOBwAbh/yWjYjCRng=="; }; }; - "@ot-builder/var-store-1.0.1" = { + "@ot-builder/var-store-1.0.2" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.1.tgz"; - sha512 = "IcoJ7U+Z+wjbFSL2qLuU0tIW9G/NR6sWI0r1bKgnBr0hE2Si4dj/D+GYjIVkRscfvI3x/5/XL2sWayuh2Pjvdg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.2.tgz"; + sha512 = "hMkIu2DaIiiBMkolGtjZ0P/Urx76zaSBeXO8aItjw0xiu/JGo843vngU7P6FNtingaolchrVrm6SRrIz7jFD6g=="; }; }; - "@ot-builder/variance-1.0.1" = { + "@ot-builder/variance-1.0.2" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.1.tgz"; - sha512 = "cJ4eL1xyvJnPlEcrnKkZeqIw6NbPGAP2RFyEclBU2U4Freu2ZH1R8WqATbekdQqlOnwoZ1vgV8mH8EpNI3N8Uw=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.2.tgz"; + sha512 = "VYSKYfLmfnQckio6C5SEsv5gaUkdKIPNX0Yusidc9EpmdoOyHdBGlHDmpWEtzyAni3Jl2eMHGhd+GCnfkdBhYA=="; }; }; "@parcel/fs-1.11.0" = { @@ -5008,13 +4846,13 @@ let sha512 = "f5bo8P5+xAxsnOCUnyEyAmiGTs9sTG8v8t5dTDAdCqSxEEJyl3/Ro5djeW5L2MHzw1XnIMxxrtG38m7rNQSFFg=="; }; }; - "@serverless/platform-client-4.0.0" = { + "@serverless/platform-client-4.1.0" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.0.0.tgz"; - sha512 = "pHhzRNStl7TP/yEi5EuT5fxx5czGb1UAyKv/dWCfMY046t24UC2l6rsDAgSb55O0Mmg/N/0GUpQ6AXqRrryHXg=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.1.0.tgz"; + sha512 = "XoDUE5UDkt6JzEY4nWPdCd6ofldBLqfBAaqCcMlnYDNyTispHNVJeaxNvsFZc9EoUpneu6vTj3vhdviUAnzX8w=="; }; }; "@serverless/platform-client-china-2.1.4" = { @@ -5134,13 +4972,13 @@ let sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ=="; }; }; - "@skorfmann/terraform-cloud-1.9.0" = { + "@skorfmann/terraform-cloud-1.9.1" = { name = "_at_skorfmann_slash_terraform-cloud"; packageName = "@skorfmann/terraform-cloud"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.9.0.tgz"; - sha512 = "XuDPEA8m7PxqFyRXS1ZztMWwyEU+zUHAc2z82VIqRGWxexpB7QgBSqH8xcv1TPm61751eWLkEd11PuqQs7TmNA=="; + url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.9.1.tgz"; + sha512 = "R28bedoGjAmDiEYHu2cmeVd3R6vxq6anQQlGCpdjk5oqnSiROFFm8dzywvMon4/9C+CErhgY7fr76NVErS/U2w=="; }; }; "@slack/client-3.16.0" = { @@ -5233,6 +5071,15 @@ let sha512 = "bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg=="; }; }; + "@snyk/java-call-graph-builder-1.20.0" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz"; + sha512 = "NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww=="; + }; + }; "@snyk/rpm-parser-2.2.1" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; @@ -6196,13 +6043,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.8" = { + "@types/koa-2.13.0" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.8"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.8.tgz"; - sha512 = "8LJHhlEjxvEb9MR06zencOxZyxpTHG2u6pcvJbSBN9DRBc+GYQ9hFI8sSH7dvYoITKeAGWo2eVPKx1Z/zX/yKw=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.0.tgz"; + sha512 = "hNs1Z2lX+R5sZroIy/WIGbPlH/719s/Nd5uIjSIAdHn9q+g7z6mxOnhwMjK1urE4/NUP0SOoYUOD4MnvD9FRNw=="; }; }; "@types/koa-compose-3.2.5" = { @@ -6367,13 +6214,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.52" = { + "@types/node-10.17.54" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.52"; + version = "10.17.54"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.52.tgz"; - sha512 = "bKnO8Rcj03i6JTzweabq96k29uVNcXGB0bkwjVQTFagDgxxNged18281AZ0nTMHl+aFpPPWyPrk4Z3+NtW/z5w=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.54.tgz"; + sha512 = "c8Lm7+hXdSPmWH4B9z/P/xIXhFK3mCQin4yCYMd2p1qpMG5AfgyJuYZ+3q2dT7qLiMMMGMd5dnkFpdqJARlvtQ=="; }; }; "@types/node-12.12.70" = { @@ -6385,13 +6232,13 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-13.13.42" = { + "@types/node-13.13.45" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.42"; + version = "13.13.45"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.42.tgz"; - sha512 = "g+w2QgbW7k2CWLOXzQXbO37a7v5P9ObPvYahKphdBLV5aqpbVZRhTpWCT0SMRqX1i30Aig791ZmIM2fJGL2S8A=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.45.tgz"; + sha512 = "703YTEp8AwQeapI0PTXDOj+Bs/mtdV/k9VcTP7z/de+lx6XjFMKdB+JhKnK+6PZ5za7omgZ3V6qm/dNkMj/Zow=="; }; }; "@types/node-14.11.1" = { @@ -6403,13 +6250,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.28" = { + "@types/node-14.14.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.28"; + version = "14.14.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.28.tgz"; - sha512 = "lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz"; + sha512 = "vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="; }; }; "@types/node-6.14.13" = { @@ -9103,13 +8950,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.32.1" = { + "apollo-2.32.5" = { name = "apollo"; packageName = "apollo"; - version = "2.32.1"; + version = "2.32.5"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.32.1.tgz"; - sha512 = "aSjGnxxm+ZZ6uYTuGrBqtQ4e3boG408K16CbB5Zm/QHCRNHpPUz7r9VRDfAJWMFE1mBdWi+r0dyY+7FUkKeRrw=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.32.5.tgz"; + sha512 = "M2EWO9OZYbyziBUqYNSs5eYm9MNarYxLhZyZQp7mbJPdVN8i+w+KMBtD5rOS4e8oZN7lblhz/ooZtlNI2F6nwg=="; }; }; "apollo-cache-1.3.5" = { @@ -9148,49 +8995,49 @@ let sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; }; }; - "apollo-codegen-core-0.39.1" = { + "apollo-codegen-core-0.39.3" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.39.1"; + version = "0.39.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.1.tgz"; - sha512 = "8Sb9CN+lYR2BMeg7p3A4wjsQW7oxDTnKbueUHV/fmZU+hg2GNLXqVTdyWE2UWDEOyDTNpQMyysGEUZZBsOmBrw=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.3.tgz"; + sha512 = "2nPwQz2u2NpmbFY5lDEg/vo33RbGAxFLQeZew8H6XfSVLPajWbz2Klest9ZVQhaUnBVZO5q2gQLX+MT2I6uNfA=="; }; }; - "apollo-codegen-flow-0.37.1" = { + "apollo-codegen-flow-0.37.3" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.37.1"; + version = "0.37.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.1.tgz"; - sha512 = "XhGUzlBxi3IHCBbIsnfk0c41mz30Ky1SPSYtJzrMdtMAdUAfMEGBLXzlLqgp1iAbUegQ10zbp2kgzLG0hkeYhg=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.3.tgz"; + sha512 = "gZZHQmGiSzNbJbolnYQPvjwC43/6GzETTo1nTi2JlnLw9jnVZR42kpqrxAeVAJKkquJ+4c2jwQkO4fVIYfdhaw=="; }; }; - "apollo-codegen-scala-0.38.1" = { + "apollo-codegen-scala-0.38.3" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.38.1"; + version = "0.38.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.1.tgz"; - sha512 = "WvIX6Gm7KHnh6FJzq/XVRyHMNwwbQEnMfRXpR9zFtaUuzZHfg9RNawtsUGMSQCnNw1sm5YLGIJvNFUp1hUEqGA=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.3.tgz"; + sha512 = "Zgg/zd/k8h/ei5UlYSCa27jJAJA4UE+wCb5+LOo2Iz73ZUZh7HRgzoKSfsP1qAiJV4Tqm9WySyU9nOqfajdK1A=="; }; }; - "apollo-codegen-swift-0.39.1" = { + "apollo-codegen-swift-0.39.3" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.39.1"; + version = "0.39.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.1.tgz"; - sha512 = "dKqDd2w2YAOkyDbDkJ5etXLdn8foNnm55r5rsIssIxCdtdR5qsusrPHQvywVjHw8ZHBy4o229dVoSzmrIUygKg=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.3.tgz"; + sha512 = "kvIoHOiv5440tHvSdhDHzOUZrpBpdXA6M/QPiuYkpPuI8TAcJ+bTeS696/8t+FO699qYgjsqW7FMdIbi1LWV2g=="; }; }; - "apollo-codegen-typescript-0.39.1" = { + "apollo-codegen-typescript-0.39.3" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.39.1"; + version = "0.39.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.1.tgz"; - sha512 = "cSnMrAqyK2AMZRxTsBrZZhemfv87AU0OS1/aM45WQRyQurkEjf8GmWMfp2IRkJo9m+jgdo74X5ct3KZOXbYMXg=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.3.tgz"; + sha512 = "Yo/FVaBJbbrndVL75tluH16dNXRZ1M9ELP5AeAPnnw+yGIvYO34LXjfk4G3kqkAJ7puoGc+9muGJLjh6LV6zNA=="; }; }; "apollo-datasource-0.7.3" = { @@ -9202,31 +9049,31 @@ let sha512 = "PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA=="; }; }; - "apollo-env-0.6.5" = { + "apollo-env-0.6.6" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.6.5"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz"; - sha512 = "jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.6.tgz"; + sha512 = "hXI9PjJtzmD34XviBU+4sPMOxnifYrHVmxpjykqI/dUD2G3yTiuRaiQqwRwB2RCdwC1Ug/jBfoQ/NHDTnnjndQ=="; }; }; - "apollo-graphql-0.6.0" = { + "apollo-graphql-0.6.1" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.0.tgz"; - sha512 = "BxTf5LOQe649e9BNTPdyCGItVv4Ll8wZ2BKnmiYpRAocYEXAVrQPWuSr3dO4iipqAU8X0gvle/Xu9mSqg5b7Qg=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.6.1.tgz"; + sha512 = "ZRXAV+k+hboCVS+FW86FW/QgnDR7gm/xMUwJPGXEbV53OLGuQQdIT0NCYK7AzzVkCfsbb7NJ3mmEclkZY9uuxQ=="; }; }; - "apollo-language-server-1.25.0" = { + "apollo-language-server-1.25.2" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.25.0"; + version = "1.25.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.25.0.tgz"; - sha512 = "k6weI4Jd64LzMO9aGHqPWUmifBy0TDxW15BkU4GLmVTi7pBSYPhwOVP8Haa+81FG2ZO2CCEv8J0VQHTv5Z8itA=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.25.2.tgz"; + sha512 = "PGQZ1+nX/RSmf9eawqXloi+ZwJs6dQRdDiEKzSIij1ucd9r9jY5EyamVMi0tYgco1G4XJo1hBRXBm29sTGNfUQ=="; }; }; "apollo-link-1.2.1" = { @@ -9877,13 +9724,13 @@ let sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; - "array-includes-3.1.2" = { + "array-includes-3.1.3" = { name = "array-includes"; packageName = "array-includes"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz"; - sha512 = "w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw=="; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz"; + sha512 = "gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A=="; }; }; "array-initial-1.1.0" = { @@ -10426,13 +10273,13 @@ let sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; }; }; - "async-append-only-log-3.0.4" = { + "async-append-only-log-3.0.7" = { name = "async-append-only-log"; packageName = "async-append-only-log"; - version = "3.0.4"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.4.tgz"; - sha512 = "sr6Q6MILUhg1xHaNOLJLsrzbKrRDpedGyw9PjeZMSvib9q3gIj+jvgpUawZEfdvwfFTS8tpGixVWcooCTFhS5Q=="; + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.7.tgz"; + sha512 = "/6W+vsTSDg+rVUAFYknugtLeNDtS8BMfJ7clMF4kGXNS5nprb+Gx+ndG1QNaD8eFeEv6lSyGMeWJ7KxHuEpkKg=="; }; }; "async-done-1.3.2" = { @@ -10732,13 +10579,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.846.0" = { + "aws-sdk-2.848.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.846.0"; + version = "2.848.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.846.0.tgz"; - sha512 = "r/VUmo7Ri4yxVonFARzb9reZgcURbddfKur5HlAG55Xd4ku3u7akMe/rZYFuhQbUTef6p6J19oUg/W+fnEY2Tw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.848.0.tgz"; + sha512 = "c/e5kaEFl+9aYkrYDkmu5mSZlL+EfP6DnBOMD06fH12gIsaFSMBGtbsDTHABhvSu++LxeI1dJAD148O17MuZvg=="; }; }; "aws-sign2-0.6.0" = { @@ -13855,13 +13702,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001187" = { + "caniuse-lite-1.0.30001190" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001187"; + version = "1.0.30001190"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz"; - sha512 = "w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001190.tgz"; + sha512 = "62KVw474IK8E+bACBYhRS0/L6o/1oeAVkpF2WetjV58S5vkzNh0/Rz3lD8D4YCbOTqi0/aD4X3LtoP7V5xnuAg=="; }; }; "canvas-2.6.1" = { @@ -14881,13 +14728,13 @@ let sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="; }; }; - "cli-table-0.3.4" = { + "cli-table-0.3.5" = { name = "cli-table"; packageName = "cli-table"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.4.tgz"; - sha512 = "1vinpnX/ZERcmE443i3SZTmU5DF0rPO9DrL4I2iVAllhxzCM9SzPlHnz19fsZB78htkKZvYBvj6SZ6vXnaxmTA=="; + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.5.tgz"; + sha512 = "7uo2+RMNQUZ13M199udxqwk1qxTOS53EUak4gmu/aioUpdH5RvBz0JkJslcWz6ABKedZNqXXzikMZgHh+qF16A=="; }; }; "cli-table3-0.5.1" = { @@ -16456,13 +16303,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.27" = { + "constructs-3.3.29" = { name = "constructs"; packageName = "constructs"; - version = "3.3.27"; + version = "3.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.27.tgz"; - sha512 = "MB+Ec8hCChUNduQCaYuFvda1uK4Z9q3BsVzUyHiTZVwcIGaIK9SImnz9X6wipll6/E8IHpt5MLhiieYswf1VTg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.29.tgz"; + sha512 = "rGQzkq2M/qKZ0hMEtt4YPpsZKOwzmiyAQx3PqexXXsjdVnTqEfIwQuDpc+1jP6CtaBHl7rR6CxQcfsP5DmaERw=="; }; }; "constructs-3.3.5" = { @@ -16952,22 +16799,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-3.8.3" = { + "core-js-3.9.0" = { name = "core-js"; packageName = "core-js"; - version = "3.8.3"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz"; - sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.9.0.tgz"; + sha512 = "PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ=="; }; }; - "core-js-compat-3.8.3" = { + "core-js-compat-3.9.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.8.3"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.3.tgz"; - sha512 = "1sCb0wBXnBIL16pfFG1Gkvei6UzvKyTNYpiC41yrdjEv0UoJoq9E/abTMzyYJ6JpTkAj15dLjbqifIzEBDVvog=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.0.tgz"; + sha512 = "YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ=="; }; }; "core-util-is-1.0.2" = { @@ -20876,13 +20723,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-to-chromium-1.3.667" = { + "electron-to-chromium-1.3.671" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.667"; + version = "1.3.671"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.667.tgz"; - sha512 = "Ot1pPtAVb5nd7jeVF651zmfLFilRVFomlDzwXmdlWe5jyzOGa6mVsQ06XnAurT7wWfg5VEIY+LopbAdD/bpo5w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.671.tgz"; + sha512 = "RTD97QkdrJKaKwRv9h/wGAaoR2lGxNXEcBXS31vjitgTPwTWAbLdS7cEsBK68eEQy7p6YyT8D5BxBEYHu2SuwQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -21391,13 +21238,13 @@ let sha512 = "5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg=="; }; }; - "env-ci-3.2.2" = { + "env-ci-5.0.2" = { name = "env-ci"; packageName = "env-ci"; - version = "3.2.2"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/env-ci/-/env-ci-3.2.2.tgz"; - sha512 = "AOiNZ3lmxrtva3r/roqaYDF+1PX2V+ouUzuGqJf7KNxyyYkuU+CsfFbbUeibQPdixxjI/lP6eDtvtkX1/wymJw=="; + url = "https://registry.npmjs.org/env-ci/-/env-ci-5.0.2.tgz"; + sha512 = "Xc41mKvjouTXD3Oy9AqySz1IeyvJvHZ20Twf5ZLYbNpPPIuCnL/qHCmNlD01LoNy0JTunw9HPYVptD19Ac7Mbw=="; }; }; "env-editor-0.4.2" = { @@ -21742,13 +21589,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.8.48" = { + "esbuild-0.8.50" = { name = "esbuild"; packageName = "esbuild"; - version = "0.8.48"; + version = "0.8.50"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.48.tgz"; - sha512 = "lrH8lA8wWQ6Lpe1z6C7ZZaFSmRsUlcQAqe16nf7ITySQ7MV4+vI7qAqQlT/u+c3+9AL3VXmT4MXTxV2e63pO4A=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.8.50.tgz"; + sha512 = "oidFLXssA7IccYzkqLVZSqNJDwDq8Mh/vqvrW+3fPWM7iUiC5O2bCllhnO8+K9LlyL/2Z6n+WwRJAz9fqSIVRg=="; }; }; "esc-exit-2.0.2" = { @@ -23470,6 +23317,15 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; + "fastpriorityqueue-0.6.3" = { + name = "fastpriorityqueue"; + packageName = "fastpriorityqueue"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fastpriorityqueue/-/fastpriorityqueue-0.6.3.tgz"; + sha512 = "l4Whw9/MDkl/0XuqZEzGE/sw9T7dIxuUnxqq4ZJDLt8AE45j8wkx4/nBRZm50aQ9kN71NB9mwQzglLsvQGROsw=="; + }; + }; "fastq-1.10.1" = { name = "fastq"; packageName = "fastq"; @@ -23659,13 +23515,13 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; - "file-entry-cache-6.0.0" = { + "file-entry-cache-6.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA=="; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; }; "file-loader-6.0.0" = { @@ -30798,13 +30654,13 @@ let sha512 = "pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw=="; }; }; - "is-what-3.12.0" = { + "is-what-3.13.0" = { name = "is-what"; packageName = "is-what"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz"; - sha512 = "2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw=="; + url = "https://registry.npmjs.org/is-what/-/is-what-3.13.0.tgz"; + sha512 = "qYTOcdAo0H0tvMTl9ZhsjpEZH5Q07JDVrPnFMAQgBM0UctGqVsKE7LgZPNZEFPw1EhUkpaBL/BKnRgVX7CoMTw=="; }; }; "is-whitespace-character-1.0.4" = { @@ -31293,13 +31149,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-2.1.0" = { + "jitdb-2.3.1" = { name = "jitdb"; packageName = "jitdb"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-2.1.0.tgz"; - sha512 = "7r9ZiBHWbjG/VHE+LXcQTOC244yXg0XVrU2n7pm1k5HBYB4UK1zr71zbSqO/OdR546KAyAihAjm41D0Yh2Fo5g=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-2.3.1.tgz"; + sha512 = "ICaXDJFRvdXrA62m+ei41uH8a88PHZgp3t8C6V7EcsrFawiLHzrYqv+ianQss43TJOf9zgmnxjpZFeH0vK2ErA=="; }; }; "jju-1.4.0" = { @@ -33652,6 +33508,15 @@ let sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; "lodash-4.17.5" = { name = "lodash"; packageName = "lodash"; @@ -33679,13 +33544,13 @@ let sha1 = "c6940128a9d30f8e902cd2cf99fd0cba4ecfc183"; }; }; - "lodash-es-4.17.20" = { + "lodash-es-4.17.21" = { name = "lodash-es"; packageName = "lodash-es"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz"; - sha512 = "JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA=="; + url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"; + sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; "lodash-id-0.14.0" = { @@ -36676,13 +36541,13 @@ let sha1 = "f8a064760d37e7978ad5f9f6d3c119a494f57081"; }; }; - "mermaid-8.9.0" = { + "mermaid-8.9.1" = { name = "mermaid"; packageName = "mermaid"; - version = "8.9.0"; + version = "8.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.0.tgz"; - sha512 = "J582tyE1vkdNu4BGgfwXnFo4Mu6jpuc4uK96mIenavaak9kr4T5gaMmYCo/7edwq/vTBkx/soZ5LcJo5WXZ1BQ=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.9.1.tgz"; + sha512 = "0XFtH3TazlWQ6hKqBDeOfXglPBAfNDreC63NKjrmgzLG+aIY3yJZNdkl22JH4LniqQDx+7oZFmD7t0PnEymkew=="; }; }; "mersenne-0.0.4" = { @@ -37783,13 +37648,13 @@ let sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; }; }; - "mqtt-packet-6.8.0" = { + "mqtt-packet-6.8.1" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "6.8.0"; + version = "6.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.8.0.tgz"; - sha512 = "YDr8cYgkeuWQqp4CDTm6FK0uABMSpFyyXlTTOH/dGzVejljrf9oVvzVCy/eiyUwIOt4tinxWTW+6O4D6kh/+fw=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.8.1.tgz"; + sha512 = "XM+QN6/pNVvoTSAiaOCuOSy8AVau6/8LVdLyMhvv2wJqzJjp8IL/h4R+wTcfm+CV+HhL6i826pHqDTCCKyBdyA=="; }; }; "mri-1.1.6" = { @@ -38314,13 +38179,13 @@ let sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; - "nanobus-4.4.0" = { + "nanobus-4.5.0" = { name = "nanobus"; packageName = "nanobus"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/nanobus/-/nanobus-4.4.0.tgz"; - sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q=="; + url = "https://registry.npmjs.org/nanobus/-/nanobus-4.5.0.tgz"; + sha512 = "7sBZo9wthqNJ7QXnfVXZL7fkKJLN55GLOdX+RyZT34UOvxxnFtJe/c7K0ZRLAKOvaY1xJThFFn0Usw2H9R6Frg=="; }; }; "nanoguard-1.3.0" = { @@ -39792,6 +39657,15 @@ let sha512 = "/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig=="; }; }; + "npm-package-arg-8.1.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz"; + sha512 = "CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg=="; + }; + }; "npm-packlist-1.4.8" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -40234,13 +40108,13 @@ let sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; - "object-is-1.1.4" = { + "object-is-1.1.5" = { name = "object-is"; packageName = "object-is"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz"; - sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; + sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; }; }; "object-keys-0.4.0" = { @@ -40342,13 +40216,13 @@ let sha512 = "IDUSMXs6LOSJBWE++L0lzIbSqHl9KDCfff2x/JSEIDtEUavUnyMYC2ZGay/04Zq4UT8lvd4xNhU4/YHKibAOlw=="; }; }; - "object.getownpropertydescriptors-2.1.1" = { + "object.getownpropertydescriptors-2.1.2" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz"; - sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha512 = "WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ=="; }; }; "object.map-1.0.1" = { @@ -40459,13 +40333,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.160.3" = { + "office-ui-fabric-react-7.161.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.160.3"; + version = "7.161.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.160.3.tgz"; - sha512 = "+fkrfBG7+ZfNS+RvqHcTZpzud86FOqqWAxUUEcSoEnanXdZ6XXQnSYpMDjygJJsYAmrcZr8+kk4ykaCQo+lGWQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.161.0.tgz"; + sha512 = "BH326SCR6KS8vEbL1hJXXBMlG+sOBFEVDetLltJNKluFYhzmwiOun76ea6dzl+CHBh/7yLCkWlmtPIx1fQu81Q=="; }; }; "omggif-1.0.10" = { @@ -41341,22 +41215,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.1" = { + "ot-builder-1.0.2" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.1.tgz"; - sha512 = "tx0ZlR8KGohvVketGtOmd5nClqvdoWPxMwugihnkzSu2z75b1uAgEfiJ2gvZLix+re20trKq/HooYv+iQ+kmjA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.2.tgz"; + sha512 = "LLb8H2Rbe/x4BgzoTOWuWH2cQm0hJKu6PXVQc7WHNQuRx1O82Rg+0GeXjV36cznOXM6IsA1VZgsuLz9oNb+15Q=="; }; }; - "otb-ttc-bundle-1.0.1" = { + "otb-ttc-bundle-1.0.2" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.1.tgz"; - sha512 = "dkdU3V3jqOLOSABpKYzl1mocygPZUhv6DjJSip5Hp2L7PVsDKv1xS+TNf+SQSBlPYPXLzP6cwvbDvwsqeeCEBw=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.2.tgz"; + sha512 = "FK+d5iSrwQogNNNT+IPsk3wNmwOK6xunP4fytztaU3zZUK3YtaiuJjp4VeqF1+CpOaFr6MYlQHOTfhChT+ssSg=="; }; }; "ow-0.21.0" = { @@ -41908,13 +41782,13 @@ let sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ=="; }; }; - "pacote-11.2.6" = { + "pacote-11.2.7" = { name = "pacote"; packageName = "pacote"; - version = "11.2.6"; + version = "11.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.2.6.tgz"; - sha512 = "xCl++Hb3aBC7LaWMimbO4xUqZVsEbKDVc6KKDIIyAeBYrmMwY1yJC2nES/lsGd8sdQLUosgBxQyuVNncZ2Ru0w=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.2.7.tgz"; + sha512 = "ogxPor11v/rnU9ukwLlI2dPx22q9iob1+yZyqSwerKsOvBMhU9e+SJHtxY4y2N0MRH4/5jGsGiRLsZeJWyM4dQ=="; }; }; "pad-0.0.5" = { @@ -44474,13 +44348,13 @@ let sha1 = "b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"; }; }; - "pretty-bytes-5.5.0" = { + "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz"; - sha512 = "p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA=="; + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; }; }; "pretty-error-2.1.2" = { @@ -45392,6 +45266,15 @@ let sha512 = "/An3KE7mVjZCqNhZsr22k1Tx8MACnUnHZZNPSJ0S62td8JtYr/AiRG42Vz7Syu31SoTLUzVIe61jtT/pNdjVYA=="; }; }; + "pull-drain-gently-1.1.0" = { + name = "pull-drain-gently"; + packageName = "pull-drain-gently"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-drain-gently/-/pull-drain-gently-1.1.0.tgz"; + sha512 = "ZUPsNrn8jkU6Y2B4w8Jz3gXAmjSpb+qn4AQhAL8qTWUHULglH16ANr+6qnfOEa1kUoUGVCQZaORTd2NSQFAnhA=="; + }; + }; "pull-file-0.5.0" = { name = "pull-file"; packageName = "pull-file"; @@ -45626,6 +45509,15 @@ let sha1 = "51a4193ce9c8d7215d95adad45e2bcdb8493b23a"; }; }; + "pull-pause-0.0.2" = { + name = "pull-pause"; + packageName = "pull-pause"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pull-pause/-/pull-pause-0.0.2.tgz"; + sha1 = "19d45be8faa615fa556f14a96fd733462c37fba3"; + }; + }; "pull-ping-2.0.3" = { name = "pull-ping"; packageName = "pull-ping"; @@ -45941,6 +45833,15 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; + "pyright-1.1.113" = { + name = "pyright"; + packageName = "pyright"; + version = "1.1.113"; + src = fetchurl { + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.113.tgz"; + sha512 = "VcitW5t5lG1KY0w8xY/ubMhFZZ2lfXJvhBW4TfTwy067R4WtXKSa23br4to1pdRA1rwpxOREgxVTnOWmf3YkYg=="; + }; + }; "q-0.9.7" = { name = "q"; packageName = "q"; @@ -48740,13 +48641,13 @@ let sha1 = "44e00858ebebc0133d58e40b2cd8a1fbb04203f5"; }; }; - "rss-parser-3.11.0" = { + "rss-parser-3.12.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.11.0.tgz"; - sha512 = "oTLoYW+bNqNwkz8OpGinBU9s3As0sdczQjETIZFgyAdi7AopyhoVFGPIyFMYXXEY8hayKzD5CH+4CtmiPtJ89g=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.12.0.tgz"; + sha512 = "aqD3E8iavcCdkhVxNDIdg1nkBI17jgqF+9OqPS1orwNaOgySdpvq6B+DoONLhzjzwV8mWg37sb60e4bmLK117A=="; }; }; "rss-parser-3.7.1" = { @@ -49082,13 +48983,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.32.7" = { + "sass-1.32.8" = { name = "sass"; packageName = "sass"; - version = "1.32.7"; + version = "1.32.8"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.7.tgz"; - sha512 = "C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz"; + sha512 = "Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ=="; }; }; "sax-0.5.8" = { @@ -50189,13 +50090,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.35.0" = { + "simple-git-2.35.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.35.0"; + version = "2.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.35.0.tgz"; - sha512 = "VuXs2/HyZmZm43Z5IjvU+ahTmURh/Hmb/egmgNdFZuu8OEnW2emCalnL/4jRQkXeJvfzCTnev6wo5jtDmWw0Dw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.35.1.tgz"; + sha512 = "Y5/hXf5ivfMziWRNGhVsbiG+1h4CkTW2qVC3dRidLuSZYAPFbLCPP1d7rgiL40lgRPhPTBuhVzNJAV9glWstEg=="; }; }; "simple-markdown-0.4.4" = { @@ -50459,13 +50360,13 @@ let sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; }; }; - "slugify-1.4.6" = { + "slugify-1.4.7" = { name = "slugify"; packageName = "slugify"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.4.6.tgz"; - sha512 = "ZdJIgv9gdrYwhXqxsH9pv7nXxjUEyQ6nqhngRxoAAOlmMGA28FDq5O4/5US4G2/Nod7d1ovNcgURQJ7kHq50KQ=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.4.7.tgz"; + sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg=="; }; }; "smart-buffer-4.1.0" = { @@ -50630,13 +50531,13 @@ let sha512 = "m6PRa1g4Rkw9rCKtf2B8+K9IS/FD/9POezsTZYJoomqDsjV9Gw20Cn5FZSiTj8EiekCk7Cfm7IEMoXd11R27vA=="; }; }; - "snyk-gradle-plugin-3.12.5" = { + "snyk-gradle-plugin-3.13.0" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.12.5"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.5.tgz"; - sha512 = "Z4qEzzPuRO1BxfL0vgfv4pzJ58ox6dksf8i18Vi1+yqDKmYEHmcMBYe33faFPJFZYf1PP7RerADpPssFJiYyLg=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.13.0.tgz"; + sha512 = "t7tibuRHMX0ot5woZlFpblTH20j8BKWxO4wwC7+dGsvS9VtXrlG73moeE5EXfOPb2E8OA7STPKGsEibVIl/j2w=="; }; }; "snyk-module-2.1.0" = { @@ -51773,13 +51674,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-1.16.2" = { + "ssb-db2-1.17.1" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "1.16.2"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.16.2.tgz"; - sha512 = "pmNFsFsRfixnubcghPKnc97Hf3TzkXfVPOeWLC+MbSORYJmREC1gUzrlylGXupX2qfjZsABAwMpiL2a7pKpEYg=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.17.1.tgz"; + sha512 = "XaKxShFGwy9NRSF26PnnLYQAUMeSb8xGilU2WZ3C2QJRmNQ3YJWBzIWI9d0cn547LuuE+AO9lQhh2SwRtJ2qTQ=="; }; }; "ssb-ebt-5.6.7" = { @@ -53366,13 +53267,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.10.0" = { + "stylelint-13.11.0" = { name = "stylelint"; packageName = "stylelint"; - version = "13.10.0"; + version = "13.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.10.0.tgz"; - sha512 = "eDuLrL0wzPKbl5/TbNGZcbw0lTIGbDEr5W6lCODvb1gAg0ncbgCRt7oU0C2VFDvbrcY0A3MFZOwltwTRmc0XCw=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz"; + sha512 = "DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw=="; }; }; "stylelint-8.4.0" = { @@ -53672,13 +53573,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.171" = { + "svelte2tsx-0.1.174" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.171"; + version = "0.1.174"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.171.tgz"; - sha512 = "PSE5gf//f6JNooJHm25LGuGUt2vP92aWrLNMhMVe5xDA/D2dEjWhxfrCOGgHxgrV7FcnYhW85OTn0DOIkd7DCg=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.174.tgz"; + sha512 = "+sOMKaiUw7GADDyg5rhQWi6ajL0LWytZbwRwyH62WP6OTjXGIM8/J9mOCA3uHA9dDI39OsmprcgfhUQp8ymekg=="; }; }; "sver-compat-1.5.0" = { @@ -53933,13 +53834,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.34.13" = { + "systeminformation-4.34.14" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.34.13"; + version = "4.34.14"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.13.tgz"; - sha512 = "K3h3ofFOvXgsGAoACcGEG+T+X9Kq1xRk1bJS+p6JOd2U4mDFkIOW03u2wSCcVMuCq/NsM/piALNt1u3DrQftlw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.14.tgz"; + sha512 = "cPkHQIBgCZrfvenIfbXv1ChCPoXwqCBF8il2ZnqTBsyZPBNBFm6zij4W3f6Y/J4agBD3n56DGLl6TwZ8tLFsyA=="; }; }; "table-3.8.3" = { @@ -54402,13 +54303,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.48.1" = { + "terminal-kit-1.49.3" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.48.1"; + version = "1.49.3"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.48.1.tgz"; - sha512 = "rUdKfN3gv2osW+M+PrWHSDQ6jOcCdSzunsFz78NmdOelQolUFkoAfM6AJUlzWENp4+jIRV89wLp4/viyRhZ5Kw=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.49.3.tgz"; + sha512 = "7GovmExYxwGWOGfTh9LlH9uRt5braMj0bi6HmrhdhGi78Xi3S8hfJhTnio/h4iaN4pKtbAn3ugdGF2ypviZvMA=="; }; }; "terminal-link-2.1.1" = { @@ -59947,13 +59848,13 @@ let sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; }; - "whatwg-fetch-3.6.0" = { + "whatwg-fetch-3.6.1" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.0.tgz"; - sha512 = "ZgtzIak+vJhRBRdz/64QikloqIyeOufspzwd7ch/TSNdK4e/kC5PqL7W4uwj0l/SyagqRkRJii5JEsufbniLgw=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.1.tgz"; + sha512 = "IEmN/ZfmMw6G1hgZpVd0LuZXOQDisrMOZrzYd5x3RAK4bMPlJohKUZWZ9t/QsTvH0dV9TbPDcc2OSuIDcihnHA=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -62077,7 +61978,7 @@ in sources."jsonc-parser-3.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" @@ -62652,7 +62553,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" @@ -62773,7 +62674,7 @@ in sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -62827,7 +62728,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -62848,7 +62749,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -62923,7 +62824,7 @@ in sources."lines-and-columns-1.1.6" sources."loader-runner-4.2.0" sources."locate-path-6.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.toarray-4.4.0" (sources."log-symbols-4.0.0" // { dependencies = [ @@ -63100,10 +63001,10 @@ in }) (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.52" + sources."@types/node-10.17.54" ]; }) - sources."@apollographql/apollo-tools-0.4.8" + sources."@apollographql/apollo-tools-0.4.9" sources."@apollographql/graphql-language-service-interface-2.0.2" sources."@apollographql/graphql-language-service-parser-2.0.2" sources."@apollographql/graphql-language-service-types-2.0.2" @@ -63112,118 +63013,118 @@ in sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.12.13" - (sources."@babel/core-7.12.16" // { + (sources."@babel/core-7.12.17" // { dependencies = [ - sources."@babel/generator-7.12.15" - sources."@babel/types-7.12.13" + sources."@babel/generator-7.12.17" + sources."@babel/types-7.12.17" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.12.11" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-annotate-as-pure-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) - (sources."@babel/helper-compilation-targets-7.12.16" // { + (sources."@babel/helper-compilation-targets-7.12.17" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.16" - sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-create-regexp-features-plugin-7.12.17" (sources."@babel/helper-explode-assignable-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-function-name-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-get-function-arity-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-hoist-variables-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) - (sources."@babel/helper-member-expression-to-functions-7.12.16" // { + (sources."@babel/helper-member-expression-to-functions-7.12.17" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-module-imports-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) - (sources."@babel/helper-module-transforms-7.12.13" // { + (sources."@babel/helper-module-transforms-7.12.17" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-optimise-call-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) sources."@babel/helper-plugin-utils-7.12.13" (sources."@babel/helper-remap-async-to-generator-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-replace-supers-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-simple-access-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) (sources."@babel/helper-split-export-declaration-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-validator-option-7.12.17" (sources."@babel/helper-wrap-function-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) - (sources."@babel/helpers-7.12.13" // { + (sources."@babel/helpers-7.12.17" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/plugin-proposal-async-generator-functions-7.12.13" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-dynamic-import-7.12.17" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" sources."@babel/plugin-proposal-json-strings-7.12.13" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" @@ -63231,7 +63132,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.12.13" sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-optional-chaining-7.12.17" sources."@babel/plugin-proposal-private-methods-7.12.13" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -63279,18 +63180,18 @@ in sources."@babel/plugin-transform-sticky-regex-7.12.13" sources."@babel/plugin-transform-template-literals-7.12.13" sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.12.16" + sources."@babel/plugin-transform-typescript-7.12.17" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.12.16" // { + (sources."@babel/preset-env-7.12.17" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.12.13" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.16" + sources."@babel/preset-typescript-7.12.17" (sources."@babel/register-7.12.13" // { dependencies = [ sources."make-dir-2.1.0" @@ -63298,16 +63199,16 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.12.18" (sources."@babel/template-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" ]; }) - (sources."@babel/traverse-7.12.13" // { + (sources."@babel/traverse-7.12.17" // { dependencies = [ - sources."@babel/generator-7.12.15" - sources."@babel/types-7.12.13" + sources."@babel/generator-7.12.17" + sources."@babel/types-7.12.17" ]; }) sources."@babel/types-7.10.4" @@ -63462,12 +63363,12 @@ in ]; }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.8" + sources."@types/koa-2.13.0" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.1" @@ -63490,14 +63391,14 @@ in sources."@vue/cli-ui-addon-widgets-4.5.11" (sources."@vue/compiler-core-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.5" (sources."@vue/compiler-sfc-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" sources."source-map-0.6.1" ]; }) @@ -63549,7 +63450,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."apollo-2.32.1" // { + (sources."apollo-2.32.5" // { dependencies = [ sources."graphql-tag-2.11.0" sources."mkdirp-1.0.4" @@ -63560,21 +63461,21 @@ in sources."apollo-cache-control-0.11.6" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.39.1" // { + (sources."apollo-codegen-core-0.39.3" // { dependencies = [ sources."recast-0.20.4" sources."source-map-0.6.1" sources."tslib-2.1.0" ]; }) - sources."apollo-codegen-flow-0.37.1" - sources."apollo-codegen-scala-0.38.1" - sources."apollo-codegen-swift-0.39.1" - sources."apollo-codegen-typescript-0.39.1" + sources."apollo-codegen-flow-0.37.3" + sources."apollo-codegen-scala-0.38.3" + sources."apollo-codegen-swift-0.39.3" + sources."apollo-codegen-typescript-0.39.3" sources."apollo-datasource-0.7.3" - sources."apollo-env-0.6.5" - sources."apollo-graphql-0.6.0" - sources."apollo-language-server-1.25.0" + sources."apollo-env-0.6.6" + sources."apollo-graphql-0.6.1" + sources."apollo-language-server-1.25.2" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -63725,7 +63626,7 @@ in ]; }) sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.1.0" @@ -63855,8 +63756,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.3" - (sources."core-js-compat-3.8.3" // { + sources."core-js-3.9.0" + (sources."core-js-compat-3.9.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -63952,14 +63853,28 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."env-ci-3.2.2" + (sources."env-ci-5.0.2" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."execa-4.1.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."es-abstract-1.18.0-next.2" @@ -64352,7 +64267,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -64504,7 +64419,7 @@ in sources."object-treeify-1.1.31" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.1" + sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -64698,7 +64613,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."roarr-2.15.4" - sources."rss-parser-3.11.0" + sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-6.6.3" @@ -65212,12 +65127,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.12.15" + sources."@babel/generator-7.12.17" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/types-7.12.17" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -65238,7 +65153,7 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."source-map-0.5.7" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" @@ -65293,32 +65208,32 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - (sources."@babel/core-7.12.16" // { + (sources."@babel/core-7.12.17" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.15" // { + (sources."@babel/generator-7.12.17" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-replace-supers-7.12.13" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -65372,7 +65287,7 @@ in sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsonlint-1.6.3" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -65425,7 +65340,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -65527,7 +65442,7 @@ in sources."jsprim-1.4.1" sources."left-pad-1.3.0" sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" sources."mime-db-1.46.0" sources."mime-types-2.1.29" @@ -66200,7 +66115,7 @@ in sources."linkify-it-2.2.0" sources."load-json-file-4.0.0" sources."locate-path-2.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."longest-1.0.1" sources."loud-rejection-1.6.0" sources."lru-cache-5.1.1" @@ -66446,7 +66361,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.42" + sources."@types/node-13.13.45" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -66859,7 +66774,7 @@ in }; dependencies = [ sources."@jsii/spec-1.21.0" - sources."@types/node-10.17.52" + sources."@types/node-10.17.54" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."array-filter-1.0.0" @@ -66971,7 +66886,7 @@ in sources."ncp-2.0.0" sources."no-case-3.0.4" sources."object-inspect-1.9.0" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."oo-ascii-tree-1.21.0" @@ -67050,11 +66965,11 @@ in }; dependencies = [ sources."@jsii/spec-1.21.0" - sources."@skorfmann/terraform-cloud-1.9.0" + sources."@skorfmann/terraform-cloud-1.9.1" sources."@types/archiver-5.1.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/readline-sync-1.4.3" sources."@types/stream-buffers-3.0.3" sources."@types/uuid-8.3.0" @@ -67069,7 +66984,7 @@ in ]; }) sources."array-filter-1.0.0" - sources."array-includes-3.1.2" + sources."array-includes-3.1.3" sources."array.prototype.flatmap-1.2.4" sources."arrify-2.0.1" sources."astral-regex-2.0.0" @@ -67107,7 +67022,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.0.2" sources."concat-map-0.0.1" - sources."constructs-3.3.27" + sources."constructs-3.3.29" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" sources."crc32-stream-4.0.2" @@ -67279,7 +67194,7 @@ in sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-inspect-1.9.0" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."object.entries-1.1.3" @@ -67485,7 +67400,7 @@ in sources."universal-url-2.0.0" sources."utile-0.3.0" sources."webidl-conversions-4.0.2" - sources."whatwg-fetch-3.6.0" + sources."whatwg-fetch-3.6.1" sources."whatwg-url-7.1.0" (sources."winston-2.4.5" // { dependencies = [ @@ -67505,6 +67420,42 @@ in bypassCache = true; reconstructLock = true; }; + coc-clangd = nodeEnv.buildNodePackage { + name = "coc-clangd"; + packageName = "coc-clangd"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.9.0.tgz"; + sha512 = "QmYLkObs561ld4vqvivzgVpGGpjsx+d0+x2slqKPvB80juKfaZbfcBxttkcAa6giB6qKFU4njhyz4pP54JebZg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "clangd extension for coc.nvim"; + homepage = "https://github.com/clangd/coc-clangd#readme"; + license = "Apache-2.0 WITH LLVM-exception"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + coc-cmake = nodeEnv.buildNodePackage { + name = "coc-cmake"; + packageName = "coc-cmake"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.1.1.tgz"; + sha512 = "1cWC11FqQG6qUNi08xIBgojxR/Q4P2dCbcvVAQup4moCXYpTwF1YdtRmdLNBY6mpSw/5U7A1Sh/8FffrxIgj7A=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "coc.nvim extension for cmake language"; + homepage = "https://github.com/voldikss/coc-cmake#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; @@ -67863,7 +67814,7 @@ in sources."semver-5.7.1" ]; }) - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log4js-6.3.0" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.0" @@ -68049,7 +68000,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -68106,7 +68057,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.8.3" + sources."core-js-3.9.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -68146,7 +68097,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -68419,7 +68370,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" sources."log-symbols-2.2.0" sources."loglevel-1.7.1" @@ -68925,6 +68876,27 @@ in bypassCache = true; reconstructLock = true; }; + coc-pyright = nodeEnv.buildNodePackage { + name = "coc-pyright"; + packageName = "coc-pyright"; + version = "1.1.113"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.113.tgz"; + sha512 = "a9mC0b7oVLT3KEHbBw1e7D7k2UD0lRaTk/HrZJJ/lkIDlpF/6TrwqTcL/BUWptUjwUA4sOOdAoQQeOR88Ugsww=="; + }; + dependencies = [ + sources."pyright-1.1.113" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Pyright extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-pyright#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-python = nodeEnv.buildNodePackage { name = "coc-python"; packageName = "coc-python"; @@ -69064,28 +69036,28 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/core-7.12.16" - sources."@babel/generator-7.12.15" + sources."@babel/core-7.12.17" + sources."@babel/generator-7.12.17" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-replace-supers-7.12.13" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -69111,7 +69083,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -69149,7 +69121,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -69162,7 +69134,7 @@ in sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" sources."fastq-1.10.1" - sources."file-entry-cache-6.0.0" + sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" @@ -69222,7 +69194,7 @@ in sources."known-css-properties-0.21.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-4.0.0" sources."longest-streak-2.0.4" sources."lru-cache-6.0.0" @@ -69340,7 +69312,7 @@ in sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.10.0" + sources."stylelint-13.11.0" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" @@ -69406,6 +69378,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-texlab = nodeEnv.buildNodePackage { + name = "coc-texlab"; + packageName = "coc-texlab"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-2.3.0.tgz"; + sha512 = "1Nph3BgqAbANW1LWa49kscQdt8i55fB304YohKvA2y78DlvxIfG0J7UnbIz+R1HQX0TpvwWdD/wzFP6ll68l8w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "TexLab extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-texlab#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-tslint = nodeEnv.buildNodePackage { name = "coc-tslint"; packageName = "coc-tslint"; @@ -69601,7 +69591,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.0" + sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fs.realpath-1.0.0" @@ -69627,7 +69617,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -69903,10 +69893,10 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.2.tgz"; - sha512 = "sG/P4fxVzz7lTzKjIg1MmnNF5ChW1+zk/LpLxdNgCHlgAMlQTAC12UqBtkFrczGQ6SapsvB3x4VbKLjdrcrjhA=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.3.tgz"; + sha512 = "mwQ6sY7tS7sVN4WKD17MA7QGju9Fs1n3f0ZJ3G67WAoOvBCMzXIMxFLch7LQZyLnPVZnuCa90AOvkuD6YQE+Yw=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -69917,7 +69907,7 @@ in sources."color-string-1.5.4" sources."colors-1.4.0" sources."colorspace-1.1.2" - sources."commander-6.1.0" + sources."commander-6.2.1" sources."core-util-is-1.0.2" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" @@ -70306,7 +70296,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" @@ -70361,7 +70351,7 @@ in sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.0" + sources."npm-package-arg-8.1.1" sources."npm-packlist-2.1.4" sources."npm-pick-manifest-6.1.0" sources."npm-registry-fetch-9.0.0" @@ -70395,7 +70385,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.2.6" + sources."pacote-11.2.7" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."path-exists-3.0.0" @@ -70500,7 +70490,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.34.13" + sources."systeminformation-4.34.14" sources."tar-6.1.0" sources."term-size-2.2.1" sources."through-2.3.8" @@ -70592,7 +70582,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -70963,7 +70953,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -71028,7 +71018,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -71613,7 +71603,7 @@ in sources."mutexify-1.3.1" sources."nan-2.14.2" sources."nanoassert-1.1.0" - sources."nanobus-4.4.0" + sources."nanobus-4.5.0" sources."nanoguard-1.3.0" sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" @@ -71963,7 +71953,7 @@ in sources."is-path-inside-3.0.2" sources."is-stream-2.0.0" sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."minimatch-3.0.4" @@ -72044,7 +72034,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -72100,7 +72090,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.escaperegexp-4.1.2" sources."lodash.groupby-4.6.0" sources."lodash.isboolean-3.0.3" @@ -72207,39 +72197,39 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/core-7.12.16" - sources."@babel/generator-7.12.15" + sources."@babel/core-7.12.17" + sources."@babel/generator-7.12.17" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.12.13" sources."@babel/helper-replace-supers-7.12.13" sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" sources."@babel/highlight-7.12.13" - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/plugin-proposal-object-rest-spread-7.12.13" sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.12.13" sources."@babel/plugin-transform-parameters-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/plugin-transform-react-jsx-7.12.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -72378,7 +72368,7 @@ in sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."loose-envify-1.4.0" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" @@ -72566,7 +72556,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.160.3" + sources."@fluentui/react-7.161.0" sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.3" @@ -73603,7 +73593,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.160.3" + sources."office-ui-fabric-react-7.161.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -73830,7 +73820,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.32.7" + sources."sass-1.32.8" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" @@ -74309,7 +74299,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.0" + sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fs.realpath-1.0.0" @@ -74332,7 +74322,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" @@ -74468,7 +74458,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.0" + sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fs.realpath-1.0.0" @@ -74491,7 +74481,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" @@ -74586,23 +74576,23 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.15" + sources."@babel/generator-7.12.17" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.12.16" // { + (sources."@babel/helper-compilation-targets-7.12.17" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.16" - sources."@babel/helper-create-regexp-features-plugin-7.12.16" + sources."@babel/helper-create-class-features-plugin-7.12.17" + sources."@babel/helper-create-regexp-features-plugin-7.12.17" sources."@babel/helper-explode-assignable-expression-7.12.13" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-hoist-variables-7.12.13" - sources."@babel/helper-member-expression-to-functions-7.12.16" + sources."@babel/helper-member-expression-to-functions-7.12.17" sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-module-transforms-7.12.17" sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.12.13" sources."@babel/helper-remap-async-to-generator-7.12.13" @@ -74611,18 +74601,18 @@ in sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.16" + sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.12.13" - sources."@babel/helpers-7.12.13" + sources."@babel/helpers-7.12.17" (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.16" + sources."@babel/parser-7.12.17" sources."@babel/plugin-proposal-async-generator-functions-7.12.13" sources."@babel/plugin-proposal-class-properties-7.12.13" - sources."@babel/plugin-proposal-dynamic-import-7.12.16" + sources."@babel/plugin-proposal-dynamic-import-7.12.17" sources."@babel/plugin-proposal-export-default-from-7.12.13" sources."@babel/plugin-proposal-export-namespace-from-7.12.13" sources."@babel/plugin-proposal-json-strings-7.12.13" @@ -74631,7 +74621,7 @@ in sources."@babel/plugin-proposal-numeric-separator-7.12.13" sources."@babel/plugin-proposal-object-rest-spread-7.12.13" sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" - sources."@babel/plugin-proposal-optional-chaining-7.12.16" + sources."@babel/plugin-proposal-optional-chaining-7.12.17" sources."@babel/plugin-proposal-private-methods-7.12.13" sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" @@ -74676,11 +74666,11 @@ in sources."@babel/plugin-transform-parameters-7.12.13" sources."@babel/plugin-transform-property-literals-7.12.13" sources."@babel/plugin-transform-react-display-name-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.12.16" + sources."@babel/plugin-transform-react-jsx-7.12.17" sources."@babel/plugin-transform-react-jsx-source-7.12.13" sources."@babel/plugin-transform-regenerator-7.12.13" sources."@babel/plugin-transform-reserved-words-7.12.13" - (sources."@babel/plugin-transform-runtime-7.12.15" // { + (sources."@babel/plugin-transform-runtime-7.12.17" // { dependencies = [ sources."semver-5.7.1" ]; @@ -74690,20 +74680,20 @@ in sources."@babel/plugin-transform-sticky-regex-7.12.13" sources."@babel/plugin-transform-template-literals-7.12.13" sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.12.16" + sources."@babel/plugin-transform-typescript-7.12.17" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.12.16" // { + (sources."@babel/preset-env-7.12.17" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.16" - sources."@babel/runtime-7.12.13" + sources."@babel/preset-typescript-7.12.17" + sources."@babel/runtime-7.12.18" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.12.13" - sources."@babel/types-7.12.13" + sources."@babel/traverse-7.12.17" + sources."@babel/types-7.12.17" sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" @@ -75144,7 +75134,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -75274,8 +75264,8 @@ in sources."slash-3.0.0" ]; }) - sources."core-js-3.8.3" - (sources."core-js-compat-3.8.3" // { + sources."core-js-3.9.0" + (sources."core-js-compat-3.9.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -75423,7 +75413,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -75874,7 +75864,7 @@ in ]; }) sources."locate-path-6.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.assign-4.2.0" sources."lodash.debounce-4.0.8" @@ -76061,14 +76051,14 @@ in sources."npm-packlist-2.1.4" (sources."npm-pick-manifest-6.1.0" // { dependencies = [ - sources."npm-package-arg-8.1.0" + sources."npm-package-arg-8.1.1" ]; }) (sources."npm-registry-fetch-9.0.0" // { dependencies = [ sources."minipass-3.1.3" sources."minizlib-2.1.2" - sources."npm-package-arg-8.1.0" + sources."npm-package-arg-8.1.1" ]; }) sources."npm-run-path-2.0.2" @@ -76092,12 +76082,12 @@ in ]; }) sources."object-inspect-1.9.0" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.entries-1.1.3" - sources."object.getownpropertydescriptors-2.1.1" + sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" sources."object.values-1.1.2" sources."obuf-1.1.2" @@ -76148,11 +76138,11 @@ in sources."semver-6.3.0" ]; }) - (sources."pacote-11.2.6" // { + (sources."pacote-11.2.7" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" - sources."npm-package-arg-8.1.0" + sources."npm-package-arg-8.1.1" sources."rimraf-3.0.2" ]; }) @@ -76352,7 +76342,7 @@ in sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-4.1.0" sources."prepend-http-3.0.1" - sources."pretty-bytes-5.5.0" + sources."pretty-bytes-5.6.0" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -76585,7 +76575,7 @@ in sources."uuid-2.0.3" ]; }) - sources."slugify-1.4.6" + sources."slugify-1.4.7" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -77324,10 +77314,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.2.tgz"; - sha512 = "terh0qFI5xNAGp/tL4EtKQKSVQdLYeBpFGOwU7vaoigzFgO3TZpH6JLwF36NeUae9sTdTlQt7X3ti2bOqCDnQQ=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.3.tgz"; + sha512 = "2K8kh4MAteqj7kOnUq8Goux4Zw0oIZEGN1xoW14cGxrOTDRXvBm3eBndI9gt24rSC8h7T8qdIeLY7O9hn6LSUg=="; }; dependencies = [ (sources."@heroku-cli/color-1.1.14" // { @@ -77454,7 +77444,7 @@ in ]; }) sources."clean-stack-3.0.1" - sources."cli-table-0.3.4" + sources."cli-table-0.3.5" (sources."cli-ux-4.9.3" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -77474,6 +77464,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -77658,7 +77649,7 @@ in sources."keyv-3.0.0" sources."kind-of-6.0.3" sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" @@ -77938,7 +77929,7 @@ in sources."@types/glob-7.1.3" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -77947,11 +77938,7 @@ in sources."ajv-6.12.6" (sources."ansi-align-3.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" ]; }) sources."ansi-escapes-3.2.0" @@ -78010,11 +77997,16 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" ]; }) @@ -78047,7 +78039,7 @@ in sources."cli-color-1.4.0" sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" - sources."cli-table-0.3.4" + sources."cli-table-0.3.5" sources."cli-width-2.2.1" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -78056,7 +78048,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" - sources."colors-1.4.0" + sources."colors-1.0.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" sources."commander-4.1.1" @@ -78135,7 +78127,7 @@ in sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -78291,22 +78283,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" - (sources."inquirer-6.3.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) - ]; - }) + sources."inquirer-6.3.1" sources."install-artifact-from-github-1.2.0" sources."ip-1.1.5" sources."ip-regex-4.3.0" @@ -78315,7 +78292,7 @@ in sources."is-binary-path-2.1.0" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" @@ -78369,7 +78346,7 @@ in sources."leven-3.1.0" sources."levn-0.3.0" sources."listenercount-1.0.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._isnative-2.4.1" sources."lodash._objecttypes-2.4.1" sources."lodash._shimkeys-2.4.1" @@ -78392,7 +78369,11 @@ in sources."lodash.union-4.6.0" sources."lodash.values-2.4.1" sources."log-symbols-2.2.0" - sources."logform-2.2.0" + (sources."logform-2.2.0" // { + dependencies = [ + sources."colors-1.4.0" + ]; + }) sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -78467,12 +78448,7 @@ in sources."open-6.4.0" sources."openapi3-ts-1.4.0" sources."optionator-0.8.3" - (sources."ora-3.4.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."ora-3.4.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-3.0.0" @@ -78504,7 +78480,7 @@ in sources."promise-breaker-5.0.0" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.42" + sources."@types/node-13.13.45" ]; }) sources."proxy-addr-2.0.6" @@ -78594,11 +78570,16 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string-width-4.2.0" - sources."string_decoder-1.3.0" - (sources."strip-ansi-6.0.0" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-1.3.0" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" ]; }) sources."strip-json-comments-2.0.1" @@ -78699,15 +78680,16 @@ in sources."verror-1.10.0" sources."wcwidth-1.0.1" sources."which-1.3.1" - (sources."wide-align-1.1.3" // { + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) - sources."widest-line-3.1.0" sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ @@ -78865,7 +78847,7 @@ in sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."map-obj-4.1.0" (sources."meow-8.1.2" // { @@ -79209,7 +79191,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" @@ -79464,7 +79446,7 @@ in dependencies = [ sources."async-2.6.3" sources."debug-4.3.2" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" @@ -79835,7 +79817,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -80000,7 +79982,7 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - (sources."@graphql-tools/utils-7.3.0" // { + (sources."@graphql-tools/utils-7.5.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -80009,13 +79991,13 @@ in }) (sources."@graphql-tools/delegate-7.0.10" // { dependencies = [ - sources."@graphql-tools/utils-7.3.0" + sources."@graphql-tools/utils-7.5.0" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ - sources."@graphql-tools/utils-7.3.0" + sources."@graphql-tools/utils-7.5.0" sources."tslib-2.1.0" ]; }) @@ -80026,7 +80008,7 @@ in }) (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - (sources."@graphql-tools/utils-7.3.0" // { + (sources."@graphql-tools/utils-7.5.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -80034,21 +80016,21 @@ in ]; }) sources."@graphql-tools/load-6.2.4" - (sources."@graphql-tools/merge-6.2.7" // { + (sources."@graphql-tools/merge-6.2.9" // { dependencies = [ - sources."@graphql-tools/utils-7.3.0" + sources."@graphql-tools/utils-7.5.0" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/schema-7.1.3" // { dependencies = [ - sources."@graphql-tools/utils-7.3.0" + sources."@graphql-tools/utils-7.5.0" sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/url-loader-6.8.1" // { dependencies = [ - sources."@graphql-tools/utils-7.3.0" + sources."@graphql-tools/utils-7.5.0" sources."form-data-4.0.0" sources."tslib-2.1.0" ]; @@ -80064,7 +80046,7 @@ in }) (sources."@graphql-tools/wrap-7.0.5" // { dependencies = [ - (sources."@graphql-tools/utils-7.3.0" // { + (sources."@graphql-tools/utils-7.5.0" // { dependencies = [ sources."tslib-2.1.0" ]; @@ -80078,7 +80060,7 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -80316,7 +80298,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lines-and-columns-1.1.6" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.toarray-4.4.0" (sources."log-symbols-2.2.0" // { dependencies = [ @@ -80377,7 +80359,7 @@ in sources."oas-validator-5.0.5" sources."oauth-sign-0.9.0" sources."object-inspect-1.9.0" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-path-0.11.5" sources."object.assign-4.1.2" @@ -80814,10 +80796,10 @@ in makam = nodeEnv.buildNodePackage { name = "makam"; packageName = "makam"; - version = "0.7.39"; + version = "0.7.40"; src = fetchurl { - url = "https://registry.npmjs.org/makam/-/makam-0.7.39.tgz"; - sha512 = "6XvSBJfpz1Jr5UHajYsKKLDlFcdYuhVmOJu3IqKsD14BcYoi+oZ+wfta8CVbKvRJDT7mF7e9dzCei8+nlsA3kA=="; + url = "https://registry.npmjs.org/makam/-/makam-0.7.40.tgz"; + sha512 = "EfuAPhLvKuN2ruOqyDpG8epeaDzAKg/6K5BgaDMaivJ9+DC84eI7PsluBYe01cuEJGaOoQCtO2mGKwMy7o2DNw=="; }; buildInputs = globalBuildInputs; meta = { @@ -80930,7 +80912,7 @@ in sources."is-stream-1.1.0" sources."iterall-1.3.0" sources."js-tokens-3.0.2" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."node-fetch-1.7.3" sources."pad-component-0.0.1" sources."pluralize-5.1.0" @@ -80973,22 +80955,13 @@ in sources."cardinal-2.1.1" sources."chalk-1.1.3" sources."charm-0.1.2" - (sources."cli-table-0.3.4" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."cli-table-0.3.5" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colors-1.0.3" sources."core-util-is-1.0.2" sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" - sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" (sources."event-stream-0.9.8" // { @@ -81001,9 +80974,8 @@ in sources."has-flag-4.0.0" sources."here-0.0.2" sources."inherits-2.0.4" - sources."is-fullwidth-code-point-3.0.0" sources."isarray-0.0.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-0.7.0" @@ -81025,12 +80997,6 @@ in sources."redeyed-2.1.1" sources."sax-1.2.4" sources."sparkline-0.1.2" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" - ]; - }) sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -81039,7 +81005,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.34.13" + sources."systeminformation-4.34.14" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -82042,7 +82008,7 @@ in sources."follow-redirects-1.13.2" sources."he-1.2.0" sources."http-proxy-1.18.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."mime-1.6.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -82842,7 +82808,7 @@ in ]; }) sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -83008,9 +82974,9 @@ in }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@ot-builder/bin-composite-types-1.0.1" - sources."@ot-builder/bin-util-1.0.1" - (sources."@ot-builder/cli-help-shower-1.0.1" // { + sources."@ot-builder/bin-composite-types-1.0.2" + sources."@ot-builder/bin-util-1.0.2" + (sources."@ot-builder/cli-help-shower-1.0.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -83020,7 +82986,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-proc-1.0.1" // { + (sources."@ot-builder/cli-proc-1.0.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -83030,7 +82996,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."@ot-builder/cli-shared-1.0.1" // { + (sources."@ot-builder/cli-shared-1.0.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -83040,35 +83006,35 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/common-impl-1.0.1" - sources."@ot-builder/errors-1.0.1" - sources."@ot-builder/io-bin-cff-1.0.1" - sources."@ot-builder/io-bin-encoding-1.0.1" - sources."@ot-builder/io-bin-ext-private-1.0.1" - sources."@ot-builder/io-bin-font-1.0.1" - sources."@ot-builder/io-bin-glyph-store-1.0.1" - sources."@ot-builder/io-bin-layout-1.0.1" - sources."@ot-builder/io-bin-metadata-1.0.1" - sources."@ot-builder/io-bin-metric-1.0.1" - sources."@ot-builder/io-bin-name-1.0.1" - sources."@ot-builder/io-bin-sfnt-1.0.1" - sources."@ot-builder/io-bin-ttf-1.0.1" - sources."@ot-builder/ot-1.0.1" - sources."@ot-builder/ot-encoding-1.0.1" - sources."@ot-builder/ot-ext-private-1.0.1" - sources."@ot-builder/ot-glyphs-1.0.1" - sources."@ot-builder/ot-layout-1.0.1" - sources."@ot-builder/ot-metadata-1.0.1" - sources."@ot-builder/ot-name-1.0.1" - sources."@ot-builder/ot-sfnt-1.0.1" - sources."@ot-builder/ot-standard-glyph-namer-1.0.1" - sources."@ot-builder/prelude-1.0.1" - sources."@ot-builder/primitive-1.0.1" - sources."@ot-builder/rectify-1.0.1" - sources."@ot-builder/stat-glyphs-1.0.1" - sources."@ot-builder/trace-1.0.1" - sources."@ot-builder/var-store-1.0.1" - sources."@ot-builder/variance-1.0.1" + sources."@ot-builder/common-impl-1.0.2" + sources."@ot-builder/errors-1.0.2" + sources."@ot-builder/io-bin-cff-1.0.2" + sources."@ot-builder/io-bin-encoding-1.0.2" + sources."@ot-builder/io-bin-ext-private-1.0.2" + sources."@ot-builder/io-bin-font-1.0.2" + sources."@ot-builder/io-bin-glyph-store-1.0.2" + sources."@ot-builder/io-bin-layout-1.0.2" + sources."@ot-builder/io-bin-metadata-1.0.2" + sources."@ot-builder/io-bin-metric-1.0.2" + sources."@ot-builder/io-bin-name-1.0.2" + sources."@ot-builder/io-bin-sfnt-1.0.2" + sources."@ot-builder/io-bin-ttf-1.0.2" + sources."@ot-builder/ot-1.0.2" + sources."@ot-builder/ot-encoding-1.0.2" + sources."@ot-builder/ot-ext-private-1.0.2" + sources."@ot-builder/ot-glyphs-1.0.2" + sources."@ot-builder/ot-layout-1.0.2" + sources."@ot-builder/ot-metadata-1.0.2" + sources."@ot-builder/ot-name-1.0.2" + sources."@ot-builder/ot-sfnt-1.0.2" + sources."@ot-builder/ot-standard-glyph-namer-1.0.2" + sources."@ot-builder/prelude-1.0.2" + sources."@ot-builder/primitive-1.0.2" + sources."@ot-builder/rectify-1.0.2" + sources."@ot-builder/stat-glyphs-1.0.2" + sources."@ot-builder/trace-1.0.2" + sources."@ot-builder/var-store-1.0.2" + sources."@ot-builder/variance-1.0.2" sources."@unicode/unicode-13.0.0-1.0.3" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" @@ -83158,8 +83124,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.1" - (sources."otb-ttc-bundle-1.0.1" // { + sources."ot-builder-1.0.2" + (sources."otb-ttc-bundle-1.0.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -83341,7 +83307,7 @@ in sources."inherits-2.0.4" sources."iterare-1.2.1" sources."jaeger-client-3.18.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."long-2.4.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -83451,7 +83417,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.846.0" // { + (sources."aws-sdk-2.848.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -83758,8 +83724,8 @@ in sources."levn-0.3.0" sources."linkify-it-2.2.0" sources."locate-path-2.0.0" - sources."lodash-4.17.20" - sources."lodash-es-4.17.20" + sources."lodash-4.17.21" + sources."lodash-es-4.17.21" sources."lodash.padend-4.6.1" sources."lodash.repeat-4.1.0" sources."lodash.sortby-4.7.0" @@ -83799,7 +83765,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.9.0" + sources."mermaid-8.9.1" sources."mime-db-1.46.0" sources."mime-types-2.1.29" sources."mimic-response-2.1.0" @@ -84032,7 +83998,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.48.1" + sources."terminal-kit-1.49.3" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -84207,7 +84173,7 @@ in sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" sources."marked-0.8.2" @@ -84264,7 +84230,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -84352,7 +84318,7 @@ in sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.46.0" @@ -84495,7 +84461,7 @@ in sources."json-parse-helpfulerror-1.0.3" sources."keyv-3.1.0" sources."latest-version-5.1.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" @@ -84663,7 +84629,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -84731,7 +84697,7 @@ in sources."is-number-7.0.0" sources."isbinaryfile-4.0.6" sources."jsonfile-4.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" (sources."log4js-6.3.0" // { dependencies = [ sources."debug-4.3.2" @@ -85020,7 +84986,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" (sources."mem-4.3.0" // { @@ -85281,7 +85247,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-5.0.0" + sources."@octokit/openapi-types-5.1.0" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -85307,11 +85273,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.9.0" + sources."@octokit/types-6.10.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -85773,7 +85739,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" @@ -85898,7 +85864,7 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.1" + sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" @@ -86235,7 +86201,7 @@ in sources."graceful-fs-4.2.6" sources."iconv-lite-0.4.24" sources."image-size-0.5.5" - sources."is-what-3.12.0" + sources."is-what-3.13.0" sources."make-dir-2.1.0" sources."mime-1.6.0" sources."ms-2.1.3" @@ -87214,7 +87180,7 @@ in sources."@babel/preset-env-7.12.17" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.17" + sources."@babel/runtime-7.12.18" sources."@babel/template-7.12.13" sources."@babel/traverse-7.12.17" sources."@babel/types-7.12.17" @@ -87238,7 +87204,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -87408,7 +87374,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -87480,7 +87446,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.3" // { + (sources."core-js-compat-3.9.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -87531,7 +87497,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -87772,7 +87738,7 @@ in ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.memoize-3.0.4" sources."lru-cache-5.1.1" sources."magic-string-0.25.7" @@ -88336,7 +88302,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."link-check-4.5.4" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."markdown-link-extractor-1.2.6" sources."marked-1.2.9" sources."mime-db-1.46.0" @@ -88540,7 +88506,7 @@ in sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" sources."lodash._basevalues-3.0.0" @@ -88730,7 +88696,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -88814,9 +88780,9 @@ in sources."inherits-2.0.4" sources."khroma-1.2.0" sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lower-case-1.1.4" - sources."mermaid-8.9.0" + sources."mermaid-8.9.1" sources."minify-4.1.3" sources."minimatch-3.0.4" sources."mkdirp-classic-0.5.3" @@ -88888,7 +88854,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.160.3" + sources."@fluentui/react-7.161.0" sources."@fluentui/react-focus-7.17.4" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.3" @@ -89001,7 +88967,7 @@ in sources."json-schema-traverse-0.4.1" sources."keyv-3.1.0" sources."latest-version-5.1.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" @@ -89028,7 +88994,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.160.3" + sources."office-ui-fabric-react-7.161.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -89305,7 +89271,7 @@ in sources."commander-4.1.1" ]; }) - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.46.0" @@ -89363,7 +89329,7 @@ in sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" sources."lodash.omit-4.5.0" sources."logform-2.2.0" @@ -89403,10 +89369,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.8.4.tgz"; - sha512 = "LHuNVJ11NtTgDSzlFJc+AGrZTbRd61RgzXRk+LulKIYZOB20x6tYPLCfwMsHlvNUXJIhA6Mve+QEu4hB7M41Bw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.8.5.tgz"; + sha512 = "W0/Kp1QSJ+CKGc5fmtuikXMtQ1GSPtbtonaQ9+wjRuUp/hM/swSqeMcD1Nl7lylfPsTDbkMYBxyU/e4xsssMnw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -89509,7 +89475,7 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.17" + sources."@babel/runtime-7.12.18" sources."@babel/template-7.12.13" sources."@babel/traverse-7.12.17" sources."@babel/types-7.12.17" @@ -89723,7 +89689,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-5.0.0" + sources."@octokit/openapi-types-5.1.0" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -89748,7 +89714,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.9.0" + sources."@octokit/types-6.10.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -89784,7 +89750,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/node-fetch-2.5.8" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -89843,7 +89809,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.846.0" // { + (sources."aws-sdk-2.848.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -89904,7 +89870,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -90036,7 +90002,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.8.3" // { + (sources."core-js-compat-3.9.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -90161,7 +90127,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -90172,7 +90138,7 @@ in sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.8.48" + sources."esbuild-0.8.50" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -90566,7 +90532,7 @@ in sources."p-locate-5.0.0" ]; }) - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -91810,7 +91776,7 @@ in sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ=="; }; dependencies = [ - sources."@babel/runtime-7.12.17" + sources."@babel/runtime-7.12.18" sources."@node-red/editor-api-1.2.9" sources."@node-red/editor-client-1.2.9" (sources."@node-red/nodes-1.2.9" // { @@ -91839,8 +91805,7 @@ in ]; }) sources."ajv-6.12.6" - sources."ansi-regex-5.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-regex-2.1.1" sources."append-field-1.0.0" sources."aproba-1.2.0" (sources."are-we-there-yet-1.1.5" // { @@ -91901,14 +91866,12 @@ in sources."bytes-3.1.0" sources."callback-stream-1.1.0" sources."caseless-0.12.0" - sources."chalk-2.4.2" sources."cheerio-0.22.0" sources."chownr-2.0.0" - sources."cli-table-0.3.4" + sources."cli-table-0.3.5" sources."clone-2.1.2" sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."commist-1.1.0" sources."concat-map-0.0.1" @@ -91959,12 +91922,10 @@ in }) sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" (sources."express-4.17.1" // { @@ -91991,14 +91952,7 @@ in sources."fs-minipass-2.1.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) + sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-3.1.0" @@ -92013,7 +91967,6 @@ in sources."graceful-fs-4.2.6" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" sources."help-me-1.1.0" @@ -92041,7 +91994,7 @@ in sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" sources."is-relative-1.0.0" @@ -92112,7 +92065,7 @@ in sources."ws-7.4.3" ]; }) - (sources."mqtt-packet-6.8.0" // { + (sources."mqtt-packet-6.8.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -92236,11 +92189,10 @@ in sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" - sources."string-width-4.2.0" + sources."string-width-1.0.2" sources."string_decoder-0.10.31" - sources."strip-ansi-6.0.0" + sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" sources."tail-2.2.0" (sources."tar-6.0.5" // { dependencies = [ @@ -92283,14 +92235,7 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."when-3.7.8" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."ws-6.2.1" sources."xml2js-0.4.23" @@ -92701,7 +92646,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -92952,7 +92897,7 @@ in ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."lodash.zip-4.2.0" sources."log-symbols-4.0.0" @@ -93244,13 +93189,12 @@ in (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -93263,7 +93207,15 @@ in sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."boxen-5.0.0" + (sources."boxen-5.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."builtins-1.0.3" @@ -93282,20 +93234,12 @@ in sources."cint-8.2.1" sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" - (sources."cli-table-0.3.4" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."cli-table-0.3.5" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."commander-6.2.1" sources."concat-map-0.0.1" @@ -93315,13 +93259,12 @@ in sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" sources."err-code-2.0.3" sources."escape-goat-2.1.1" - sources."escape-string-regexp-1.0.5" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -93336,14 +93279,7 @@ in sources."fp-and-or-0.1.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) + sources."gauge-2.7.4" sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" @@ -93381,7 +93317,7 @@ in sources."ip-1.1.5" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.4.0" sources."is-lambda-1.0.1" @@ -93420,7 +93356,7 @@ in ]; }) sources."locate-path-6.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { @@ -93455,7 +93391,7 @@ in sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.0" + sources."npm-package-arg-8.1.1" sources."npm-packlist-2.1.4" sources."npm-pick-manifest-6.1.0" sources."npm-registry-fetch-9.0.0" @@ -93475,7 +93411,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.2.6" + sources."pacote-11.2.7" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -93528,9 +93464,9 @@ in sources."spawn-please-1.0.0" sources."sshpk-1.16.1" sources."ssri-8.0.1" - sources."string-width-4.2.0" + sources."string-width-1.0.2" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tar-6.1.0" @@ -93552,16 +93488,25 @@ in sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" sources."which-2.0.2" - (sources."wide-align-1.1.3" // { + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -93903,7 +93848,7 @@ in sources."@babel/plugin-transform-unicode-regex-7.12.13" sources."@babel/preset-env-7.12.17" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.17" + sources."@babel/runtime-7.12.18" sources."@babel/template-7.12.13" sources."@babel/traverse-7.12.17" sources."@babel/types-7.12.17" @@ -94021,7 +93966,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -94048,7 +93993,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.8.3" // { + (sources."core-js-compat-3.9.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -94156,7 +94101,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -94349,7 +94294,7 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" @@ -94423,7 +94368,7 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.1" + sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" sources."object.values-1.1.2" sources."on-finished-2.3.0" @@ -94912,7 +94857,7 @@ in sources."kad-memstore-0.0.1" sources."limitation-0.2.1" sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lru-cache-6.0.0" @@ -95442,7 +95387,7 @@ in sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -95493,7 +95438,7 @@ in sources."number-is-nan-1.0.1" sources."numeral-2.0.6" sources."object-assign-4.1.1" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-2.0.1" @@ -95818,7 +95763,7 @@ in sources."readable-stream-2.3.7" ]; }) - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -96178,7 +96123,7 @@ in sources."js-git-0.7.8" sources."lazy-1.0.11" sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-driver-1.2.7" sources."lru-cache-5.1.1" sources."minimatch-3.0.4" @@ -96264,7 +96209,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.34.13" + sources."systeminformation-4.34.14" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -96299,10 +96244,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.17.2"; + version = "5.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.17.2.tgz"; - sha512 = "X0WEumozKhlYZObL1E+Nmi67f+ZMS+fbpE6vAymlazT2lx0B+Agw9iJsdd//tjAqIzxcsxxgZScx0EIPc42Ulw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.17.3.tgz"; + sha512 = "Dy2MkOEYsE/9xRNEc6JdiA5HXRo0hxtBOKiYbnbU2BPtBmUt7FVwhnJI4oPW5LrbP1p6lXt/RpPFWl3WmwRH9A=="; }; buildInputs = globalBuildInputs; meta = { @@ -96500,7 +96445,7 @@ in sources."inherits-2.0.4" sources."isexe-2.0.0" sources."keypress-0.2.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -96653,7 +96598,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { @@ -96851,10 +96796,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.112"; + version = "1.1.113"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.112.tgz"; - sha512 = "/pwzJWmGo3s7gETYq9CUcPP5F4ZxFBe9u8sQpEJDHD//YFi97EQjhBkOT4M6sNEKpG8u/nyoVRK9ZlGFBHZtcQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.113.tgz"; + sha512 = "VcitW5t5lG1KY0w8xY/ubMhFZZ2lfXJvhBW4TfTwy067R4WtXKSa23br4to1pdRA1rwpxOREgxVTnOWmf3YkYg=="; }; buildInputs = globalBuildInputs; meta = { @@ -96948,7 +96893,7 @@ in sources."lcid-2.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.padend-4.6.1" sources."magic-string-0.22.5" sources."map-age-cleaner-0.1.3" @@ -97057,7 +97002,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" - sources."whatwg-fetch-3.6.0" + sources."whatwg-fetch-3.6.1" sources."which-1.3.1" sources."which-module-2.0.0" sources."word-wrap-1.2.3" @@ -97149,7 +97094,7 @@ in sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.9.0" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -97323,7 +97268,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" sources."mime-db-1.46.0" sources."mime-types-2.1.29" @@ -97412,7 +97357,7 @@ in sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.12.13" sources."@babel/parser-7.12.17" - sources."@babel/runtime-7.12.17" + sources."@babel/runtime-7.12.18" sources."@babel/template-7.12.13" sources."@babel/traverse-7.12.17" sources."@babel/types-7.12.17" @@ -97422,7 +97367,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.42" + sources."@types/node-13.13.45" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -97480,7 +97425,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.8.3" + sources."core-js-3.9.0" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -97566,7 +97511,7 @@ in sources."jsonpointer-4.1.0" sources."leven-3.1.0" sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."loose-envify-1.4.0" sources."lunr-2.3.8" sources."mark.js-8.11.1" @@ -97663,7 +97608,7 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."slugify-1.4.6" + sources."slugify-1.4.7" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" @@ -97932,7 +97877,7 @@ in sources."fast-levenshtein-2.0.6" sources."fastq-1.10.1" sources."fd-slicer-1.1.0" - sources."file-entry-cache-6.0.0" + sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-5.0.2" @@ -97986,7 +97931,7 @@ in sources."linkify-it-2.2.0" sources."listenercount-1.0.1" sources."locate-path-6.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-4.0.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" @@ -98309,10 +98254,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.32.7"; + version = "1.32.8"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.7.tgz"; - sha512 = "C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz"; + sha512 = "Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ=="; }; dependencies = [ sources."anymatch-3.1.1" @@ -98529,7 +98474,7 @@ in ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.0.0" // { + (sources."@serverless/platform-client-4.1.0" // { dependencies = [ sources."js-yaml-3.14.1" ]; @@ -98569,7 +98514,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.168" sources."@types/long-4.0.1" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -98626,7 +98571,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.846.0" // { + (sources."aws-sdk-2.848.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -99022,7 +98967,7 @@ in ]; }) sources."lie-3.3.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -99140,7 +99085,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.42" + sources."@types/node-13.13.45" sources."long-4.0.0" ]; }) @@ -99192,7 +99137,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.35.0" // { + (sources."simple-git-2.35.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -99618,8 +99563,6 @@ in sha512 = "8XJnwCFR4DatLz1s0nGFe6IJPJ+5pjRFhoBuBKq8SLgFI40eD7ak6jOXpzeG0tmIpyOc1zCs9bjKAxMFm1451A=="; }; dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -99638,7 +99581,6 @@ in ]; }) sources."cache-base-1.0.1" - sources."chalk-2.4.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -99656,10 +99598,9 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-table-0.3.4" + sources."cli-table-0.3.5" sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."colors-1.0.3" sources."commander-2.9.0" sources."component-emitter-1.3.0" sources."copy-descriptor-0.1.1" @@ -99667,8 +99608,6 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" - sources."emoji-regex-8.0.0" - sources."escape-string-regexp-1.0.5" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -99708,7 +99647,6 @@ in sources."get-value-2.0.6" sources."graceful-fs-4.2.6" sources."graceful-readlink-1.0.1" - sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -99721,7 +99659,6 @@ in sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" - sources."is-fullwidth-code-point-3.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -99732,7 +99669,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.3" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."micromatch-3.1.10" @@ -99824,10 +99761,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."string-width-4.2.0" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" - sources."supports-color-5.5.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -100015,10 +99949,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.456.0"; + version = "1.458.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.456.0.tgz"; - sha512 = "ZcZP86DNEfny34eW626lB9FikIUmiynQuJkydf4C7Kzx1szrmQhSGaXkRohBGXBhapzildNauhVX7327aTGk8Q=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.458.0.tgz"; + sha512 = "w/ZCb8rOyFDn09OmoyuLDQcmW63rSfbVsXINM+bvT9UJ4ML4JRWA2qKURcaMy9RnkXEK3gPYstly7ezb9iF82g=="; }; dependencies = [ sources."@open-policy-agent/opa-wasm-1.2.0" @@ -100037,7 +99971,7 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."@snyk/java-call-graph-builder-1.19.1" // { + (sources."@snyk/java-call-graph-builder-1.20.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -100062,7 +99996,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.6" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/responselike-1.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -100447,7 +100381,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.12.5" // { + (sources."snyk-gradle-plugin-3.13.0" // { dependencies = [ sources."chalk-3.0.0" sources."rimraf-3.0.2" @@ -100458,7 +100392,17 @@ in sources."snyk-module-3.1.0" (sources."snyk-mvn-plugin-2.25.3" // { dependencies = [ - sources."tmp-0.1.0" + (sources."@snyk/java-call-graph-builder-1.19.1" // { + dependencies = [ + sources."tmp-0.2.1" + ]; + }) + sources."rimraf-3.0.2" + (sources."tmp-0.1.0" // { + dependencies = [ + sources."rimraf-2.7.1" + ]; + }) sources."tslib-1.11.1" ]; }) @@ -100638,7 +100582,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -100876,7 +100820,7 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - (sources."async-append-only-log-3.0.4" // { + (sources."async-append-only-log-3.0.7" // { dependencies = [ sources."push-stream-11.0.0" ]; @@ -101047,6 +100991,7 @@ in sources."extend.js-0.0.2" sources."extglob-0.3.2" sources."fastintcompression-0.0.4" + sources."fastpriorityqueue-0.6.3" sources."file-uri-to-path-1.0.0" sources."filename-regex-2.0.1" sources."fill-range-2.2.4" @@ -101199,7 +101144,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-2.1.0" // { + (sources."jitdb-2.3.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.0" @@ -101325,7 +101270,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -101394,6 +101339,7 @@ in sources."pull-cont-0.1.1" sources."pull-cursor-3.0.0" sources."pull-defer-0.2.3" + sources."pull-drain-gently-1.1.0" sources."pull-file-1.1.0" sources."pull-flatmap-0.0.1" (sources."pull-fs-1.1.6" // { @@ -101418,6 +101364,7 @@ in sources."pull-notify-0.1.1" sources."pull-pair-1.1.0" sources."pull-paramap-1.2.2" + sources."pull-pause-0.0.2" sources."pull-ping-2.0.3" sources."pull-pushable-2.2.0" sources."pull-rate-1.0.2" @@ -101622,7 +101569,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-1.16.2" // { + (sources."ssb-db2-1.17.1" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -101883,7 +101830,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.846.0" // { + (sources."aws-sdk-2.848.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -102199,7 +102146,7 @@ in }) sources."load-json-file-1.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.get-4.4.2" sources."lodash.isequal-4.5.0" sources."long-2.4.0" @@ -102651,10 +102598,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "13.10.0"; + version = "13.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.10.0.tgz"; - sha512 = "eDuLrL0wzPKbl5/TbNGZcbw0lTIGbDEr5W6lCODvb1gAg0ncbgCRt7oU0C2VFDvbrcY0A3MFZOwltwTRmc0XCw=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.11.0.tgz"; + sha512 = "DhrKSWDWGZkCiQMtU+VroXM6LWJVC8hSK24nrUngTSQvXGK75yZUq4yNpynqrxD3a/fzKMED09V+XxO4z4lTbw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -102705,7 +102652,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -102743,7 +102690,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -102755,7 +102702,7 @@ in sources."fast-glob-3.2.5" sources."fastest-levenshtein-1.0.12" sources."fastq-1.10.1" - sources."file-entry-cache-6.0.0" + sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" @@ -102815,7 +102762,7 @@ in sources."known-css-properties-0.21.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-4.0.0" sources."longest-streak-2.0.4" sources."lru-cache-6.0.0" @@ -102974,10 +102921,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.12.11"; + version = "0.12.14"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.11.tgz"; - sha512 = "H+oXtowkBJj1HaCeES6aauwABXyMvDKGHxUyGA2y1mRqhqUkUzzmFnHfiKSB27nSpejB8M0xDgon0ZdUo427Kg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.14.tgz"; + sha512 = "pf569M9VeeyyPrRbmmQlndYO2nr8/Q2OMC1TlrCf7SBzqyqkCV1XirRRX5w2/RVq+T5tJC6k2tKTrNyhVF1mqQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -102986,7 +102933,7 @@ in sources."@emmetio/abbreviation-2.2.1" sources."@emmetio/css-abbreviation-2.1.2" sources."@emmetio/scanner-1.0.0" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/parse-json-4.0.0" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" @@ -103020,7 +102967,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."jsonc-parser-2.3.1" sources."lines-and-columns-1.1.6" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lower-case-2.0.2" sources."min-indent-1.0.1" sources."no-case-3.0.4" @@ -103039,7 +102986,7 @@ in sources."supports-color-5.5.0" sources."svelte-3.32.3" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.171" + sources."svelte2tsx-0.1.174" sources."to-regex-range-5.0.1" sources."tslib-2.1.0" sources."typescript-4.1.5" @@ -103068,10 +103015,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.0.1.tgz"; - sha512 = "v5Tzv3WPayd0XVnpmnRHqWqSHAabQFFjiTuA/KrBAOwMIyn6odBk1bCmygJJbw/6IJLwGznSvaNDKqNQeWJOtA=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.0.3.tgz"; + sha512 = "q6YtEaLXkPN1ARaifoENYPPweAbBV8YoqWg+8DFQ3xsImfyRIdBbr42Cqz4NZwCftmVJjh+m1rEK7ItRdLTxdg=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -103316,7 +103263,7 @@ in sources."graceful-fs-4.2.6" (sources."graphlib-2.1.8" // { dependencies = [ - sources."lodash-4.17.20" + sources."lodash-4.17.21" ]; }) sources."growl-1.9.2" @@ -103388,7 +103335,7 @@ in sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.6.0" // { dependencies = [ - sources."lodash-4.17.20" + sources."lodash-4.17.21" ]; }) sources."jsonfile-2.4.0" @@ -103655,7 +103602,7 @@ in sources."swagger-editor-2.10.5" (sources."swagger-test-templates-1.6.0" // { dependencies = [ - sources."lodash-4.17.20" + sources."lodash-4.17.21" ]; }) (sources."swagger-tools-0.9.16" // { @@ -104015,7 +103962,7 @@ in sources."levn-0.4.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-1.0.2" sources."map-like-2.0.0" sources."markdown-escapes-1.0.4" @@ -104026,7 +103973,7 @@ in sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."once-1.4.0" sources."optionator-0.9.1" @@ -104833,7 +104780,7 @@ in sources."@textlint/ast-node-types-4.4.1" sources."@textlint/types-1.5.2" sources."boundary-1.0.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."split-lines-2.0.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -104863,7 +104810,7 @@ in sources."@textlint/ast-node-types-4.4.1" sources."@textlint/types-1.5.2" sources."boundary-1.0.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -104890,7 +104837,7 @@ in sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ - sources."array-includes-3.1.2" + sources."array-includes-3.1.3" sources."call-bind-1.0.2" sources."define-properties-1.1.3" sources."es-abstract-1.18.0-next.2" @@ -104981,7 +104928,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -105057,7 +105004,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.8.3" + sources."core-js-3.9.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -105515,7 +105462,7 @@ in }) sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."mime-db-1.46.0" sources."mime-types-2.1.29" @@ -105636,7 +105583,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" (sources."lomstream-1.1.0" // { dependencies = [ sources."assert-plus-0.1.5" @@ -105951,7 +105898,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -106071,7 +106018,7 @@ in sources."kuler-2.0.0" sources."latest-version-5.1.0" sources."locks-0.2.2" - sources."lodash-4.17.20" + sources."lodash-4.17.21" (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.3" @@ -107006,7 +106953,7 @@ in sources."loader-runner-2.4.0" sources."loader-utils-1.4.0" sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-3.0.0" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -107108,7 +107055,7 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.1" + sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-0.1.1" @@ -107580,7 +107527,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."log-symbols-2.2.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -107742,7 +107689,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -108146,7 +108093,7 @@ in sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.iteratee-4.7.0" @@ -108688,7 +108635,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" @@ -109144,7 +109091,7 @@ in sources."lighthouse-logger-1.2.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -109245,7 +109192,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" @@ -109586,17 +109533,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.22.0"; + version = "5.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.22.0.tgz"; - sha512 = "xqlb6r9RUXda/d9iA6P7YRTP1ChWeP50TEESKMMNIg0u8/Rb66zN9YJJO7oYgJTRyFyYi43NVC5feG45FSO1vQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.23.0.tgz"; + sha512 = "RC6dwDuRxiU75F8XC4H08NtzUrMfufw5LDnO8dTtaKU2+fszEdySCgZhNwSBBn516iNaJbQI7T7OPHIgCwcJmg=="; }; dependencies = [ sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -109619,11 +109566,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.3" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001187" + sources."caniuse-lite-1.0.30001190" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.667" + sources."electron-to-chromium-1.3.671" sources."enhanced-resolve-5.7.0" sources."es-module-lexer-0.3.26" sources."escalade-3.1.1" @@ -109764,7 +109711,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -110035,7 +109982,7 @@ in sources."killable-1.0.1" sources."kind-of-6.0.3" sources."locate-path-3.0.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."loglevel-1.7.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -110076,7 +110023,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-is-1.1.4" + sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" @@ -110418,7 +110365,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.42" + sources."@types/node-13.13.45" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -110845,13 +110792,13 @@ in sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.12.13" - sources."@babel/runtime-7.12.17" + sources."@babel/runtime-7.12.18" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.28" + sources."@types/node-14.14.31" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -110944,14 +110891,7 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" - (sources."cli-table-0.3.4" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."cli-table-0.3.5" sources."cli-width-2.2.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -110964,6 +110904,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."commondir-1.0.1" sources."component-emitter-1.3.0" @@ -110973,7 +110914,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.8.3" + sources."core-js-3.9.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -111241,7 +111182,7 @@ in }) sources."locate-path-2.0.0" sources."locutus-2.0.14" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" @@ -111392,7 +111333,7 @@ in sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."pretty-bytes-5.5.0" + sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index b493dbd5a0..8ef1c3627f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -1,23 +1,26 @@ { stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum -, fpath, ke, logs, lwt, ocamlgraph, uri, rresult +, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64 , result, bigstringaf, optint, mirage-flow, domain-name, emile , mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt }: buildDunePackage rec { pname = "git"; - version = "3.2.0"; + version = "3.3.0"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "14rq7h1n5v2n0507ycbac8sq21xnzhgirxmlmqv4j5k3aajdcj16"; + sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0"; }; + buildInputs = [ + base64 + ]; propagatedBuildInputs = [ angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow @@ -31,7 +34,7 @@ buildDunePackage rec { meta = { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ sternenseemann vbgl ]; homepage = "https://github.com/mirage/ocaml-git"; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix index 37be4c68ad..58ac0204b4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -6,6 +6,7 @@ , tcpip, awa-mirage, mirage-flow , alcotest, alcotest-lwt, base64, cstruct , ke, mirage-crypto-rng, ocurl, git-binary +, ptime }: buildDunePackage { @@ -14,6 +15,14 @@ buildDunePackage { useDune2 = true; + patches = [ + # https://github.com/mirage/ocaml-git/pull/472 + (fetchpatch { + url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch"; + sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my"; + }) + ]; + buildInputs = [ awa awa-mirage cmdliner git-cohttp-unix mirage-clock mirage-clock-unix tcpip @@ -26,17 +35,10 @@ buildDunePackage { ]; checkInputs = [ alcotest alcotest-lwt base64 cstruct ke - mirage-crypto-rng ocurl git-binary + mirage-crypto-rng ocurl git-binary ptime ]; doCheck = true; - patches = [ - (fetchpatch { - url = "https://github.com/mirage/ocaml-git/commit/09b41073fa869c0a595e1d8ed7224d539682af1c.patch"; - sha256 = "1avbxv60gbrll9gny1pl6jwbx5b8282h3frhzy2ghb0fx1pggp6w"; - }) - ]; - meta = { description = "Unix backend for the Git protocol(s)"; inherit (git.meta) homepage license maintainers; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix index 166c4c6b85..fe13377b3c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage -, astring, base64, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri +, astring, digestif, fmt, jsonm, logs, ocaml_lwt, ocamlgraph, uri , repr, ppx_irmin, bheap }: @@ -13,7 +13,6 @@ buildDunePackage { propagatedBuildInputs = [ astring - base64 digestif fmt jsonm diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index 6e4598dd98..ca205cac4e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -1,4 +1,6 @@ -{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin }: +{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin +, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix +}: buildDunePackage rec { @@ -10,8 +12,14 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp-lwt graphql-cohttp graphql-lwt irmin ]; - # test requires network - doCheck = false; + doCheck = true; + checkInputs = [ + alcotest + alcotest-lwt + logs + cohttp-lwt-unix + yojson + ]; meta = irmin.meta // { description = "GraphQL server for Irmin"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/layers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/layers.nix index 9e6b237f1e..40410b004a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/layers.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/layers.nix @@ -12,9 +12,6 @@ buildDunePackage { lwt ]; - # mutual dependency on irmin-test - doCheck = false; - meta = irmin.meta // { description = "Combine different Irmin stores into a single, layered store"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index 91fd115518..1d605763ab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ppx_irmin"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; - sha256 = "1b6lav5br1b83cwdc3gj9mqkzhlbfjrbyjx0107zvj54m82dbrxb"; + sha256 = "131pcgmpys6danprcbxzf4pdsl0ka74bpmmxz8db4507cvxhsz3n"; }; minimumOCamlVersion = "4.08"; @@ -18,13 +18,10 @@ buildDunePackage rec { ppxlib ]; - # tests depend on irmin, would create mutual dependency - doCheck = false; - meta = { homepage = "https://irmin.org/"; description = "PPX deriver for Irmin generics"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ vbgl sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix index 03de70237a..e1b3503b54 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.16"; + version = "0.17"; useDune2 = true; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = version; - sha256 = "1s5dpqj8zvd3wr2w3fp4wb6yc57snjpxzzfv9fb6l9qgigswwjdr"; + sha256 = "0qfyqhfg98spmfci9z6f527a16gwjnx2lrbbgw67p37ys5acrfar"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix index c849ffee47..52d97e1299 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix @@ -21,14 +21,18 @@ buildDunePackage rec { }) ]; - # disable remaining broken tests, see - # https://github.com/andrenth/ocaml-stdint/issues/59 + # 1. disable remaining broken tests, see + # https://github.com/andrenth/ocaml-stdint/issues/59 + # 2. fix tests to liberal test range + # https://github.com/andrenth/ocaml-stdint/pull/61 postPatch = '' substituteInPlace tests/stdint_test.ml \ --replace 'test "An integer should perform left-shifts correctly"' \ 'skip "An integer should perform left-shifts correctly"' \ --replace 'test "Logical shifts must not sign-extend"' \ - 'skip "Logical shifts must not sign-extend"' + 'skip "Logical shifts must not sign-extend"' \ + --replace 'let pos_int = QCheck.map_same_type abs in_range' \ + 'let pos_int = QCheck.int_range 0 maxi' ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 559b55fae3..8fc15a7b0b 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.76"; + version = "0.12.78"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-UYQvzWAnbaD77yDXVTui+fQEwOfOFXKLf5Bt/81mQI4="; + sha256 = "sha256-YPCh6HAVuFf2rJhUj/uzfqkWKN+Jd2iPfugSiTh65zc="; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix index 3304b96a8d..a7b2de240e 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psalm"; - version = "4.5.0"; + version = "4.6.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "sha256-FVgUxeV+N5Hqn5KQmI+KuQnKmvNScz9A+g02WNMxgmA="; + sha256 = "sha256-YFeTSIfZ2u1KmpoKV5I7pMMvCk3u5ILktsunvoDnBsg="; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix new file mode 100644 index 0000000000..54979dbd7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocache/default.nix @@ -0,0 +1,34 @@ +{ lib +, aioredis +, buildPythonPackage +, fetchFromGitHub +, msgpack +}: + +buildPythonPackage rec { + pname = "aiocache"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "aio-libs"; + repo = pname; + rev = version; + sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx"; + }; + + propagatedBuildInputs = [ + aioredis + msgpack + ]; + + # aiomcache would be required but last release was in 2017 + doCheck = false; + pythonImportsCheck = [ "aiocache" ]; + + meta = with lib; { + description = "Python API Rate Limit Decorator"; + homepage = "https://github.com/tomasbasham/ratelimit"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix index dbd29f3d11..a6081858af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aqualogic"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "swilson"; repo = pname; rev = version; - sha256 = "0101lni458y88yrw1wri3pz2cn5jlxln03pa3q2pxaybcyklb9qk"; + sha256 = "sha256-yxd+A5dsB9gBwVlPNjz+IgDHKTktNky84bWZMhA/xa4="; }; propagatedBuildInputs = [ pyserial ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix index 14c800f568..2360d170f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "1zkmjvq47zw2fsbnzhr5mh9rsazx0z1f8m528ash25jrxsza5crm"; + sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o="; }; # OSError: AF_UNIX path too long diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix index e4a6a5f562..29d676ad62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -1,7 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, beautifulsoup4, bottle, chardet, dateutil -, google_api_python_client, lxml, oauth2client -, ply, python_magic, pytest, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, beautifulsoup4 +, bottle +, chardet +, dateutil +, google_api_python_client +, lxml +, oauth2client +, ply +, pytest +, python_magic +, requests +}: buildPythonPackage rec { version = "2.3.3"; @@ -29,7 +41,7 @@ buildPythonPackage rec { python_magic requests # pytest really is a runtime dependency - # https://bitbucket.org/blais/beancount/commits/554e13057551951e113835196770847c788dd592 + # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 pytest ]; @@ -41,8 +53,7 @@ buildPythonPackage rec { financial transaction records in a text file, read them in memory, generate a variety of reports from them, and provides a web interface. ''; - license = licenses.gpl2; - maintainers = with maintainers; [ ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ bhipple ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 1d3e0cca67..cfc222d2d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - pname = "boto3"; + pname = "boto3"; version = "1.17.5"; # N.B: if you change this, change botocore too src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index 29de26ac49..be51e87c95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.26.1"; + version = "4.27.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f59ecadebbb76e3b4710e8c9d2f8f98d51e54701930a38ddf732930653dcf6b5"; + sha256 = "5b21f86d0cc99d3168f0d9730e07c1438057083ccc9a9c54de322e59e1f4e740"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix index d2f040609d..f55a2fe750 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { preBuild = '' export HOME=$(mktemp -d) + export GO111MODULE=off ''; # tests requires cluster for testing diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix index 69b5d2f97f..05a73c3167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage, lib, fetchPypi, isPy27 , aiohttp , maxminddb -, mock , mocket , requests , requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix index 51ce0ef050..483539bc22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix @@ -1,5 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pytest, pytest-benchmark, pytest-mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-benchmark +, pytest-mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "getmac"; @@ -7,19 +12,32 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GhostofGoes"; - repo = "getmac"; + repo = pname; rev = version; sha256 = "08d4iv5bjl1s4i9qhzf3pzjgj1rgbwi0x26qypf3ycgdj0a6gvh2"; }; - checkInputs = [ pytest pytest-benchmark pytest-mock ]; - checkPhase = '' - pytest --ignore tests/test_cli.py - ''; + checkInputs = [ + pytestCheckHook + pytest-benchmark + pytest-mock + ]; + + disabledTests = [ + # Disable CLI tests + "test_cli_main_basic" + "test_cli_main_verbose" + "test_cli_main_debug" + "test_cli_multiple_debug_levels" + # Disable test that require network access + "test_uuid_lanscan_iface" + ]; + + pythonImportsCheck = [ "getmac" ]; meta = with lib; { + description = "Python package to get the MAC address of network interfaces and hosts on the local network"; homepage = "https://github.com/GhostofGoes/getmac"; - description = "Pure-Python package to get the MAC address of network interfaces and hosts on the local network."; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index a266426517..644c7ef918 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "c4c43f7f440d6e5bb2895d21122af5de65b487ea2c69cea466a516bb826ab921"; + sha256 = "33fcbdf5567bdb7657fb3485f061e7f1b45361f65fdafc168ab9172117fd9a5a"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 1cf94d220e..4a14080e5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "04f9mx1wxy3l9dvzvvr579fnjp1fdqhgplv5y2gl7h2mvn281k8d"; + sha256 = "69e10c999c64996822aa2ca138cffcdf0f1e04bdbdb7206c286fa17fb800703a"; }; propagatedBuildInputs = [ google-api-core grpc_google_iam_v1 libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index f3b8393a27..110c28ee2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -2,13 +2,15 @@ buildPythonPackage rec { pname = "identify"; - version = "1.5.13"; + version = "1.5.14"; src = fetchPypi { inherit pname version; - sha256 = "70b638cf4743f33042bebb3b51e25261a0a10e80f978739f17e7fd4837664a66"; + sha256 = "de7129142a5c86d75a52b96f394d94d96d497881d2aaf8eafe320cdbe8ac4bcc"; }; + pythonImportsCheck = [ "identify" ]; + # Tests not included in PyPI tarball doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix deleted file mode 100644 index d00ccd06c8..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/jabberbot/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi, xmpppy }: - -buildPythonPackage rec { - pname = "jabberbot"; - version = "0.16"; - - disabled = isPy3k; - src = fetchPypi { - inherit pname version; - sha256 = "1qr7c5p9a0nzsvri1djnd5r3d7ilh2mdxvviqn1s2hcc70rha65d"; - }; - - propagatedBuildInputs = [ xmpppy ]; - - doCheck = false; # lol, it does not even specify dependencies properly - - meta = with lib; { - description = "A framework for writing Jabber/XMPP bots and services"; - homepage = "http://thp.io/2007/python-jabberbot/"; - license = licenses.gpl3; - maintainers = with maintainers; [ mic92 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix new file mode 100644 index 0000000000..e475c3117d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix @@ -0,0 +1,24 @@ +{ lib, isPy27, buildPythonPackage, fetchPypi, pytestCheckHook, mock }: + +let + pythonEnv = lib.optional isPy27 mock; +in buildPythonPackage rec { + pname = "json-rpc"; + version = "1.13.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "12bmblnznk174hqg2irggx4hd3cq1nczbwkpsqqzr13hbg7xpw6y"; + }; + + checkInputs = pythonEnv ++ [ pytestCheckHook ]; + + nativeBuildInputs = pythonEnv; + + meta = with lib; { + description = "JSON-RPC 1/2 transport implementation"; + homepage = "https://github.com/pavlov99/json-rpc"; + license = licenses.mit; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix index 5a70dcb467..8b9823b6f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keep/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "keep"; - version = "2.10"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "ce71d14110df197ab5afdbd26a14c0bd266b79671118ae1351835fa192e61d9b"; + sha256 = "3abbe445347711cecd9cbb80dab4a0777418972fc14a14e9387d0d2ae4b6adb7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix index 6c5112312b..e39e313baa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix @@ -10,6 +10,7 @@ , six , testresources , wadllib +, pytestCheckHook }: buildPythonPackage rec { @@ -32,6 +33,8 @@ buildPythonPackage rec { wadllib ]; + checkInputs = [ pytestCheckHook ]; + preCheck = '' export HOME=$TMPDIR ''; @@ -41,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Script Launchpad through its web services interfaces. Officially supported"; homepage = "https://help.launchpad.net/API/launchpadlib"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ maintainers.marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix index 93956c51b2..cb78dfff1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -8,6 +8,10 @@ , setuptools , six , wadllib +, fixtures +, lazr-uri +, pytestCheckHook +, wsgi-intercept }: buildPythonPackage rec { @@ -23,7 +27,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; - doCheck = false; # requires to package lazr.restful, lazr.authentication, and wsgi_intercept + # E ModuleNotFoundError: No module named 'lazr.uri' + doCheck = false; + checkInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ]; pythonImportsCheck = [ "lazr.restfulclient" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix new file mode 100644 index 0000000000..f8ddac600a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -0,0 +1,49 @@ +{ lib +, asyncio-dgram +, buildPythonPackage +, click +, dnspython +, fetchFromGitHub +, mock +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "mcstatus"; + version = "5.1.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Dinnerbone"; + repo = pname; + rev = "release-${version}"; + sha256 = "1a3qrl6w76ayqkl1knaz5ai0brrzpjfdk33lyb1n1p7gnc73nhlr"; + }; + + propagatedBuildInputs = [ + asyncio-dgram + click + dnspython + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt --replace "dnspython3" "dnspython" + ''; + + pythonImportsCheck = [ "mcstatus" ]; + + meta = with lib; { + description = "Python library for checking the status of Minecraft servers"; + homepage = "https://github.com/Dinnerbone/mcstatus"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index aa08ead2d9..3f67c044de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -4,12 +4,9 @@ , fetchPypi , python , buildPythonPackage -, isPy27 -, isPy3k , numpy , llvmlite -, funcsigs -, singledispatch +, setuptools , libcxx }: @@ -26,9 +23,8 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite] - ++ lib.optionals isPy27 [ funcsigs singledispatch]; - + propagatedBuildInputs = [ numpy llvmlite setuptools ]; + pythonImportsCheck = [ "numba" ]; # Copy test script into $out and run the test suite. checkPhase = '' ${python.interpreter} -m numba.runtests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index cb43084556..2176b5f949 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.13.0"; + version = "2.15.1"; src = fetchPypi { inherit pname version; - sha256 = "648386e6cdad3218adc4e3e6a349bee41c55a61980dace616c05d6a31e8c652d"; + sha256 = "f57fdb3c0e420f729dbe54ec3add9bdbbd19b62183aa8f4576e00e5834b2ef52"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf3-to-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf3-to-dict/default.nix new file mode 100644 index 0000000000..ffc21c1428 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf3-to-dict/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, protobuf, six }: + +buildPythonPackage rec { + pname = "protobuf3-to-dict"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nibblvj3n20zvq6d73zalbjqjby0w8ji5mim7inhn7vb9dw4hhy"; + }; + + doCheck = false; + + pythonImportsCheck = [ "protobuf_to_dict" ]; + + propagatedBuildInputs = [ protobuf six ]; + + meta = with lib; { + description = "A teeny Python library for creating Python dicts from protocol buffers and the reverse"; + homepage = "https://github.com/kaporzhu/protobuf-to-dict"; + license = licenses.publicDomain; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix new file mode 100644 index 0000000000..59a9339c26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyalmond"; + version = "0.0.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "stanford-oval"; + repo = pname; + rev = "v${version}"; + sha256 = "0d1w83lr7k2wxcs846iz4mjyqn1ximnw6155kgl515v10fqyrhgk"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Tests require a running Almond instance + doCheck = false; + pythonImportsCheck = [ "pyalmond" ]; + + meta = with lib; { + description = "Python client for the Almond API"; + homepage = "https://github.com/stanford-oval/pyalmond"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix new file mode 100644 index 0000000000..0c5e290334 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychannels/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "pychannels"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "fancybits"; + repo = pname; + rev = version; + sha256 = "0dqc0vhf6c5r3g7nfbpa668x6z2zxrznk6h907s6sxkq4sbqnhqf"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has not published tests yet + doCheck = false; + pythonImportsCheck = [ "pychannels" ]; + + meta = with lib; { + description = "Python library for interacting with the Channels app"; + homepage = "https://github.com/fancybits/pychannels"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 9eefaa5f36..742ea3d08c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "8.0.0"; + version = "8.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0dlxgh57j25cvk2pqr2dj4lv6yn0pix2rcl2kzqsg2405rdjks91"; + sha256 = "sha256-3wKV9lPO51LeOM+O8J8TrZeCxTkk37qhkcpivV4dzhQ="; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix new file mode 100644 index 0000000000..a1d36670a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pyjwt +, ratelimit +, pytz +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "pyflume"; + version = "0.6.2"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ChrisMandich"; + repo = "PyFlume"; + rev = "v${version}"; + sha256 = "0i181c8722j831bjlcjwv5ccy20hl8zzlv7bfp8w0976gdmv4iz8"; + }; + + propagatedBuildInputs = [ + pyjwt + ratelimit + pytz + requests + ]; + + checkInputs = [ + requests-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyflume" ]; + + meta = with lib; { + description = "Python module to work with Flume sensors"; + homepage = "https://github.com/ChrisMandich/PyFlume"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix new file mode 100644 index 0000000000..9b77cc61de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix @@ -0,0 +1,56 @@ +{ lib +, aiohttp +, aresponses +, aiocache +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, msgpack +, ujson +}: + +buildPythonPackage rec { + pname = "pyflunearyou"; + version = "2.0.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "18vxwfyvicbx8idpa0h0alp4ygnwfph6g4kq93hfm0fc94gi6h94"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiohttp + aiocache + msgpack + ujson + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytest-aiohttp + pytestCheckHook + ]; + + # Ignore the examples directory as the files are prefixed with test_. + # disabledTestFiles doesn't seem to work here + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyflunearyou" ]; + + meta = with lib; { + description = "Python library for retrieving UV-related information from Flu Near You"; + homepage = "https://github.com/bachya/pyflunearyou"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix new file mode 100644 index 0000000000..ffaabb04a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymitv/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pymitv"; + version = "1.4.3"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jbs1zhqpnsyad3pd8cqy1byv8m5bq17ydc6crmrfkjbp6xvvg3x"; + }; + + propagatedBuildInputs = [ requests ]; + + # Projec thas no tests + doCheck = false; + pythonImportsCheck = [ "pymitv" ]; + + meta = with lib; { + description = "Python client the Mi Tv 3"; + homepage = "https://github.com/simse/pymitv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix new file mode 100644 index 0000000000..bbfeec3a36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, click +, crcmod +, fetchFromGitHub +, getmac +, intelhex +, paho-mqtt +, pyserial +, pyserial-asyncio +, pytest-sugar +, pytest-timeout +, pytestCheckHook +, pythonOlder +, voluptuous +}: + +buildPythonPackage rec { + pname = "pymysensors"; + version = "0.20.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "theolind"; + repo = pname; + rev = version; + sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy"; + }; + + propagatedBuildInputs = [ + click + crcmod + getmac + intelhex + paho-mqtt + pyserial + pyserial-asyncio + voluptuous + ]; + + checkInputs = [ + pytest-sugar + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ "mysensors" ]; + + meta = with lib; { + description = "Python API for talking to a MySensors gateway"; + homepage = "https://github.com/theolind/pymysensors"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix index 08c90d8289..fbf6769ab4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix @@ -1,34 +1,50 @@ -{ lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }: +{ lib +, buildPythonPackage +, dpkt +, fetchFromGitHub +, fetchpatch +, libpcap +, pytestCheckHook +}: buildPythonPackage rec { pname = "pypcap"; version = "1.2.3"; - src = fetchPypi { - inherit pname version; - sha256 = "1w5i79gh7cswvznr8rhilcmzhnh2y5c4jwh2qrfnpx05zqigm1xd"; + + src = fetchFromGitHub { + owner = "pynetwork"; + repo = pname; + rev = "v${version}"; + sha256 = "1zscfk10jpqwxgc8d84y8bffiwr92qrg2b24afhjwiyr352l67cf"; }; patches = [ - # The default setup.py searchs for pcap.h in a static list of default - # folders. So we have to add the path to libpcap in the nix-store. - (writeText "libpcap-path.patch" - '' - --- a/setup.py - +++ b/setup.py - @@ -28,6 +28,7 @@ def recursive_search(path, target_files): - - def find_prefix_and_pcap_h(): - prefixes = chain.from_iterable(( - + '${libpcap}', - ('/usr', sys.prefix), - glob.glob('/opt/libpcap*'), - glob.glob('../libpcap*'), - '') + # Support for Python 3.9, https://github.com/pynetwork/pypcap/pull/102 + (fetchpatch { + name = "support-python-3.9.patch"; + url = "https://github.com/pynetwork/pypcap/pull/102/commits/e22f5d25f0d581d19ef337493434e72cd3a6ae71.patch"; + sha256 = "0n1syh1vcplgsf6njincpqphd2w030s3b2jyg86d7kbqv1w5wk0l"; + }) ]; + postPatch = '' + # Add the path to libpcap in the nix-store + substituteInPlace setup.py --replace "('/usr', sys.prefix)" "'${libpcap}'" + # Remove coverage from test run + sed -i "/--cov/d" setup.cfg + ''; + buildInputs = [ libpcap ]; - checkInputs = [ dpkt ]; + + checkInputs = [ + dpkt + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests" ]; + + pythonImportsCheck = [ "pcap" ]; meta = with lib; { homepage = "https://github.com/pynetwork/pypcap"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix index bea1438f67..93aa6606c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmbc/default.nix @@ -1,23 +1,31 @@ -{ lib, buildPythonPackage, fetchPypi -, samba, pkg-config -, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, samba +, pkg-config +}: buildPythonPackage rec { - version = "1.0.21"; pname = "pysmbc"; + version = "1.0.23"; src = fetchPypi { inherit pname version; - extension = "tar.bz2"; - sha256 = "14b75f358ical7zzqh3g1qkh2dxwxn2gz7sah5f5svndqkd3z8jy"; + sha256 = "1y0n1n6jkzf4mr5lqfc73l2m0qp56gvxwfjnx2vj8c0hh5i1gnq8"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ setuptools samba ]; + + buildInputs = [ samba ]; + + # Tests would require a local SMB server + doCheck = false; + pythonImportsCheck = [ "smbc" ]; meta = with lib; { description = "libsmbclient binding for Python"; homepage = "https://github.com/hamano/pysmbc"; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix new file mode 100644 index 0000000000..30f6ab9a0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "python-twitch-client"; + version = "0.7.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "tsifrer"; + repo = pname; + rev = version; + sha256 = "10wwkam3dw0nqr3v9xzigx1zjlrnrhzr7jvihddvzi84vjb6j443"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ "twitch" ]; + + meta = with lib; { + description = "Python wrapper for the Twitch API"; + homepage = "https://github.com/tsifrer/python-twitch-client"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix new file mode 100644 index 0000000000..a02edfdc1f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-velbus/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyserial +}: + +buildPythonPackage rec { + pname = "python-velbus"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "thomasdelaet"; + repo = pname; + rev = "v${version}"; + sha256 = "0dv7dsjp5li87ispdphaz7jd0a9xc328rxwawf2f58b1ii904xr4"; + }; + + propagatedBuildInputs = [ pyserial ]; + + # Project has not tests + doCheck = false; + pythonImportsCheck = [ "velbus" ]; + + meta = with lib; { + description = "Python library to control the Velbus home automation system"; + homepage = "https://github.com/thomasdelaet/python-velbus"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix new file mode 100644 index 0000000000..da3ac35c46 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyvolumio"; + version = "0.1.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "OnFreund"; + repo = "PyVolumio"; + rev = "v${version}"; + sha256 = "0x2dzmd9lwnak2iy6v54y24qjq37y3nlfhsvx7hddgv8jj1klvap"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pyvolumio" ]; + + meta = with lib; { + description = "Python module to control Volumio"; + homepage = "https://github.com/OnFreund/PyVolumio"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix new file mode 100644 index 0000000000..1d3a83177e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cryptography +}: + +buildPythonPackage rec { + pname = "pyxiaomigateway"; + version = "0.13.4"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "PyXiaomiGateway"; + rev = version; + sha256 = "1xg89sdds04wgil88ihs84cjr3df6lajjbkyb1aymj638ibdyqns"; + }; + + propagatedBuildInputs = [ cryptography ]; + + # Tests are not mocking the gateway completely + doCheck = false; + pythonImportsCheck = [ "xiaomi_gateway" ]; + + meta = with lib; { + description = "Python library to communicate with the Xiaomi Gateway"; + homepage = "https://github.com/Danielhiversen/PyXiaomiGateway/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix new file mode 100644 index 0000000000..f706d043bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ratelimit"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "tomasbasham"; + repo = pname; + rev = "v${version}"; + sha256 = "04hy3hhh5xdqcsz0lx8j18zbj88kh5ik4wyi5d3a5sfy2hx70in2"; + }; + + postPatch = '' + sed -i "/--cov/d" pytest.ini + ''; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "tests" ]; + + pythonImportsCheck = [ "ratelimit" ]; + + meta = with lib; { + description = "Python API Rate Limit Decorator"; + homepage = "https://github.com/tomasbasham/ratelimit"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix new file mode 100644 index 0000000000..6b73642aea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, boto3 +, google-pasta +, importlib-metadata +, numpy +, protobuf +, protobuf3-to-dict +, smdebug-rulesconfig +}: + +buildPythonPackage rec { + pname = "sagemaker"; + version = "2.25.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-xQ1nt8FcjuoilzM5PbU8KHgirPyj9us+ykyjfgEqZhg="; + }; + + doCheck = false; + + pythonImportsCheck = [ "sagemaker" ]; + + propagatedBuildInputs = [ + attrs + boto3 + google-pasta + importlib-metadata + numpy + protobuf + protobuf3-to-dict + smdebug-rulesconfig + ]; + + meta = with lib; { + description = "Library for training and deploying machine learning models on Amazon SageMaker"; + homepage = "https://github.com/aws/sagemaker-python-sdk/"; + license = licenses.asl20; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix index b5dd0be544..b5875818b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, substituteAll, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, substituteAll, pythonOlder , geos, pytest, cython , numpy }: @@ -31,7 +31,12 @@ buildPythonPackage rec { libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) - ]; + # included in next release. + (fetchpatch { + url = "https://github.com/Toblerity/Shapely/commit/ea5b05a0c87235d3d8f09930ad47c396a76c8b0c.patch"; + sha256 = "sha256-egdydlV+tpXosSQwQFHaXaeBhXEHAs+mn7vLUDpvybA="; + }) + ]; # Disable the tests that improperly try to use the built extensions checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smdebug-rulesconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smdebug-rulesconfig/default.nix new file mode 100644 index 0000000000..864a395cc8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/smdebug-rulesconfig/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "smdebug-rulesconfig"; + version = "1.0.1"; + + src = fetchPypi { + inherit version; + pname = "smdebug_rulesconfig"; + sha256 = "1mpwjfvpmryqqwlbyf500584jclgm3vnxa740yyfzkvb5vmyc6bs"; + }; + + doCheck = false; + + pythonImportsCheck = [ "smdebug_rulesconfig" ]; + + meta = with lib; { + description = "These builtin rules are available in Amazon SageMaker"; + homepage = "https://github.com/awslabs/sagemaker-debugger-rulesconfig"; + license = licenses.asl20; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix index 7b54993358..c541751bd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -6,7 +6,6 @@ , pyenchant , pygeoip , pytestCheckHook -, python , pytz , sqlalchemy , xmltodict diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swspotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swspotify/default.nix index e213e9e265..020e4fe147 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swspotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swspotify/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Library to get the currently playing song and artist from Spotify"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix new file mode 100644 index 0000000000..4402182231 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tahoma-api/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tahoma-api"; + version = "0.0.17"; + + src = fetchFromGitHub { + owner = "philklei"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YwOKSBlN4lNyS+hfdbQDUq1gc14FBof463ofxtUVLC4="; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tahoma_api" ]; + + meta = with lib; { + description = "Python module to interface with Tahoma REST API"; + homepage = "https://github.com/philklei/tahoma-api/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 46c8a2853b..59af2b33d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, pytest-asyncio , pytestCheckHook , wrapt }: @@ -35,15 +36,11 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ pytestCheckHook ]; - - # Not all Home Assistant related check pass - # https://github.com/zabuldon/teslajsonpy/issues/121 - # https://github.com/zabuldon/teslajsonpy/pull/124 - disabledTests = [ - "test_values_on_init" - "test_get_value_on_init" + checkInputs = [ + pytest-asyncio + pytestCheckHook ]; + pythonImportsCheck = [ "teslajsonpy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix new file mode 100644 index 0000000000..a53124783d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tuyaha/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "tuyaha"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "PaulAnnekov"; + repo = pname; + rev = version; + sha256 = "0n08mqrz76zv1cyqky6ibs6im1fqcywkiyvfmfabml0vzvr43awf"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "tuyaha" ]; + + meta = with lib; { + description = "Python module with the Tuya API"; + homepage = "https://github.com/PaulAnnekov/tuyaha"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wiffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wiffi/default.nix new file mode 100644 index 0000000000..a3da3f2f02 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wiffi/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "wiffi"; + version = "1.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mampfes"; + repo = "python-wiffi"; + rev = version; + sha256 = "1bsx8dcmbkajh7hdgxg6wdnyxz4bfnd45piiy3yzyvszfdyvxw0f"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "wiffi" ]; + + meta = with lib; { + description = "Python module to interface with STALL WIFFI devices"; + homepage = "https://github.com/mampfes/python-wiffi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix new file mode 100644 index 0000000000..7303a27f5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, six, httplib2, py, pytestCheckHook, requests, urllib3 }: + +buildPythonPackage rec { + pname = "wsgi-intercept"; + version = "1.9.2"; + + src = fetchPypi { + pname = "wsgi_intercept"; + inherit version; + sha256 = "1b6251d03jnhqywr54bzj9fnc3qzp2kvz22asxpd27jy984qx21n"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ httplib2 py pytestCheckHook requests urllib3 ]; + + disabledTests = [ + "test_http_not_intercepted" + "test_https_not_intercepted" + "test_https_no_ssl_verification_not_intercepted" + ]; + + pythonImportsCheck = [ "wsgi_intercept" ]; + + meta = with lib; { + description = "wsgi_intercept installs a WSGI application in place of a real URI for testing"; + homepage = "https://github.com/cdent/wsgi-intercept"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 221076fae8..841348339a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.3"; + version = "0.17.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8="; + sha256 = "sha256-fzLqkeCfeLNu13R9cp1XVh8fE2B3L47UDpuWOod33gU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix deleted file mode 100644 index 65e2b3711f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmpppy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchurl, isPy3k }: -buildPythonPackage rec { - pname = "xmpp.py"; - version = "0.5.0rc1"; - - patches = [ ./ssl.patch ]; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz"; - sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si"; - }; - - preInstall = '' - mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) - export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) - ''; - - disabled = isPy3k; - - meta = with lib; { - description = "XMPP python library"; - homepage = "http://xmpppy.sourceforge.net/"; - license = licenses.gpl3; - maintainers = [ maintainers.mic92 ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch b/third_party/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch deleted file mode 100644 index 915602dc23..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmpppy/ssl.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -wbBur xmpppy-0.5.0rc1/xmpp/transports.py xmpppy-0.5.0rc1.q/xmpp/transports.py ---- xmpppy-0.5.0rc1/xmpp/transports.py 2009-04-07 12:34:09.000000000 +0400 -+++ xmpppy-0.5.0rc1.q/xmpp/transports.py 2015-05-08 13:06:03.049252065 +0300 -@@ -27,7 +27,7 @@ - Also exception 'error' is defined to allow capture of this module specific exceptions. - """ - --import socket,select,base64,dispatcher,sys -+import socket,ssl,select,base64,dispatcher,sys - from simplexml import ustr - from client import PlugIn - from protocol import * -@@ -312,9 +312,9 @@ - """ Immidiatedly switch socket to TLS mode. Used internally.""" - """ Here we should switch pending_data to hint mode.""" - tcpsock=self._owner.Connection -- tcpsock._sslObj = socket.ssl(tcpsock._sock, None, None) -- tcpsock._sslIssuer = tcpsock._sslObj.issuer() -- tcpsock._sslServer = tcpsock._sslObj.server() -+ tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, None, None) -+ tcpsock._sslIssuer = tcpsock._sslObj.getpeercert().get('issuer') -+ tcpsock._sslServer = tcpsock._sslObj.getpeercert().get('server') - tcpsock._recv = tcpsock._sslObj.read - tcpsock._send = tcpsock._sslObj.write - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix new file mode 100644 index 0000000000..a4ca97e27a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "yalesmartalarmclient"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "domwillcode"; + repo = "yale-smart-alarm-client"; + rev = "v${version}"; + sha256 = "0fscp9n66h8a8khvjs2rjgm95xsdckpknadnyxqdmhw3hlj0aw6h"; + }; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "yalesmartalarmclient" ]; + + meta = with lib; { + description = "Python module to interface with Yale Smart Alarm Systems"; + homepage = "https://github.com/mampfes/python-wiffi"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index efc6523cd9..06bf2c5467 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript -, common-updater-scripts, cacert, git, nixfmt, nix, jq, coreutils, gnused -, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, which +, curl +, makeWrapper +, jdk +, writeScript +, common-updater-scripts +, cacert +, git +, nixfmt +, nix +, jq +, coreutils +, gnused +}: stdenv.mkDerivation rec { pname = "sbt-extras"; @@ -28,41 +42,40 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/sbt --prefix PATH : ${lib.makeBinPath [ which curl ]} ''; - passthru = { - tests = { inherit (nixosTests) sbt-extras; }; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/sbt -h >/dev/null + ''; - updateScript = writeScript "update.sh" '' - #!${stdenv.shell} - set -xo errexit - PATH=${ - lib.makeBinPath [ - common-updater-scripts - curl - cacert - git - nixfmt - nix - jq - coreutils - gnused - ] - } - - oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" - latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" - - if [ ! "null" = "$latestSha" ]; then - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" - latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version ${pname} "$latestSha" --version-key=rev - update-source-version ${pname} "$latestDate" --ignore-same-hash - nixfmt "$default_nix" - else - echo "${pname} is already up-to-date" - fi - ''; - }; + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -xo errexit + PATH=${ + lib.makeBinPath [ + common-updater-scripts + curl + cacert + git + nixfmt + nix + jq + coreutils + gnused + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestSha="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + if [ ! "null" = "$latestSha" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix" + latestDate="$(curl -L -s https://api.github.com/repos/paulp/sbt-extras/commits/$latestSha | jq '.commit.committer.date' | sed 's|"\(.*\)T.*|\1|g')" + update-source-version ${pname} "$latestSha" --version-key=rev + update-source-version ${pname} "$latestDate" --ignore-same-hash + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; meta = { description = diff --git a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix index c20e2866dc..d78b54b33e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.1"; + version = "0.3.10"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zc2ZlyeWdRvyuJLDDTONfh0/q+HKR4lNtSFMjgJWrRY="; + sha256 = "sha256-oS3ZGQkDSRdVLluLNg56VGp6MCrRDlgjk1va1+xocas="; }; - vendorSha256 = "sha256-4IJKXcnMXBqoEjsV4Xg2QYvKwxDDUjcZtrj9IRuT6i4="; + vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; @@ -25,7 +25,15 @@ buildGoModule rec { preCheck = '' # Remove tests that use networking - rm pkg/scanner/scan_test.go pkg/utils/fetch_test.go + rm pkg/scanner/scan_test.go + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/dockle --help + $out/bin/dockle --version | grep "dockle version ${version}" + runHook postInstallCheck ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 2e973e9a0b..49928b1a08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.36.0"; + version = "1.37.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-AObZI104q+kOvV3/6aAusl5PMro1nbNUasvmJ4mRGz8="; + sha256 = "sha256-x0VLNQeTVN9aPO06Yi1DTb8bTjq+9VemJaX1R+8s/Bg="; }; - vendorSha256 = "sha256-jr8sYfonggAHqtq3A8YVuTqJu3/iIu0OgBEUWj6bq+A="; + vendorSha256 = "sha256-uduT4RL6p6/jdT8JeTx+FY9bz0P2eUSaFNDIzi7jcqg="; doCheck = false; @@ -19,7 +19,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=19700101-00:00:00" ]; + preBuild = '' + buildFlagsArray+=("-ldflags=-s -w -X main.version=${version} -X main.commit=v${version} -X main.date=19700101-00:00:00") + ''; postInstall = '' for shell in bash zsh; do @@ -31,7 +33,7 @@ buildGoModule rec { meta = with lib; { description = "Fast linters Runner for Go"; homepage = "https://golangci-lint.run/"; - license = licenses.gpl3; - maintainers = with maintainers; [ anpryl manveru ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ anpryl manveru mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix index eb0ab96217..ceb8212cf7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/knightos/scas/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "Assembler and linker for the Z80"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/krew/default.nix b/third_party/nixpkgs/pkgs/development/tools/krew/default.nix index f2a4f390f8..f0d0f18651 100644 --- a/third_party/nixpkgs/pkgs/development/tools/krew/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/krew/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krew"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "krew"; rev = "v${version}"; - sha256 = "1fcbpipnbms096c36b2z06ysfwyjj22lm1zd1r5xlv5gp24qimlv"; + sha256 = "sha256-+YwBkXrj5sWlMA01GfBhu12st+es5YygkD16jc+blt8="; }; - vendorSha256 = "1bmsjv5snrabd9h9szkpcl15rwxm54jgm361ghhy234d2s45c3gn"; + vendorSha256 = "sha256-49kWaU5dYqd86DvHi3mh5jYUQVmFlI8zsWtAFseYriE="; subPackages = [ "cmd/krew" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix new file mode 100644 index 0000000000..4c8693b0e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -0,0 +1,34 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kustomize-sops"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "viaduct-ai"; + repo = pname; + rev = "v${version}"; + sha256 = "0sr4d7amwn62xywwn83y58ynl8xv6l1q6zwbky5rmy0qxk909bqp"; + }; + + vendorSha256 = "0vn6vrczbdln7ngz061xixjwn899jn7p2a46770xqx44bh3f2lgv"; + + installPhase = '' + mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ + mv $GOPATH/bin/kustomize-sops $out/lib/viaduct.ai/v1/ksops-exec/ksops-exec + ''; + + # Tests are broken in a nix environment + doCheck = false; + + meta = with lib; { + description = "A Flexible Kustomize Plugin for SOPS Encrypted Resource"; + longDescription = '' + KSOPS can be used to decrypt any Kubernetes resource, but is most commonly + used to decrypt encrypted Kubernetes Secrets and ConfigMaps. + ''; + homepage = "https://github.com/viaduct-ai/kustomize-sops"; + license = licenses.asl20; + maintainers = with maintainers; [ starcraft66 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix index 104988eb21..06004b9f77 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mockgen/default.nix @@ -1,14 +1,14 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "mockgen"; - version = "1.4.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "golang"; repo = "mock"; rev = "v${version}"; - sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a"; + sha256 = "sha256-YSPfe8/Ra72qk12+T78mTppvkag0Hw6O7WNyfhG4h4o="; }; - vendorSha256 = "1md4cg1zzhc276sc7i2v0xvg5pf6gzy0n9ga2g1lx3d572igq1wy"; + vendorSha256 = "sha256-cL4a7iOSeaQiG6YO0im9bXxklCL1oyKhEDmB1BtEmEw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index 77d3902955..cf24a13221 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,5 +1,10 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +let + # ounit is only available for OCaml >= 4.04 + doCheck = lib.versionAtLeast ocaml.version "4.04"; +in + stdenv.mkDerivation { pname = "ocamlmod"; version = "0.0.9"; @@ -9,13 +14,15 @@ stdenv.mkDerivation { sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ]; - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + configurePhase = "ocaml setup.ml -configure --prefix $out" + + lib.optionalString doCheck " --enable-tests"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; - doCheck = true; + inherit doCheck; + checkInputs = [ ounit ]; checkPhase = "ocaml setup.ml -test"; diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index 2cc46d018e..8090fc6ff1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sdTDBEdBl+IM2HB4hIrAijG4dF3OU7+CjPpGWD8HQm8="; + sha256 = "sha256-wGlxi9X8RrAtvevDfufY1t3en6QgHy5XoSh0K/M/ve4="; }; vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30="; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index ba126e57a1..ea7f01ada7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.8.5"; + version = "0.8.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "01czsnhlvs78fpx1kpi75386657jmlrqpsj4474nxmgcs75igncx"; + sha256 = "sha256-LXc4PFJ1FbdF3yotqqOkhhe+MKGZ4sqJgxAvDml9GeA="; }; - cargoSha256 = "1d5vh6cifkvqxmbgc2z9259q8879fjw016z959hfivv38rragqbr"; + cargoSha256 = "sha256-4FFyRhmMpzKmKrvU2bmGHWUnLAbTDU1bPv7RfhQfYeY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix index 3b28af1097..37c905879b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-GYdWKRgdS9gCQRu1C8ht0wC1eBTtIMg585OuAfDn/+4="; + sha256 = "sha256-2YngMRPNiUVqg82Ck/ovcMbZV+STGyowT9zlwBkcKok="; }; - cargoSha256 = "0381wgyb2xnsiick8invrkhcvp905rrfyikgv01w6qn9872z11s0"; + cargoSha256 = "sha256-4HQhBE4kNhOhO48PBiAxtppmaqy7jaV8p/jb/Uv7vJk="; passthru = { updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 4d6603d31d..addcab582f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-02-15"; + rev = "2021-02-22"; version = "unstable-${rev}"; - sha256 = "sha256-4Dgj2RQDe2FoOSXjL7oaHg8WlYX1vnc66LzzbXvTmjM="; - cargoSha256 = "sha256-c6kr2PWSG3Sns6/O1zOVUFdkLWHAXcQ8LMeensCEuSk="; + sha256 = "sha256-QiVSwpTTOqR2WEm0nXyLLavlF2DnY9GY93HtpgHt2uI="; + cargoSha256 = "sha256-934ApOv/PJzkLc/LChckb/ZXKrh4kU556Bo/Zck+q8g="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix index 10f0c6b26a..0ce33f0f23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -41,6 +41,8 @@ rustPlatform.buildRustPackage { runHook postInstallCheck ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "An experimental modular compiler frontend for the Rust language"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix index bfe496e3cb..0fbd3362b4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.20"; + version = "1.0.23"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SKBSsS8WPsr5/42IMueLkfJCrOQIO/ODlhTp+xrmQ/4="; + sha256 = "sha256-oOLNLyQjuLhSfIaiIavuJ1qWWLI0RWp7L9c0m6m5owY="; }; vendorSha256 = "sha256-3KNYG6RBnfFRgIoIyAe7QwAB56ZMF8bHdgt9Ghtod20="; diff --git a/third_party/nixpkgs/pkgs/development/tools/spicy/default.nix b/third_party/nixpkgs/pkgs/development/tools/spicy/default.nix new file mode 100644 index 0000000000..691a105941 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/spicy/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "spicy"; + version = "unstable-2020-02-21"; + + goPackagePath = "github.com/trhodeos/spicy"; + + src = fetchFromGitHub { + owner = "trhodeos"; + repo = "spicy"; + rev = "47409fb73e0b20b323c46cc06a3858d0a252a817"; + sha256 = "022r8klmr21vaz5qd72ndrzj7pyqpfxc3jljz7nzsa50fjf82c3a"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "A Nintendo 64 segment assembler"; + longDescription = '' + An open-source version of the Nintendo64 sdk's mild.exe. Assembles + segments into an n64-compatible rom. + ''; + homepage = "https://github.com/trhodeos/spicy"; + license = licenses.mit; + maintainers = [ maintainers._414owen]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/spicy/deps.nix b/third_party/nixpkgs/pkgs/development/tools/spicy/deps.nix new file mode 100644 index 0000000000..9532b01dec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/spicy/deps.nix @@ -0,0 +1,56 @@ +[ + { + goPackagePath = "github.com/alecthomas/participle"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/participle.git"; + rev = "fed0e8fbb638b11091014aa838748210dc9ff576"; + sha256 = "0yhhm42lis8ak9m6x6aai280xq0652vcq5v17pibbf74dalxyims"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus.git"; + rev = "f104497f2b2129ab888fd274891f3a278756bcde"; + sha256 = "0gr2c7s3ffdaynzn1zplp79zz16qgqpnsq2z9zg79wxksq5mz5l1"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag.git"; + rev = "73e519546fc0bce0c395610afcf6aa4e5aec88eb"; + sha256 = "114zpgl6l47gsz0sifpq62hi2i6k0ra9hi8wx7d39giablf9i4ii"; + }; + } + { + goPackagePath = "github.com/trhodeos/n64rom"; + fetch = { + type = "git"; + url = "https://github.com/trhodeos/n64rom.git"; + rev = "504dba7b4d4675bd3396c052d64016c5725c2f5e"; + sha256 = "01hybm8nxh1lym0wc9sxrms3wyqhhs0dm1a2nwz6xc60lkjcp8kb"; + }; + } + { + goPackagePath = "github.com/trhodeos/ecoff"; + fetch = { + type = "git"; + url = "https://github.com/trhodeos/ecoff.git"; + rev = "e54570a0fac23c0fa7f605681345611f345ce0f6"; + sha256 = "0pc0yj7hy43m00br0q0f1y5a3bc3a134imcyy2jvzim45g6g12kj"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://github.com/golang/sys"; + rev = "9a76102bfb4322425a1228caa377974426e82c84"; + sha256 = "07qn19yla2w604p3dc8h1c75xj2pxc4fajvg0mf0d4c72d5qiss4"; + }; + } +] diff --git a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index d63493ba7a..f962447feb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "1.11.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "1cnzwfqmzlzi6797l37arhhx2l6wsvs3jjgxdxwdbgq3rfz1ncr8"; + sha256 = "1fqhvmz7a4qgz3zq6qgpcjhhhm2j4wpx0385n3zcphd9h9s3a9xa"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index 0a300ca82e..955bc35c5a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "mikefarah"; rev = "v${version}"; repo = "yq"; - sha256 = "sha256-ehr9mCUbwQQSLR0iYoiJ3Xvgu+7Ue9Xvru9kAUkPCuQ="; + sha256 = "sha256-9D00I34pfoiI5cqXjsVLTT6XbFUYxgGit0ZuYeWSEyE="; }; - vendorSha256 = "sha256-CUELy6ajaoVzomY5lMen24DFJke3IyFzqWYyF7sws5g="; + vendorSha256 = "sha256-66ccHSKpl6yB/NVhZ1X0dv4wnGCJAMvZhpKu2vF+QT4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/games/enigma/default.nix b/third_party/nixpkgs/pkgs/games/enigma/default.nix new file mode 100644 index 0000000000..131bd00e18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/enigma/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, gettext, imagemagick, curl, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, xercesc, xdg-utils, hicolor-icon-theme }: +stdenv.mkDerivation rec { + pname = "enigma"; + version = "1.30-alpha"; + + src = fetchurl { + url = "https://github.com/Enigma-Game/Enigma/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "1zyk3j43gzfr1lhc6g13j7qai5f33fv5xm5735nnznaqvaz17949"; + }; + + nativeBuildInputs = [ pkg-config gettext makeWrapper imagemagick ]; + buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng xercesc curl xdg-utils ]; + + # For some reason (might be related to the alpha status), some includes + # which are required by lib-src/enigma-core are not picked up by the + # configure script. Hence we add them manually. + CPPFLAGS = "-I${SDL2.dev}/include/SDL2 -I${SDL2_ttf}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; + + postInstall = '' + rm -r $out/include + wrapProgram $out/bin/enigma --prefix PATH : "${lib.makeBinPath [ xdg-utils ]}" + ''; + + meta = with lib; { + description = "Puzzle game inspired by Oxyd on the Atari ST and Rock'n'Roll on the Amiga"; + license = with licenses; [ gpl2 free ]; # source + bundles libs + art + platforms = platforms.unix; + broken = stdenv.targetPlatform.isDarwin; + maintainers = with maintainers; [ iblech ]; + homepage = "https://www.nongnu.org/enigma/"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index a8f49d5995..810332a975 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.21.tar.xz", + "name": "factorio_alpha_x64-1.1.25.tar.xz", "needsAuth": true, - "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", + "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/alpha/linux64", + "version": "1.1.25" }, "stable": { - "name": "factorio_alpha_x64-1.1.21.tar.xz", + "name": "factorio_alpha_x64-1.1.25.tar.xz", "needsAuth": true, - "sha256": "0js252wmny46s5fss8b4l83cyy3l5lqsnx31x9n9wqc9akr9c9w7", + "sha256": "1xz03xr144grf5pa194j8pvyniiw77lsidkl32wha9x85fln5jhi", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/alpha/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/alpha/linux64", + "version": "1.1.25" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.21.tar.xz", + "name": "factorio_demo_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", + "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/demo/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/demo/linux64", + "version": "1.1.25" }, "stable": { - "name": "factorio_demo_x64-1.1.21.tar.xz", + "name": "factorio_demo_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "1z049ckiff6sv9f6xym5akmmn3gh37z9mr2wf8a70ch7j1i4z3fn", + "sha256": "1v3rpi9cfx4bg4jqq3h8zwknb5wsidk3lf3qkf55kf4xw6fnkzcj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/demo/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/demo/linux64", + "version": "1.1.25" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.21.tar.xz", + "name": "factorio_headless_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", + "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/headless/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/headless/linux64", + "version": "1.1.25" }, "stable": { - "name": "factorio_headless_x64-1.1.21.tar.xz", + "name": "factorio_headless_x64-1.1.25.tar.xz", "needsAuth": false, - "sha256": "038342z429cavdp2q3mjczlprw83nca030mjlipjppr43bzg9db0", + "sha256": "0xirxdf41sdsgcknvhdfg6rm12bwmg86bl4ml6ap1skifk8dlia1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.21/headless/linux64", - "version": "1.1.21" + "url": "https://factorio.com/get-download/1.1.25/headless/linux64", + "version": "1.1.25" } } } diff --git a/third_party/nixpkgs/pkgs/games/fairymax/default.nix b/third_party/nixpkgs/pkgs/games/fairymax/default.nix index 5c7cad879d..d743395045 100644 --- a/third_party/nixpkgs/pkgs/games/fairymax/default.nix +++ b/third_party/nixpkgs/pkgs/games/fairymax/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp ${ini} fmax.ini ''; buildPhase = '' - gcc *.c -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' + $CC *.c -Wno-return-type -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' ''; installPhase = '' mkdir -p "$out"/{bin,share/fairymax} @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.free ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; }; } diff --git a/third_party/nixpkgs/pkgs/games/mindustry/default.nix b/third_party/nixpkgs/pkgs/games/mindustry/default.nix index 6f3cdab9ab..df645171a7 100644 --- a/third_party/nixpkgs/pkgs/games/mindustry/default.nix +++ b/third_party/nixpkgs/pkgs/games/mindustry/default.nix @@ -29,20 +29,20 @@ let # Note: when raising the version, ensure that all SNAPSHOT versions in # build.gradle are replaced by a fixed version # (the current one at the time of release) (see postPatch). - version = "124.1"; + version = "125.1"; buildVersion = makeBuildVersion version; Mindustry = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "1k4k559y8l6wmj9m4980f7xmaaxzx84x86rqc77j4nd3y3x53546"; + sha256 = "0p05ndxhl3zgwm4k9cbqclp995kvcjxxhmbkmpjvv7cphiw82hvw"; }; Arc = fetchFromGitHub { owner = "Anuken"; repo = "Arc"; rev = "v${version}"; - sha256 = "08v929sgxy1pclzc00p7l7fak2h9l306447w5k5db3719kacj059"; + sha256 = "1injdyxwgc9dn49zvr4qggsfrsslkvh5d53z3yv28ayx48qpsgxk"; }; soloud = fetchFromGitHub { owner = "Anuken"; @@ -114,7 +114,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "18yfchv55f0fza6gdxd3f6gm0m4wy2a9jkw5wgl84id518jal6la"; + outputHash = "0dk4w8h0kg0mgbn0ifmk29rw8aj917k3nf27qdf1lyr6wl8k7f8k"; }; in diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index c4764fc928..7bea330e1c 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.212.0"; + version = "2021.220.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "JQUQEAZlVdyKhazhr7aI2I0+cHMQ303DZXUVgQiMaNs="; + sha256 = "XGwG/1cWSUNniCrUY1/18KHRtumxIWjfW5x+aYQ6RKU="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 9ba1259154..519d7b4179 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -366,8 +366,8 @@ }) (fetchNuGet { name = "Microsoft.Build.Locator"; - version = "1.2.6"; - sha256 = "1rnfd7wq2bkynqj767xmq9ha38mz010fmqvvvrgb4v86gd537737"; + version = "1.4.1"; + sha256 = "0j119rri7a401rca67cxdyrn3rprzdl1b2wrblqc23xsff1xvlrx"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; @@ -556,8 +556,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.1"; - sha256 = "012klayhnnygncdi9zzq32vballb2wbknk91g2ziz5mhdhg38lr8"; + version = "5.0.2"; + sha256 = "0asbw0l5syfgk2qb26czggvdix43d6043kl25ihdqdlhghcyy806"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -721,13 +721,13 @@ }) (fetchNuGet { name = "NUnit"; - version = "3.12.0"; - sha256 = "1880j2xwavi8f28vxan3hyvdnph4nlh5sbmh285s4lc9l0b7bdk2"; + version = "3.13.1"; + sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9"; }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.128.0"; - sha256 = "19c0bj9d0hjcyhaf04aapyzyd4yrzhc61k89z2il7y32841vnzg6"; + version = "2021.220.0"; + sha256 = "0lsv1xl4wav9wv50d1aba56sf6dgqa5qsx4lfn81azy3lzpcbzpp"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; diff --git a/third_party/nixpkgs/pkgs/games/stockfish/default.nix b/third_party/nixpkgs/pkgs/games/stockfish/default.nix index 71c482fe76..ef9c7fbe4d 100644 --- a/third_party/nixpkgs/pkgs/games/stockfish/default.nix +++ b/third_party/nixpkgs/pkgs/games/stockfish/default.nix @@ -10,6 +10,7 @@ let arch = if stdenv.isDarwin then archDarwin else if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else + if stdenv.isAarch64 then "armv8" else "unknown"; version = "12"; @@ -55,7 +56,7 @@ stdenv.mkDerivation { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro peti ]; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/games/wargus/default.nix b/third_party/nixpkgs/pkgs/games/wargus/default.nix new file mode 100644 index 0000000000..fda4f792c7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/wargus/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, callPackage, fetchFromGitHub +, cmake, pkg-config, makeWrapper +, zlib, bzip2, libpng +, dialog, python3, cdparanoia +}: + +let + stratagus = callPackage ./stratagus.nix {}; +in +stdenv.mkDerivation rec { + pname = "wargus"; + inherit (stratagus) version; + + src = fetchFromGitHub { + owner = "wargus"; + repo = "wargus"; + rev = "v${version}"; + sha256 = "0dibm68jxaqzgzcyblfj2bmwyz9v5ax0njnnbvak7xjk1zlh11sx"; + }; + + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + buildInputs = [ zlib bzip2 libpng ]; + cmakeFlags = [ + "-DSTRATAGUS=${stratagus}/games/stratagus" + "-DSTRATAGUS_INCLUDE_DIR=${stratagus.src}/gameheaders" + ]; + postInstall = '' + makeWrapper $out/games/wargus $out/bin/wargus \ + --prefix PATH : ${lib.makeBinPath [ "$out" cdparanoia python3 ]} + ''; + + meta = with lib; { + description = "Importer and scripts for Warcraft II: Tides of Darkness, the expansion Beyond the Dark Portal, and Aleonas Tales"; + homepage = "https://wargus.github.io/"; + license = licenses.gpl2Only; + maintainers = [ maintainers.astro ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix b/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix new file mode 100644 index 0000000000..f029e284f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config, makeWrapper +, zlib, bzip2, libpng, lua5_1, toluapp +, SDL, SDL_mixer, SDL_image, libGL +}: + +stdenv.mkDerivation rec { + pname = "stratagus"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "wargus"; + repo = "stratagus"; + rev = "v${version}"; + sha256 = "128m5n9axq007xi8a002ig7d4dyw8j060542x220ld66ibfprhcn"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + zlib bzip2 libpng + lua5_1 toluapp + SDL.dev SDL_image SDL_mixer libGL + ]; + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow" + ]; + + meta = with lib; { + description = "strategy game engine"; + homepage = "https://wargus.github.io/stratagus.html"; + license = licenses.gpl2Only; + maintainers = [ maintainers.astro ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/emulators/cen64/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/cen64/default.nix new file mode 100644 index 0000000000..0153ed11cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/cen64/default.nix @@ -0,0 +1,29 @@ +{ lib, cmake, fetchFromGitHub, libGL, libiconv, libX11, openal, stdenv }: + +stdenv.mkDerivation rec { + pname = "cen64"; + version = "unstable-2020-02-20"; + + src = fetchFromGitHub { + owner = "n64dev"; + repo = "cen64"; + rev = "6f9f5784bf0a720522c4ecb0915e20229c126aed"; + sha256 = "08q0a3b2ilb95zlz4cw681gwz45n2wrb2gp2z414cf0bhn90vz0s"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGL libiconv openal libX11 ]; + + installPhase = '' + mkdir -p $out/bin + mv cen64 $out/bin + ''; + + meta = with lib; { + description = "A Cycle-Accurate Nintendo 64 Emulator"; + license = licenses.bsd3; + homepage = "https://github.com/n64dev/cen64"; + maintainers = [ maintainers._414owen ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index cec004e246..8a4adfa314 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-13178"; + version = "5.0-13603"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "a34823df61df65168aa40ef5e82e44defd4a0138"; - sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1"; + rev = "7250d6e4e091f4b5b4f2289c2c732349b69a2e8a"; + sha256 = "0l4vvxmc79x0b5p8k4km7p380wv8wsbmxjnif08rj0p3brbavc1i"; }; nativeBuildInputs = [ cmake pkg-config ] diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index df687f6ccb..6ae6a42fac 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -788,6 +788,8 @@ self: super: { } // ( let nodePackageNames = [ + "coc-clangd" + "coc-cmake" "coc-css" "coc-diagnostic" "coc-emmet" @@ -805,6 +807,7 @@ self: super: { "coc-metals" "coc-pairs" "coc-prettier" + "coc-pyright" "coc-python" "coc-r-lsp" "coc-rls" @@ -814,6 +817,7 @@ self: super: { "coc-solargraph" "coc-stylelint" "coc-tabnine" + "coc-texlab" "coc-tslint" "coc-tslint-plugin" "coc-tsserver" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix index 6e64013464..213ae45f48 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.10"; + version = "7.11"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY="; + sha256 = "sha256-MVG6rTDx2eMXsqtPL1qnqfe03BH8+P5zrNDcC126v30="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index e466b76867..c8575907f4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.10.10"; + version = "5.10.15"; suffix = "lqx2"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1cjgx9qjfkiaalqkcdmibsrq2frwd621rwcg6w05ms4w9lnwi3af"; + sha256 = "11dgaqj1xr5hq6wxscrkln68dwqq4lakvfkr646x2yfynry1jqjk"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index b30ee99664..0a658b7334 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.10.10"; - suffix = "zen1"; + version = "5.10.15"; + suffix = "zen2"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0jsi2q8k1w5zs5l6z1brm2mxpl9arv6n6linc8yj6xc75nydw6w4"; + sha256 = "18qgh79hi1ph6x16sbvq36icv7c5bkdvh193wqjnbvwf0yph09as"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 3d78f4b4cd..73a8325066 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.11"; + version = "9.16.12"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ARH2TdfY9RXPoSnhgczpb/ggcNGyfxGiH2hWEQ0GmcE="; + sha256 = "sha256-mRSvkxH9NJyrRBCXiY2U+yjQv9m/btBP4fl/BCZE2n8="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix index be3012740f..9890f4ac06 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/agate/default.nix @@ -1,23 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mnatEvojma1+cOVllTAzDVxl5luRGleLE6GNPnQUNWQ="; + sha256 = "sha256-IapgDqRZ7VMWerusWcv++Ky4yWgGLMaq8rFhbPshFjE="; }; - cargoSha256 = "sha256-B07itUftDj3yVMDc/2VetwYs74fZBa1tmeELbbQ39P0="; + cargoSha256 = "sha256-+Ch6nEGxYm2L4S9FkIkenDQovMZvQUJGOu5mR9T8r/Y="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { - homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; - changelog = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + homepage = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; + changelog = "https://proxy.vulpes.one/gemini/qwertqwefsday.eu/agate.gmi"; description = "Very simple server for the Gemini hypertext protocol"; longDescription = '' Agate is a server for the Gemini network protocol, built with the Rust @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { static files. It uses async I/O, and should be quite efficient even when running on low-end hardware and serving many concurrent requests. ''; - license = licenses.asl20; + license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/gonic/default.nix b/third_party/nixpkgs/pkgs/servers/gonic/default.nix index e541027af7..fbefca063a 100644 --- a/third_party/nixpkgs/pkgs/servers/gonic/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gonic/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "gonic"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "sentriz"; repo = pname; - rev = "6c69bd3be6279f743c83596c4f0fc12798fdb26a"; - sha256 = "1igb2lbkc1nfxp49id3yxql9sbdqr467661jcgnchcnbayj4d664"; + rev = "7d420f61a90739cd82a81c2740274c538405d950"; + sha256 = "0ix33cbhik1580h1jgv6n512dcgip436wmljpiw53c9v438k0ps5"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ taglib alsaLib ]; + buildInputs = [ taglib alsaLib ] ++ lib.optionals transcodingSupport [ ffmpeg ]; vendorSha256 = "0inxlqxnkglz4j14jav8080718a80nqdcl866lkql8r6zcxb4fm9"; meta = { diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 595a0a05a4..febfc7fdea 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -23,7 +23,7 @@ "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors ]; - "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond + "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage "amazon_polly" = ps: with ps; [ boto3 ]; "ambiclimate" = ps: with ps; [ aiohttp-cors ambiclimate ]; @@ -110,7 +110,7 @@ "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; - "channels" = ps: with ps; [ ]; # missing inputs: pychannels + "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; @@ -264,8 +264,8 @@ "flick_electric" = ps: with ps; [ ]; # missing inputs: PyFlick "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; - "flume" = ps: with ps; [ ]; # missing inputs: pyflume - "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou + "flume" = ps: with ps; [ pyflume ]; + "flunearyou" = ps: with ps; [ pyflunearyou ]; "flux" = ps: with ps; [ ]; "flux_led" = ps: with ps; [ flux-led ]; "folder" = ps: with ps; [ ]; @@ -499,7 +499,7 @@ "mikrotik" = ps: with ps; [ librouteros ]; "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus + "minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ]; "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; @@ -523,7 +523,7 @@ "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; "mystrom" = ps: with ps; [ aiohttp-cors python-mystrom ]; "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 @@ -815,7 +815,7 @@ "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ python-tado ]; "tag" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api + "tahoma" = ps: with ps; [ tahoma-api ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff @@ -865,13 +865,13 @@ "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy "trend" = ps: with ps; [ numpy ]; "tts" = ps: with ps; [ aiohttp-cors mutagen ]; - "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha + "tuya" = ps: with ps; [ tuyaha ]; "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twinkly" = ps: with ps; [ ]; # missing inputs: twinkly-client - "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client + "twitch" = ps: with ps; [ python-twitch-client ]; "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; @@ -894,7 +894,7 @@ "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp - "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus + "velbus" = ps: with ps; [ python-velbus ]; "velux" = ps: with ps; [ pyvlx ]; "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch "vera" = ps: with ps; [ pyvera ]; @@ -911,7 +911,7 @@ "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ volkszaehler ]; - "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio + "volumio" = ps: with ps; [ pyvolumio ]; "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 @@ -928,7 +928,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ python-whois ]; - "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi + "wiffi" = ps: with ps; [ wiffi ]; "wilight" = ps: with ps; [ pywilight ]; "wink" = ps: with ps; [ aiohttp-cors pubnubsub-handler python-wink ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy @@ -948,12 +948,12 @@ "xeoma" = ps: with ps; [ pyxeoma ]; "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway "xiaomi" = ps: with ps; [ ha-ffmpeg ]; - "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway + "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors netdisco zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct python-miio ]; - "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv + "xiaomi_tv" = ps: with ps; [ pymitv ]; "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client - "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient + "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps diff --git a/third_party/nixpkgs/pkgs/servers/http/darkhttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/darkhttpd/default.nix index 49097fe2bf..56bf5cd5b7 100644 --- a/third_party/nixpkgs/pkgs/servers/http/darkhttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/darkhttpd/default.nix @@ -1,20 +1,27 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "darkhttpd"; - version = "1.12"; + version = "1.13"; - src = fetchurl { - url = "https://unix4lyfe.org/darkhttpd/${pname}-${version}.tar.bz2"; - sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155"; + src = fetchFromGitHub { + owner = "emikulic"; + repo = pname; + rev = "v${version}"; + sha256 = "0w11xq160q9yyffv4mw9ncp1n0dl50d9plmwxb0yijaaxls9i4sk"; }; enableParallelBuilding = true; installPhase = '' + runHook preInstall install -Dm555 -t $out/bin darkhttpd - install -Dm444 -t $out/share/doc/${pname} README + install -Dm444 -t $out/share/doc/${pname} README.md head -n 18 darkhttpd.c > $out/share/doc/${pname}/LICENSE + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 468904b3f0..aaa2a2f2b5 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "12.0.2"; + version = "12.0.3"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "006k6ac00iz61s6hi3wzj6w71mhhv7n00vh82ak4yhwr97jffqbz"; + sha256 = "sha256-YUeSX02iLhrGzItnbUbK8ib7IfWG3+2k154cTPAt8Wc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch b/third_party/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch deleted file mode 100644 index 0980ec9a5d..0000000000 --- a/third_party/nixpkgs/pkgs/servers/ma1sd/0001-gradle.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/build.gradle 2019-09-01 16:17:17.815513296 +0200 -+++ b/build.gradle 2019-09-01 16:21:14.688832785 +0200 -@@ -73,7 +73,7 @@ - - buildscript { - repositories { -- jcenter() -+REPLACE - } - - dependencies { -@@ -83,7 +83,7 @@ - } - - repositories { -- jcenter() -+REPLACE - } - - dependencies { diff --git a/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix b/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix index 055136c207..5947d18eb9 100644 --- a/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ma1sd/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle_5, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: let name = "ma1sd-${version}"; - version = "2.1.1"; - rev = "a112a5e57cb38ad282939d2dcb9c1476e038af39"; + version = "2.4.0"; + rev = version; src = fetchFromGitHub { inherit rev; owner = "ma1uta"; repo = "ma1sd"; - sha256 = "1qibn6m6mvxwnbiypxlgkaqg6in358vkf0q47410rv1dx1gjcnv5"; + hash = "sha256-8UnhrGa8KKmMAAkzUXztMkxgYOX8MU1ioXuEStGi4Vc="; }; deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle_5 perl git ]; + nativeBuildInputs = [ gradle perl git ]; buildPhase = '' export MA1SD_BUILD_VERSION=${rev} @@ -35,34 +35,36 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1w9cxq0rlzyh7bzqr3v3vn2cjhpn7hhc5lk9qzwj7sdj4jn2qxq6"; + outputHash = "0x2wmmhjgnb6p72d3kvnv2vg52l0c4151rs4jrazs9rvxjfc88dr"; }; in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle perl makeWrapper ]; buildInputs = [ jre ]; - patches = [ ./0001-gradle.patch ]; - buildPhase = '' + runHook preBuild export MA1SD_BUILD_VERSION=${rev} export GRADLE_USER_HOME=$(mktemp -d) - sed -ie "s#REPLACE#mavenLocal(); maven { url '${deps}' }#g" build.gradle + sed -ie "s#jcenter()#mavenLocal(); maven { url '${deps}' }#g" build.gradle gradle --offline --no-daemon build -x test + runHook postBuild ''; installPhase = '' + runHook preInstall install -D build/libs/source.jar $out/lib/ma1sd.jar makeWrapper ${jre}/bin/java $out/bin/ma1sd --add-flags "-jar $out/lib/ma1sd.jar" + runHook postInstall ''; meta = with lib; { description = "a federated matrix identity server; fork of mxisd"; homepage = "https://github.com/ma1uta/ma1sd"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix index b8582f68eb..1abedead87 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { fi chmod -R u+w node_modules rake webpacker:compile + rails assets:precompile ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 677d166a3c..10105e3b27 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-02-14T04-01-33Z"; + version = "2021-02-19T04-38-02Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Su3BkVZJ4c5T829/1TNQi7b0fZhpG/Ly80ynt5Po+Qs="; + sha256 = "sha256-Swm8gQeSN84SYE0M03Se9n/clYVT/W/v0GAmRRsL674="; }; - vendorSha256 = "sha256-r0QtgpIfDYu2kSy6/wSAExc3Uwd62sDEi1UZ8XzTBoU="; + vendorSha256 = "sha256-7WvR6WHiaFHHBhpPoqnkr9pzFxNpLpZuaB1a/SkLBtc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 55b0ab14af..3a01acbb37 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "telegraf"; - version = "1.17.2"; + version = "1.17.3"; excludedPackages = "test"; @@ -12,14 +12,14 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-R0RYiVVS1ce2xabPBTEmOxBNlknP4iXkbVy412whrFw="; + sha256 = "sha256-DJvXGjh1FN6SHcfVUlbfoKgBD1ThaJMvKUqvIKCyzeI="; }; - vendorSha256 = "sha256-3cELah9i2rY563QQOYt7ke0HEUR1By74vTgl+UbOHwc="; + vendorSha256 = "sha256-UTdJT4cwRCqkn01YXB1KYc7hp1smpZFke9aAODd/2x0="; - buildFlagsArray = [ ''-ldflags= - -w -s -X main.version=${version} - '' ]; + preBuild = '' + buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") + ''; passthru.tests = { inherit (nixosTests) telegraf; }; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 6c4352e23b..c5dc1a8219 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.3.4046-3c1c83ba4"; + version = "1.21.4.4054-bab510e86"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1ikv75pgircqnllimx3yszihpfaj8blhrmgvli0lagirx6sg22zl"; + sha256 = "1vxh9yihwxv610q10sak3n8jrq7il6ryhqi6j10nmm7mxn1nkqcx"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1fywpkchpc726a66q7xpqrn92g73v4941df19glscrrvy7808f8n"; + sha256 = "0dxch4m3ywndrwys2rfvh34p6nsx0w2f6k7xvs7hi20biz6bd344"; }; outputs = [ "out" "basedb" ]; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p "$out/lib" cp -dr --no-preserve='ownership' usr/lib/plexmediaserver $out/lib/ @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { # to the '/db' file; we create this path in the FHS userenv (see the "plex" # package). ln -fs /db $f + runHook postInstall ''; # We're running in a FHS userenv; don't patch anything diff --git a/third_party/nixpkgs/pkgs/servers/swego/default.nix b/third_party/nixpkgs/pkgs/servers/swego/default.nix index 91b0995466..83416af317 100644 --- a/third_party/nixpkgs/pkgs/servers/swego/default.nix +++ b/third_party/nixpkgs/pkgs/servers/swego/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "swego"; - version = "0.9"; + version = "0.91"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-Wt+2spZfgBWzZEQP+SiDYI5DdLKrwFMgYT1ukbF4x0I="; + sha256 = "sha256-cNsVRYKnzsxYnTkPRfX3ga0eGd09uJ0dyJj1doxfCrg="; }; vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; diff --git a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix index 5241139cfa..60480b3ac2 100644 --- a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "xandikos"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "jelmer"; repo = "xandikos"; rev = "v${version}"; - sha256 = "1x0bylmdizirvlcn6ryd43lffpmlq0cklj3jz956scmxgq4p6wby"; + sha256 = "sha256-/pr8ZqgYk24CdJNAETCDF4ZtufXkVEu1Zw25PcPEo7M="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix deleted file mode 100644 index ebb817f164..0000000000 --- a/third_party/nixpkgs/pkgs/servers/xmpp/pyIRCt/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages, runtimeShell } : - -stdenv.mkDerivation rec { - pname = "pyIRCt"; - version = "0.4"; - - src = fetchurl { - url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz"; - sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb"; - }; - - buildInputs = [ pythonPackages.wrapPython ]; - - pythonPath = [ - xmpppy pythonIRClib - ]; - - # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; - - installPhase = '' - mkdir -p $out/bin $out/share/${pname}-${version} - sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py - sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py - sed -e '/configFiles/iimport os' -i config.py - cp * $out/share/${pname}-${version} - cat > $out/bin/pyIRCt < $out/bin/pyMAILt < 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -124,7 +124,7 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.427.0) + aws-partitions (1.428.0) aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -215,7 +215,7 @@ GEM activesupport (~> 5.2.2) railties (~> 5.2.2) metasploit-payloads (2.0.28) - metasploit_data_models (4.1.1) + metasploit_data_models (4.1.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) arel-helpers @@ -224,6 +224,7 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) + webrick metasploit_payloads-mettle (1.0.6) method_source (1.0.0) mini_portile2 (2.5.0) @@ -326,7 +327,7 @@ GEM rex-text rex-socket (0.1.25) rex-core - rex-sslscan (0.1.5) + rex-sslscan (0.1.6) rex-core rex-socket rex-text diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index 619cc9c319..2268bcc5d3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.30"; + version = "6.0.31"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-DD/nFbSNs3nVNe+W+5zAmDlvMCseYuWWpKX9Dp+9Etc="; + sha256 = "sha256-wt7VeS8NnmJHMhry/68W1S1f9jUnsSHnhUSrCQN1qNM="; }; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index 72f60a90ea..429e685b8f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v7dwyqkwdbp4f627y459lj22vimjzwhk2z987bcncq2ml7ldrfz"; + sha256 = "13rvpllihvpksf1jqwa2i5vbv2hhb34viaidw4rkxr3dyygkdpj8"; type = "gem"; }; - version = "1.427.0"; + version = "1.428.0"; }; aws-sdk-core = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "f444c3995f21f9e9eaba63d465fac7d60ba88ebb"; - sha256 = "1mqjpnghxzd5ljbfaqhy5cq6yfcqq2fgp5pg6papkcwdnhayfgqc"; + rev = "56ef940a085620b127d61a516bc10241a795f92b"; + sha256 = "1lx8fl1hkas4hpkj3c976pv5ybfm2spzzwhs693n57hd5xwxbpn2"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.30"; + version = "6.0.31"; }; metasploit-model = { groups = ["default"]; @@ -556,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czqg49b7n9n2iqp6r4f1cxh8kd39gbjvydq09hzmzdmkwxh3x1f"; + sha256 = "1kzlvq20ml4b5lr1qbrkmivdi37mxi8fasdqg4yla2libfbdz008"; type = "gem"; }; - version = "4.1.1"; + version = "4.1.2"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -1086,10 +1086,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06gbx45q653ajcx099p0yxdqqxazfznbrqshd4nwiwg1p498lmyx"; + sha256 = "0r58n1ifbay1gq3kln9yg5iqjwp69l0pmb9sqakhqwhjlhzqx2kr"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.6"; }; rex-struct2 = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index b37273aeb1..ab4a719764 100644 --- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RZFh9RVU8RwtLGIP7OWnf0yNsXfElqWSXieljqp8ahU="; + sha256 = "sha256-mPd4HsWbPUNJTUNjQ5zQztoXZy2b9iLksdGKAjp0A58="; }; - vendorSha256 = "sha256-Ya/33ocPhY5OSnCEyULsOIHaxwb1yNEle3JEYo/7/Yk="; + vendorSha256 = "sha256-eNQTJHqOCOTAPO+vil6rkV9bNWZIdXxGQPE4IpETFtA="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix b/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix index a285c720ea..c04b696758 100644 --- a/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.25.1"; + version = "0.25.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "1205rhv4mizpb1nbc2sry52n7wljcwb8xp7lpazh1r1cldfayr5b"; + sha256 = "sha256-r9/CxXFaeod48NgOFWhl+axiNqjaU+RIEHI71fmYzP8="; }; - vendorSha256 = "0hv4b6k8k7xkzkjgzcm5y8pqyiwyk790a1qw18gjslkwkyw5hjf2"; + vendorSha256 = "sha256-DLjaDj3fJYl5ICxJuaCLKdd/AfwfUIM8teJLs3a2MHo="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index 7b0b45fedb..1051d48b8a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q26NnHSnJ8vVWHwXtFJ90/8xr772x/gW6BRG29wsIeI="; + sha256 = "sha256-vz8qqsFc1CETnrqStLyiGZ6w0jy+y5GlwQQgxdyJ5aY="; }; vendorSha256 = "sha256-kIMd0xzQ+c+jCpX2+qdD/GcFEirR15PMInbEV184EBU="; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index e727734be6..0905086882 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config , CoreFoundation, IOKit, libossp_uuid -, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch +, curl, libcap, libuuid, lm_sensors, zlib , nixosTests , withCups ? false, cups , withDBengine ? true, libuv, lz4, judy @@ -15,14 +15,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.29.1"; + version = "1.29.2"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-Wmfqxjy0kCy8vsegoe+Jn5Az/XEZxeHZDRMLmOrp+Iw="; + sha256 = "sha256-Y949jHIX3VOwaxeaBqqTZUx66Sd0s27kMCCjcnJORO4="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -36,6 +36,8 @@ in stdenv.mkDerivation rec { ++ optionals withSsl [ openssl.dev ]; patches = [ + # required to prevent plugins from relying on /etc + # and /var ./no-files-in-etc-and-var.patch ]; @@ -77,7 +79,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 954c9eb411..8d0539d118 100644 --- a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -6,11 +6,11 @@ let version = "7.2"; - dbrev = "5164"; + dbrev = "5171"; drivedbBranch = "RELEASE_7_2_DRIVEDB"; driverdb = fetchurl { url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw"; - sha256 = "1vj0sv3bgcd0lwk5x450brfyxksa5fn1mjgvmj994ab8spmicc43"; + sha256 = "0vncr98xagbcfsxgfgxsip2qrl9q3y8va19qhv6yknlwbdfap4mn"; name = "smartmontools-drivedb.h"; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix b/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix index 638caa3c62..f9e0e80478 100644 --- a/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tre-command"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "10c8mpqzpw7m3vrm2vl2rx678z3c37hxpqyh3fn83dlh9f4f0j87"; + sha256 = "0syvhpnw9c5csxv8c4gdfwif9a9vl4rjkwj4mfglgxk227k1y53q"; }; - cargoSha256 = "0jd6cfs2zi2n34kirpsy12l76whaqwm1pkqa57w1ms5z658z07wj"; + cargoSha256 = "056wlxz8hzky8315rnn65nh7dd2yhx5323y3hq64g6aqj52vd734"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index 511c61caf5..89ea852334 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "shipyard"; - version = "0.1.18"; + version = "0.2.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-ZrzW1sx0wCuaICONS3SR0VsqDj2ZUM53LaB5Wj1s9uc="; + sha256 = "sha256-eTwl2tMrhLPeHI0C76Rvm/OOt02OtDtejXYr4N6IWcg="; }; - vendorSha256 = "sha256-eeR316CKlAqWxlYcPZVlP260NR7WHfmCVE3PywMay/w="; + vendorSha256 = "sha256-rglpY7A0S56slL+mXFRgaZwS0bF1b9zxxmNYiX6TJzs="; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index a9a13aaa6b..812f5cf49b 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -769,6 +769,9 @@ mapAliases ({ xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01 + xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; + pyIRCt = throw "pyIRCt has been removed from nixpkgs as it is unmaintained and python2-only"; + pyMAILt = throw "pyMAILt has been removed from nixpkgs as it is unmaintained and python2-only"; xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09 xf86_input_mtrack = throw ("xf86_input_mtrack has been removed from nixpkgs as it hasn't been maintained" + "and is broken. Working alternatives are libinput and synaptics."); diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 9edb546f79..22feb34160 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -192,6 +192,8 @@ in castxml = callPackage ../development/tools/castxml { }; + cen64 = callPackage ../misc/emulators/cen64 { }; + cereal = callPackage ../development/libraries/cereal { }; checkov = callPackage ../development/tools/analysis/checkov {}; @@ -284,6 +286,7 @@ in grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { + go = buildPackages.go_1_15; writePython3 = buildPackages.writers.writePython3; }; @@ -1295,7 +1298,9 @@ in gaia = callPackage ../development/libraries/gaia { }; - galene = callPackage ../servers/web-apps/galene {}; + galene = callPackage ../servers/web-apps/galene { + buildGoModule = buildGo115Module; + }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1361,6 +1366,8 @@ in hime = callPackage ../tools/inputmethods/hime {}; + hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; + hostctl = callPackage ../tools/system/hostctl { }; hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; @@ -2256,6 +2263,8 @@ in enca = callPackage ../tools/text/enca { }; + enigma = callPackage ../games/enigma {}; + ent = callPackage ../tools/misc/ent { }; envconsul = callPackage ../tools/system/envconsul { }; @@ -2535,6 +2544,8 @@ in klog = qt5.callPackage ../applications/radio/klog { }; + krapslog = callPackage ../tools/misc/krapslog { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -2805,6 +2816,7 @@ in step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; + buildGoModule = buildGo115Module; }; step-cli = callPackage ../tools/security/step-cli { }; @@ -3293,7 +3305,9 @@ in ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { + go = go_1_15; + }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -7997,6 +8011,8 @@ in spglib = callPackage ../development/libraries/spglib { }; + spicy = callPackage ../development/tools/spicy { }; + ssh-askpass-fullscreen = callPackage ../tools/networking/ssh-askpass-fullscreen { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -8664,7 +8680,9 @@ in uwsgi = callPackage ../servers/uwsgi { }; - v2ray = callPackage ../tools/networking/v2ray { }; + v2ray = callPackage ../tools/networking/v2ray { + buildGoModule = buildGo115Module; + }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; @@ -9196,8 +9214,6 @@ in w3m = w3m-batch; }; - xmpppy = pythonPackages.xmpppy; - xiccd = callPackage ../tools/misc/xiccd { }; xidlehook = callPackage ../tools/X11/xidlehook { @@ -10198,31 +10214,31 @@ in inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_15; + go = go_1_16; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -12493,6 +12509,8 @@ in kustomize = callPackage ../development/tools/kustomize { }; + kustomize-sops = callPackage ../development/tools/kustomize/kustomize-sops.nix { }; + ktlint = callPackage ../development/tools/ktlint { }; kythe = callPackage ../development/tools/kythe { }; @@ -13784,7 +13802,10 @@ in ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { }; + garble = callPackage ../build-support/go/garble.nix { + # https://github.com/burrowers/garble/issues/124 + buildGoModule = buildGo115Module; + }; gcab = callPackage ../development/libraries/gcab { }; @@ -17069,7 +17090,9 @@ in tremor = callPackage ../development/libraries/tremor { }; - trillian = callPackage ../tools/misc/trillian { }; + trillian = callPackage ../tools/misc/trillian { + buildGoModule = buildGo115Module; + }; twolame = callPackage ../development/libraries/twolame { }; @@ -17524,7 +17547,7 @@ in go = buildPackages.go_1_16; }; - buildGoPackage = buildGo115Package; + buildGoPackage = buildGo116Package; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; @@ -17536,7 +17559,7 @@ in go = buildPackages.go_1_16; }; - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; go2nix = callPackage ../development/tools/go2nix { }; @@ -17875,7 +17898,9 @@ in grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; - grafana-loki = callPackage ../servers/monitoring/loki { }; + grafana-loki = callPackage ../servers/monitoring/loki { + buildGoModule = buildGo115Module; + }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; @@ -18083,7 +18108,9 @@ in nsq = callPackage ../servers/nsq { }; - oauth2_proxy = callPackage ../servers/oauth2_proxy { }; + oauth2_proxy = callPackage ../servers/oauth2_proxy { + buildGoModule = buildGo115Module; + }; openbgpd = callPackage ../servers/openbgpd { }; @@ -18361,7 +18388,9 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; + prometheus = callPackage ../servers/monitoring/prometheus { + buildGoPackage = buildGo115Package; + }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -18422,10 +18451,6 @@ in pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; - pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; - - pyMAILt = callPackage ../servers/xmpp/pyMAILt {}; - pypolicyd-spf = python3.pkgs.callPackage ../servers/mail/pypolicyd-spf { }; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { @@ -20753,6 +20778,8 @@ in orbitron = callPackage ../data/fonts/orbitron { }; + orchis = callPackage ../data/themes/orchis { }; + orion = callPackage ../data/themes/orion {}; overpass = callPackage ../data/fonts/overpass { }; @@ -21531,8 +21558,9 @@ in claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; }; - claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail/gtk3.nix { + claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; + useGtk3 = true; }; clfswm = callPackage ../applications/window-managers/clfswm { }; @@ -21620,7 +21648,9 @@ in coursera-dl = callPackage ../applications/misc/coursera-dl {}; - coyim = callPackage ../applications/networking/instant-messengers/coyim {}; + coyim = callPackage ../applications/networking/instant-messengers/coyim { + buildGoPackage = buildGo115Package; + }; cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; @@ -23775,6 +23805,8 @@ in ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + pragha = libsForQt5.callPackage ../applications/audio/pragha { }; + rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; rofi-calc = callPackage ../applications/science/math/rofi-calc { }; @@ -23903,7 +23935,9 @@ in ninjas2 = callPackage ../applications/audio/ninjas2 {}; - nncp = callPackage ../tools/misc/nncp { }; + nncp = callPackage ../tools/misc/nncp { + go = go_1_15; + }; notion = callPackage ../applications/window-managers/notion { }; @@ -24948,16 +24982,12 @@ in linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }) - // (callPackage ../applications/misc/sweethome3d/editors.nix { - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - sweethome3dApp = sweethome3d.application; - }) - ); + sweethome3d = recurseIntoAttrs ( + (callPackage ../applications/misc/sweethome3d { }) // + (callPackage ../applications/misc/sweethome3d/editors.nix { + sweethome3dApp = sweethome3d.application; + }) + ); swingsane = callPackage ../applications/graphics/swingsane { }; @@ -27395,6 +27425,8 @@ in libpng = libpng12; }; + wargus = callPackage ../games/wargus { }; + warmux = callPackage ../games/warmux { }; warsow-engine = callPackage ../games/warsow/engine.nix { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 5b37fedfae..88d1ddd873 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -8741,7 +8741,6 @@ let sha256 = "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk"; }; buildInputs = [ pkgs.glib ]; - doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 meta = { homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl wrappers for the GLib utility and Object libraries"; @@ -8757,13 +8756,20 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"; sha256 = "0mxg6pz8qfyipw0ypr54alij0c4adzg94f62702b2a6hkp5jhij6"; }; - checkInputs = [ pkgs.cairo ]; + checkInputs = [ pkgs.cairo CairoGObject ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that we will delete after the execution of the tests. + mkdir -p $out/lib + ln -s $PWD/build/*.so $out/lib/ + ''; + postCheck = '' + rm -r $out/lib + ''; meta = { - broken = true; # TODO: tests failing because "failed to load libregress.so" - # see https://github.com/NixOS/nixpkgs/pull/68115 - # and https://github.com/NixOS/nixpkgs/issues/68116 - # adding pkgs.gnome3.gjs does not fix it description = "Dynamically create Perl language bindings"; license = lib.licenses.lgpl2Plus; }; @@ -8914,6 +8920,20 @@ let }; }; + gotofile = buildPerlPackage { + pname = "goto-file"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/goto-file-0.005.tar.gz"; + sha256 = "c6cdd5ee4a6cdcbdbf314d92a4f9985dbcdf9e4258048cae76125c052aa31f77"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Stop parsing the current file and move on to a different one"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Graph = buildPerlPackage { pname = "Graph"; version = "0.9712"; @@ -8924,6 +8944,22 @@ let propagatedBuildInputs = [ HeapFibonacci ]; }; + GraphicsTIFF = buildPerlPackage { + pname = "Graphics-TIFF"; + version = "9"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Graphics-TIFF-9.tar.gz"; + sha256 = "1n1r9r7f6hp2s6l361pyvb1i1pm9xqy0w9n3z5ygm7j64160kz9a"; + }; + buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; + propagatedBuildInputs = [ Readonly ]; + checkInputs = [ TestRequires TestDeep pkgs.hexdump ]; + meta = { + description = "Perl extension for the libtiff library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GraphViz = buildPerlPackage { pname = "GraphViz"; version = "2.24"; @@ -9097,6 +9133,26 @@ let }; }; + Gtk3ImageView = buildPerlPackage { + pname = "Gtk3-ImageView"; + version = "6"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk3-ImageView-6.tar.gz"; + sha256 = "0krkif9i3hrgjdskw05pcks40fmb43d21lxf4h8aclv0g8z647f0"; + }; + buildInputs = [ pkgs.gtk3 ]; + propagatedBuildInputs = [ Readonly Gtk3 ]; + checkInputs = [ TestDifferences PerlMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; + checkPhase = '' + ${pkgs.xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' \ + make test + ''; + meta = { + description = "Image viewer widget for Gtk3"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Gtk3SimpleList = buildPerlPackage { pname = "Gtk3-SimpleList"; version = "0.21"; @@ -10022,6 +10078,20 @@ let }; }; + ImagePNGLibpng = buildPerlPackage { + pname = "Image-PNG-Libpng"; + version = "0.56"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BK/BKB/Image-PNG-Libpng-0.56.tar.gz"; + sha256 = "1nf7qcql7b2w98i859f76q1vb4b2zd0k0ypjbsw7ngs2zzmvzyzs"; + }; + buildInputs = [ pkgs.libpng ]; + meta = { + description = "Perl interface to the C library \"libpng\""; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Imager = buildPerlPackage { pname = "Imager"; version = "1.012"; @@ -11798,6 +11868,20 @@ let }; }; + LongJump = buildPerlPackage { + pname = "Long-Jump"; + version = "0.000001"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Long-Jump-0.000001.tar.gz"; + sha256 = "d5d6456d86992b559d8f66fc90960f919292cd3803c13403faac575762c77af4"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Mechanism for returning to a specific point from a deeply nested stack"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LWP = buildPerlPackage { pname = "libwww-perl"; version = "6.49"; @@ -16406,6 +16490,21 @@ let }; }; + PDFBuilder = buildPerlPackage { + pname = "PDF-Builder"; + version = "3.021"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.021.tar.gz"; + sha256 = "1hc22s5gdspr5nyfmix3cwdzcw7z66pcqxy422ksmbninbzv4z93"; + }; + checkInputs = [ TestException TestMemoryCycle ]; + propagatedBuildInputs = [ FontTTF ]; + meta = { + description = "Facilitates the creation and modification of PDF files"; + license = lib.licenses.lgpl21Plus; + }; + }; + PDL = buildPerlPackage rec { pname = "PDL"; version = "2.025"; @@ -19794,6 +19893,55 @@ let }; }; + Test2Harness = buildPerlPackage { + pname = "Test2-Harness"; + version = "1.000042"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000042.tar.gz"; + sha256 = "aaf231a68af1a6ffd6a11188875fcf572e373e43c8285945227b9d687b43db2d"; + }; + + checkPhase = '' + patchShebangs ./t ./scripts/yath + ./scripts/yath test -j $NIX_BUILD_CORES + ''; + + propagatedBuildInputs = [ DataUUID Importer LongJump ScopeGuard TermTable Test2PluginMemUsage Test2PluginUUID Test2Suite gotofile ]; + meta = { + description = "A new and improved test harness with better Test2 integration"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Test2PluginMemUsage = buildPerlPackage { + pname = "Test2-Plugin-MemUsage"; + version = "0.002003"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-MemUsage-0.002003.tar.gz"; + sha256 = "5e0662d5a823ae081641f5ce82843111eec1831cd31f883a6c6de54afdf87c25"; + }; + buildInputs = [ Test2Suite ]; + meta = { + description = "Collect and display memory usage information"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + Test2PluginUUID = buildPerlPackage { + pname = "Test2-Plugin-UUID"; + version = "0.002001"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Plugin-UUID-0.002001.tar.gz"; + sha256 = "4c6c8d484d7153d8779dc155a992b203095b5c5aa1cfb1ee8bcedcd0601878c9"; + }; + buildInputs = [ Test2Suite ]; + propagatedBuildInputs = [ DataUUID ]; + meta = { + description = "Use REAL UUIDs in Test2"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Test2PluginNoWarnings = buildPerlPackage { pname = "Test2-Plugin-NoWarnings"; version = "0.09"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index ed2a4d7a3a..4ae605e1d3 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -210,6 +210,8 @@ in { aioasuswrt = callPackage ../development/python-modules/aioasuswrt { }; + aiocache = callPackage ../development/python-modules/aiocache { }; + aiocoap = callPackage ../development/python-modules/aiocoap { }; aioconsole = callPackage ../development/python-modules/aioconsole { }; @@ -3291,8 +3293,6 @@ in { j2cli = callPackage ../development/python-modules/j2cli { }; - jabberbot = callPackage ../development/python-modules/jabberbot { }; - janus = callPackage ../development/python-modules/janus { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; @@ -3399,6 +3399,8 @@ in { jsonref = callPackage ../development/python-modules/jsonref { }; + json-rpc = callPackage ../development/python-modules/json-rpc { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; @@ -4006,6 +4008,8 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; + mcstatus = callPackage ../development/python-modules/mcstatus { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; @@ -5135,6 +5139,8 @@ in { protobuf = pkgs.protobuf; }; + protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; + prov = callPackage ../development/python-modules/prov { }; prox-tv = callPackage ../development/python-modules/prox-tv { }; @@ -5229,6 +5235,8 @@ in { pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; + pyalmond = callPackage ../development/python-modules/pyalmond { }; + pyamf = callPackage ../development/python-modules/pyamf { }; pyamg = callPackage ../development/python-modules/pyamg { }; @@ -5311,6 +5319,8 @@ in { pycfdns = callPackage ../development/python-modules/pycfdns { }; + pychannels = callPackage ../development/python-modules/pychannels { }; + pychart = callPackage ../development/python-modules/pychart { }; pychef = callPackage ../development/python-modules/pychef { }; @@ -5458,6 +5468,10 @@ in { pyflakes = callPackage ../development/python-modules/pyflakes { }; + pyflume = callPackage ../development/python-modules/pyflume { }; + + pyflunearyou = callPackage ../development/python-modules/pyflunearyou { }; + pyfma = callPackage ../development/python-modules/pyfma { }; pyfribidi = callPackage ../development/python-modules/pyfribidi { }; @@ -5690,6 +5704,8 @@ in { pymetno = callPackage ../development/python-modules/pymetno { }; + pymitv = callPackage ../development/python-modules/pymitv { }; + pymodbus = callPackage ../development/python-modules/pymodbus { }; pymongo = callPackage ../development/python-modules/pymongo { }; @@ -5718,6 +5734,8 @@ in { pymyq = callPackage ../development/python-modules/pymyq { }; + pymysensors = callPackage ../development/python-modules/pymysensors { }; + pymysql = callPackage ../development/python-modules/pymysql { }; pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; @@ -6481,6 +6499,8 @@ in { python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + python-twitch-client = callPackage ../development/python-modules/python-twitch-client { }; + python-twitter = callPackage ../development/python-modules/python-twitter { }; python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; @@ -6493,6 +6513,8 @@ in { python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + python-velbus = callPackage ../development/python-modules/python-velbus { }; + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; python-vlc = callPackage ../development/python-modules/python-vlc { }; @@ -6592,6 +6614,8 @@ in { pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + pyvolumio = callPackage ../development/python-modules/pyvolumio { }; + pyvoro = callPackage ../development/python-modules/pyvoro { }; pywal = callPackage ../development/python-modules/pywal { }; @@ -6636,6 +6660,8 @@ in { pyxeoma = callPackage ../development/python-modules/pyxeoma { }; + pyxiaomigateway = callPackage ../development/python-modules/pyxiaomigateway { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); @@ -6729,6 +6755,8 @@ in { rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + ratelimit = callPackage ../development/python-modules/ratelimit { }; + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; raven = callPackage ../development/python-modules/raven { }; @@ -6996,6 +7024,8 @@ in { safety = callPackage ../development/python-modules/safety { }; + sagemaker = callPackage ../development/python-modules/sagemaker { }; + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; sane = callPackage ../development/python-modules/sane { @@ -7308,6 +7338,8 @@ in { smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; + smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 smmap = callPackage ../development/python-modules/smmap { }; @@ -7669,6 +7701,8 @@ in { tag-expressions = callPackage ../development/python-modules/tag-expressions { }; + tahoma-api = callPackage ../development/python-modules/tahoma-api { }; + tarman = callPackage ../development/python-modules/tarman { }; tasklib = callPackage ../development/python-modules/tasklib { }; @@ -7973,6 +8007,8 @@ in { tumpa = callPackage ../development/python-modules/tumpa { }; + tuyaha = callPackage ../development/python-modules/tuyaha { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; tvnamer = callPackage ../development/python-modules/tvnamer { }; @@ -8346,6 +8382,8 @@ in { widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; + wiffi = callPackage ../development/python-modules/wiffi { }; + willow = callPackage ../development/python-modules/willow { }; winacl = callPackage ../development/python-modules/winacl { }; @@ -8372,6 +8410,8 @@ in { ws4py = callPackage ../development/python-modules/ws4py { }; + wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; @@ -8474,8 +8514,6 @@ in { xmodem = callPackage ../development/python-modules/xmodem { }; - xmpppy = callPackage ../development/python-modules/xmpppy { }; - xnd = callPackage ../development/python-modules/xnd { }; xpybutil = callPackage ../development/python-modules/xpybutil { }; @@ -8500,6 +8538,8 @@ in { yahooweather = callPackage ../development/python-modules/yahooweather { }; + yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { }; + yamale = callPackage ../development/python-modules/yamale { }; yamllint = callPackage ../development/python-modules/yamllint { };