diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 048218a6d4..1d3d51cda7 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -79,11 +79,11 @@ /pkgs/development/tools/poetry2nix @adisbladis # Haskell -/pkgs/development/compilers/ghc @cdepillabout -/pkgs/development/haskell-modules @cdepillabout -/pkgs/development/haskell-modules/default.nix @cdepillabout -/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout -/pkgs/development/haskell-modules/hoogle.nix @cdepillabout +/pkgs/development/compilers/ghc @cdepillabout @sternenseemann +/pkgs/development/haskell-modules @cdepillabout @sternenseemann +/pkgs/development/haskell-modules/default.nix @cdepillabout @sternenseemann +/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout @sternenseemann +/pkgs/development/haskell-modules/hoogle.nix @cdepillabout @sternenseemann # Perl /pkgs/development/interpreters/perl @volth @stigtsp diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml new file mode 100644 index 0000000000..0db6fd7832 --- /dev/null +++ b/third_party/nixpkgs/.github/labeler.yml @@ -0,0 +1,146 @@ +"6.topic: agda": + - doc/languages-frameworks/agda.section.md + - nixos/tests/agda.nix + - pkgs/build-support/agda/**/* + - pkgs/development/libraries/agda/**/* + - pkgs/top-level/agda-packages.nix + +"6.topic: cinnamon": + - pkgs/desktops/cinnamon/**/* + +"6.topic: emacs": + - nixos/modules/services/editors/emacs.nix + - nixos/modules/services/editors/emacs.xml + - nixos/tests/emacs-daemon.nix + - pkgs/applications/editors/emacs-modes/**/* + - pkgs/applications/editors/emacs/**/* + - pkgs/build-support/emacs/**/* + - pkgs/top-level/emacs-packages.nix + +"6.topic: erlang": + - doc/languages-frameworks/beam.section.md + - pkgs/development/beam-modules/**/* + - pkgs/development/interpreters/elixir/**/* + - pkgs/development/interpreters/erlang/**/* + - pkgs/development/tools/build-managers/rebar/**/* + - pkgs/development/tools/build-managers/rebar3/**/* + - pkgs/development/tools/erlang/**/* + - pkgs/top-level/beam-packages.nix + +"6.topic: fetch": + - pkgs/build-support/fetch*/**/* + +"6.topic: GNOME": + - doc/languages-frameworks/gnome.section.md + - nixos/modules/services/desktops/gnome3/**/* + - nixos/modules/services/x11/desktop-managers/gnome3.nix + - nixos/tests/gnome3-xorg.nix + - nixos/tests/gnome3.nix + - pkgs/desktops/gnome-3/**/* + +"6.topic: golang": + - doc/languages-frameworks/go.section.md + - pkgs/development/compilers/go/**/* + - pkgs/development/go-modules/**/* + - pkgs/development/go-packages/**/* + +"6.topic: haskell": + - doc/languages-frameworks/haskell.section.md + - pkgs/development/compilers/ghc/**/* + - pkgs/development/haskell-modules/**/* + - pkgs/development/tools/haskell/**/* + - pkgs/top-level/haskell-packages.nix + +"6.topic: kernel": + - pkgs/build-support/kernel/**/* + +"6.topic: lua": + - pkgs/development/interpreters/lua-5/**/* + - pkgs/development/interpreters/luajit/**/* + - pkgs/development/lua-modules/**/* + - pkgs/top-level/lua-packages.nix + +"6.topic: nixos": + - nixos/**/* + +"6.topic: ocaml": + - doc/languages-frameworks/ocaml.section.md + - pkgs/development/compilers/ocaml/**/* + - pkgs/development/compilers/reason/**/* + - pkgs/development/ocaml-modules/**/* + - pkgs/development/tools/ocaml/**/* + - pkgs/top-level/ocaml-packages.nix + +"6.topic: pantheon": + - nixos/modules/services/desktops/pantheon/**/* + - nixos/modules/services/x11/desktop-managers/pantheon.nix + - nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix + - nixos/tests/pantheon.nix + - pkgs/desktops/pantheon/**/* + +"6.topic: policy discussion": + - .github/**/* + +"6.topic: printing": + - nixos/modules/services/printing/cupsd.nix + - pkgs/misc/cups/**/* + +"6.topic: python": + - doc/languages-frameworks/python.section.md + - pkgs/development/interpreters/python/**/* + - pkgs/development/python-modules/**/* + - pkgs/top-level/python-packages.nix + +"6.topic: qt/kde": + - doc/languages-frameworks/qt.section.md + - nixos/modules/services/x11/desktop-managers/plasma5.nix + - nixos/tests/plasma5.nix + - pkgs/applications/kde/**/* + - pkgs/desktops/plasma-5/**/* + - pkgs/development/libraries/kde-frameworks/**/* + - pkgs/development/libraries/qt-5/**/* + +"6.topic: ruby": + - doc/languages-frameworks/ruby.section.md + - pkgs/development/interpreters/ruby/**/* + - pkgs/development/ruby-modules/**/* + +"6.topic: rust": + - doc/languages-frameworks/rust.section.md + - pkgs/build-support/rust/**/* + - pkgs/development/compilers/rust/**/* + +"6.topic: stdenv": + - pkgs/stdenv/**/* + +"6.topic: steam": + - pkgs/games/steam/**/* + +"6.topic: systemd": + - pkgs/os-specific/linux/systemd/**/* + - nixos/modules/system/boot/systemd*/**/* + +"6.topic: TeX": + - doc/languages-frameworks/texlive.section.md + - pkgs/tools/typesetting/tex/**/* + +"6.topic: vim": + - doc/languages-frameworks/vim.section.md + - pkgs/applications/editors/vim/**/* + - pkgs/misc/vim-plugins/**/* + +"6.topic: xfce": + - nixos/doc/manual/configuration/xfce.xml + - nixos/modules/services/x11/desktop-managers/xfce.nix + - nixos/tests/xfce.nix + - pkgs/desktops/xfce/**/* + +"8.has: changelog": + - nixos/doc/manual/release-notes/**/* + +"8.has: documentation": + - doc/**/* + - nixos/doc/**/* + +"8.has: module (update)": + - nixos/modules/**/* diff --git a/third_party/nixpkgs/.github/workflows/labels.yml b/third_party/nixpkgs/.github/workflows/labels.yml new file mode 100644 index 0000000000..1139807753 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/labels.yml @@ -0,0 +1,14 @@ +name: "Label PR" + +on: + pull_request_target: + +jobs: + labels: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' + steps: + - uses: actions/labeler@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + sync-labels: true diff --git a/third_party/nixpkgs/doc/builders/packages/ibus.section.md b/third_party/nixpkgs/doc/builders/packages/ibus.section.md new file mode 100644 index 0000000000..2ce85467bb --- /dev/null +++ b/third_party/nixpkgs/doc/builders/packages/ibus.section.md @@ -0,0 +1,38 @@ +# ibus-engines.typing-booster {#sec-ibus-typing-booster} + +This package is an ibus-based completion method to speed up typing. + +## Activating the engine {#sec-ibus-typing-booster-activate} + +IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html). + +On NixOS you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module: + +```nix +{ pkgs, ... }: { + i18n.inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ typing-booster ]; + }; +} +``` + +## Using custom hunspell dictionaries {#sec-ibus-typing-booster-customize-hunspell} + +The IBus engine is based on `hunspell` to support completion in many languages. By default the dictionaries `de-de`, `en-us`, `fr-moderne` `es-es`, `it-it`, `sv-se` and `sv-fi` are in use. To add another dictionary, the package can be overridden like this: + +```nix +ibus-engines.typing-booster.override { langs = [ "de-at" "en-gb" ]; } +``` + +_Note: each language passed to `langs` must be an attribute name in `pkgs.hunspellDicts`._ + +## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker} + +The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed: + +On NixOS it can be installed using the following expression: + +```nix +{ pkgs, ... }: { fonts.fonts = with pkgs; [ noto-fonts-emoji ]; } +``` diff --git a/third_party/nixpkgs/doc/builders/packages/ibus.xml b/third_party/nixpkgs/doc/builders/packages/ibus.xml deleted file mode 100644 index 2ed37903a2..0000000000 --- a/third_party/nixpkgs/doc/builders/packages/ibus.xml +++ /dev/null @@ -1,57 +0,0 @@ -
- ibus-engines.typing-booster - - - This package is an ibus-based completion method to speed up typing. - - -
- Activating the engine - - - IBus needs to be configured accordingly to activate typing-booster. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the upstream docs. - - - - On NixOS you need to explicitly enable ibus with given engines before customizing your desktop to use typing-booster. This can be achieved using the ibus module: -{ pkgs, ... }: { - i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ typing-booster ]; - }; -} - -
- -
- Using custom hunspell dictionaries - - - The IBus engine is based on hunspell to support completion in many languages. By default the dictionaries de-de, en-us, fr-moderne es-es, it-it, sv-se and sv-fi are in use. To add another dictionary, the package can be overridden like this: -ibus-engines.typing-booster.override { - langs = [ "de-at" "en-gb" ]; -} - - - - Note: each language passed to langs must be an attribute name in pkgs.hunspellDicts. - -
- -
- Built-in emoji picker - - - The ibus-engines.typing-booster package contains a program named emoji-picker. To display all emojis correctly, a special font such as noto-fonts-emoji is needed: - - - - On NixOS it can be installed using the following expression: -{ pkgs, ... }: { - fonts.fonts = with pkgs; [ noto-fonts-emoji ]; -} - -
-
diff --git a/third_party/nixpkgs/doc/builders/packages/index.xml b/third_party/nixpkgs/doc/builders/packages/index.xml index fac82180b2..e1e2fef3f1 100644 --- a/third_party/nixpkgs/doc/builders/packages/index.xml +++ b/third_party/nixpkgs/doc/builders/packages/index.xml @@ -12,7 +12,7 @@ - + diff --git a/third_party/nixpkgs/lib/systems/platforms.nix b/third_party/nixpkgs/lib/systems/platforms.nix index 3bf90cd0ca..f46e9c826a 100644 --- a/third_party/nixpkgs/lib/systems/platforms.nix +++ b/third_party/nixpkgs/lib/systems/platforms.nix @@ -303,14 +303,12 @@ rec { preferBuiltin = true; target = "zImage"; extraConfig = '' - # Serial port for Raspberry Pi 3. Upstream forgot to add it to the ARMv7 defconfig. + # Serial port for Raspberry Pi 3. Wasn't included in ARMv7 defconfig + # until 4.17. SERIAL_8250_BCM2835AUX y SERIAL_8250_EXTENDED y SERIAL_8250_SHARE_IRQ y - # Fix broken sunxi-sid nvmem driver. - TI_CPTS y - # Hangs ODROID-XU4 ARM_BIG_LITTLE_CPUIDLE n diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 8b265d59e6..54c7d5e9e5 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -746,6 +746,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + armijnhemel = { + email = "armijn@tjaldur.nl"; + github = "armijnhemel"; + githubId = 10587952; + name = "Armijn Hemel"; + }; arnarg = { email = "arnarg@fastmail.com"; github = "arnarg"; @@ -3193,6 +3199,12 @@ githubId = 19961516; name = "Felix Weilbach"; }; + fliegendewurst = { + email = "arne.keller@posteo.de"; + github = "FliegendeWurst"; + githubId = 12560461; + name = "Arne Keller"; + }; flokli = { email = "flokli@flokli.de"; github = "flokli"; @@ -4009,6 +4021,12 @@ githubId = 61913481; name = "Mat Marini"; }; + illustris = { + email = "me@illustris.tech"; + github = "illustris"; + githubId = 3948275; + name = "Harikrishnan R"; + }; ilya-fedin = { email = "fedin-ilja2010@ya.ru"; github = "ilya-fedin"; @@ -6325,6 +6343,12 @@ githubId = 1776903; name = "Andrew Abbott"; }; + mitchmindtree = { + email = "mail@mitchellnordine.com"; + github = "mitchmindtree"; + githubId = 4587373; + name = "Mitchell Nordine"; + }; mjanczyk = { email = "m@dragonvr.pl"; github = "mjanczyk"; @@ -6779,6 +6803,12 @@ githubId = 1488603; name = "François Espinet"; }; + neverbehave = { + email = "i@never.pet"; + github = "NeverBehave"; + githubId = 17120571; + name = "Xinhao Luo"; + }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; github = "nikitavoloboev"; @@ -9803,6 +9833,16 @@ githubId = 16151097; name = "Valentin Gehrke"; }; + tuxinaut = { + email = "trash4you@tuxinaut.de"; + github = "tuxinaut"; + githubId = 722482; + name = "Denny Schäfer"; + keys = [{ + longkeyid = "rsa4096/0xB057455D1E567270"; + fingerprint = "C752 0E49 4D92 1740 D263 C467 B057 455D 1E56 7270"; + }]; + }; tv = { email = "tv@krebsco.de"; github = "4z3"; @@ -10198,6 +10238,12 @@ email = "kirill.wedens@gmail.com"; name = "wedens"; }; + weihua = { + email = "luwh364@gmail.com"; + github = "weihua-lu"; + githubId = 9002575; + name = "Weihua Lu"; + }; wheelsandmetal = { email = "jakob@schmutz.co.uk"; github = "wheelsandmetal"; diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 0575b87b74..8acf68ac3a 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -82,6 +82,7 @@ with lib.maintainers; { jtojnar worldofpeace dasj19 + maxeaubrey ]; scope = "Maintain GNOME desktop environment and platform."; }; @@ -96,6 +97,18 @@ with lib.maintainers; { scope = "Maintain Jitsi."; }; + kodi = { + members = [ + aanderse + cpages + edwtjo + minijackson + peterhoeg + sephalon + ]; + scope = "Maintain Kodi and related packages."; + }; + matrix = { members = [ ma27 diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml index 405a50a9e4..d8654d71ac 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/luks-file-systems.xml @@ -26,7 +26,11 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** # mkfs.ext4 /dev/mapper/crypted - To ensure that this file system is automatically mounted at boot time as + The LUKS volume should be automatically picked up by + nixos-generate-config, but you might want to verify that your + hardware-configuration.nix looks correct. + + To manually ensure that the system is automatically mounted at boot time as /, add the following to configuration.nix: diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 07774dd1d2..4a63a09ab8 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -682,6 +682,7 @@ ./services/networking/i2p.nix ./services/networking/icecream/scheduler.nix ./services/networking/icecream/daemon.nix + ./services/networking/inspircd.nix ./services/networking/iodine.nix ./services/networking/iperf3.nix ./services/networking/ircd-hybrid/default.nix diff --git a/third_party/nixpkgs/nixos/modules/security/acme.nix b/third_party/nixpkgs/nixos/modules/security/acme.nix index c33a92580d..6ea0cfe615 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme.nix @@ -235,7 +235,7 @@ let # https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099 wantedBy = optionals (!config.boot.isContainer) [ "multi-user.target" ]; - path = with pkgs; [ lego coreutils diffutils ]; + path = with pkgs; [ lego coreutils diffutils openssl ]; serviceConfig = commonServiceConfig // { Group = data.group; @@ -274,6 +274,34 @@ let script = '' set -euxo pipefail + # This reimplements the expiration date check, but without querying + # the acme server first. By doing this offline, we avoid errors + # when the network or DNS are unavailable, which can happen during + # nixos-rebuild switch. + is_expiration_skippable() { + pem=$1 + + # This function relies on set -e to exit early if any of the + # conditions or programs fail. + + [[ -e $pem ]] + + expiration_line="$( + set -euxo pipefail + openssl x509 -noout -enddate <$pem \ + | grep notAfter \ + | sed -e 's/^notAfter=//' + )" + [[ -n "$expiration_line" ]] + + expiration_date="$(date -d "$expiration_line" +%s)" + now="$(date +%s)" + expiration_s=$[expiration_date - now] + expiration_days=$[expiration_s / (3600 * 24)] # rounds down + + [[ $expiration_days -gt ${toString cfg.validMinDays} ]] + } + ${optionalString (data.webroot != null) '' # Ensure the webroot exists mkdir -p '${data.webroot}/.well-known/acme-challenge' @@ -288,8 +316,14 @@ let # When domains are updated, there's no need to do a full # Lego run, but it's likely renew won't work if days is too low. if [ -e certificates/domainhash.txt ] && cmp -s domainhash.txt certificates/domainhash.txt; then - lego ${renewOpts} --days ${toString cfg.validMinDays} + if is_expiration_skippable out/full.pem; then + echo 1>&2 "nixos-acme: skipping renewal because expiration isn't within the coming ${toString cfg.validMinDays} days" + else + echo 1>&2 "nixos-acme: renewing now, because certificate expires within the configured ${toString cfg.validMinDays} days" + lego ${renewOpts} --days ${toString cfg.validMinDays} + fi else + echo 1>&2 "certificate domain(s) have changed; will renew now" # Any number > 90 works, but this one is over 9000 ;-) lego ${renewOpts} --days 9001 fi diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix index 573f0efa9d..ac57f27152 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix @@ -93,10 +93,12 @@ in }; paths = mkOption { - type = types.listOf types.str; - default = []; + type = types.nullOr (types.listOf types.str); + default = null; description = '' - Which paths to backup. + Which paths to backup. If null or an empty array, no + backup command will be run. This can be used to create a + prune-only job. ''; example = [ "/var/lib/postgresql" @@ -217,7 +219,7 @@ in resticCmd = "${pkgs.restic}/bin/restic${extraOptions}"; filesFromTmpFile = "/run/restic-backups-${name}/includes"; backupPaths = if (backup.dynamicFilesFrom == null) - then concatStringsSep " " backup.paths + then if (backup.paths != null) then concatStringsSep " " backup.paths else "" else "--files-from ${filesFromTmpFile}"; pruneCmd = optionals (builtins.length backup.pruneOpts > 0) [ ( resticCmd + " forget --prune " + (concatStringsSep " " backup.pruneOpts) ) @@ -243,7 +245,8 @@ in restartIfChanged = false; serviceConfig = { Type = "oneshot"; - ExecStart = [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ] ++ pruneCmd; + ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ]) + ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; CacheDirectory = "restic-backups-${name}"; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/README.md b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/README.md new file mode 100644 index 0000000000..87288a81cf --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/README.md @@ -0,0 +1,6 @@ +# Updating + +1. Update the version & hash in pkgs/development/libraries/pipewire/default.nix +2. run `nix build -f /path/to/nixpkgs/checkout pipewire pipewire.mediaSession` +3. copy all JSON files from result/etc/pipewire and result-mediaSession/etc/pipewire/media-session.d to this directory +4. add new files to the module config and passthru tests diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client-rt.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client-rt.conf.json index d294927b4f..284d8c394a 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client-rt.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client-rt.conf.json @@ -6,21 +6,34 @@ "audio.convert.*": "audioconvert/libspa-audioconvert", "support.*": "support/libspa-support" }, - "context.modules": { - "libpipewire-module-rtkit": { + "context.modules": [ + { + "name": "libpipewire-module-rtkit", "args": {}, "flags": [ "ifexists", "nofail" ] }, - "libpipewire-module-protocol-native": null, - "libpipewire-module-client-node": null, - "libpipewire-module-client-device": null, - "libpipewire-module-adapter": null, - "libpipewire-module-metadata": null, - "libpipewire-module-session-manager": null - }, + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-client-device" + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-session-manager" + } + ], "filter.properties": {}, "stream.properties": {} } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client.conf.json index 224938abbb..71294a0e78 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/client.conf.json @@ -6,14 +6,26 @@ "audio.convert.*": "audioconvert/libspa-audioconvert", "support.*": "support/libspa-support" }, - "context.modules": { - "libpipewire-module-protocol-native": null, - "libpipewire-module-client-node": null, - "libpipewire-module-client-device": null, - "libpipewire-module-adapter": null, - "libpipewire-module-metadata": null, - "libpipewire-module-session-manager": null - }, + "context.modules": [ + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-client-device" + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-session-manager" + } + ], "filter.properties": {}, "stream.properties": {} } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json index 2de04036b3..a6bd349178 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/jack.conf.json @@ -5,17 +5,24 @@ "context.spa-libs": { "support.*": "support/libspa-support" }, - "context.modules": { - "libpipewire-module-rtkit": { + "context.modules": [ + { + "name": "libpipewire-module-rtkit", "args": {}, "flags": [ "ifexists", "nofail" ] }, - "libpipewire-module-protocol-native": null, - "libpipewire-module-client-node": null, - "libpipewire-module-metadata": null - }, + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-metadata" + } + ], "jack.properties": {} } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json index 4b2505ff81..62e59935db 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/media-session.conf.json @@ -6,21 +6,34 @@ "api.v4l2.*": "v4l2/libspa-v4l2", "api.libcamera.*": "libcamera/libspa-libcamera" }, - "context.modules": { - "libpipewire-module-rtkit": { + "context.modules": [ + { + "name": "libpipewire-module-rtkit", "args": {}, "flags": [ "ifexists", "nofail" ] }, - "libpipewire-module-protocol-native": null, - "libpipewire-module-client-node": null, - "libpipewire-module-client-device": null, - "libpipewire-module-adapter": null, - "libpipewire-module-metadata": null, - "libpipewire-module-session-manager": null - }, + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-client-device" + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-session-manager" + } + ], "session.modules": { "default": [ "flatpak", diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index b41ea349fb..539a4cf446 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -9,21 +9,12 @@ let && pkgs.stdenv.isx86_64 && pkgs.pkgsi686Linux.pipewire != null; - prioritizeNativeProtocol = { - "context.modules" = { - "libpipewire-module-protocol-native" = { - _priority = -100; - _content = null; - }; - }; - }; - # Use upstream config files passed through spa-json-dump as the base # Patched here as necessary for them to work with this module defaults = { alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json)); bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json)); - media-session = recursiveUpdate (builtins.fromJSON (builtins.readFile ./media-session.conf.json)) prioritizeNativeProtocol; + media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json)); v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json)); }; # Helpers for generating the pipewire JSON config file diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json index da08bcea2c..3e776fe75a 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire-pulse.conf.json @@ -4,25 +4,35 @@ "audio.convert.*": "audioconvert/libspa-audioconvert", "support.*": "support/libspa-support" }, - "context.modules": { - "libpipewire-module-rtkit": { + "context.modules": [ + { + "name": "libpipewire-module-rtkit", "args": {}, "flags": [ "ifexists", "nofail" ] }, - "libpipewire-module-protocol-native": null, - "libpipewire-module-client-node": null, - "libpipewire-module-adapter": null, - "libpipewire-module-metadata": null, - "libpipewire-module-protocol-pulse": { + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-protocol-pulse", "args": { "server.address": [ "unix:native" ] } } - }, + ], "stream.properties": {} } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.conf.json index 59e2afca09..bae87dd663 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.conf.json @@ -14,42 +14,66 @@ "api.jack.*": "jack/libspa-jack", "support.*": "support/libspa-support" }, - "context.modules": { - "libpipewire-module-rtkit": { + "context.modules": [ + { + "name": "libpipewire-module-rtkit", "args": {}, "flags": [ "ifexists", "nofail" ] }, - "libpipewire-module-protocol-native": null, - "libpipewire-module-profiler": null, - "libpipewire-module-metadata": null, - "libpipewire-module-spa-device-factory": null, - "libpipewire-module-spa-node-factory": null, - "libpipewire-module-client-node": null, - "libpipewire-module-client-device": null, - "libpipewire-module-portal": { + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-profiler" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-spa-device-factory" + }, + { + "name": "libpipewire-module-spa-node-factory" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-client-device" + }, + { + "name": "libpipewire-module-portal", "flags": [ "ifexists", "nofail" ] }, - "libpipewire-module-access": { + { + "name": "libpipewire-module-access", "args": {} }, - "libpipewire-module-adapter": null, - "libpipewire-module-link-factory": null, - "libpipewire-module-session-manager": null - }, - "context.objects": { - "spa-node-factory": { + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-link-factory" + }, + { + "name": "libpipewire-module-session-manager" + } + ], + "context.objects": [ + { + "factory": "spa-node-factory", "args": { "factory.name": "support.node.driver", "node.name": "Dummy-Driver", "priority.driver": 8000 } } - }, - "context.exec": {} + ], + "context.exec": [] } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix index 2577e77c4a..7cf19706a6 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -18,45 +18,15 @@ let ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire" ''; - prioritizeNativeProtocol = { - "context.modules" = { - # Most other modules depend on this, so put it first - "libpipewire-module-protocol-native" = { - _priority = -100; - _content = null; - }; - }; - }; - - fixDaemonModulePriorities = { - "context.modules" = { - # Most other modules depend on thism so put it first - "libpipewire-module-protocol-native" = { - _priority = -100; - _content = null; - }; - # Needs to be before libpipewire-module-access - "libpipewire-module-portal" = { - _priority = -50; - _content = { - flags = [ - "ifexists" - "nofail" - ]; - }; - }; - }; - }; - # Use upstream config files passed through spa-json-dump as the base # Patched here as necessary for them to work with this module defaults = { - client = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client.conf.json)) prioritizeNativeProtocol; - client-rt = recursiveUpdate (builtins.fromJSON (builtins.readFile ./client-rt.conf.json)) prioritizeNativeProtocol; - jack = recursiveUpdate (builtins.fromJSON (builtins.readFile ./jack.conf.json)) prioritizeNativeProtocol; + client = builtins.fromJSON (builtins.readFile ./client.conf.json); + client-rt = builtins.fromJSON (builtins.readFile ./client-rt.conf.json); + jack = builtins.fromJSON (builtins.readFile ./jack.conf.json); # Remove session manager invocation from the upstream generated file, it points to the wrong path - pipewire = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire.conf.json)) fixDaemonModulePriorities; - pipewire-pulse = recursiveUpdate (builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json)) prioritizeNativeProtocol; + pipewire = builtins.fromJSON (builtins.readFile ./pipewire.conf.json); + pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json); }; # Helpers for generating the pipewire JSON config file diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix index 03070a8f9e..29e5fbaee6 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix @@ -4,9 +4,7 @@ with lib; let - pkg = if config.hardware.sane.snapshot - then pkgs.sane-backends-git - else pkgs.sane-backends; + pkg = pkgs.sane-backends; sanedConf = pkgs.writeTextFile { name = "saned.conf"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index 1d45af3634..c9dd10ec55 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -196,6 +196,7 @@ let domain: "${cfg.smtp.domain}", ${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"} enable_starttls_auto: ${boolToString cfg.smtp.enableStartTLSAuto}, + tls: ${boolToString cfg.smtp.tls}, ca_file: "/etc/ssl/certs/ca-certificates.crt", openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}' } @@ -463,6 +464,12 @@ in { description = "Whether to try to use StartTLS."; }; + tls = mkOption { + type = types.bool; + default = false; + description = "Whether to use TLS wrapper-mode."; + }; + opensslVerifyMode = mkOption { type = types.str; default = "peer"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix b/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix new file mode 100644 index 0000000000..8cb2b406ee --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.inspircd; + + configFile = pkgs.writeText "inspircd.conf" cfg.config; + +in { + meta = { + maintainers = [ lib.maintainers.sternenseemann ]; + }; + + options = { + services.inspircd = { + enable = lib.mkEnableOption "InspIRCd"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.inspircd; + defaultText = lib.literalExample "pkgs.inspircd"; + example = lib.literalExample "pkgs.inspircdMinimal"; + description = '' + The InspIRCd package to use. This is mainly useful + to specify an overridden version of the + pkgs.inspircd dervivation, for + example if you want to use a more minimal InspIRCd + distribution with less modules enabled or with + modules enabled which can't be distributed in binary + form due to licensing issues. + ''; + }; + + config = lib.mkOption { + type = lib.types.lines; + description = '' + Verbatim inspircd.conf file. + For a list of options, consult the + InspIRCd documentation, the + Module documentation + and the example configuration files distributed + with pkgs.inspircd.doc + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.inspircd = { + description = "InspIRCd - the stable, high-performance and modular Internet Relay Chat Daemon"; + wantedBy = [ "multi-user.target" ]; + requires = [ "network.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = '' + ${lib.getBin cfg.package}/bin/inspircd start --config ${configFile} --nofork --nopid + ''; + DynamicUser = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix index 769490e915..dd63857a55 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix @@ -133,8 +133,10 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' - install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem - install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem + ${optionalString (cfg.insecure != true) '' + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem + install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem + ''} ''; serviceConfig = mkMerge [ diff --git a/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 6bee900c68..2ea191426c 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 @@ -15,12 +15,15 @@ import re import datetime import glob import os.path +from typing import Tuple, List, Optional -def copy_if_not_exists(source, dest): + +def copy_if_not_exists(source: str, dest: str) -> None: if not os.path.exists(dest): shutil.copyfile(source, dest) -def system_dir(profile, generation): + +def system_dir(profile: Optional[str], generation: int) -> str: if profile: return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation) else: @@ -42,7 +45,8 @@ MEMTEST_BOOT_ENTRY = """title MemTest86 efi /efi/memtest86/BOOTX64.efi """ -def write_loader_conf(profile, generation): + +def write_loader_conf(profile: Optional[str], generation: int) -> None: with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": f.write("timeout @timeout@\n") @@ -55,10 +59,12 @@ def write_loader_conf(profile, generation): f.write("console-mode @consoleMode@\n"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") -def profile_path(profile, generation, name): + +def profile_path(profile: Optional[str], generation: int, name: str) -> str: return os.readlink("%s/%s" % (system_dir(profile, generation), name)) -def copy_from_profile(profile, generation, name, dry_run=False): + +def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str: store_file_path = profile_path(profile, generation, name) suffix = os.path.basename(store_file_path) store_dir = os.path.basename(os.path.dirname(store_file_path)) @@ -67,7 +73,8 @@ def copy_from_profile(profile, generation, name, dry_run=False): copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) return efi_file_path -def describe_generation(generation_dir): + +def describe_generation(generation_dir: str) -> str: try: with open("%s/nixos-version" % generation_dir) as f: nixos_version = f.read() @@ -87,7 +94,8 @@ def describe_generation(generation_dir): return description -def write_entry(profile, generation, machine_id): + +def write_entry(profile: Optional[str], generation: int, machine_id: str) -> None: kernel = copy_from_profile(profile, generation, "kernel") initrd = copy_from_profile(profile, generation, "initrd") try: @@ -116,14 +124,16 @@ def write_entry(profile, generation, machine_id): f.write("machine-id %s\n" % machine_id) os.rename(tmp_path, entry_file) -def mkdir_p(path): + +def mkdir_p(path: str) -> None: try: os.makedirs(path) except OSError as e: if e.errno != errno.EEXIST or not os.path.isdir(path): raise -def get_generations(profile=None): + +def get_generations(profile: Optional[str] = None) -> List[Tuple[Optional[str], int]]: gen_list = subprocess.check_output([ "@nix@/bin/nix-env", "--list-generations", @@ -137,7 +147,8 @@ def get_generations(profile=None): configurationLimit = @configurationLimit@ return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:] -def remove_old_entries(gens): + +def remove_old_entries(gens: List[Tuple[Optional[str], int]]) -> None: rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$") rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$") known_paths = [] @@ -150,8 +161,8 @@ def remove_old_entries(gens): prof = rex_profile.sub(r"\1", path) else: prof = "system" - gen = int(rex_generation.sub(r"\1", path)) - if not (prof, gen) in gens: + gen_number = int(rex_generation.sub(r"\1", path)) + if not (prof, gen_number) in gens: os.unlink(path) except ValueError: pass @@ -159,7 +170,8 @@ def remove_old_entries(gens): if not path in known_paths and not os.path.isdir(path): os.unlink(path) -def get_profiles(): + +def get_profiles() -> List[str]: if os.path.isdir("/nix/var/nix/profiles/system-profiles/"): return [x for x in os.listdir("/nix/var/nix/profiles/system-profiles/") @@ -167,7 +179,8 @@ def get_profiles(): else: return [] -def main(): + +def main() -> None: parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') args = parser.parse_args() @@ -182,7 +195,9 @@ def main(): # be there on newly installed systems, so let's generate one so that # bootctl can find it and we can also pass it to write_entry() later. cmd = ["@systemd@/bin/systemd-machine-id-setup", "--print"] - machine_id = subprocess.check_output(cmd).rstrip() + machine_id = subprocess.run( + cmd, text=True, check=True, stdout=subprocess.PIPE + ).stdout.rstrip() if os.getenv("NIXOS_INSTALL_GRUB") == "1": warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) @@ -213,7 +228,6 @@ def main(): print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version)) subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"]) - mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") @@ -252,5 +266,6 @@ def main(): if rc != 0: print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr) + if __name__ == '__main__': main() diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index f0bd76a3c1..ff304f570d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -7,7 +7,7 @@ let efi = config.boot.loader.efi; - gummibootBuilder = pkgs.substituteAll { + systemdBootBuilder = pkgs.substituteAll { src = ./systemd-boot-builder.py; isExecutable = true; @@ -30,6 +30,17 @@ let memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else ""; }; + + checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { + nativeBuildInputs = [ pkgs.mypy ]; + } '' + install -m755 ${systemdBootBuilder} $out + mypy \ + --no-implicit-optional \ + --disallow-untyped-calls \ + --disallow-untyped-defs \ + $out + ''; in { imports = @@ -131,7 +142,7 @@ in { boot.loader.supportsInitrdSecrets = true; system = { - build.installBootLoader = gummibootBuilder; + build.installBootLoader = checkedSystemdBootBuilder; boot.loader.id = "systemd-boot"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh index 936077b9df..50ee0b8841 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh @@ -167,6 +167,7 @@ exec {logOutFd}>&- {logErrFd}>&- # Start systemd. echo "starting systemd..." + PATH=/run/current-system/systemd/lib/systemd:@fsPackagesPath@ \ - LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive \ + LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive @systemdUnitPathEnvVar@ \ exec @systemdExecutable@ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix index 94bc34fea0..f6b6a8e4b0 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix @@ -10,7 +10,7 @@ let src = ./stage-2-init.sh; shellDebug = "${pkgs.bashInteractive}/bin/bash"; shell = "${pkgs.bash}/bin/bash"; - inherit (config.boot) systemdExecutable; + inherit (config.boot) systemdExecutable extraSystemdUnitPaths; isExecutable = true; inherit (config.nix) readOnlyStore; inherit useHostResolvConf; @@ -20,6 +20,10 @@ let pkgs.util-linux ] ++ lib.optional useHostResolvConf pkgs.openresolv); fsPackagesPath = lib.makeBinPath config.system.fsPackages; + systemdUnitPathEnvVar = lib.optionalString (config.boot.extraSystemdUnitPaths != []) + ("SYSTEMD_UNIT_PATH=" + + builtins.concatStringsSep ":" config.boot.extraSystemdUnitPaths + + ":"); # If SYSTEMD_UNIT_PATH ends with an empty component (":"), the usual unit load path will be appended to the contents of the variable postBootCommands = pkgs.writeText "local-cmds" '' ${config.boot.postBootCommands} @@ -82,6 +86,15 @@ in PATH. ''; }; + + extraSystemdUnitPaths = mkOption { + default = []; + type = types.listOf types.str; + description = '' + Additional paths that get appended to the SYSTEMD_UNIT_PATH environment variable + that can contain mutable unit files. + ''; + }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 6b672c7b2e..45febb27bf 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -175,8 +175,10 @@ let "timers.target.wants" ]; - upstreamUserUnits = - [ "basic.target" + upstreamUserUnits = [ + "app.slice" + "background.slice" + "basic.target" "bluetooth.target" "default.target" "exit.target" @@ -184,6 +186,7 @@ let "graphical-session.target" "paths.target" "printer.target" + "session.slice" "shutdown.target" "smartcard.target" "sockets.target" @@ -193,6 +196,7 @@ let "systemd-tmpfiles-clean.timer" "systemd-tmpfiles-setup.service" "timers.target" + "xdg-desktop-autostart.target" ]; makeJobScript = name: text: diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix index 997edf77ba..148d022199 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix @@ -118,8 +118,9 @@ in [network] cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] - ${lib.optionalString (cfg.ociSeccompBpfHook.enable == true) '' [engine] + init_path = "${pkgs.catatonit}/bin/catatonit" + ${lib.optionalString (cfg.ociSeccompBpfHook.enable) '' hooks_dir = [ "${config.boot.kernelPackages.oci-seccomp-bpf-hook}", ] diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 3ce71b0abe..fb45ec1a31 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -176,6 +176,7 @@ in initrd-network-ssh = handleTest ./initrd-network-ssh {}; initrdNetwork = handleTest ./initrd-network.nix {}; initrd-secrets = handleTest ./initrd-secrets.nix {}; + inspircd = handleTest ./inspircd.nix {}; installer = handleTest ./installer.nix {}; iodine = handleTest ./iodine.nix {}; ipfs = handleTest ./ipfs.nix {}; @@ -393,6 +394,7 @@ in systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; + systemd-unit-path = handleTest ./systemd-unit-path.nix {}; taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/inspircd.nix b/third_party/nixpkgs/nixos/tests/inspircd.nix new file mode 100644 index 0000000000..f4d8205401 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/inspircd.nix @@ -0,0 +1,93 @@ +let + clients = [ + "ircclient1" + "ircclient2" + ]; + server = "inspircd"; + ircPort = 6667; + channel = "nixos-cat"; + iiDir = "/tmp/irc"; +in + +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "inspircd"; + nodes = { + "${server}" = { + networking.firewall.allowedTCPPorts = [ ircPort ]; + services.inspircd = { + enable = true; + package = pkgs.inspircdMinimal; + config = '' + + + ''; + }; + }; + } // lib.listToAttrs (builtins.map (client: lib.nameValuePair client { + imports = [ + ./common/user-account.nix + ]; + + systemd.services.ii = { + requires = [ "network.target" ]; + wantedBy = [ "default.target" ]; + + serviceConfig = { + Type = "simple"; + ExecPreStartPre = "mkdir -p ${iiDir}"; + ExecStart = '' + ${lib.getBin pkgs.ii}/bin/ii -n ${client} -s ${server} -i ${iiDir} + ''; + User = "alice"; + }; + }; + }) clients); + + testScript = + let + msg = client: "Hello, my name is ${client}"; + clientScript = client: [ + '' + ${client}.wait_for_unit("network.target") + ${client}.systemctl("start ii") + ${client}.wait_for_unit("ii") + ${client}.wait_for_file("${iiDir}/${server}/out") + '' + # wait until first PING from server arrives before joining, + # so we don't try it too early + '' + ${client}.wait_until_succeeds("grep 'PING' ${iiDir}/${server}/out") + '' + # join ${channel} + '' + ${client}.succeed("echo '/j #${channel}' > ${iiDir}/${server}/in") + ${client}.wait_for_file("${iiDir}/${server}/#${channel}/in") + '' + # send a greeting + '' + ${client}.succeed( + "echo '${msg client}' > ${iiDir}/${server}/#${channel}/in" + ) + '' + # check that all greetings arrived on all clients + ] ++ builtins.map (other: '' + ${client}.succeed( + "grep '${msg other}$' ${iiDir}/${server}/#${channel}/out" + ) + '') clients; + + # foldl', but requires a non-empty list instead of a start value + reduce = f: list: + builtins.foldl' f (builtins.head list) (builtins.tail list); + in '' + start_all() + ${server}.wait_for_open_port(${toString ircPort}) + + # run clientScript for all clients so that every list + # entry is executed by every client before advancing + # to the next one. + '' + lib.concatStrings + (reduce + (lib.zipListsWith (cs: c: cs + c)) + (builtins.map clientScript clients)); +}) diff --git a/third_party/nixpkgs/nixos/tests/podman.nix b/third_party/nixpkgs/nixos/tests/podman.nix index 4985ff6036..6078a936ed 100644 --- a/third_party/nixpkgs/nixos/tests/podman.nix +++ b/third_party/nixpkgs/nixos/tests/podman.nix @@ -96,6 +96,15 @@ import ./make-test-python.nix ( podman.succeed(su_cmd("podman ps | grep sleeping")) podman.succeed(su_cmd("podman stop sleeping")) podman.succeed(su_cmd("podman rm sleeping")) + + with subtest("Run container with init"): + podman.succeed( + "tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - busybox" + ) + pid = podman.succeed("podman run --rm busybox readlink /proc/self").strip() + assert pid == "1" + pid = podman.succeed("podman run --rm --init busybox readlink /proc/self").strip() + assert pid == "2" ''; } ) diff --git a/third_party/nixpkgs/nixos/tests/restic.nix b/third_party/nixpkgs/nixos/tests/restic.nix index 0cc8bd39af..16979eab82 100644 --- a/third_party/nixpkgs/nixos/tests/restic.nix +++ b/third_party/nixpkgs/nixos/tests/restic.nix @@ -45,6 +45,10 @@ import ./make-test-python.nix ( ''; inherit passwordFile initialize paths pruneOpts; }; + remoteprune = { + inherit repository passwordFile; + pruneOpts = [ "--keep-last 1" ]; + }; }; environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local"; @@ -84,6 +88,8 @@ import ./make-test-python.nix ( "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^4 snapshot"', + "systemctl start restic-backups-remoteprune.service", + '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', ) ''; } diff --git a/third_party/nixpkgs/nixos/tests/systemd-unit-path.nix b/third_party/nixpkgs/nixos/tests/systemd-unit-path.nix new file mode 100644 index 0000000000..5998a18718 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-unit-path.nix @@ -0,0 +1,47 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + exampleScript = pkgs.writeTextFile { + name = "example.sh"; + text = '' + #! ${pkgs.runtimeShell} -e + + while true; do + echo "Example script running" >&2 + ${pkgs.coreutils}/bin/sleep 1 + done + ''; + executable = true; + }; + + unitFile = pkgs.writeTextFile { + name = "example.service"; + text = '' + [Unit] + Description=Example systemd service unit file + + [Service] + ExecStart=${exampleScript} + + [Install] + WantedBy=multi-user.target + ''; + }; +in +{ + name = "systemd-unit-path"; + + machine = { pkgs, lib, ... }: { + boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ]; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.succeed("mkdir -p /etc/systemd-rw/system") + machine.succeed( + "cp ${unitFile} /etc/systemd-rw/system/example.service" + ) + machine.succeed("systemctl start example.service") + machine.succeed("systemctl status example.service | grep 'Active: active'") + ''; +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix index 26e25c687e..b664326407 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -16,6 +16,7 @@ , glibmm , graphviz , gtkmm2 +, harvid , itstool , libarchive , libjack2 @@ -35,6 +36,7 @@ , lilv , lrdf , lv2 +, makeWrapper , pango , perl , pkg-config @@ -49,6 +51,8 @@ , taglib , vamp-plugin-sdk , wafHook +, xjadeo +, videoSupport ? false }: stdenv.mkDerivation rec { pname = "ardour"; @@ -70,6 +74,7 @@ stdenv.mkDerivation rec { doxygen graphviz # for dot itstool + makeWrapper perl pkg-config python3 @@ -121,7 +126,7 @@ stdenv.mkDerivation rec { suil taglib vamp-plugin-sdk - ]; + ] ++ lib.optionals videoSupport [ harvid xjadeo ]; wafConfigureFlags = [ "--cxx11" @@ -158,6 +163,10 @@ stdenv.mkDerivation rec { "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour6.png" done install -vDm 644 "ardour.1"* -t "$out/share/man/man1" + '' + lib.optionalString videoSupport '' + # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. + wrapProgram "$out/bin/ardour6" \ + --prefix PATH : "${lib.makeBinPath [ harvid xjadeo ]}" ''; LINKFLAGS = "-lpthread"; @@ -174,8 +183,8 @@ stdenv.mkDerivation rec { https://community.ardour.org/donate ''; homepage = "https://ardour.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu magnetophon ]; + maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index ac405cde64..09be8faa8a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -1,4 +1,5 @@ { mkDerivation +, stdenv , lib , fetchFromGitHub , fetchpatch @@ -39,6 +40,14 @@ mkDerivation rec { postConfigure = "make qmake_all"; + # installs app bundle on darwin, re-extract the binary + # wrapQtAppsHook fails to wrap mach-o binaries, manually call wrapper (https://github.com/NixOS/nixpkgs/issues/102044) + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mv $out/bin/BambooTracker{.app/Contents/MacOS/BambooTracker,} + rm -r $out/bin/BambooTracker.app + wrapQtApp $out/bin/BambooTracker + ''; + meta = with lib; { description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers"; homepage = "https://rerrahkr.github.io/BambooTracker"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix index f4099f49ec..6524700ae1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix @@ -75,7 +75,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = teams.gnome.members; platforms = platforms.unix; - # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2) - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix index 638f54da51..4d7d70aebd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix @@ -43,7 +43,9 @@ stdenv.mkDerivation rec { installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/Mdashdotdashn/littlegptracker.git"; + }; meta = with lib; { description = "A music tracker similar to lsdj optimised to run on portable game consoles"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index f951486e3f..32f43eaed9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "MBdistortion"; version = "1.1.1"; @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { sha256 = "0mdzaqmxzgspfgx9w1hdip18y17hwpdcgjyq1rrfm843vkascwip"; }; + patches = [ + (fetchpatch { + url = "https://github.com/magnetophon/MBdistortion/commit/10e35084b88c559f1b63760cf40fd5ef5a6745a5.patch"; + sha256 = "0hwjl3rzvn3id0sr0qs8f37jdmr915mdan8miaf78ra0ir3wnk76"; + }) + ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix new file mode 100644 index 0000000000..09256911f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mpdevil/default.nix @@ -0,0 +1,52 @@ +{ lib, fetchFromGitHub +, python3Packages +, gdk-pixbuf, glib, gobject-introspection, gtk3 +, intltool +, wrapGAppsHook }: + +python3Packages.buildPythonApplication rec { + pname = "mpdevil"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "SoongNoonien"; + repo = pname; + rev = "v${version}"; + sha256 = "0l7mqv7ys05al2hds4icb32hf14fqi3n7b0f5v1yx54cbl9cqfap"; + }; + + nativeBuildInputs = [ + glib.dev gobject-introspection gtk3 intltool wrapGAppsHook + ]; + + buildInputs = [ + gdk-pixbuf glib + ]; + + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 distutils_extra mpd2 notify-py pygobject3 requests + ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + # Prevent double wrapping. + dontWrapGApps = true; + # Otherwise wrapGAppsHook do not pick up the dependencies correctly. + strictDeps = false; + # There aren't any checks. + doCheck = false; + + meta = with lib; { + description = "A simple music browser for MPD"; + homepage = "https://github.com/SoongNoonien/mpdevil"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ bloomvdomino ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix index 2fd1aeccd7..d770396a6a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.9.6"; + version = "3.10.2"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg"; + sha256 = "sha256-mmo6/zc/3R8ptXfY01RKUOLgmDhWTHiYBMlGqpdMTAo="; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 6a093c91da..72e8ba135d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.28"; + version = "1.29"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1c2x43f46l7556kl9y9qign0g6ywdkh7ywkzv6c9y63n68ph20x2"; + sha256 = "sha256-xnw4UL30nUv/Ru6x/7d05gC0X9nREMdXO9QWBjVoIvo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix index 41931bc9ec..3be8b908c7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero/default.nix @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ ehmry rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch b/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch deleted file mode 100644 index 5bbec1d39b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/CMakeLists.txt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b43f02f6..4470abbf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC) - - include_directories (${CMAKE_SOURCE_DIR}) - --set(Boost_USE_STATIC_LIBS ON) -+add_definitions(-DBOOST_LOG_DYN_LINK) - set(Boost_USE_MULTITHREADED ON) - - if (BOOST_CUSTOM) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix index 60ad51152f..0e39587fab 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,28 +1,24 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL -, qtbase}: +, qtbase, python }: stdenv.mkDerivation rec { pname = "nano-wallet"; - version = "20.0"; + version = "21.3"; src = fetchFromGitHub { owner = "nanocurrency"; - repo = "raiblocks"; + repo = "nano-node"; rev = "V${version}"; - sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn"; + sha256 = "0f6chl5vrzdr4w8g3nivfxk3qm6m11js401998afnhz0xaysm4pm"; fetchSubmodules = true; }; - # Use a patch to force dynamic linking - patches = [ - ./CMakeLists.txt.patch - ]; - cmakeFlags = let options = { + PYTHON_EXECUTABLE = "${python}/bin/python"; + NANO_SHARED_BOOST = "ON"; BOOST_ROOT = boost; - Boost_USE_STATIC_LIBS = "OFF"; RAIBLOCKS_GUI = "ON"; RAIBLOCKS_TEST = "ON"; Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5"; @@ -37,17 +33,15 @@ stdenv.mkDerivation rec { buildInputs = [ boost libGL qtbase ]; buildPhase = '' + runHook preBuild make nano_wallet - ''; - - # Move executables under bin directory - postInstall = '' - mkdir -p $out/bin - mv $out/nano* $out/bin/ + runHook postBuild ''; checkPhase = '' + runHook preCheck ./core_test + runHook postCheck ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix index dd8757d0c1..5d435fa682 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/apostrophe/default.nix @@ -13,14 +13,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.3"; + version = "2.4"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "1ggrbbnhbnf6p3hs72dww3c9m1rvr4znggmvwcpj6i8v1a3kycnb"; + sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz"; }; nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils @@ -32,9 +32,6 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs --build build-aux/meson_post_install.py - - # get rid of unused distributed dependencies - rm -r ${pname}/pylocales ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/atom/env.nix b/third_party/nixpkgs/pkgs/applications/editors/atom/env.nix index 5e3c1070ad..3c0f348ebd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/atom/env.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/atom/env.nix @@ -1,7 +1,7 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core +, at-spi2-core, libdbusmenu }: let @@ -11,7 +11,7 @@ let xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core + xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu ]; libPathNative = lib.makeLibraryPath packages; diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index 2d9138bc32..efb3adaaa2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.122.3"; + version = "1.129.3"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "1h56hj433z0n4l97zl1cwkjv0qvz4qmvf469zzjzf1nj4zj8px2b"; + sha256 = "1sg9wg6w3w0phrnnzpj7h2g22y0x7a3dl57djzydayxmg8fnn2ys"; }; postPatch = '' @@ -91,7 +91,12 @@ stdenv.mkDerivation rec { install -Dm644 setup/debfiles/cudatext-512.png -t $out/share/pixmaps install -Dm644 setup/debfiles/cudatext.desktop -t $out/share/applications '' + lib.concatMapStringsSep "\n" (lexer: '' - install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib + if [ -d "CudaText-lexers/${lexer}" ]; then + install -Dm644 CudaText-lexers/${lexer}/*.{cuda-lexmap,lcf} $out/share/cudatext/data/lexlib + else + echo "${lexer} lexer not found" + exit 1 + fi '') additionalLexers; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 89f6dbc75f..a0044aaf83 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -6,38 +6,38 @@ }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2020.11.22", - "sha256": "0dkvzm32ls03pfp40fxvsyrkfmyznc5yrj65cp4a8pp9kpkvzlz7" + "rev": "2021.02.13", + "sha256": "1p2r2q1al6rcsdbbg8ilm4xn6w48bj348khxdmpak7vfwx9741h8" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.01.12", - "sha256": "1mavv3krs4srdp362prf4sncssxjh11la5j4lkx0wk5csrmd1pc9" + "rev": "2021.03.05", + "sha256": "1p2pzha5dd4p23j2bv6jxphj596dlb5v8ixjzg4x2zglz2hir6yz" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.01.19", - "sha256": "0lpgfwljwh9mypscbpj5c7fivhza0hizjgqypval3v0209cx38d1" + "rev": "2021.03.16", + "sha256": "1sq9j2zaif019gl6nf391lyp8k9s38f5s6ci7k3z5v90hkz1dcql" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.01.17", - "sha256": "14i4jdpbmh6sjpvbwipdvvmmqqw8wg592b34a9wdf2f9qxq2p4ly" + "rev": "2021.03.08", + "sha256": "0xvnvx4qzp6nxi912i4zlnal91k6vbcsyfbz05ib73sz68xqd5qv" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.01.12", - "sha256": "107zyd65vc72fl4mvyirhv2a9m47l9bs6gwqiwar7hrn02zns6bq" + "rev": "2021.03.16", + "sha256": "159s1rpl829bmaa4bllqhjm8z0vji1ncsd6hw2s8z8hz28n905k8" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2020.10.04", - "sha256": "0z66cm9pgdi7whqaim6hva4aa08zrr1881n1fal7lnz6wlla824k" + "rev": "2021.03.16", + "sha256": "1a4mxcwjm9naxh4piqm5y93w2xd5rgl0vcn108wy1pkr221agg2q" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2021.01.16", - "sha256": "07qv3x1cm3r12gxfnqzxly6nff39bghwwgxzl2lxi1qbpqhcs2l5" + "rev": "2021.02.18", + "sha256": "0fy6bmpdcl2aa8pb7zban6midkfwdj99x14hdghrv7cp8l4gcsg5" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -46,8 +46,8 @@ }, "CudaText-lexers": { "owner": "Alexey-T", - "rev": "2021.01.16", - "sha256": "13zyg0cm1c1662l3f7sy462pbc39l1cwm5214nx8ijngf8kgn2zh" + "rev": "2021.02.01", + "sha256": "051jnrhfpl9n5pgrssf68lj732zxhvjbvna4746ngmdyxvw6dqfd" }, "bgrabitmap": { "owner": "bgrabitmap", diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 842b181cc4..a389cf539a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "ace-window"; ename = "ace-window"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ace-window-0.9.0.el"; - sha256 = "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3"; + url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar"; + sha256 = "1kfyf7za4zc41gf0k3rq8byvwkw7q5pxnyynh5i0gv686zrzak1i"; }; packageRequires = [ avy ]; meta = { @@ -343,10 +343,10 @@ elpaBuild { pname = "bnf-mode"; ename = "bnf-mode"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bnf-mode-0.4.4.tar"; - sha256 = "0acr3x96zknxs90dc9mpnrwiaa81883h36lx5q1lxfn78vjfw14x"; + url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar"; + sha256 = "0bj5ffqi54cdrraj5bp4v2cpbxjzly1p467dx1hzrlwv2b1svy2y"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -497,10 +497,10 @@ elpaBuild { pname = "clipboard-collector"; ename = "clipboard-collector"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/clipboard-collector-0.2.el"; - sha256 = "19scspkxgm3b1jkv10jy6nw9gv1q6sfjys09l37mvsva3djxa1dl"; + url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar"; + sha256 = "09zxbivmc1zhcj8ksac2a0qpqh74rrx2slnj6cwz1n1nixn19743"; }; packageRequires = [ emacs ]; meta = { @@ -591,10 +591,10 @@ elpaBuild { pname = "company-math"; ename = "company-math"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-math-1.3.tar"; - sha256 = "0fc9ms0s9w81sxp3qcfva3n3d2qys0pj19pnm621a6v1xdsc7i1l"; + url = "https://elpa.gnu.org/packages/company-math-1.4.tar"; + sha256 = "17p5ib65lg8lj2gwip5qgsznww96pch16pr16b41lls5dx4k6d6z"; }; packageRequires = [ company math-symbol-lists ]; meta = { @@ -940,10 +940,10 @@ elpaBuild { pname = "easy-kill"; ename = "easy-kill"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/easy-kill-0.9.3.tar"; - sha256 = "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb"; + url = "https://elpa.gnu.org/packages/easy-kill-0.9.4.tar"; + sha256 = "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1118,10 +1118,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.9"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar"; - sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.11.tar"; + sha256 = "0s1mpapvcivy25zbhw6ghpg0ym23vb4dsrz876rl4z2rfyckxral"; }; packageRequires = []; meta = { @@ -1884,10 +1884,10 @@ elpaBuild { pname = "kiwix"; ename = "kiwix"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar"; - sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d"; + url = "https://elpa.gnu.org/packages/kiwix-1.0.3.tar"; + sha256 = "061b816xp8ykqd56z0nvc69aql9y4mba42p6x6vc0j6gr9n3c1j6"; }; packageRequires = [ emacs request ]; meta = { @@ -1929,10 +1929,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.3.2"; + version = "4.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.3.2.tar"; - sha256 = "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi"; + url = "https://elpa.gnu.org/packages/leaf-4.4.4.tar"; + sha256 = "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1"; }; packageRequires = [ emacs ]; meta = { @@ -2195,31 +2195,54 @@ license = lib.licenses.free; }; }) {}; - modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + modus-operandi-theme = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , modus-themes }: elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.12.0"; + version = "0.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el"; - sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.1.tar"; + sha256 = "08l9qmhvxiscxn4mfb80x57mk4gfm5r0fs2l9c8i3gfzd4i3h091"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs modus-themes ]; meta = { homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html"; license = lib.licenses.free; }; }) {}; - modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "modus-themes"; + ename = "modus-themes"; + version = "1.2.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/modus-themes-1.2.4.tar"; + sha256 = "0wz6dgkrq4ryvj0kxnzqxwh4i8b9lw15d5dsazjpqa7gfwffpzp0"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/modus-themes.html"; + license = lib.licenses.free; + }; + }) {}; + modus-vivendi-theme = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , modus-themes }: elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.12.0"; + version = "0.13.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.12.0.el"; - sha256 = "01f6z5xjnmki1k9m83jwva42lxidb31pdpwm4wpxjzxqmb96picn"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.1.tar"; + sha256 = "0xz304zcc872c2zwnlm8ky0m18smf7bffiyj21ygghgclr7kgma1"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs modus-themes ]; meta = { homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html"; license = lib.licenses.free; @@ -2763,10 +2786,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.5"; + version = "3.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.5.tar"; - sha256 = "0593ds3zbmpd6235b8v33f3cb3sn8cwr6arb6zbf1ba97nawjxqs"; + url = "https://elpa.gnu.org/packages/pyim-3.6.tar"; + sha256 = "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3103,10 +3126,10 @@ elpaBuild { pname = "rich-minority"; ename = "rich-minority"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rich-minority-1.0.1.el"; - sha256 = "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc"; + url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar"; + sha256 = "1w61qvx2rw6a6gmrm61080zghil95nzdv4w06c0pvyb62m4rwab0"; }; packageRequires = [ cl-lib ]; meta = { @@ -3225,6 +3248,21 @@ license = lib.licenses.free; }; }) {}; + setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "setup"; + ename = "setup"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/setup-0.1.1.tar"; + sha256 = "0z34m06lxw6xd6bxacm1h5cijamsksk4daf6fbzhd7kqmw3gbgqg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/setup.html"; + license = lib.licenses.free; + }; + }) {}; shelisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shelisp"; @@ -3797,10 +3835,10 @@ elpaBuild { pname = "valign"; ename = "valign"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/valign-3.1.0.tar"; - sha256 = "0zx6p2nlvd4nkffj0myqv4hry8kgnhq45fcivfjzbfn62j2kp293"; + url = "https://elpa.gnu.org/packages/valign-3.1.1.tar"; + sha256 = "1nla0zfj0rxwhdjgnsy2c34wzrxfxiwl89cjb6aicyvfxninz7j0"; }; packageRequires = [ emacs ]; meta = { @@ -4012,10 +4050,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.3.2"; + version = "3.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar"; - sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb"; + url = "https://elpa.gnu.org/packages/which-key-3.5.1.tar"; + sha256 = "187cssvqpd0wj01rgd19pp1k6aj9m2n5fdqznkga6w1h6cb5cm2b"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix index 95f9ee3245..7ed43a82cc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210308"; + version = "20210315"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210308.tar"; - sha256 = "1i5zga615inn5s547329g6paqbzcbhyj9hxv14c0c1m9bhra5bjs"; + url = "https://orgmode.org/elpa/org-20210315.tar"; + sha256 = "128agds82kfmvxshzrs61802vgwlf2dsm79hq9x2bljrnvf8p14l"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210308"; + version = "20210315"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210308.tar"; - sha256 = "1agbxhjkkmf4p8p8mwc6sv77ij22dr5fyhkpsnljvzkidiarfldf"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210315.tar"; + sha256 = "0dih4690pbbnwlphjnv1kgvsw43pkcgk41xjjiphy9sf7w9gr11j"; }; packageRequires = []; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index e7a530d46a..3b9cb3f528 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -198,11 +198,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210303, - 1228 + 20210316, + 2027 ], - "commit": "dd58b7601ec536980a14540bddac53f5d1c1da08", - "sha256": "0ccvidz5zivmy3pkxn3mj3y3c7j6qr6im7cf2fz7n98wq1h2cpn1" + "commit": "af9d405a0f6ea078ae5b6567f664f4166f9f0ab0", + "sha256": "0jsnvnpvrrz5b4vh9jf3sjjm0pgh4241zw54bjkqa1ld9vvxwkxn" }, "stable": { "version": [ @@ -1507,14 +1507,14 @@ "repo": "mrkkrp/ace-popup-menu", "unstable": { "version": [ - 20190713, - 1337 + 20210318, + 1748 ], "deps": [ "avy-menu" ], - "commit": "390f0711d2a42675980d8b531fd5dc396b85f24b", - "sha256": "00va4glq9iibrfrnhinv8a7f5q0z7xvfyxnjf1rl4z770drz9j4n" + "commit": "9a2056c53faba0bd7b7f44fb3faabf4d34b8497f", + "sha256": "0i7a708y9x4xdny3ccqwngn4la5vg0539c7qk87d163gl61mbk7k" }, "stable": { "version": [ @@ -1918,8 +1918,8 @@ "annotation", "eri" ], - "commit": "f9a181685397517b5d14943ca88a1c0acacc2075", - "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw" + "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299", + "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08" }, "stable": { "version": [ @@ -2378,11 +2378,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210307, - 1457 + 20210313, + 2205 ], - "commit": "96772f87b0bd22573b9d6433e4c5e9f082616600", - "sha256": "1l329c754qlddzffgdnx5c50lz1v573lv3y4f053qp4d0az5m3js" + "commit": "a8c84176af7f3b97019423ebf3e02f983f4ebdf9", + "sha256": "07vscdf28wjjxsqaich694r94rf9iffjbqsvmqcq8h0qhqzfp2pq" }, "stable": { "version": [ @@ -3146,8 +3146,8 @@ 20200914, 644 ], - "commit": "f9a181685397517b5d14943ca88a1c0acacc2075", - "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw" + "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299", + "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08" }, "stable": { "version": [ @@ -3644,11 +3644,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210303, - 2006 + 20210316, + 2156 ], - "commit": "cf12db35089836ee521ef248860ef8c48ea6ce4a", - "sha256": "0fqj5zc82nl2x3lsdaz7v1df366lzhymf0ji4d8a2cpbpliy1dh4" + "commit": "22b394e3c9fc8db3a33c0f7fa36263ce44b0dec5", + "sha256": "1075f1gp9q210h4varmrj69g35wf8dygamzwsgfp38kqggdqdrxq" }, "stable": { "version": [ @@ -5454,8 +5454,8 @@ "avy", "embark" ], - "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3", - "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2" + "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd", + "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54" }, "stable": { "version": [ @@ -5665,11 +5665,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20210131, - 2053 + 20210312, + 2248 ], - "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", - "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" + "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6", + "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7" } }, { @@ -6144,14 +6144,26 @@ "repo": "dykstrom/basic-mode", "unstable": { "version": [ - 20180919, - 1752 + 20210316, + 1253 ], "deps": [ "seq" ], - "commit": "812f078240f9de09491701853569335ba6d9b5ff", - "sha256": "1492klgbkxb46x02kmhngccx4p9fmjvf6m4ay89j7pyaixvcqj8v" + "commit": "eaa5f24d2fb303d9e5d7de2a28c7c18b01532ab6", + "sha256": "1qvrf6mdrxzzd66888saddjrg5008rrgk0shg6vsyd39gk2bai22" + }, + "stable": { + "version": [ + 0, + 4, + 3 + ], + "deps": [ + "seq" + ], + "commit": "0f135eb6581dabe69fff07f31082c8f53b4dcc70", + "sha256": "13z1b9wqhrx5c87ymc7jikvais7xd1jzx5qsnn03d6wmlm1y027z" } }, { @@ -6502,11 +6514,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20200526, - 2005 + 20210319, + 1039 ], - "commit": "9c7a92779d75f6fd985cf707ff5241bc98ccea6c", - "sha256": "1r9033zlx2q2dk3bjz004flxdiw79qiswq0zqdjnlzwassvk0f35" + "commit": "94465a6c80827e7db9dc2384932b168a0d8254e4", + "sha256": "1jnx6fqmj0i4kxpw03znribqj5nlhyprwlmsbi63hjzbd51h83q3" }, "stable": { "version": [ @@ -6902,8 +6914,8 @@ "a", "pdf-tools" ], - "commit": "e086c59a14701cd041641b51c952fa704ee963df", - "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p" + "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", + "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" } }, { @@ -7598,8 +7610,8 @@ "repo": "josteink/bmx-mode", "unstable": { "version": [ - 20180929, - 1132 + 20210319, + 620 ], "deps": [ "cl-lib", @@ -7607,8 +7619,8 @@ "dash", "s" ], - "commit": "30122e2a6bfb00834e18363e7909182b2701ce82", - "sha256": "1kk98g2zlgz9s7r95986p7f9dch23r8dk78k2dgy07ifnqickvfx" + "commit": "6f008707efe0bb5646f0c1b0d6f57f0a8800e200", + "sha256": "0v6b8w4hy1yw713mkkh74b7c638hnk24ccbizfsylnk00ynrrza1" } }, { @@ -9696,8 +9708,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210309, - 2113 + 20210319, + 2155 ], "deps": [ "ansi", @@ -9708,8 +9720,8 @@ "s", "shut-up" ], - "commit": "afa7fd8a885ee76c9cc0dcf1425f01b98e4b2e48", - "sha256": "0vdrazjhlnpxjw6ah065713g15qmdx11mfcjjzr3004nvhksnmwh" + "commit": "d1ee01ba3c06a62e784c3982ad6f50dbabf5c00f", + "sha256": "1fbk6b4jpg9sg886dbd66fmmwawrjzdw564d49822s6vnjhgs0wf" }, "stable": { "version": [ @@ -10226,8 +10238,8 @@ 20171115, 2108 ], - "commit": "80e18350c1c55906f624915f58e9eb3d87d2af92", - "sha256": "0qk2hn4w5k6a8147a46fzsyfyagq4kwiii4jgn19qwwzpfa1iijx" + "commit": "225c5e0cbd4704606eaafecb908bcd8daed4c54f", + "sha256": "1k8lx2s61kynhdv43czasp27vxb3bh6kmpsd0caxklk5n6m804rj" }, "stable": { "version": [ @@ -10272,6 +10284,40 @@ "sha256": "1hqyxsnnl6zbbbfbacipd226dvhc9zlfpxvacmn6g9iv7qfc8k53" } }, + { + "ename": "cfn-mode", + "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97", + "sha256": "0yk7zlgbr0s3lc2b05g057g55x3rl767xd317hb162lg0d7d900v", + "fetcher": "gitlab", + "repo": "worr/cfn-mode", + "unstable": { + "version": [ + 20210129, + 2037 + ], + "deps": [ + "f", + "s", + "yaml-mode" + ], + "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533", + "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "f", + "s", + "yaml-mode" + ], + "commit": "f3462930067de8f79c3d2e8da14d1924f609d3ab", + "sha256": "15ndphxz1jy4wbk52f6l3hk67b29844ljmmxd8wmahmi6c8nh3si" + } + }, { "ename": "cframe", "commit": "6e39555b2538cc8a955766c5533871396e8fe712", @@ -10927,8 +10973,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210302, - 849 + 20210318, + 837 ], "deps": [ "clojure-mode", @@ -10939,8 +10985,8 @@ "sesman", "spinner" ], - "commit": "15eaf42922e5e24b834e8078f953f9f51310f335", - "sha256": "0wx5w7vy81afyz3rh7vr3pzj6yhry9b9gi5p7738qgcblns076ad" + "commit": "32835ea157212c500756ab625ddba4844b029c14", + "sha256": "0h9wwk72gp19fljiv9c18h5qz7ckddqhcvppm9k0vddxy7vhbhv5" }, "stable": { "version": [ @@ -12233,8 +12279,8 @@ 20210104, 1831 ], - "commit": "e3009f16e9a29e5fd29c8e19dfecb970c3783a55", - "sha256": "17fag7xl25apynprz2g5lldjmg5wwpla59f7ap9mp6g4pgpx1z92" + "commit": "9b4390e76be7e46f2031563642f0a1cae5dbf4e8", + "sha256": "19h3gf7b63b8xblyqrdlizzsjpjsg6xi0spp4fsymlhvxm5j2g1b" }, "stable": { "version": [ @@ -12242,10 +12288,10 @@ 20, 0, -1, - 4 + 5 ], - "commit": "c69d4b177fb3f6ebd22cddec919dbe1c30f43714", - "sha256": "03ivc8pmhbfrba0nfy1b7j83mdcrg6qb0c98qns6gagw35s338d1" + "commit": "fab7fe7ef5a5462952297611c1dd668a603e3a36", + "sha256": "12v6v1hpw0ykkikj4qid3m4m7sb164rgpx6fxin4hvsm20pjcrd4" } }, { @@ -13346,8 +13392,8 @@ "axiom-environment", "company" ], - "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", - "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" + "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6", + "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7" } }, { @@ -14149,8 +14195,8 @@ "company", "native-complete" ], - "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52", - "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd" + "commit": "cf142e84eaa4dd91bc75d96a5d26dab5e38eba4c", + "sha256": "01li6c271v5j35chg3a8nl9az3bwq4hk1j8lfjq5a27p91iszpc0" } }, { @@ -15400,11 +15446,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210312, - 1143 + 20210318, + 1440 ], - "commit": "bd58f2e3b7a9bd52145aa97997e62ec5d9e7e4d5", - "sha256": "007i3qxjkvqrkpwyx495s46xbfzjxp4hbzgfvg8ys7yi2qxnbsys" + "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb", + "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9" }, "stable": { "version": [ @@ -15430,8 +15476,8 @@ "consult", "flycheck" ], - "commit": "bd58f2e3b7a9bd52145aa97997e62ec5d9e7e4d5", - "sha256": "007i3qxjkvqrkpwyx495s46xbfzjxp4hbzgfvg8ys7yi2qxnbsys" + "commit": "e7d409c684a34475349e4019c9c54ee08f644cdb", + "sha256": "1z5qkaaqpz7h9sjfjfr4rvy49gaxfxg82knmplq9x0iyxc31k8b9" }, "stable": { "version": [ @@ -15454,15 +15500,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210309, - 2100 + 20210312, + 2201 ], "deps": [ "consult", "notmuch" ], - "commit": "f3f8ffe3d2e15e67ded5d7aaa7f50bf17c2b1aa4", - "sha256": "0gkvqwqi07saf8hy7bqbafi97ygp361jrn9qxp7k663jpj7b9d71" + "commit": "67cf219fcce211237347a783ce6982402341d5fd", + "sha256": "03amdvzj09dsdjc7y6xvxn429by9vzyv5wghyairn9n0rf8c3r1m" }, "stable": { "version": [ @@ -15493,8 +15539,8 @@ "espotify", "marginalia" ], - "commit": "e714905b71993b6234a4aee6138d5b659605fe57", - "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw" + "commit": "031e0e63a214dd089478d60e6d900c1a65851678", + "sha256": "0lmcihysjwmk22yhqmiby1sbj9f67lr6wpdzyz9df8wsmziva26v" } }, { @@ -15810,15 +15856,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210310, - 1746 + 20210313, + 1108 ], "deps": [ "ivy", "swiper" ], - "commit": "8866138333f92c3d82062c5fa613beba38901504", - "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" + "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", + "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" }, "stable": { "version": [ @@ -16927,16 +16973,16 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210311, - 1831 + 20210319, + 846 ], "deps": [ "tree-sitter", "tree-sitter-indent", "tree-sitter-langs" ], - "commit": "43e591987f620479413defa3d0bc5b3cd7887159", - "sha256": "0mxdywffg4ww98905mc6kjhk9mfzhgwzsn98w0vmy0fckcarl3gl" + "commit": "d942b2762c72a0112f564af173fa66d2e63903cf", + "sha256": "0g6x85mayjd7cf9b19bsnrbmv32kf75318qx76csa3bqgq309whx" }, "stable": { "version": [ @@ -17409,6 +17455,21 @@ "sha256": "1d1mz0j51i09g2fn25iik7wk0cc9i6ps8qviik73fy7ivvxjn0vp" } }, + { + "ename": "curry-on-theme", + "commit": "a87da8c1522b826252193faa67c933a0eb3a3266", + "sha256": "08nfpzpg4q46p62l3kfxnfcmnmzjbi35vfgvlwl1aan29sw0ciid", + "fetcher": "github", + "repo": "mvarela/Curry-On-theme", + "unstable": { + "version": [ + 20210308, + 1244 + ], + "commit": "316fad72466cc5bd120a26cf235e9357117230a0", + "sha256": "11gkfccrynq3bk8qcbibinai9l497sij4b4zlizdf8qicjymmkd1" + } + }, { "ename": "cursor-test", "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e", @@ -17548,11 +17609,11 @@ "repo": "mrkkrp/cyphejor", "unstable": { "version": [ - 20210111, - 841 + 20210319, + 1423 ], - "commit": "037c0f2d0cd0e23acd2aacb621d7694080f5eef6", - "sha256": "16jca2abc66vcf92js5m5489np7a4ymb27i78rkqwsrwcniz178j" + "commit": "cf580995f891e339a9485ba91d6cb81a2abd61e4", + "sha256": "1k0zwgr80figw0xkni2ih87bi566q3j4009dhicq4ldv2lyaybl9" }, "stable": { "version": [ @@ -17590,8 +17651,8 @@ 20190111, 2150 ], - "commit": "9a761a637fce6a7b70735ae2248963d63e569e14", - "sha256": "1f7zk28ywx47ig5fa6plq4415lbvd4972j4jjgb05qrg853zpca5" + "commit": "0ec9be57f5770869cb2fbe36e00bbde405b3b855", + "sha256": "16qiazp9p24nwaspdyi04jjlvpjpw291c40nvzlnqa2afdk5zwxn" }, "stable": { "version": [ @@ -17798,8 +17859,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210305, - 1555 + 20210317, + 151 ], "deps": [ "bui", @@ -17811,8 +17872,8 @@ "posframe", "s" ], - "commit": "7b67475361f7a89a1c3d5f6979d12209ad036f54", - "sha256": "0yvaplfrd6agi8balv1wnyvyi9n7wgc1raqw43qlzaz03bbdq1da" + "commit": "ae395aa991d55eaddb2d2b80cd469089b9d19bb7", + "sha256": "1bxpnaj466n6sw00zc4fbw7i7nmkr0b6g8qvai6vql503lmm5f89" }, "stable": { "version": [ @@ -19392,14 +19453,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210223, - 2303 + 20210318, + 1413 ], "deps": [ "cl-lib" ], - "commit": "738c5d6a6bffe46b18249c77d59ae1d9e2d4d126", - "sha256": "1dn77ysxi9h1yz7f3lpw2gv4jsbwgjqbci5b6blgk5zaqpkj8nrd" + "commit": "1af31fe1c177646ef7419c95b5d9c25655187ceb", + "sha256": "10gh6fl0j41ga612kk2yh82zh67hbd86rg640r1fk6gc0lcmwqih" }, "stable": { "version": [ @@ -19641,6 +19702,24 @@ "sha256": "0k9m57zrdpabb6b34j9xy3cmcpzni89wq71pzzwgdi47p1n4r4vd" } }, + { + "ename": "dime", + "commit": "227c61618e491c4da2b2b48daf7f1bebd2271558", + "sha256": "1pd464l4rj1nychdhmi23m98cfxkhvdpxhzni33j275jqin335mp", + "fetcher": "github", + "repo": "dylan-lang/dylan-emacs-support", + "unstable": { + "version": [ + 20210319, + 1414 + ], + "deps": [ + "dylan" + ], + "commit": "c51cdb2d947494d8161a429134f9e9d23070a173", + "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3" + } + }, { "ename": "diminish", "commit": "1bfb4acb381cada46458cf60eae9b88d007294d5", @@ -20304,11 +20383,11 @@ "repo": "vifon/dired-rifle.el", "unstable": { "version": [ - 20200308, - 2358 + 20210316, + 1452 ], - "commit": "99e4110c80d65ca43e2b0ec078e3202995e392d7", - "sha256": "034qak8kdp7laz1ylqy9np5ajhwf741mdl0bj5kb7rrrsijxada6" + "commit": "cc1af692bbac651f5e5111d9ab1c0805989d65e5", + "sha256": "08csqjpwlqln2yk5by9zwh6jsl5kn33jy240d7a1py1d892b7xy8" } }, { @@ -20493,11 +20572,11 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210312, - 758 + 20210316, + 1841 ], - "commit": "354b7a38d1e5778fa88287ddf2f54a8177bf78ad", - "sha256": "0wpv0ym6zs11pf30bj6b672hgaf0gsh9pxnlbyrbm5pgdwzfcxs0" + "commit": "dd945de3e0c66a164f003a96d473376b58fc6dc7", + "sha256": "1d4rdrc827nnb9p56la1sd9nzwjbxbnr8fgmcgardlz3qw97j3q1" }, "stable": { "version": [ @@ -21337,8 +21416,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210304, - 1614 + 20210313, + 1943 ], "deps": [ "dash", @@ -21348,8 +21427,8 @@ "tablist", "transient" ], - "commit": "85bc970dc2c1b81737c5ab89c62d6b75983388c2", - "sha256": "0y8zdvv11kxkbsrhnh3dl2sgxk6gbr3b7jz3d4kzgs36hyzv15l3" + "commit": "ed0cdf08597ceb3a1f85e065d1b2b7aefd7e35ee", + "sha256": "1p0281gaj09jpavlkv24dzvf0gdh9r7ki1z53x0q49dm1fcday6m" }, "stable": { "version": [ @@ -21543,14 +21622,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20210301, - 1350 + 20210317, + 1612 ], "deps": [ "s" ], - "commit": "a60b49ed37345c5f47604e857c97978a93e314bf", - "sha256": "0x8ih30m1d2m4za17zzfdjvc2h0qlpdh4nwzgz9laxwibgm499ds" + "commit": "5ce0d758dbabb6c250f761fcb6754930cd793c2a", + "sha256": "0x9sxcp40p83isjc6smhg00n42056q5dsf0w71gglb1gc5rqhhl6" }, "stable": { "version": [ @@ -22232,8 +22311,8 @@ "s", "seq" ], - "commit": "945f014d2a3618caa5031f6a8fbc8daf1a5754ae", - "sha256": "13rdlp0j3f4kvms29akhrbr5l2y58x48jlzgaivi6qhhh2ggya8w" + "commit": "2a2a635e2b1d8243a41df0450e45fc8c75c6674b", + "sha256": "0kd8lkvaxqaz4ns8mwyczbbjyi68r3gicngnrichwlbl27am1zvm" } }, { @@ -22394,8 +22473,8 @@ 20210213, 757 ], - "commit": "2d20e430437a09fb438d7294672e4c7f30a68504", - "sha256": "1rl8zrv7bwsvffbp9k7gqz2j5gmx7bs1rbq3vhq5aq2hw5k06an4" + "commit": "a181b937c20c706f24ba1d17021593b0087ac574", + "sha256": "0g3s4g3lq42c6ca10idxlybwj3pici2v7r9aifyr5q15n2xgpizq" }, "stable": { "version": [ @@ -22480,18 +22559,18 @@ } }, { - "ename": "dylan-mode", - "commit": "94481ba3ebba6a99f11efab5a33e8bc6ea2d857a", - "sha256": "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy", + "ename": "dylan", + "commit": "227c61618e491c4da2b2b48daf7f1bebd2271558", + "sha256": "0i0139jv2l9yw82hpmavw0jkzi3jxbz663xls604nhdggi7kqgzg", "fetcher": "github", - "repo": "dylan-lang/dylan-mode", + "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20210309, - 1456 + 20210317, + 1405 ], - "commit": "25dd620cf467a4a322461d9f9983db0fcca08e43", - "sha256": "0w70h20b33h6vykqkb0h3cb21hv1nd7rm4j9dcc66ihpisw9crkp" + "commit": "c51cdb2d947494d8161a429134f9e9d23070a173", + "sha256": "0p4kp2gp27xgs4fw0cfd4qz06yp6kvn0k1pq902arzcxkrqz6lj3" } }, { @@ -23065,14 +23144,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210307, - 1125 + 20210316, + 840 ], "deps": [ "parsebib" ], - "commit": "6a3351c4bee70517facf0eac457a17a1efc21144", - "sha256": "0ppp6a8qyllh1kjrh8fa8dvhv98wnq0w742mzh8gahkjbrsjdwcj" + "commit": "1a23ce943991d5dce4a3c3d71d7b5d6b6f9897fe", + "sha256": "1wwgfgcr83mvjp9w1yizg49j85j92kd2fyiyyl6x9v8bs4xsn4pi" }, "stable": { "version": [ @@ -23913,8 +23992,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210306, - 2312 + 20210319, + 2010 ], "deps": [ "eldoc", @@ -23923,8 +24002,8 @@ "project", "xref" ], - "commit": "f0c770cfbbc75c7aeb22cd2b118bc3948596d7a7", - "sha256": "0qcjiawszs3v166q8nanifp465yd5ib2gl2ywrlmgk1l7ixr80wp" + "commit": "b4ffcf26fb392ed83f6c40bc9b62cbe54483119c", + "sha256": "1lpi249cv61892nl8a0asx6z4dzgyphrh4f5cn9awryyv8x166dx" }, "stable": { "version": [ @@ -24074,8 +24153,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210228, - 15 + 20210317, + 12 ], "deps": [ "anaphora", @@ -24086,8 +24165,8 @@ "websocket", "with-editor" ], - "commit": "dfd968c0ae92f368a1861a15b54d4e4385271469", - "sha256": "1cna661kqkw1sz1dz7pba06d9l581k6g3vjl99vrraq1f7k4afcl" + "commit": "147940d5d734b22e8dc6fc24d1d7423766ceed0c", + "sha256": "1yjdlghgsm4alrfp6nsfq2wi7ym66nbh1gx3dfsm5c1hr22lx9fq" }, "stable": { "version": [ @@ -24170,8 +24249,8 @@ "direx", "spinner" ], - "commit": "6eecf51e4c5e6f7d24ab90e8def34f6cea4eda52", - "sha256": "0yk5bblrzf0bvnkzdkb0bzk8mfp4b6j84cjg60k3i4dyyp17h847" + "commit": "c24519e5b7fc1051257b0ec67fc6dec84d6b996e", + "sha256": "1qsps36cxvd8vpssr7xjydgmgq8zslck0j77920xm27wvfyrj2a2" }, "stable": { "version": [ @@ -24584,11 +24663,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210311, - 256 + 20210316, + 1921 ], - "commit": "9bea3248938b99498f5114f46441720e1d4b2f3a", - "sha256": "0l540rpw2vwjm9vh4bv673lcjw20v5gvfyf1xmxdsfhsf7m0rdns" + "commit": "d63021046b5ccb129669f1eae60ffc5f48338230", + "sha256": "1mf98cfnmb58bzwrfcg6v1k02mmzwzkig3h61qx779014ayq7v2h" } }, { @@ -24657,11 +24736,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20200316, - 1956 + 20210313, + 1824 ], - "commit": "c1a1b77ec0c7fff9ecf7122d10dcd16eebcd3829", - "sha256": "1gg3gxw5ks4fds7lgl9mqxyb2qjrdsdwyyc183nfz6aq0m4w91yb" + "commit": "d4574ee392b9a8c537bec895be37468b600c25ac", + "sha256": "08fscq9amwqap741i25j7swb0gwzipkczqrvrgg3430jb3i0d663" }, "stable": { "version": [ @@ -24814,11 +24893,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20200607, - 1405 + 20210313, + 1118 ], - "commit": "f039011edb922cdc56c1d2bd0e49bb4575c35ab3", - "sha256": "1qfjk928y8bnx2ksciv0f0ackahj78x3qsr84m9qcvsvlg9cql5p" + "commit": "fb1437a3386f55440abdbe7c107c86e5b028bdc5", + "sha256": "00pmp1596p24i7pasmm080aly8ifinp9hbvia2l4jf8mbfg2ndlw" } }, { @@ -26445,11 +26524,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210309, - 1632 + 20210317, + 1432 ], - "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3", - "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2" + "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd", + "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54" }, "stable": { "version": [ @@ -26475,8 +26554,8 @@ "consult", "embark" ], - "commit": "d267c11b2d6f510d9e173400ec90e18a471fc7b3", - "sha256": "1a8qj71jcy0cpywy6677kg9d3l2a4v96nvaw7kccm2xmsrhq6wa2" + "commit": "4e3e751725787f18b55defc2fe7d8115adf524fd", + "sha256": "03qqc5yw7pyz58pdkvypw63ls14pm9gkcfvrf66fidmbi5w4fg54" }, "stable": { "version": [ @@ -28019,8 +28098,8 @@ 20200914, 644 ], - "commit": "f9a181685397517b5d14943ca88a1c0acacc2075", - "sha256": "10gk6052zdp28n9z3bjxwcgg0161sfcnz52h46w7s5jwibl1ymiw" + "commit": "232fa59a8e7954d20fbac8aac7f51bcf58c2f299", + "sha256": "016dk9gf86fm2s6xd016jml895h8zqlyrp1bw7khzq5xliny7d08" }, "stable": { "version": [ @@ -28041,11 +28120,11 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20210226, - 1127 + 20210315, + 1640 ], - "commit": "13f941d2ed90b3dcb0f8fc97bbad79bcdc474f64", - "sha256": "1ikxsgynzs0k3yxxf442bxnvlpy5zkkri3i886sy03cik04yhjvq" + "commit": "ebc70093c3be41cd86da18d2f188ce9648dc287c", + "sha256": "1gvb5p92gnl0lv48wqgls6jyhyzkd7kckklrsmn325s6vnqx72cd" }, "stable": { "version": [ @@ -28794,8 +28873,8 @@ 20210224, 126 ], - "commit": "e714905b71993b6234a4aee6138d5b659605fe57", - "sha256": "118cksih4rm113miiagw31w0fx5inih60b04431amp0ydphp4fdw" + "commit": "6a0a939ad2b07203e7c66a71b3a348ea06780cff", + "sha256": "1kjywdafjga5rd2way2vafwb0paz2fb2dkg1i5vlsggwhkl7dn6r" } }, { @@ -28907,11 +28986,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210307, - 735 + 20210318, + 748 ], - "commit": "a83206ab65ed5f0b1710de69241938f2fc7e3d25", - "sha256": "045004dmljnxfvalngjp8y0qdmii68gk5jp12r2fg0axd5rwxprk" + "commit": "96ba4876753e7ac592a150f7ee1272747dc693d3", + "sha256": "0drfgzkdah2gpz7ahacbsqh5i1y4znrjgj4hmlwx4ycpcvvixbrz" }, "stable": { "version": [ @@ -29063,8 +29142,8 @@ "f", "s" ], - "commit": "d4e5a340b7bcc58c434867b97923094bd0680283", - "sha256": "1yzki5f2k7gmj4m0871h4h46zalv2x71rbpa6glkfx7bm9kyc193" + "commit": "925cafd876e2cc37bc756bb7fcf3f34534b457e2", + "sha256": "1hb83cjr711yg4dphbyg9nfkdmd1a6bcsqw964nwdarflw6jss24" } }, { @@ -29075,15 +29154,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20201202, - 1124 + 20210315, + 1643 ], "deps": [ "csv-mode", "ess" ], - "commit": "9aeb18c0adc3e0fed75640a15500944becd5f3ef", - "sha256": "0mspy45wrc42r7agksyzrlf6ir3wqnyx19hfikm0fh81bn23im2h" + "commit": "b642e2e7f4643eadee14c3599f9af399a2f714fe", + "sha256": "1dm4w0cj4sc1ybfmvgapwxlnkbywkfqs79gx13381k99ah0wbgji" }, "stable": { "version": [ @@ -29490,15 +29569,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210305, - 1341 + 20210319, + 1539 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "f5ab7ff7b5cfbcdc6953589954c9aadc2d81ff6a", - "sha256": "1na7y6d77rzsvcqqaadzvv3m99dsbj73vrnldabk89i3gngdcsvs" + "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357", + "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h" }, "stable": { "version": [ @@ -29692,15 +29771,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210302, - 124 + 20210319, + 1440 ], "deps": [ "annalist", "evil" ], - "commit": "26493597c74a7e574364aa2ca751a1e70ee4e5eb", - "sha256": "123shmnxrc304ppa1xc4ckxsizw3j88llrvg2kjgafj7b7csmjcv" + "commit": "2d3d652cb51eeddc6c63ad9cbf251ecbd2f561d6", + "sha256": "15vdi5kynm1gczvdp006zyac96n1q25im9pf2q2n244ph9rzgc4v" }, "stable": { "version": [ @@ -31015,8 +31094,8 @@ "deps": [ "evil" ], - "commit": "f5ab7ff7b5cfbcdc6953589954c9aadc2d81ff6a", - "sha256": "1na7y6d77rzsvcqqaadzvv3m99dsbj73vrnldabk89i3gngdcsvs" + "commit": "325a822bee6b9f8590e6e77fe73b4d916fcec357", + "sha256": "0lbzmarhddmsr334d51ia1p64i3wzy3mak586pj3gziv7fcvn06h" }, "stable": { "version": [ @@ -31804,11 +31883,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20200518, - 1043 + 20210316, + 205 ], - "commit": "7d0ca861e6b483be1f4a08e63c5ade9cd07b4799", - "sha256": "0mw041jccyn8s1n3wpas397k2vrp9ryq9lfj16ipk9iqs4la6hlx" + "commit": "81d79cb2f611aef10fd7b05f6d47977a66502a08", + "sha256": "0bmpmiaz32id2yplfp2vmg3bjbfypg8k0mac8m7v6jclaprw3mal" } }, { @@ -33103,20 +33182,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210310, - 426 + 20210315, + 413 ], - "commit": "ee471c23a5a890427b1afa55cd74ad27a42f46f7", - "sha256": "1zygz8imm0r0370imzksfc6257hcnyi1lri8ngdsspzz6hlrd2z1" + "commit": "50607615352df980dfe99d464f5fd0b3d70a4381", + "sha256": "120182fjalcamijwxvrfgf72f63k5jy1z9rl4arg80bx2682a0pj" }, "stable": { "version": [ 6, 0, - 2 + 3 ], - "commit": "ee471c23a5a890427b1afa55cd74ad27a42f46f7", - "sha256": "1zygz8imm0r0370imzksfc6257hcnyi1lri8ngdsspzz6hlrd2z1" + "commit": "6a6328c59a96b09e771cbcc5f4188f20d0757aca", + "sha256": "17l5b9nibhfymyndppq0avbdr2rh20527fyr1q5i1c3xkn4d6wvp" } }, { @@ -33500,14 +33579,14 @@ "repo": "mrkkrp/fix-word", "unstable": { "version": [ - 20190713, - 1338 + 20210319, + 1414 ], "deps": [ "cl-lib" ], - "commit": "46487e5279a3079730e2d7146ace7c8ad42371ac", - "sha256": "0ij0bjrb446h07lyhflfk06sk802jylgdl11ib00r89zai8sq8r7" + "commit": "80cf4529915c34d2d39b4d3410781a19ef264e9f", + "sha256": "193bwcsj42w07aj8k32zl895yp0kw4rgrphn10dd81jv5411r6ij" }, "stable": { "version": [ @@ -34099,8 +34178,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20201228, - 2104 + 20210314, + 2015 ], "deps": [ "dash", @@ -34108,8 +34187,8 @@ "pkg-info", "seq" ], - "commit": "01396a5eff9fa494285e0d3139838231c05e3948", - "sha256": "0s740sbchr84yddcg0zbs4v4s52smy178f8fq5y07i3vsdnfly8m" + "commit": "6e6ac0c50f85170ed47bf1711bc761941b69b325", + "sha256": "1rp53zpd8mi16r7n66hxy3jv966rr3yw9v3d8dsq9lnnyly9llny" }, "stable": { "version": [ @@ -34270,6 +34349,36 @@ "sha256": "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy" } }, + { + "ename": "flycheck-cfn", + "commit": "3ac23c6e0cceb3dd52519a9946dcd500936d8e97", + "sha256": "16ls9xbg7s8c4li51zvv9frlinrwflp6blgxw5psnvvdrm6gavi5", + "fetcher": "gitlab", + "repo": "worr/cfn-mode", + "unstable": { + "version": [ + 20201120, + 2307 + ], + "deps": [ + "flycheck" + ], + "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533", + "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "flycheck" + ], + "commit": "b4ffad5cabea7e858c66dc824d545653b1cdcb70", + "sha256": "1la7qhczg9bgs1klinwj21mjywsg1nm3sxd5cyc09bxjzbflzzz6" + } + }, { "ename": "flycheck-checkbashisms", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", @@ -35781,24 +35890,6 @@ "sha256": "072jc0vrjg531ydk5bjrjpmbvdk81yw75jqjnvb7alkib6jn5f9r" } }, - { - "ename": "flycheck-perl6", - "commit": "2f6ecdb2ce6bc74a27dca01ab4942778e986ac8f", - "sha256": "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4", - "fetcher": "github", - "repo": "hinrik/flycheck-perl6", - "unstable": { - "version": [ - 20180509, - 2201 - ], - "deps": [ - "flycheck" - ], - "commit": "b804702305d7a6e26f762ff98cfdeec2e9dd4cb7", - "sha256": "0gys38rlx9lx35bia6nj7kfhz1v5xfrirgf8adwk7b2hfjazrsib" - } - }, { "ename": "flycheck-pest", "commit": "f0c1b89d79456ecaa22b95f3c292799f5d1aa133", @@ -36003,15 +36094,15 @@ "repo": "alexmurray/flycheck-posframe", "unstable": { "version": [ - 20210217, - 327 + 20210316, + 618 ], "deps": [ "flycheck", "posframe" ], - "commit": "24fd9b3d81eab8dd850c504ae46a5c5f11a46ee0", - "sha256": "0dv9bkagzk61r32i9231zpndizv6avpg8n84nrnh8yyl0w4hzldv" + "commit": "8f60c9bf124ab9597d681504a73fdf116a0bde12", + "sha256": "0qh9hzvs95jvfrspglzkwhfq6a5pinab94bbh5vzkg8jc2fq6drf" } }, { @@ -36162,6 +36253,24 @@ "sha256": "0f58127197q6yfylz53nigyn7v91pcsdd91ywfgq5lrl0f5fvmdy" } }, + { + "ename": "flycheck-raku", + "commit": "a285426ee792eab3138ceb012f3825d91a7c85b1", + "sha256": "13il1cl60rv18xnp381z57l4nv4jc4isavjsqbrrqpyjpi81c3g8", + "fetcher": "github", + "repo": "Raku/flycheck-raku", + "unstable": { + "version": [ + 20210316, + 820 + ], + "deps": [ + "flycheck" + ], + "commit": "4163c0dcc1447bc98bb20b835eb23cb68a638ba9", + "sha256": "0z19zz5dq0pjkzrjg2fbrh9szlgd0lq2j9wmkf4pzkrcb519kchn" + } + }, { "ename": "flycheck-relint", "commit": "e20128460e942a78a88bd9e6389a8fcbb14343ad", @@ -37615,11 +37724,11 @@ "repo": "federicotdn/flymake-shellcheck", "unstable": { "version": [ - 20210307, - 1609 + 20210314, + 2048 ], - "commit": "68c7da5b53be4a3cc4d4c85d9367ed2a47448aec", - "sha256": "00062bk5q5n5z733v18nk2b242azhqsvcy4jprpcmllpd9pmx7mv" + "commit": "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7", + "sha256": "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl" } }, { @@ -38254,8 +38363,8 @@ 20191004, 1850 ], - "commit": "e086c59a14701cd041641b51c952fa704ee963df", - "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p" + "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", + "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" } }, { @@ -38332,8 +38441,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210303, - 2046 + 20210314, + 2238 ], "deps": [ "closql", @@ -38345,8 +38454,8 @@ "markdown-mode", "transient" ], - "commit": "8382fd3d43855de779c46da338dd59b1cb1d333e", - "sha256": "1ah4f5sy2ja33ibk37yqps7vmgdvkp36vahs2njqg0rg6zx057r3" + "commit": "f4c95dd0e633b3dd332d6f91122c864ab3640912", + "sha256": "02jhimj1ykz0mfg63iwaaxg1i9fdijczcd1g5fz02zwj1v2dgqgh" }, "stable": { "version": [ @@ -38401,15 +38510,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210305, - 809 + 20210315, + 640 ], "deps": [ "inheritenv", "language-id" ], - "commit": "50e9def18f5cfa6bc7d30567dc05e4539ef3af8c", - "sha256": "0vi9r4sm8isi33dc2vnjq61vy1pxi1bqd5mxy2vfpg5sff3awgmg" + "commit": "94239d35944830ce009d01ac3369e0d61f9723c2", + "sha256": "1q27yr916vhk0ah1406vs540f8hpp8bca1f118xwhyj1fw3yrbaw" }, "stable": { "version": [ @@ -39170,8 +39279,8 @@ "deps": [ "cl-lib" ], - "commit": "0ca6901328dbc4279d70dedf7201ceebdaab037c", - "sha256": "063wyg4mpq6g5h462l6zs7r2g2zavlxm4hv2lh7lr1asrmcf6rxm" + "commit": "8f5f6939044b68a97d231b6902ab5ac86744db2a", + "sha256": "15fnn413rmaav9zi8p5yqvim0wblsljfp6xhgsa68zji5y99lxva" }, "stable": { "version": [ @@ -39366,11 +39475,11 @@ "repo": "auto-complete/fuzzy-el", "unstable": { "version": [ - 20210301, - 1541 + 20210317, + 140 ], - "commit": "122939ee0a82efa1bcf405de3134debe34e4a0b6", - "sha256": "07kpixgqc6vky91bi7j4r0q78ccc3azydwmkaz4z7lr3ncbc6ymj" + "commit": "edce468a3077d03ca63e1559f7ffebfa09c8effd", + "sha256": "126wbccdilqi7yf1w7z9gjr6zr4lmrrii6bz65jg5ffnpx8kj30d" }, "stable": { "version": [ @@ -40916,11 +41025,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20210121, - 235 + 20210318, + 313 ], - "commit": "d6eef8051003a9a0966e4524232648d110199c74", - "sha256": "1jc4acvlhgjdfh0ckalnv4hiv7nx8l1i6wh02zv2p9gxjxaqrj7x" + "commit": "2b510cf3f28bed842853294fc4ee23c7f8b6435a", + "sha256": "0c5p5llxlgi09lymjnh0jpp36v5vfmi6rjb77123gcnsqi0031wn" }, "stable": { "version": [ @@ -41366,8 +41475,8 @@ "repo": "charignon/github-review", "unstable": { "version": [ - 20201012, - 40 + 20210314, + 2203 ], "deps": [ "a", @@ -41376,8 +41485,8 @@ "ghub", "s" ], - "commit": "d0c8234cf523818513f892f30153210606abb6be", - "sha256": "1d0g79mp14ngx5x0f8sc4lri40m3gh0ql6gzyqrl4c94lhq59cn7" + "commit": "341b7a1352e4ee1f1119756360ac0714abbaf460", + "sha256": "15lqiknl7ilskpy1s9qdfi0qjvrkvmj8nw110cf8ifwvvyxyqbhb" } }, { @@ -43414,11 +43523,11 @@ "url": "https://depp.brause.cc/gotham-theme.git", "unstable": { "version": [ - 20200506, - 1250 + 20210318, + 2207 ], - "commit": "a549cd031859e24fd37a779323e1542aefe86d43", - "sha256": "0smjajazr86r8f1szw1xdrinfbn455xhl6bbhyhhmrk6sw0pnc6n" + "commit": "51876a72dbe5a16aeadde2e885da6bbf75909bd1", + "sha256": "042cpdl7srfj1ha3z27xj03bzp3vrz6ql4x0zzvjxsyj08z1q80y" }, "stable": { "version": [ @@ -43558,14 +43667,14 @@ "magit-popup", "s" ], - "commit": "dc29aa29c61c0013bd00091654cc8ce48e888264", - "sha256": "1irrli6cx7c1hz53ipwhi87876m789anqpjkfhyii0vk9crq24r8" + "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411", + "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g" }, "stable": { "version": [ 0, 24, - 0 + 1 ], "deps": [ "dash", @@ -43573,8 +43682,8 @@ "magit-popup", "s" ], - "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4", - "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj" + "commit": "f49dcf5ec6e16562de30674b36b18e6bdcd47411", + "sha256": "1slw2pawlcx9zfvsazsir2kj32g30b80c7a0yiqyrd7cv1hjnr8g" } }, { @@ -45577,16 +45686,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210223, - 2045 + 20210318, + 1838 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51", - "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p" + "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03", + "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j" }, "stable": { "version": [ @@ -46485,14 +46594,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210211, - 1417 + 20210319, + 1649 ], "deps": [ "async" ], - "commit": "dbdec633c2816981d7127fe00bcd9778b2c31c51", - "sha256": "19rppfsiv1642xlz17m877dx6sbzg37nspg6r7nh9b783r4sij6p" + "commit": "2ca62b0384727338c2a7dd90a591fcac26d86a03", + "sha256": "0k81bp0b8pdmj16hmip849207s8x8g4hy2mg9821fviafss0sk9j" }, "stable": { "version": [ @@ -47784,16 +47893,16 @@ "repo": "yyoncho/helm-icons", "unstable": { "version": [ - 20210219, - 1752 + 20210315, + 1339 ], "deps": [ "dash", "f", "treemacs" ], - "commit": "5a668ef21ba02bf1fce2db18950858c769bf5d05", - "sha256": "0n759vnymjgpf24kn7704vj8l1phsnjrgllqhcv1c50fsni1fajl" + "commit": "7e8d1e213a164aa63b868e610ef8a4fd1ff58769", + "sha256": "0g5n9f8vfv3zbylxh6w2xrym4fzd4jqx5n4g6gjp8sscaw5zaxkd" } }, { @@ -48096,14 +48205,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20200519, - 912 + 20210317, + 1205 ], "deps": [ "helm" ], - "commit": "4da1a53f2f0a078ee2e896a914a1b19c0bf1d5ed", - "sha256": "12fi08w20yjsdfkxl1pk9q4w0z9l92va5fa5ghay9w33xlymc8dc" + "commit": "58dbeafb184cf6a10a1ae3078b37310dd82ad2ed", + "sha256": "1hlqvpb34pq4bmyplm58wsnwfrflp5bf7kzjl8nrsj9fcqr29nbv" }, "stable": { "version": [ @@ -50057,16 +50166,16 @@ "repo": "emacs-helm/helm-w3m", "unstable": { "version": [ - 20181029, - 726 + 20210315, + 723 ], "deps": [ "cl-lib", "helm", "w3m" ], - "commit": "c15d926631198d6d759ec8881837bcca5a64963b", - "sha256": "0qaqcwhwmckfmg3axiad35azn0l74k1niw4ix0v1bn2vqrxanqcw" + "commit": "0a25a2b1df9bc660a90d633beb301b3815556e4e", + "sha256": "0cdfk1r2rcc5hflwjpmsijss6xf5lwzn7x68jq4b4xdlckkqf9d7" }, "stable": { "version": [ @@ -50256,8 +50365,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20210307, - 206 + 20210319, + 802 ], "deps": [ "dash", @@ -50265,8 +50374,8 @@ "f", "s" ], - "commit": "88e53d3267e8168e056e96989e9cc8fb50d33c50", - "sha256": "1gcymjysbba56q7gkn6a9vpvv45az38c4cwsvxlsnb1sa16rbz88" + "commit": "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73", + "sha256": "0qrz3klqs94aj6bxh49qymf9fvpa73xpp6djkxwpypgb2wv8hk6n" }, "stable": { "version": [ @@ -50424,11 +50533,11 @@ "repo": "omajid/hgignore-mode", "unstable": { "version": [ - 20160501, - 7 + 20210314, + 431 ], - "commit": "7aa9f3b8a9c610dbd80b952061b40194e1d9c5bd", - "sha256": "0l22sqi9lmy25idh231p0hgq22b3dxwb9wq60yxk8dck9zlkv7rr" + "commit": "2c5aa4c238848f5b4f2955afcfb5f21ea513653b", + "sha256": "0jn9rzhrmmv4lf7rdapdjclk6623d1mir2lq3c46428skhzjlph7" } }, { @@ -50826,10 +50935,10 @@ }, { "ename": "highlight-parentheses", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "1d38wxk5bwblddr74crzwjwpgyr8zgcl5h5ilywg35jpv7n66lp5", - "fetcher": "github", - "repo": "tsdh/highlight-parentheses.el", + "commit": "40bb1119bea79bb9e91378c99e2aa60936de013a", + "sha256": "0ly9d01ja517psf1sqg12wyljykixi5c6qbhahyjy7n331kkpkmr", + "fetcher": "git", + "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { "version": [ 20210104, @@ -50838,8 +50947,8 @@ "deps": [ "cl-lib" ], - "commit": "013ac29970d5209c14da0af6c5bb9bbbcca40c02", - "sha256": "01p8j248vcmbcdskr3146ag979c0m74gddy3yzp3x8hz9a4mgqx0" + "commit": "723abf9b6092d7e19548316de1f907ed0d67c780", + "sha256": "1kkxxq5cw090vw3cddzdq51f208vxw326hsqb1zi8f6z3vsm2h7s" }, "stable": { "version": [ @@ -51374,16 +51483,16 @@ "repo": "thanhvg/emacs-hnreader", "unstable": { "version": [ - 20200726, - 654 + 20210319, + 527 ], "deps": [ "org", "promise", "request" ], - "commit": "7ff808d4728ce4e269b6d99a73604063dd9b374a", - "sha256": "0kxx8pvl99qdbldsn6lvxj69j1jpmmc33wxcr2aw3h423ibcna3s" + "commit": "ae52af1424ccde2b20e88ff8c589eb772162a560", + "sha256": "12h1lvm6bwdln7jnl1adl1vqgi603yvsvb4dbg9yvy1np8b6mj7r" } }, { @@ -53486,11 +53595,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20210307, - 731 + 20210319, + 126 ], - "commit": "0588a5dbb4926e09cd19415eaafb6f79168183d8", - "sha256": "0bbr5rjxbk1dci31b1y92i9cxy5x90y3awm4678zvmaa3xa7jzxl" + "commit": "0fdc71bfa66ecc1f8a54cdcd2458eb47eab41ecd", + "sha256": "1ibd9i75x6gb0nprbdi0giklllfwsmvghi3fm19qm7hiw3kg9j3m" } }, { @@ -53555,14 +53664,14 @@ "repo": "bmag/imenu-list", "unstable": { "version": [ - 20210305, - 2206 + 20210316, + 2102 ], "deps": [ "cl-lib" ], - "commit": "6cded436010a39592175238e4d02263a7cdb44c4", - "sha256": "09x1n2bgwgximcmnrfn32d5hr6wa0iz8acaj78a93azzx065xxgk" + "commit": "b50222378412fbe321622a84cb2b036e084c697a", + "sha256": "1936dd41fa05ndzf2bwhllvjz97iz0rflkazjipr7dvz5q072wj2" }, "stable": { "version": [ @@ -54055,14 +54164,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210307, - 740 + 20210317, + 1221 ], "deps": [ "clojure-mode" ], - "commit": "f4a279ef5b007c3d43b79e22fecca6a331c5f3f0", - "sha256": "0aq65zbqrxdcx797wcr537bsp9pvbr9ndwyfbaf4lhl3w03s31x6" + "commit": "3e712d9f489313c4097ccc891abedcfb6e1788d3", + "sha256": "1bdz8zsv6vixgvq88vc8mlq729rn105wr2mzjl6a2w9b8zkjzs08" }, "stable": { "version": [ @@ -54115,11 +54224,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20210226, - 1653 + 20210315, + 1723 ], - "commit": "9c21ae6d7a1313c856fd508880ee121fbea99f4d", - "sha256": "0w6fj1sh1pdsrk5sis2zkbdz0ixbpndaizvlqv2riw3sgpnc41f3" + "commit": "b526ce852886d1863163e054fcbbcbb83c55b32a", + "sha256": "1kmv2j1g299wb8dqq43zk61jigkfl9rnqxbfnclzsqfdlnhvw6ii" }, "stable": { "version": [ @@ -54154,11 +54263,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20201228, - 1237 + 20210314, + 123 ], - "commit": "1fc972ecda6a2155806d75d202481327703a0681", - "sha256": "0kv98g30kgfpyd0ghiclk17ac2y17j7bi77km59gdw5i1b5k1a27" + "commit": "c6990a60c740b2d69495e34e95b29f13014b3cde", + "sha256": "05nz7hvly47n7d945gdb1x8xgzla5r9k629if81rgjh99w24dpgc" }, "stable": { "version": [ @@ -55359,8 +55468,8 @@ 20210311, 1638 ], - "commit": "8866138333f92c3d82062c5fa613beba38901504", - "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" + "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", + "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" }, "stable": { "version": [ @@ -55387,8 +55496,8 @@ "avy", "ivy" ], - "commit": "8866138333f92c3d82062c5fa613beba38901504", - "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" + "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", + "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" }, "stable": { "version": [ @@ -55755,8 +55864,8 @@ "hydra", "ivy" ], - "commit": "8866138333f92c3d82062c5fa613beba38901504", - "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" + "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", + "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" }, "stable": { "version": [ @@ -58522,8 +58631,8 @@ "parseedn", "s" ], - "commit": "1376d50f1fc91f9345351aeb4960b54bf83be59e", - "sha256": "06zp5kshcsxf91d4as0nw1ncxx1a8ii6npzvk485sjrghnldsccm" + "commit": "755b0dfb3bd676c769c4b4aeb81c2cd5828bd207", + "sha256": "1snrzah6pcxd9vm6crxz85c5nl6zfhfbc0581z765g2vg87qcb12" }, "stable": { "version": [ @@ -58548,15 +58657,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210301, - 1533 + 20210315, + 1754 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "1f8204a40ab24cb54f22bc89345d7f603084688a", - "sha256": "1qfm5wc0rkyxnnm3dzba0q4hxc5s3s0agvsjqwwg1q90zw6q70j2" + "commit": "80d0a5824fedb332432d5999af9842316b7dc3f2", + "sha256": "0309vmrbw7a4r0gnsdd5jyfql2fl3lbh3gsnagynvq7rzv9ryr1c" }, "stable": { "version": [ @@ -59330,11 +59439,11 @@ "repo": "kivy/kivy", "unstable": { "version": [ - 20180702, - 2029 + 20210318, + 2106 ], - "commit": "6b8495e48328af5088a899372d93b6daabc75a02", - "sha256": "1wp0rqwakdx532lg2gacrarkg86w3d4pp4l2b43ik0343pr6bg00" + "commit": "3421cedfd83acb9fd0dd15600811662136faa1c6", + "sha256": "103d32iamgharcjnqagm5w63ssj6365mqcxjdrvzarhgsq2gqx6b" }, "stable": { "version": [ @@ -59985,8 +60094,8 @@ "highlight", "math-symbol-lists" ], - "commit": "08755211c073f4216c34f8dd7864ce3b874415b4", - "sha256": "0k8gcap4bvqx04wl0ica3bkfxz8j4a42w9lgwacnchffs3l4gbpx" + "commit": "3f2d0e95362c3ea9ed78f32fcb3d310c2366df12", + "sha256": "1898ixkcgmcwzfxl4cpjdc9kim5s2a5n2s7hi6xqzccqx2mf4brd" } }, { @@ -60474,11 +60583,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210303, - 1613 + 20210316, + 1822 ], - "commit": "b1fe4f20efa713b8beca97a27643456061c0fb3f", - "sha256": "16mzwr91k6bg8nfh2f2y9hzr6vlnx56afqh4795apzylqvwm8zd4" + "commit": "ab5cc26b56a6a53a3338ebfde17b746522c2c14c", + "sha256": "1ds545sh8hg2vg5l7fm4v6z31lzax14ivdni3a37278jfx82xxrx" }, "stable": { "version": [ @@ -60734,11 +60843,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20210221, - 1315 + 20210318, + 26 ], - "commit": "3495d1224ee73aa96c1d5bd131dc3a7f23d46336", - "sha256": "137z70baylzv6bm6y2wyl1p3f47hzkvjzqcmwmwjmlkpc0p5j4ac" + "commit": "3c53ecc4fd27736560db7a64587e516b26521d61", + "sha256": "176h5n3azjqyp63map0224m01jrqzmjy4g9cdh00mna5p2n1lbwr" }, "stable": { "version": [ @@ -61025,15 +61134,15 @@ "repo": "tecosaur/lexic", "unstable": { "version": [ - 20210203, - 358 + 20210318, + 1315 ], "deps": [ "dash", "visual-fill-column" ], - "commit": "e59224cd5808af50e8b9ba8cce0a687cf09aacc1", - "sha256": "1si5ndfs8xbk96iiwcwlhi57k914jnsq3zdgvlb7xm3y8zjy2l6x" + "commit": "4ded6be2ce3e8dadc5635a534827181a8c8ab602", + "sha256": "116qjizqa83zy6xas5cah58sf22ha05pps2004wfgng487ln9n59" } }, { @@ -61047,8 +61156,8 @@ 20201007, 2214 ], - "commit": "7be14cb23a72b2c445519281e4e2fb9b607f9a8b", - "sha256": "0scq5bmsw7smgn7pkfnw98zcn6by1iqn6qds24zrxl7fmgcvwjk7" + "commit": "339021e29a50c71045736f322e961efbfc37bd99", + "sha256": "0416fcd1jnvhfj1bm3x60yi8n9cbxyyz11ri5k1g7b454pw54yb5" }, "stable": { "version": [ @@ -61294,17 +61403,17 @@ 20210303, 1751 ], - "commit": "4eb0953dc58193a945cfe77e532b2c4fc36cc78d", - "sha256": "0lklnwdbi8rnvia3a0xjyrgdlsm515j9v3y899hz7f05n6fplp7f" + "commit": "46827603dc28320c359ca30364778f24f66ea6f4", + "sha256": "1jf6cfp26n7k2hr30sh16x7ijd1pig0g4krzmv5dpgw0m5v1ba6f" }, "stable": { "version": [ 0, - 11, + 12, 0 ], - "commit": "a9a0badd79d0d3d7077feaf8bb646154783d5b36", - "sha256": "0h5kzavv7r8w4kzqas8nnpyssal1rh8ax8jh4av5pjp67hcjnq94" + "commit": "70d42b3922d152e8be946c2415151d0551b591d4", + "sha256": "17k0v1nfcsq5kdfk05cdkh8nbbi5bqniydqcr6whzw3aawnjryyc" } }, { @@ -61981,11 +62090,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20210130, - 107 + 20210318, + 350 ], - "commit": "de73de9e8060574cb0c85be4ec3b5d8ff8a92b7b", - "sha256": "19kyrvpkmbgiygcxr3hyrba9smz33y0adz5fwh1kb5qhcyrq8jw7" + "commit": "6979fc6369d55519d52ca1e8f7d80d73ce54c383", + "sha256": "180lsghxcjrn21c79jl7g9kkvd4lf4xabgbwbqlck7barfj256jv" }, "stable": { "version": [ @@ -62710,8 +62819,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210307, - 1805 + 20210313, + 1940 ], "deps": [ "dap-mode", @@ -62722,14 +62831,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "31847020aa512019f542b566ed42a938a6325b32", - "sha256": "1pvw5if54mja9z4xxja7024izb67yvfmj0f36jad1lipz0ydy7mg" + "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d", + "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk" }, "stable": { "version": [ 1, - 17, - 14 + 18, + 0 ], "deps": [ "dap-mode", @@ -62740,8 +62849,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "31847020aa512019f542b566ed42a938a6325b32", - "sha256": "1pvw5if54mja9z4xxja7024izb67yvfmj0f36jad1lipz0ydy7mg" + "commit": "f3b70ec0e6adf3a51e15f9a3effb182c2363493d", + "sha256": "0iyp844wnvxjrp860dgkr10qrfsaj2rcssj8dv93hhv8pg91fhsk" } }, { @@ -62803,28 +62912,36 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210309, - 650 + 20210317, + 538 ], "deps": [ + "grammarly", "ht", - "lsp-mode" + "keytar", + "lsp-mode", + "request", + "s" ], - "commit": "c89b8c44cb0738b04432120d9faf062aebed6fde", - "sha256": "1jms97aa10w2p9gz3d26q62725dp0n38kg9ydk18ffvj97vd8x50" + "commit": "f5675c58ba80258331dda99072c5bfac524dbf48", + "sha256": "0ziv51c9fq4yv8ll7087cd2bwqkl309b1a0gds67d160pj9swwhh" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 1 ], "deps": [ + "grammarly", "ht", - "lsp-mode" + "keytar", + "lsp-mode", + "request", + "s" ], - "commit": "c89b8c44cb0738b04432120d9faf062aebed6fde", - "sha256": "1jms97aa10w2p9gz3d26q62725dp0n38kg9ydk18ffvj97vd8x50" + "commit": "739a7efc7de6e2b0eca9e72268790431a0fb3185", + "sha256": "1ksa685ggp9z0zndscwy9azxjibxd9l79qzvh50i7mz4x9xzdjbd" } }, { @@ -63102,8 +63219,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210312, - 1745 + 20210319, + 1818 ], "deps": [ "dash", @@ -63113,8 +63230,8 @@ "markdown-mode", "spinner" ], - "commit": "63fac21fa222403972cf16734bd4f2d8b0297b7c", - "sha256": "0zggkz864p9pz9hjg9f3bfia6wcplyviq5p7qbn97w5x0vp63f6q" + "commit": "726ba9b174be01ca84b850428c41b6f3b3dfc9c9", + "sha256": "15wmb3bapmkvg21dqhv6v3xjx1iaxbzbjxf0las6a87dyb8qz1gn" }, "stable": { "version": [ @@ -63364,14 +63481,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210208, - 1458 + 20210315, + 624 ], "deps": [ "lsp-mode" ], - "commit": "0558fd1cdbc31c48ca02308bee1b65c77f3fce3a", - "sha256": "0lbpwcf6vnk99rk3mzq3mbh4nxgl6prjrrak2aq9c789n7qainfr" + "commit": "d11cdc25be8e20400a1f9005f716648dd2ce4a3f", + "sha256": "1gls3c2ai2axnsl2dh4vy8l6hr1fyzv4hxi6yss5fw0xs8rqq7c5" } }, { @@ -63420,16 +63537,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210220, - 703 + 20210317, + 1358 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "0ac3e12138a7eeaf764845d1e7e61b02769003ec", - "sha256": "1xqdmbfvn3i7lpk287jslgc9j6zlfxxw6hamqhb25y22bkqjgxsp" + "commit": "784e6d4bb72c6ad1338f3c62d88e2e95056f236f", + "sha256": "04xv0v8l6x57d66rlk4ibs9m59hvliv35ikmiz1dygpdn3ili9zh" }, "stable": { "version": [ @@ -65193,19 +65310,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210310, - 1539 + 20210317, + 1054 ], - "commit": "e54aa0c4974905cc4da114c3bbcfb084486aa6e1", - "sha256": "1z6qcjbzm6r859fxspsm45cjfirrc68jwn729dvk1zz1h61l3xlv" + "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f", + "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "62ed158ff588900b9d3e56f3f05f659763c8c2ba", - "sha256": "1qihw1vq9sysrl6ha23ggycp0n2n1dx1ajkaqfm5vmv8480al07i" + "commit": "e741b243b30f6cfe85e568cc551acff9a1e5e74f", + "sha256": "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh" } }, { @@ -66263,16 +66380,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210312, - 135 + 20210319, + 1657 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "3eaefd6653d6cb1d1fa593a01f7c01354012bf5b", - "sha256": "1k2z72fn0i5knwifp8v8gm8m6fhwrk173l3r3jg0kd6mcxian3l7" + "commit": "a3dbefc07f897fb09124d8568272a31791657898", + "sha256": "15969wbd9wqryi2q1f3n21c732m0my5rp9lc3v4xa4w288s1m21a" } }, { @@ -66286,8 +66403,8 @@ 20210129, 1443 ], - "commit": "6ede379616fbbe295a2368cc9813e5e24290ea02", - "sha256": "1nfmw48jhf9hgrgrf189x88qcyff72vaimpzaw971k65lbjj3kcy" + "commit": "5dae97414e4e4f68a9d71d79362e03416bb6e6ce", + "sha256": "09c430k88kwvcni1v68ncvnf5pdpp236ij8k6vf5rnm5khki6vj3" }, "stable": { "version": [ @@ -67473,11 +67590,11 @@ "repo": "mrkkrp/modalka", "unstable": { "version": [ - 20190713, - 1335 + 20210318, + 1748 ], - "commit": "4b2b92b14ed0b64fb0a0fa80a374ec9f87fbfeb6", - "sha256": "18dbnicaqryq4xhv4d7hds61k85kj3bnpcqv7rippvlyrqm2r6wx" + "commit": "0accefac11451b9c9196a56223b5fe1e26d75e6e", + "sha256": "04i776arnyg2gzzhiifarb73dr4w3sg38kw9cwp1bl1x5w49x47x" }, "stable": { "version": [ @@ -67685,11 +67802,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210312, - 2029 + 20210319, + 543 ], - "commit": "ccca6b3369dd6c1ce90dac60d5b090c04f2ed885", - "sha256": "1vmq9477a3inq6qdafkwl21v1jxdh8lsnlbzkbd5cqhbbrflr621" + "commit": "121aa48cadd9ab3fd64f5cddc057bdcc94dd7383", + "sha256": "1aqsh0qbk0rkcfznbbhhja3whl6xygij89kdqlzc4az0kj43l2jq" }, "stable": { "version": [ @@ -68041,11 +68158,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20210308, - 1721 + 20210318, + 1137 ], - "commit": "8e0fbcbe0c190cd98925d9cb5d5cad606c983a1c", - "sha256": "1wd5hm25d94s9s1wwdxjc1hm77rybbl4s80ialcmg4mr1jyba0vz" + "commit": "9d3170f60dd188bac2d0304daf2a94bec9bfbbd3", + "sha256": "1fc20zglhv48aiy5vl8y6vlk3nimwgfzajx8pq4n7jga3k7cp0q5" }, "stable": { "version": [ @@ -68376,8 +68493,8 @@ 20210306, 1053 ], - "commit": "884d9f4b64fe97597643247f1bed1d4fc9ca5bbf", - "sha256": "116l18wgp1xqdcn4rzscnah8qn6xvnqjbmaf5grvbf2g1gglcipg" + "commit": "8ad7b19d89e65ec81c78204986088154d8702309", + "sha256": "1m4vnwfr04cr3rbg7cny49spz08c09sgm8zpq99r510xn8xxs7vg" }, "stable": { "version": [ @@ -68644,14 +68761,14 @@ "repo": "andrmuel/mqtt-mode", "unstable": { "version": [ - 20180605, - 1731 + 20180611, + 1735 ], "deps": [ "dash" ], - "commit": "36d1d4296d79e17b8f35e8e14f2708980eb502db", - "sha256": "1116xvwpavg7icm263s0clgxhw3qqm4aqiw4ky94w9a8ydazx51l" + "commit": "613e70e9b9940e635e779994b5c83f86eb62c8e6", + "sha256": "1ci1w4yma6axiigz55b2ip0r7zy8v215532jc0rkb3wyn14nsrh7" }, "stable": { "version": [ @@ -70000,11 +70117,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20200814, - 2301 + 20210315, + 2048 ], - "commit": "be7ced29c5a86e29c364f19d248634b8b54d0e52", - "sha256": "1lyad89byq54fva58njf7wiq2rw3767fxif1ykijirzx7q14ahxd" + "commit": "cf142e84eaa4dd91bc75d96a5d26dab5e38eba4c", + "sha256": "01li6c271v5j35chg3a8nl9az3bwq4hk1j8lfjq5a27p91iszpc0" } }, { @@ -70662,11 +70779,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20210115, - 2034 + 20210318, + 1654 ], - "commit": "ca504e4387641b648e7bc6037fe515b03a90b801", - "sha256": "0gz2qrkr4gvy5wh44wiy7mhqwlxgfa8fyg0bincnba89161fnymk" + "commit": "a4d9d69442c9edac3f2cacabd2a7401dbefe7ff3", + "sha256": "1h828cxjacfqlhm719w2kwh91i0r1lai6wswpp7wp21wvvp28v5r" } }, { @@ -71385,8 +71502,8 @@ 20210205, 1412 ], - "commit": "97fadd0645e908ff8322577a983dc710bfda33d6", - "sha256": "0gigvw5awwmy87vm07l73va321lrsilihfa4k33sw542svqvmwjk" + "commit": "13efbd0e1c88fcbdb48b4c30c7852c5bf1fbd0b7", + "sha256": "0xc06vqyqpkbq6hd00vdcwxk74mraxmbswin3j716iyx5j7hk7wc" }, "stable": { "version": [ @@ -72100,8 +72217,8 @@ "deps": [ "axiom-environment" ], - "commit": "41e0bf68b06911cbd0a1d7d36a506679a0f6137f", - "sha256": "0qy61shqrgaw3pqz94x10s969irs4hn8cawi1acp9hapfcfnf218" + "commit": "ac8228a702290732ba12c5d13b38576a57afb0d6", + "sha256": "1nrlgrckvh2fiwis9bmr95h2bpxfkz1nknxdz61380f2caqwwhw7" } }, { @@ -73125,8 +73242,8 @@ 20201204, 945 ], - "commit": "02ea48f0d09a48fb2a25fdba75a8bf20872dadb5", - "sha256": "08klrrndkb961979wcp133swl2rckbm5z708zxgzsqf9lamqjc73" + "commit": "585b139f3dee1f801edbbf6545891232119c9087", + "sha256": "15gfvnkqzixwvq4jq8w6y7v7lyd2j8gca62hap3rsh6c41b8ls1p" }, "stable": { "version": [ @@ -73666,8 +73783,8 @@ "popup", "s" ], - "commit": "8ec59296b2e2a12d8ea146fb7056091fbb7bdd10", - "sha256": "02kx5gx1hk5r3lks3y9myq3x90zcz0snhckyf7sx45ydgnjxm5j4" + "commit": "5fad6835bee15792774183164dd423ba18cf1e01", + "sha256": "1ww202j6bh8ycw2wfngy9rw1hv5qrjg66bgp2yj28j12ag1qxn2r" }, "stable": { "version": [ @@ -74191,6 +74308,21 @@ "sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b" } }, + { + "ename": "org-appear", + "commit": "d4c5bea920593d5da72b4208c0727b5ced0a588a", + "sha256": "1b88r4nsvm1ndicwc2rgkznmfcyb6bz7fb05fw667dw6mzmlpxk1", + "fetcher": "github", + "repo": "awth13/org-appear", + "unstable": { + "version": [ + 20210307, + 1335 + ], + "commit": "0b3b029d5851c77ee792727b280f062eaf2c22c7", + "sha256": "136z40r0i9q9wqbj4yxa8d4c2ygx7dzp9i126ra56sm6cdkvz0cj" + } + }, { "ename": "org-attach-screenshot", "commit": "f545cd8d1da39e7fbd61020e178de30053ba774b", @@ -75132,8 +75264,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210304, - 803 + 20210313, + 420 ], "deps": [ "alert", @@ -75141,8 +75273,8 @@ "request", "request-deferred" ], - "commit": "ff55b2117c074288633c35bc38f21db13b476bbd", - "sha256": "01wr33ra6h254r123zy677bwf98jzgkb4qpsy90rgf0kjq7wb142" + "commit": "d38acdad70883dc3fe34a4cd41024e5a8099ddb2", + "sha256": "17lnsn045l99w787mbrq623div40w3c59rgryvx04px085bb2i5g" }, "stable": { "version": [ @@ -75504,30 +75636,30 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20200729, - 2120 + 20210315, + 28 ], "deps": [ "dash", "org", "s" ], - "commit": "70b4c9823b32ae299f3da521966b6c5abacf73e2", - "sha256": "159g13m1zpc1b2ggs9iw2l51pj0h433y1x00bgznhc9fvamysasd" + "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257", + "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h" }, "stable": { "version": [ 0, 6, - 1 + 3 ], "deps": [ "dash", "org", "s" ], - "commit": "fbb27c3983ad735a333c766815642a6615cea2ed", - "sha256": "0xclk323hq4lszqmvba4v8785v57bxfxln5n1hy0vaf0f45hfkjw" + "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257", + "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h" } }, { @@ -75557,8 +75689,8 @@ "repo": "yangsheng6810/org-latex-impatient", "unstable": { "version": [ - 20201123, - 845 + 20210312, + 2250 ], "deps": [ "dash", @@ -75566,8 +75698,8 @@ "posframe", "s" ], - "commit": "d8be05fd6857c72a1766e3fa9dafa1602ccf88e3", - "sha256": "0vidxcv07brz4adik1826g0v7zyyz80r84kzz01rcxcc471fl957" + "commit": "a27ec1491c7d897904e84d9b9db380e1a4c7914a", + "sha256": "0r0yn0z4d5y5mzc8awg8wcb3lvb058c7gk7v5mghnwln50zvqqia" } }, { @@ -76640,8 +76772,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210310, - 1855 + 20210315, + 1730 ], "deps": [ "bibtex-completion", @@ -76656,8 +76788,8 @@ "pdf-tools", "s" ], - "commit": "0a46b63a8233374c8873cb0cd99b8b67244f8166", - "sha256": "1vv50h1zmr52pqmx900ia267flv2xfak3zphsnc43inf0c6jf4xb" + "commit": "7b0ebdd2e34b3a509c7f043cb9d919a0069491c2", + "sha256": "1r1p2k9x5sddxr8cf5ds3hqz2xn4zvy9zabgyr63s16cl7hhn2lg" }, "stable": { "version": [ @@ -76823,28 +76955,28 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210302, - 805 + 20210316, + 840 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "068d9c27650207447ecf7a41fcd5b7abc40f4c3c", - "sha256": "1jbg5cwp0yf36fv2w695m091m8ylkgg831bmgwvscrdhx1zq4lsi" + "commit": "81b6fedf99996a78199067e61935964dea9389ee", + "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "71da772469bcb49d4a93ee9d9704fbee9488aa28", - "sha256": "13pll793khyfncpwm2dg24w747sqp7kgf7m3fqw2xzhv9cx2g7nq" + "commit": "81b6fedf99996a78199067e61935964dea9389ee", + "sha256": "1xb7nskz73dfa2rgwmf4s3iq10f43zagggia3ddhx109wmy2m9a9" } }, { @@ -77140,14 +77272,14 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20210219, - 1622 + 20210314, + 1558 ], "deps": [ "dash" ], - "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2", - "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf" + "commit": "786257e682bf147022d5b19e6df6e7c9939193af", + "sha256": "1vfw06c08yhpc1dbqb4gprh9l3j0rgsyvhhgmvcv3y5cq2yaibhb" }, "stable": { "version": [ @@ -77178,8 +77310,8 @@ "org-starter", "swiper" ], - "commit": "5f9e1d225b216d76e4955f394e0387ce015361b2", - "sha256": "0yipahcq3rl395b16fb2fzfrxq0mnc4paqm06zjiz5i8qpb1w1cf" + "commit": "786257e682bf147022d5b19e6df6e7c9939193af", + "sha256": "1vfw06c08yhpc1dbqb4gprh9l3j0rgsyvhhgmvcv3y5cq2yaibhb" }, "stable": { "version": [ @@ -77769,8 +77901,8 @@ "repo": "org-trello/org-trello", "unstable": { "version": [ - 20200508, - 1705 + 20210314, + 1856 ], "deps": [ "dash", @@ -77779,8 +77911,8 @@ "request-deferred", "s" ], - "commit": "56c519a00c6e3c8f6923cd0460342089d58c41c9", - "sha256": "09028167pi9pzgcb8fpvqgvzviq1fxvgby5lb99wvyy94vjxwnk2" + "commit": "0435d77cd32cf475ce71b81cda4bb48066c44f31", + "sha256": "1nnii5d5qf0bgfpywmhzprh6f1hk39k2wnhnjl0ahqm99bl46fps" }, "stable": { "version": [ @@ -77810,8 +77942,8 @@ 20200919, 1348 ], - "commit": "e086c59a14701cd041641b51c952fa704ee963df", - "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p" + "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", + "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" } }, { @@ -78402,11 +78534,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20210225, - 915 + 20210315, + 1415 ], - "commit": "bcb38ada8469a7f6f9a915c36760a05b2c68ad88", - "sha256": "1db0wm7dlx1yqnfhbw4m3q3a8x4wk02j1c276qazhff4n03mbhf8" + "commit": "639ec296ccca4e2f7405e9ef72506fad609f2167", + "sha256": "0nkm6y851sm1bp8ch9d7dxi1z07qs1254ab8zjv16hvq8arp0s6c" } }, { @@ -80099,14 +80231,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210209, - 1639 + 20210318, + 1411 ], "deps": [ "cl-lib" ], - "commit": "d8ec8ddf5e39b61e9338de9a778633b7e01854cd", - "sha256": "1wdii6hlvd4pbgf7bp9d8ay0kd34nyxz2w7gyq2kx43hlcgxhyp1" + "commit": "af4f87beb48afc3fb455c58648749e5bfdda1d03", + "sha256": "1cn61si2dn60pm3q0d0yjlrsfbns2v51zsdfl52rnfmnrhnl3qjl" }, "stable": { "version": [ @@ -80553,15 +80685,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20210308, - 2211 + 20210317, + 2340 ], "deps": [ "dash", "hydra" ], - "commit": "500e80666fb779457be8771c5613c177187ba0cc", - "sha256": "1c3gay9fkikg7h46djw1nf86fzckmv7w1zbz5fbar20klcr12pbm" + "commit": "2ad3cfa3045e0a3bcbdee02819c6fd356a8bc40c", + "sha256": "1m6c5y95asrw7fkn9sah6a38glr66vb35d3g6gc8lcvh2ikmgjn1" }, "stable": { "version": [ @@ -80610,8 +80742,8 @@ 20200510, 5 ], - "commit": "e086c59a14701cd041641b51c952fa704ee963df", - "sha256": "0w1crw5lsk22jfw2w5qq6ab7zxdzp38akasvyvxakvpp1782xq9p" + "commit": "331252334ea2e62d8e06b2dfa24be5dbd7f9c09f", + "sha256": "0gri6k1px53lmi5nq3zpv0m0kc3c8pbnc4h0zard5v449gmf1d5q" } }, { @@ -81789,8 +81921,8 @@ 20160321, 2237 ], - "commit": "1d410a4e48db07a942e54d3b83a85c7a7ec0aab3", - "sha256": "1b7csqypqkalkzq6vrbq5ry1gdk0qnhnk43rlj514mph0s1nywdd" + "commit": "29f6e7058f635b0084880a1f890a6c92501e8c29", + "sha256": "06lzb3mzrf2hqbdj4m8vfayf1xar9dgkwznzsqkbj6gjwxbz6xvd" } }, { @@ -84552,6 +84684,21 @@ "sha256": "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln" } }, + { + "ename": "popper", + "commit": "fd5bfc5df356ea6c91f2fd120b8f912d093a0de6", + "sha256": "0iz784hzrhmxr7zv1jx13fk0k9h1c15rbgakry0nyjm4x366rmhj", + "fetcher": "github", + "repo": "karthink/popper", + "unstable": { + "version": [ + 20210319, + 31 + ], + "commit": "89ed8ab2da330ffefa0d32ac34491467fc6be228", + "sha256": "1n9raivjdsh0nrn0npw2357j72ccqb19mpnmg4cq5qj5q1if2f8v" + } + }, { "ename": "popup", "commit": "083fb071191bccd6feb3fb84569373a597440fb1", @@ -84560,14 +84707,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20210108, - 1821 + 20210317, + 138 ], - "deps": [ - "cl-lib" - ], - "commit": "bd5a0df7e5bc68af46eef37afe9e80764a1d4fd8", - "sha256": "1y9wv5c9x1rsfdhh3r7mah7yyx2cs7asjzhgsn1pbq7zdjpv5p0p" + "commit": "866a091b83369873b4d1c5d62a590fbb0a150bd0", + "sha256": "059x15zlc6c17yg5ahdca3bryr10nh9xbb61dv0gdc2wg2c0pzzi" }, "stable": { "version": [ @@ -84901,14 +85045,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20201129, - 2306 + 20210317, + 110 ], "deps": [ "cl-lib" ], - "commit": "b293abf83c0a2b2988af19dd0ef0426c3b1d1501", - "sha256": "01nqff1pg9nxv49g2mmapnrjl8978wwyr6afkr3rm7zlnjz1cjas" + "commit": "cfff1cfe63793ea1a8bcfcae50c296558384cf08", + "sha256": "12s3mp2dyslq1ilah64gpz7a2j0ca9yls7wvj9kcmjca1931s8s3" }, "stable": { "version": [ @@ -85157,15 +85301,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20210303, - 2119 + 20210313, + 1047 ], "deps": [ "iter2", "nvm" ], - "commit": "b4c23d108f10d6693c3e2766220fb7dd9c8de7b3", - "sha256": "1s1asp755ywkl6myk2rvr5xj5405w43p8fqzfm9zn51l4zdq5lg5" + "commit": "5232b886bb6a4fb3848d63db1bcfcb30487a180f", + "sha256": "0sbka039sccqip36y98s1b5z6rd5w5q0jzl5kbdq4wmzi7j823ri" }, "stable": { "version": [ @@ -86133,11 +86277,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210227, - 1942 + 20210317, + 510 ], - "commit": "7844e312b2a192c4245d0d05c12908efc5730e3b", - "sha256": "0ky8ivcwkjdclh1vh9hi8wc5zljamby10fd4m73nnkdi2lr6x5nr" + "commit": "56ee4ebc97e77da7d61eaa7b00580bf4ef5b87d9", + "sha256": "0hqmsqb6q2m0gq52lfm64xh8sc9kc48jbqr2w0vd6mp2467afj42" }, "stable": { "version": [ @@ -86240,8 +86384,8 @@ 20200619, 1742 ], - "commit": "9ad97629be72eeecf8bc9fe8145e55ceaeab6b78", - "sha256": "0li6vyr87vspya07j9rkj3m82s9qww6zrnx78yhkn1mznlf73v48" + "commit": "617e2556171d5db4f0c13bed56a5010d08fc3b4c", + "sha256": "0blmqy1jh2c536lwrksrbndmy0za6dxafkww28wkfhs64s9dqwdm" }, "stable": { "version": [ @@ -87096,15 +87240,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210312, - 545 + 20210319, + 1102 ], "deps": [ "async", "xr" ], - "commit": "a65a5c26a5e39420bf7bba54cb9e42d9ce32c90d", - "sha256": "1hjmk0jilqp61wskv4vlxagql5mx7yqqybs3kfd36dr88cg20pyx" + "commit": "f48c3edee78ba5f020bcb42830db99a14761f176", + "sha256": "1ld3bqvfrda6fa4dv3g0wilznrdrsv544sr370sn3a9xlmy4fwp9" }, "stable": { "version": [ @@ -87248,8 +87392,8 @@ 20200503, 1624 ], - "commit": "890a9b91fbac1fbc8f40fc48a78b8cd6855dbbaa", - "sha256": "1p7ki0ww12vf14l2ccxax40032vhyf21vjkmdr0qbmgdqzwvpjgc" + "commit": "cdfc8374b1b0ee88af0463bdbe58299186244d53", + "sha256": "0657491d55x4r4fir357l372pxz7palj60plsk7hinir3db9q7ri" } }, { @@ -87806,11 +87950,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20210208, - 716 + 20210317, + 1221 ], - "commit": "8c25a40d07c08a6a9754b3ae12174664e8ed7871", - "sha256": "05yl7ivr6rq6gry0ik4qg2pxsw07byqwz9sn58hpsx8v7blxwxln" + "commit": "ec61039dfd50967ca545cb955bf1dd349682dcf3", + "sha256": "0hlcckp9vc5rpxp7w30l25ncz7wxywx5jkr12836zcz2mzc8jbhp" }, "stable": { "version": [ @@ -90865,8 +91009,8 @@ "deps": [ "inf-ruby" ], - "commit": "3ef165c5c99aebfd811a0f18ea7f8c983d4ab152", - "sha256": "1vwwchgd45a0lin4n04ffwz021889ps4vcj787iy5ijw34pi8zrj" + "commit": "126650a06224f1a616b10c02bd9ad8a763a512ef", + "sha256": "11yhl9dpf7ni4l9qpr8akpzr2y6j99n3w5hx4yp8v9gppgb1q37w" }, "stable": { "version": [ @@ -91669,8 +91813,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210308, - 2135 + 20210315, + 1728 ], "deps": [ "dash", @@ -91683,8 +91827,8 @@ "spinner", "xterm-color" ], - "commit": "270bc5afda080ed656ad53aa132e8b1fb05083e6", - "sha256": "0f4ff3mpdkqxyi3dv5gm5987nlaaf0gb5k95likjm8i5n9qkk4x5" + "commit": "d97ec8623c4c7e7ad3bb32e3d3773ba29a34bb0d", + "sha256": "1mimrn4aaplmdrwmgp6wax489vp0njd7j95abdnjf0ggc7qbgzcv" } }, { @@ -92154,8 +92298,8 @@ 20200830, 301 ], - "commit": "4546119f2d0582cb03e772a785e5ff93829f2f68", - "sha256": "19g33m15b4rzf16acsiaf7rh9ck0dhyc4kj5zvzd9h21ihyg5sh7" + "commit": "4ebebdaf0dec2f7aaebb6a1c1f6163f503caaa63", + "sha256": "1vj4rd5mq93sg10cbdcr2yx5i954ng9s369dghw35h9dasblz1pl" } }, { @@ -92958,11 +93102,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210311, - 2257 + 20210316, + 835 ], - "commit": "a8806f71f9cc07daa0149c89a4dbdae0aa5aebff", - "sha256": "04q0blmgbwn9jhp4y3jn5vj1h5m1bip6hwa9rf1sywkdbj153n3s" + "commit": "a72109ab3eb3a06d1d8e01629bed06871b2c94d2", + "sha256": "19z3hicdkr11112snalp657f28wb1n6l1kky7qffd01a71pmd8ia" }, "stable": { "version": [ @@ -93166,16 +93310,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210210, - 1411 + 20210316, + 1434 ], "deps": [ "dash", - "dash-functional", "edit-indirect" ], - "commit": "cc1145bde8b1868322ea799a90e38a1295089ada", - "sha256": "0m429i3zy5aik0q91r6sbr5xpqh4fgx984szp01p8fmbyb7wsh67" + "commit": "12db61458b053cee2d57dbf04f725f03487bb895", + "sha256": "1h7mr10agkvx8v6pvki8klz6b33lls201wn10q1fgg42djcw2skk" } }, { @@ -93186,11 +93329,11 @@ "repo": "brannala/sequed", "unstable": { "version": [ - 20210307, - 939 + 20210315, + 2012 ], - "commit": "bfd9109a4fe5625554a87988564403031e57f5d9", - "sha256": "1h2qqd39lj5kqn5yy7c93r5zh6ajbrnr0c5nmxfjb2llra6hlc1y" + "commit": "50c5dca413a12fe2d8a89eae833f10967c2f38d2", + "sha256": "16hsjk04xw88ddr2gbwlb4v8didqmk7ffwphp1iqy3a02wf4kif6" } }, { @@ -97229,11 +97372,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20201006, - 1441 + 20210317, + 909 ], - "commit": "a7db58747131dca2eee0e0757c3d254d391ddd1c", - "sha256": "05f58nz2bhb5bzy06glpv7pjfqpalv5pyggm43zsh1kl2pxwzb9a" + "commit": "ca8f409788964daeabdeff9c8beb36109900f996", + "sha256": "1hkzhjnnz1m5lsh2alphr3d234zpbxw44xxhb47l2ws0vr64w50x" } }, { @@ -97817,11 +97960,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210306, - 18 + 20210318, + 2242 ], - "commit": "78d65e571a811088d726858f8f60b9c55f26cfcb", - "sha256": "1wrzpzp98blwzbgfgfkz5kzc1chcbpgdl23zvs90m01yhhldmmnj" + "commit": "512d51e8b6f912857d484095defd7b89535edfbb", + "sha256": "0nww5hhzajj4vhps9n1hlyrgj3lifr9lg2dm1s04f2hy84pn9jm1" }, "stable": { "version": [ @@ -99319,8 +99462,8 @@ "deps": [ "ivy" ], - "commit": "8866138333f92c3d82062c5fa613beba38901504", - "sha256": "0nmyv8i0z81xhmlyg79ynsnhv17k1bn21284nb8367w2jdpsscn8" + "commit": "75002963859101003436c84d1d3a85f9ea5f89fc", + "sha256": "0pf54qimwjsm6y808vx68zxdfpj0c1kaysy3s7bsi875b99yyd8h" }, "stable": { "version": [ @@ -99635,11 +99778,10 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210310, - 214 + 20210319, + 329 ], "deps": [ - "dash", "evil", "evil-cleverparens", "evil-surround", @@ -99650,16 +99792,15 @@ "smartparens", "undo-tree" ], - "commit": "5c95dc5b19b6762b5541da784dbb24e8c9b662d7", - "sha256": "1gyisadxsx8a6dw3xncmzxhpc1m2qw08m2wzsqj78cp7m1waxicj" + "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb", + "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf" }, "stable": { "version": [ - 0, - 9 + 1, + 0 ], "deps": [ - "dash", "evil", "evil-cleverparens", "evil-surround", @@ -99670,8 +99811,8 @@ "smartparens", "undo-tree" ], - "commit": "741eee5f69af575e6dfd584baa78c37241f61646", - "sha256": "0l25vds6qjx36bxgy0iwfjqsgcasslhywl8gvb2wv7jpsmjdqg4q" + "commit": "d37532a9dcff8ec5a2fdc54f27b517890f972bfb", + "sha256": "19ffgdvmnys2hby1iwb85kwr74iadnp8mfd0816jlaafjsga7inf" } }, { @@ -100030,11 +100171,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210221, - 2336 + 20210315, + 1609 ], - "commit": "7fe200bf2c7397abe5623d1b05983eaccc467320", - "sha256": "16rf0b33adj780ix3x7xhp74dbx6f2044dzihpl77ar1yd48dhc7" + "commit": "d2ff6b1acb553bf1546e730640397b9e33ca5279", + "sha256": "1agjb68bjfjzgacrip2mjwzfdbvj3xn8cs3f6q5kdjg5v7lg9c9h" } }, { @@ -100045,14 +100186,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210213, - 2138 + 20210319, + 2222 ], "deps": [ "s" ], - "commit": "930a86edcfe7c0e33e16bfe2501dbe285a443df9", - "sha256": "14vpwh2yh1626jlc1ifyl7lfyv2lsczcgsbjs4flbpv83c9biq8s" + "commit": "09f2049d5fac5c046e517108ac527d087a7352d8", + "sha256": "024yxwb40jpfk5bfb3achf0vkbkblnkidy7rymvln2mzym85g77s" } }, { @@ -100514,15 +100655,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210312, - 1754 + 20210319, + 2200 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "d803588c9e845706f982b8e996343e1d627ce422", - "sha256": "0ihdkdhcn7pqlj329mis5akjrh9jd4hggnm6f9n3fdqjbcj63sdz" + "commit": "de153b575d0a6470314efb3cba9b48b14b5f6d57", + "sha256": "014hzm2dlvzrx15557zhd3h8d0dn6akyprxc81ijc6wfczj8bv6m" }, "stable": { "version": [ @@ -100653,11 +100794,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210304, - 1358 + 20210319, + 2222 ], - "commit": "d29c794e1648b4d862a3f48b9de713dd2d972519", - "sha256": "1yy1n4df7k49c5fvflq1myrxw88qk39rjcsm9p0pgd4akxbd3klj" + "commit": "ef93f4190c785166b49a310bf2d8695d3227ab40", + "sha256": "13hwa7v5yyji98g9rz2m4ql89nx2wi0hhhikm9y552l25qayrgxz" }, "stable": { "version": [ @@ -101590,18 +101731,18 @@ 20200212, 1903 ], - "commit": "492a049c23cb86bfc2dc38762a95c6da41fcc7d8", - "sha256": "1v37lz2gqyb5jrmhkrxdyp3xxdz4a37n7638ql4jrvrvq31b8x9b" + "commit": "c6b9113fbe9d3510eb49d24f10cd47a249260e01", + "sha256": "0r7k57lpazrz65ix53cflc94msvw7j68myg6y8x0bz44hf8m5irs" }, "stable": { "version": [ 2021, 3, - 8, + 15, 0 ], - "commit": "e2b61c2a165b8fda48c43f02c6e9e78ec5b3cb37", - "sha256": "1miv1jgxk2vip63vwnsb9k6x1kp6rz9kj62y8asr0sszf6y1h8jk" + "commit": "6d68811e7ee75f8e0b450b9b1778bfad2c44c715", + "sha256": "16yixl9qq6zh47zjnad9rv2vbjq936ms212j0wfdax7qhg094af8" } }, { @@ -101681,8 +101822,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20210211, - 1055 + 20210313, + 1524 ], "deps": [ "cl-lib", @@ -101691,8 +101832,8 @@ "s", "typescript-mode" ], - "commit": "7f7334b42a40dd3093b830e887c36cdb4ef40858", - "sha256": "0krixylc58lglpi6kgwlxfd47c90vmck3cml0h3awplbyyr8b5vg" + "commit": "f6ad5e591c4a21a8ed252444cbc0cf6b079d2449", + "sha256": "1vkvlkgbk1mlfk31gdf13w4lq3nj7pskp5xd40hivirgmck18wd4" }, "stable": { "version": [ @@ -102008,8 +102149,8 @@ "deps": [ "request" ], - "commit": "269bda7001613c0b70c0662d2a74d200765c1dcb", - "sha256": "0z8hkp15sdb0x0g67v6xa8ds28awz4i2vcbryj5zfpl15d0fiqc2" + "commit": "d59405bd72f3379417b9e73f06e8848b43cb021d", + "sha256": "19yb4cxcaif73yvf62d4891l5rvp8ynhxl0f2wc9lvssg0lpx5y0" } }, { @@ -102640,11 +102781,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210311, - 1549 + 20210315, + 1902 ], - "commit": "eff65f1d8515df3dc41fb628d54950990a30dbb0", - "sha256": "0zqicpbijvp2crmwk6c6ipkc6nlh2mkidxda7dc82ilyb9562fhk" + "commit": "cc16a5eaa73617a281b0bbf71b24432c38994e30", + "sha256": "15ah0h7i96wn4w5321gydr6pxahb8mc8dk58b9paqv06klp5q2cd" }, "stable": { "version": [ @@ -102887,26 +103028,26 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210310, - 1533 + 20210315, + 238 ], "deps": [ "tsc" ], - "commit": "e1052cb562a178061538397531be8ca6b11e7d15", - "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" + "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", + "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" }, "stable": { "version": [ 0, - 14, + 15, 0 ], "deps": [ "tsc" ], - "commit": "e1052cb562a178061538397531be8ca6b11e7d15", - "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" + "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", + "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" } }, { @@ -102948,26 +103089,26 @@ "repo": "ubolonton/tree-sitter-langs", "unstable": { "version": [ - 20210305, - 1109 + 20210314, + 1704 ], "deps": [ "tree-sitter" ], - "commit": "8f1f22dc5923ef4b8e594a556acd0a3c878b0855", - "sha256": "1y5g9fp05zlnklflgkbibs64ypbrixcq591pw6fpg5lklij6h1r2" + "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861", + "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a" }, "stable": { "version": [ 0, - 9, - 2 + 10, + 0 ], "deps": [ "tree-sitter" ], - "commit": "d13a43e286e9e20daf6c6dd29357ac4992208747", - "sha256": "11ap8rwsa83pq8850sbn9w46imdi3w8zncqp56g57gwgkkq11l6h" + "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861", + "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a" } }, { @@ -103027,8 +103168,8 @@ "pfuture", "s" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" }, "stable": { "version": [ @@ -103064,8 +103205,8 @@ "all-the-icons", "treemacs" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" } }, { @@ -103083,8 +103224,8 @@ "evil", "treemacs" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" }, "stable": { "version": [ @@ -103113,8 +103254,8 @@ "deps": [ "treemacs" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" }, "stable": { "version": [ @@ -103145,8 +103286,8 @@ "pfuture", "treemacs" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" }, "stable": { "version": [ @@ -103178,8 +103319,8 @@ "persp-mode", "treemacs" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" }, "stable": { "version": [ @@ -103211,8 +103352,8 @@ "perspective", "treemacs" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" } }, { @@ -103230,8 +103371,8 @@ "projectile", "treemacs" ], - "commit": "2d5ec4a9437bfaa21d351497871bf1884305ac8e", - "sha256": "1kg3fnnlw0kxl4w14kbcp88nq1y4r8w4k6z5qp1vpw6bglb13qhk" + "commit": "33be5b672b0492a901acd95bb9801a68ae7bdc95", + "sha256": "0rc0hpg5x39qwwdv05ky7iaq8kz1vzliidl73nyvmkjbjc58aw6c" }, "stable": { "version": [ @@ -103337,11 +103478,11 @@ "repo": "ianpan870102/tron-legacy-emacs-theme", "unstable": { "version": [ - 20200601, - 533 + 20210315, + 712 ], - "commit": "af17842821400a6fd466bb2769d13606e98550c0", - "sha256": "19pabaiza0lrvqa8yi0p83rffm9g44n6789m395iayfcxq49lylq" + "commit": "4d543fbb9cb2098af1be0f5b10e1e4cd5245a9d0", + "sha256": "0fyprvi4s331r6a54xa4dljw0k330kiyhzcfnnjhbsqxc86264pz" }, "stable": { "version": [ @@ -103485,20 +103626,20 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20210310, - 1533 + 20210315, + 238 ], - "commit": "e1052cb562a178061538397531be8ca6b11e7d15", - "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" + "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", + "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" }, "stable": { "version": [ 0, - 14, + 15, 0 ], - "commit": "e1052cb562a178061538397531be8ca6b11e7d15", - "sha256": "1m83kg4s0gibdq1kq43l9b2yaf35k203qx5bm32n0gi3b5l03qi3" + "commit": "174200858b4192b9d5be3f5bcd1b62995151245b", + "sha256": "1syzz7gq6n3ri1sgr6jdr0lyfwycpjv68iws5rxwjmf9n3gdbyfh" } }, { @@ -103867,15 +104008,15 @@ "repo": "mrkkrp/typit", "unstable": { "version": [ - 20200217, - 2059 + 20210318, + 1747 ], "deps": [ "f", "mmt" ], - "commit": "f567867a0a519e17ad3552837b48d3d45fb73aa5", - "sha256": "0a5xds0mhfnq6kyc13s385vf4x4cqqpk2jiw1in7qg382fl8w2p0" + "commit": "fa125bf43757737fbcf91958b76c38b440d54b4c", + "sha256": "1l0qb8gjgsmjjdvxlma7g6fn2z6rj246p2kczrikq8ajg1xh61sr" }, "stable": { "version": [ @@ -105819,11 +105960,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210303, - 2314 + 20210315, + 1753 ], - "commit": "b8d2ecbf84b2a9b6a31124e7e4fc22f13e48e18e", - "sha256": "1hgs61gg75712d6q0sd51xlvmrpn8r6x9nnca8v5f7qnxhnyxv6p" + "commit": "9c5e9baf43388d5a69ea2fb216d9936628b36a84", + "sha256": "1jl4b1ka1xaavfm4gpqgg01f76mlvy0g0rdifmwwz9w8apw306j0" }, "stable": { "version": [ @@ -106582,11 +106723,11 @@ "repo": "ianpan870102/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20201116, - 749 + 20210317, + 930 ], - "commit": "4a4c7502ceda44d189a5fb09018ef2bc3f3c8d5f", - "sha256": "0vgg301za0bgdgcj8kfniysvjq1iyia3jk6lvi6vwrzc8sy9hx6z" + "commit": "d54fc120f0c0b363a8bef159da58786fb51e7b0f", + "sha256": "1imz2fr9164lsc8f1qji439iz4a643qslmxd9526alxa8gwx2yiz" }, "stable": { "version": [ @@ -106621,11 +106762,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210308, - 1505 + 20210313, + 1359 ], - "commit": "21c0c0fe8baddf69043d3173f9fdcf790187f570", - "sha256": "0caqcvs5ba5796isnvqmvrn81lpkqk11jybx1lhizcl23jv060jc" + "commit": "98179e129544bdee7d78fc095098971eeb72428d", + "sha256": "0abh1ydq4rzisgy1wf591r5jj606wh0w9jza7pjzwy30s19qd7bl" } }, { @@ -106636,14 +106777,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210226, - 1800 + 20210313, + 305 ], "deps": [ "vterm" ], - "commit": "91f788e90b12dd940e3bc9c7b24108be37b99c03", - "sha256": "1gdf27b89d47js89wi1amicrm49qryi0d3qyjzav4ryf8m7xx54m" + "commit": "d10239b7bb89b78dddb82f66ac2286bc0b02747b", + "sha256": "0r9n23wg9cfy10h5f9zqr8jpkvw34f9rylri3nxq870awjab7rqi" } }, { @@ -106764,16 +106905,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210308, - 751 + 20210314, + 1818 ], "deps": [ "org", "org-roam", "s" ], - "commit": "39c514f307f70b5baa6d65163ec7140c9189e662", - "sha256": "1fxy0n1kv7lrqq4k58wpbbdi4m2rd93k5n66v7bz77qjxzsvpssf" + "commit": "ee35c562768a3a46b9d2c2f28dd2def105c05446", + "sha256": "19gx5i6jdb8dgpwaw0vmmla1v451svixahyf1pnfk6615rsb3m08" }, "stable": { "version": [ @@ -107659,11 +107800,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210227, - 1749 + 20210318, + 1726 ], - "commit": "831005d21ac373d5d12a1ef2d524e83a6b114c56", - "sha256": "1grqvy901bkx0pqfy2zfyqzmk5wdarihg27lyjlz1hpiyl74y3sp" + "commit": "1441ff884092de03fa7be97fcfd03eefd4dd4b07", + "sha256": "0i2idvcck5605miyc938h2y85jvbmd1nky20nmyhrs9q155lifxv" } }, { @@ -108344,15 +108485,15 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210309, - 1531 + 20210315, + 1848 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "655df549deb1a5895851c2b989a27bb281db00f4", - "sha256": "162w8isgpyma4wqgvznvvfdp8kyv5z4p8jfm57dgc8vb9aa1p2zp" + "commit": "aa4e7376ab72b7f67cf8ad46b67a2eaec2f8cd61", + "sha256": "1l7nrms211jslxibq18wxxdx7rv6i18by8lzhk692fp6s5af2fi3" }, "stable": { "version": [ @@ -108570,11 +108711,11 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20210117, - 2008 + 20210319, + 1930 ], - "commit": "36e163ca80f74905ba3c1cf7b596a0ccc8bc5cac", - "sha256": "0sq1kpc1ia0vjqylfqi6g2d24fcz5a3yvc5m8x3knhyx8qj5nz5y" + "commit": "ebcbd3b137154e6c5a2b976bacbb89d48ddfa242", + "sha256": "0qir7kzvnlchpvmpl8gj11yqly6j5m260mmxny9xxwx0dzwaya4k" }, "stable": { "version": [ @@ -109187,11 +109328,11 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20210129, - 407 + 20210316, + 156 ], - "commit": "4f1a63bf990c06942c5c290d5d146f8545f43b95", - "sha256": "0awa2zhnmm49sdvxwzhbnzcynk4qsbpsrmqmh9xi9rw20711iwjr" + "commit": "d66e6808367048b7694383cf545102e7cad6ba8c", + "sha256": "0ahz85n49x2579hpzir2xsqwm0mwlv9x2h91haq0w0l73llnj35q" }, "stable": { "version": [ @@ -109356,11 +109497,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210310, - 1652 + 20210319, + 1553 ], - "commit": "4196c9d06c5da12e9d10b1307e4e6aefb05f4686", - "sha256": "143j6fwvl6k9gf7m99bmh1y6c6sayr120ndyfbfx34c22wgfgbj4" + "commit": "f35ef2e8cb8208c30a7ba02df52f32d915073fe6", + "sha256": "13xf12ci1anm6r8j90i6mj8pfmb8ffvhyzinz42046achhpymwnl" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix index e48ee4dd13..161acb54bb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gophernotes"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "gopherdata"; repo = "gophernotes"; rev = "v${version}"; - sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27"; + sha256 = "sha256-EEMKV+k5qcep4z7J5r1nSLxmb0fbfpJOPmz5bE91cd8="; }; - vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs"; + vendorSha256 = "sha256-Wy4HcPlrlYUjRQHhw+UPAa+Rn1FvJobWGxgFiJKJTAg="; meta = with lib; { description = "Go kernel for Jupyter notebooks"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix b/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix index 5429497d20..29a3e1ff1c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix @@ -21,6 +21,5 @@ buildGoPackage rec { longDescription = "The Hex Editor From Hell!"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 7f36bc35cb..0901c815f1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -270,12 +270,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "10120y9ccdlhjrpvfnspfj4s7940b3v3yic78r372wj5ns4bsjax"; /* updated by script */ + sha256 = "10s0jkxi892pg7d2slh7cvrd0ch2223qms3c9v1ax0n6ymfkcw14"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -296,12 +296,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "00wbl4g1wgb9c287z6i7a48bm5zyb1gkmyqmhasmj0n2vamaq6sz"; /* updated by script */ + sha256 = "148rs9w0fqr5xzhnq5bd473j4vnb69kf8yxxjmwdp25z2d7x47ip"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -309,12 +309,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0zkjmvi27b69xrkn4s6f5788n5yn044phgf48kamfqfs37q4xf1d"; /* updated by script */ + sha256 = "1msfl8qq0aday4ssip73r0y096mrb89mr7z2j4mpqhkzgsmvpjk0"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -322,12 +322,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1vac21d9p52z4k1dl903rc2dbbcf873xbg8rx1fp9nsaaphnc9lq"; /* updated by script */ + sha256 = "0szq8lqp1h7kci8kqd1bb3g16j3p5f4dfmbccbyrrwsram3hvjgi"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -335,12 +335,12 @@ in mps = buildMps rec { name = "mps-${version}"; - version = "2020.3.1"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/mps/2020.3/MPS-${version}.tar.gz"; - sha256 = "0qvl724mm53rxfhafl6561rhpwppcadmwr9sh0hpsfgsprh2xznv"; /* updated by script */ + sha256 = "0vskzia48jq50bjdqw993gizvvd59f3qlszbsdp7xg5a3afbk7p3"; /* updated by script */ }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; @@ -348,12 +348,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1dmymlv71syjv8byb9ap9c13fimjl6c3r94dwr9kghdlj3jh7p0k"; /* updated by script */ + sha256 = "0arff0882xw1azbxpn1n3wbc5ncg8gmfim3jf6rq2dky8kp9ylkm"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -361,12 +361,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.3.3"; /* updated by script */ + version = "2020.3.4"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0p05pgfmr9515sqbqbjiksg7qzvqxcs119lxfc6dsirdvc1qhnli"; /* updated by script */ + sha256 = "0xh0hb0v3ilgqjljh22c75hkllqgqbpppplni2dz2pv9rb3r5dv5"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -374,12 +374,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.3.3"; /* updated by script */ + version = "2020.3.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1yzv1pxpw6pvsjljqvbnf8qgdx34rs5j232zaq4vb5x2ahswf9mm"; /* updated by script */ + sha256 = "18gkjc52qpghs721rkbsj03kaf6n8c8sxg57b2d82hjckjgm6q10"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -387,12 +387,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.4"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */ + sha256 = "1v99yqj83aw9j400z3v24n7xnyxzw5vm0b3rwd4yb8w3ajl59gq1"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -413,12 +413,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.3.2"; /* updated by script */ + version = "2020.3.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1jpa4gfy0xmmscjqca4pvvwvh4h3lg02nbf1m5wcsjdcywbk9y40"; /* updated by script */ + sha256 = "0szq7qz5p1ksmqdy1rma5rfl0d9dy9qmhz8k5id4zdpyz2jsacfb"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix index d75dcc9ac9..2ca24cf661 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -34,13 +34,13 @@ self: super: { kak-ansi = stdenv.mkDerivation rec { pname = "kak-ansi"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "eraserhd"; repo = "kak-ansi"; rev = "v${version}"; - sha256 = "0ddjih8hfyf6s4g7y46p1355kklaw1ydzzh61141i0r45wyb2d0d"; + sha256 = "pO7M3MjKMJQew9O20KALEvsXLuCKPYGGTtuN/q/kj8Q="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/manuskript/default.nix b/third_party/nixpkgs/pkgs/applications/editors/manuskript/default.nix index 49dafe8fc1..3d3fa19611 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/manuskript/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/manuskript/default.nix @@ -57,6 +57,6 @@ python3Packages.buildPythonApplication rec { ''; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.steveej ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix new file mode 100644 index 0000000000..505fd41f79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper +, msgpack, neovim, pythonPackages, qtbase }: + +mkDerivation rec { + pname = "neovim-qt-unwrapped"; + version = "0.2.16.1"; + + src = fetchFromGitHub { + owner = "equalsraf"; + repo = "neovim-qt"; + rev = "v${version}"; + sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny"; + }; + + cmakeFlags = [ + "-DUSE_SYSTEM_MSGPACK=1" + "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found + ]; + + buildInputs = [ + neovim.unwrapped # only used to generate help tags at build time + qtbase + ] ++ (with pythonPackages; [ + jinja2 python msgpack + ]); + + nativeBuildInputs = [ cmake doxygen ]; + + preCheck = '' + # The GUI tests require a running X server, disable them + sed -i ../test/CMakeLists.txt -e '/^add_xtest_gui/d' + ''; + + doCheck = true; + + meta = with lib; { + description = "Neovim client library and GUI, in Qt5"; + homepage = "https://github.com/equalsraf/neovim-qt"; + license = licenses.isc; + maintainers = with maintainers; [ peterhoeg ]; + inherit (neovim.meta) platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix index 8eaa9204c4..5210b6b67c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/qt.nix @@ -1,79 +1,38 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper -, msgpack, neovim, pythonPackages, qtbase }: +, msgpack, neovim, pythonPackages, qtbase, neovim-qt-unwrapped }: let - unwrapped = mkDerivation rec { - pname = "neovim-qt-unwrapped"; - version = "0.2.16.1"; - - src = fetchFromGitHub { - owner = "equalsraf"; - repo = "neovim-qt"; - rev = "v${version}"; - sha256 = "0x5brrim3f21bzdmh6wyrhrislwpx1248wbx56csvic6v78hzqny"; - }; - - cmakeFlags = [ - "-DUSE_SYSTEM_MSGPACK=1" - "-DENABLE_TESTS=0" # tests fail because xcb platform plugin is not found - ]; - - buildInputs = [ - neovim.unwrapped # only used to generate help tags at build time - qtbase - ] ++ (with pythonPackages; [ - jinja2 python msgpack - ]); - - nativeBuildInputs = [ cmake doxygen ]; - - preCheck = '' - # The GUI tests require a running X server, disable them - sed -i ../test/CMakeLists.txt \ - -e '/^add_xtest_gui/d' - ''; - - doCheck = true; - - meta = with lib; { - description = "Neovim client library and GUI, in Qt5"; - homepage = "https://github.com/equalsraf/neovim-qt"; - license = licenses.isc; - maintainers = with maintainers; [ peterhoeg ]; - inherit (neovim.meta) platforms; - inherit version; - }; - }; + unwrapped = neovim-qt-unwrapped; in - stdenv.mkDerivation { - pname = "neovim-qt"; - version = unwrapped.version; - buildCommand = if stdenv.isDarwin then '' - mkdir -p $out/Applications - cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications +stdenv.mkDerivation { + pname = "neovim-qt"; + version = unwrapped.version; + buildCommand = if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications - chmod -R a+w "$out/Applications/nvim-qt.app/Contents/MacOS" - wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \ - --prefix PATH : "${neovim}/bin" - '' else '' - makeWrapper '${unwrapped}/bin/nvim-qt' "$out/bin/nvim-qt" \ - --prefix PATH : "${neovim}/bin" + chmod -R a+w $out/Applications/nvim-qt.app/Contents/MacOS + wrapProgram $out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt \ + --prefix PATH : ${neovim}/bin + '' else '' + makeWrapper ${unwrapped}/bin/nvim-qt $out/bin/nvim-qt \ + --prefix PATH : ${neovim}/bin - # link .desktop file - mkdir -p "$out/share/pixmaps" - ln -s '${unwrapped}/share/applications' "$out/share/applications" - ln -s '${unwrapped}/share/pixmaps/nvim-qt.png' "$out/share/pixmaps/nvim-qt.png" - ''; + # link .desktop file + mkdir -p $out/share/pixmaps + ln -s ${unwrapped}/share/applications $out/share/applications + ln -s ${unwrapped}/share/pixmaps/nvim-qt.png $out/share/pixmaps/nvim-qt.png + ''; - preferLocalBuild = true; + preferLocalBuild = true; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ + makeWrapper + ]; - passthru = { - inherit unwrapped; - }; + passthru = { + inherit unwrapped; + }; - inherit (unwrapped) meta; - } + inherit (unwrapped) meta; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix index c0345dbf8e..83c5bb6f93 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.2"; + version = "12.3"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "b25cda9830e8fe1d05687b08cc5fa9bcac7e8e6d12776998a4da7e483b3be0d04493345e56be7e6198fa8f86428d57d4459bfa7372c2e3f918f4a1101d0a31a7"; + sha512 = "2fy696qrfbdkzmq4cwd6l7v6rsc0bf9akh61w3azc544bq3vxl3v6s31hvg3ba0nsh0jv3nbdrk6jp1l4hwgcg9zg7kf2012a1vv2nk"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix index 1c6f005863..22e6185b22 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -10,7 +10,7 @@ , readline , guiSupport ? false, tcl, tcllib, tk , miSupport ? true, json_c -, nbdSupport ? true, libnbd +, nbdSupport ? !stdenv.isDarwin, libnbd , textStylingSupport ? true , dejagnu }: @@ -19,11 +19,11 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-3pMLhwDAdys8LNDQyjX1D9PXe9+CxiUetRa0noyiWwo="; + hash = "sha256-zWjfY8dBtBYLEsvqAvJ8RxWCeUZuNEOTDSU1pFLAatY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix index 19cc7bc297..533e353a43 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/retext/default.nix @@ -33,6 +33,10 @@ in python3.pkgs.buildPythonApplication { paths = map (path: "${path}/lib/aspell") enchantAspellDicts; }}" ) + + substituteInPlace $out/share/applications/me.mitya57.ReText.desktop \ + --replace "Exec=ReText-${version}.data/scripts/retext %F" "Exec=$out/bin/retext %F" \ + --replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index bdc5552a64..06613485e7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1b9pzfi034idhi6f3n0sz3fckf95ckf2qx3sgfn9fx2g52r9m9z1"; - x86_64-darwin = "1983d8hn04xl5vw7p6842cv5x08q7vilqg7nhvy5yg3lj9q2rpp0"; - aarch64-linux = "09l32abkq110ib4hjd0yv9avr8a2vg5vs7w4jpk0p499gzrysh2l"; - armv7l-linux = "1s0gbq1fapq2i905c0xxfyh0656qnb7dmg00khlwbplxzd6i6m18"; + x86_64-linux = "1577wxmm8623aj513hxqcfim4d9p1r9wbla9my0c0c1x6pik0h8h"; + x86_64-darwin = "1n8q626nlqw78wlpfppzj365gmlz2swll6csg3ic7p4ik3nak95b"; + aarch64-linux = "1a7rkmhz456rsqw95lrknp1wqsdp63pkzh76vhzy5bazb1h081v0"; + armv7l-linux = "1qjik1r41c8n9fs7p09p0zdj8c5xgqjniwv23hcy6mp28i4whclr"; }.${system}; sourceRoot = { @@ -33,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.53.2"; + version = "1.54.3"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix index 96c2e80668..c67abe1a74 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -32,11 +32,11 @@ mkDerivation rec { pname = "saga"; - version = "7.8.2"; + version = "7.9.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "1008l8f4733vsxy3y6d1yg8m4h8pp65d2p48ljc9kp5nyrg5vfy5"; + sha256 = "sha256-ob23JbQnBxNO1QA8zUhLjgo5YBR90pwm8JT62bsPBdg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix index 4b59748255..a88209bfbd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/batik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "batik"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; - sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw"; + sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/eddy/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/eddy/default.nix new file mode 100644 index 0000000000..6b8f465a10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/eddy/default.nix @@ -0,0 +1,47 @@ +{ python3Packages +, fetchFromGitHub +, lib +, jre +, qt5 +, wrapQtAppsHook +}: + +python3Packages.buildPythonApplication rec { + pname = "eddy"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "obdasystems"; + repo = pname; + rev = "v${version}"; + sha256 = "12j77bbva5py9bd57c80cmjvf8vll40h19n81h16lvv2r2r7jynh"; + }; + + propagatedBuildInputs = [ + qt5.qtbase + wrapQtAppsHook + python3Packages.setuptools + python3Packages.rfc3987 + python3Packages.JPype1 + python3Packages.pyqt5 + ]; + + # Tests fail with: ImportError: cannot import name 'QtXmlPatterns' from 'PyQt5' + doCheck = false; + + preBuild = '' + export HOME=/tmp + ''; + + preFixup = '' + wrapQtApp "$out/bin/eddy" --prefix JAVA_HOME : ${jre} + ''; + + meta = with lib; { + homepage = "http://www.obdasystems.com/eddy"; + description = "Graphical editor for the specification and visualization of Graphol ontologies"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ koslambrou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index f5b8b80621..365dbb66b6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -8,16 +8,16 @@ , pythonPackages }: -pythonPackages.buildPythonPackage { +pythonPackages.buildPythonPackage rec { pname = "hydrus"; - version = "426"; + version = "431"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2"; - sha256 = "1snihd433hx36s6d5hsnq4qg0xs6ag4822lwm5fqak64n22ad2qb"; + rev = "v${version}"; + sha256 = "0mfql27n725k6ynvhkgzmxxpfbjlzil2fjpy082gz257kb0880zy"; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ pythonPackages.buildPythonPackage { matplotlib qtpy pyside2 + mpv ]; checkInputs = with pythonPackages; [ nose httmock ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 18fe87b128..e839650af9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.20"; + version = "0.9.21"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-FtkBIoz5u70DbZZBH4uSaAkmOphWA9H0uYuukIPVGUM="; + sha256 = "sha256-Tnv+vfKOdDWIU36T9ZqwdTwuMd2AOGyKBY0IkPfrZlc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix index 67b64ee575..8633494a4c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitHub -, fetchpatch , libGLU , qtbase , qtscript @@ -19,13 +18,13 @@ mkDerivation rec { pname = "meshlab"; - version = "2020.07"; + version = "2020.12"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = "Meshlab-${version}"; - sha256 = "0vj849b57zk3k6lx35zzcjhr9gdy4hxqnnkb8chwy7hw262cm3ri"; + sha256 = "QrnqXEVqI1ADUYWalZ0h/0+xS+gDZTinm0weT39onw0="; fetchSubmodules = true; # for vcglib }; @@ -46,17 +45,11 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - patches = [ - # Make cmake use the system qhull. The next meshlab will not need this patch because it is already in master. - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/cnr-isti-vclab/meshlab/pull/747.patch"; - sha256 = "0wx9f6zn458xz3lsqcgvsbwh1pgi3g0lah93nlbsb0sagng7n565"; - }) - ]; - preConfigure = '' - substituteAll ${./meshlab.desktop} install/linux/resources/meshlab.desktop - cd src + substituteAll ${./meshlab.desktop} scripts/Linux/resources/meshlab.desktop + cmakeDir=$PWD/src + mkdir ../build + cd ../build ''; cmakeFlags = [ @@ -75,19 +68,12 @@ mkDerivation rec { postFixup = '' patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped - patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlabserver-wrapped ''; - # Meshlab is not format-security clean; without disabling hardening, we get: - # src/common/GLLogStream.h:61:37: error: format not a string literal and no format arguments [-Werror=format-security] - # 61 | int chars_written = snprintf(buf, buf_size, f, std::forward(ts)...); - # | - hardeningDisable = [ "format" ]; - meta = { description = "A system for processing and editing 3D triangular meshes"; homepage = "https://www.meshlab.net/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openimageio/2.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/openimageio/2.x.nix index f5595da47a..5982e4abe0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openimageio/2.x.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openimageio/2.x.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , boost , cmake , ilmbase @@ -11,26 +10,20 @@ , openexr , robin-map , unzip +, fmt }: stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.1.9.0"; + version = "2.2.12.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "1bbxx3bcc5jlb90ffxbk29gb8227097rdr8vg97vj9axw2mjd5si"; + sha256 = "16z8lnsqhljbfaarfwx9rc95p0a9wxf4p271j6kxdfknjb88p56i"; }; - patches = [ - (fetchpatch { - url = "https://github.com/OpenImageIO/oiio/pull/2441/commits/e9bdd69596103edf41b659ad8ab0ca4ce002f6f5.patch"; - sha256 = "0x1wmjf1jrm19d1izhs1cs3y1if9al1zx48lahkfswyjag3r5dn0"; - }) - ]; - outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ @@ -47,6 +40,7 @@ stdenv.mkDerivation rec { opencolorio openexr robin-map + fmt ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openimageio/2539_backport.patch b/third_party/nixpkgs/pkgs/applications/graphics/openimageio/2539_backport.patch new file mode 100644 index 0000000000..c484b2ef9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/openimageio/2539_backport.patch @@ -0,0 +1,31 @@ +diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp +index 10b75c21..0287d9c5 100644 +--- a/src/libOpenImageIO/exif.cpp ++++ b/src/libOpenImageIO/exif.cpp +@@ -213,6 +213,9 @@ static const EXIF_tag_info exif_tag_table[] = { + + + ++// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define ++// them ourselves. ++#ifndef GPSTAG_VERSIONID + enum GPSTag { + GPSTAG_VERSIONID = 0, + GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2, +@@ -237,6 +240,7 @@ enum GPSTag { + GPSTAG_DIFFERENTIAL = 30, + GPSTAG_HPOSITIONINGERROR = 31 + }; ++#endif + + static const EXIF_tag_info gps_tag_table[] = { + { GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 }, +@@ -270,7 +274,7 @@ static const EXIF_tag_info gps_tag_table[] = { + { GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 }, + { GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 }, + { GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 }, +- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, ++ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 }, + { -1, NULL } // signal end of table + }; + diff --git a/third_party/nixpkgs/pkgs/applications/graphics/openimageio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/openimageio/default.nix index 8bd82c7839..2461fcc276 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/openimageio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/openimageio/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { "dist_dir=" ]; + patches = [ + # Backported from https://github.com/OpenImageIO/oiio/pull/2539 for 1.8.17 + ./2539_backport.patch + ]; + meta = with lib; { homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix index f444ebfe5b..9fd629ca8e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -81,7 +81,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { meta = with lib; { description = "Photo and video importer for cameras, phones, and memory cards"; homepage = "https://www.damonlynch.net/rapid/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix index ad2681d25f..821a97e358 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix @@ -1,10 +1,107 @@ -{ callPackage, fetchurl, ... } @ args: +{ stdenv, lib, fetchurl, runtimeShell +, gettext, pkg-config, python3 +, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp +, curl, systemd, libxml2, poppler -callPackage ./generic.nix (args // rec { - version = "1.0.30"; +# List of { src name backend } attibute sets - see installFirmware below: +, extraFirmware ? [] + +# For backwards compatibility with older setups; use extraFirmware instead: +, gt68xxFirmware ? null, snapscanFirmware ? null +}: + +stdenv.mkDerivation { + pname = "sane-backends"; + version = "1.0.32"; src = fetchurl { - url = "https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-${version}.tar.gz"; - sha256 = "18vryaycps3zpjzxh0wjgg8nv2f4pdvcfxxmdfj28qbzqjlrcp9z"; + # raw checkouts of the repo do not work because, the configure script is + # only functional in manually uploaded release tarballs. + # https://gitlab.com/sane-project/backends/-/issues/440 + # unfortunately this make the url unpredictable on update, to find the link + # go to https://gitlab.com/sane-project/backends/-/releases and choose + # the link with other in the URL. + url = "https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz"; + sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s"; }; -}) + + outputs = [ "out" "doc" "man" ]; + + nativeBuildInputs = [ + gettext + pkg-config + python3 + ]; + + buildInputs = [ + avahi + libgphoto2 + libieee1284 + libjpeg + libpng + libtiff + libusb1 + libv4l + net-snmp + curl + systemd + libxml2 + poppler + ]; + + enableParallelBuilding = true; + + configureFlags = + lib.optional (avahi != null) "--with-avahi" + ++ lib.optional (libusb1 != null) "--with-usb" + ; + + postInstall = let + + compatFirmware = extraFirmware + ++ lib.optional (gt68xxFirmware != null) { + src = gt68xxFirmware.fw; + inherit (gt68xxFirmware) name; + backend = "gt68xx"; + } + ++ lib.optional (snapscanFirmware != null) { + src = snapscanFirmware; + name = "your-firmwarefile.bin"; + backend = "snapscan"; + }; + + installFirmware = f: '' + mkdir -p $out/share/sane/${f.backend} + ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name} + ''; + + in '' + mkdir -p $out/etc/udev/rules.d/ + ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ + cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules + # the created 49-libsane references /bin/sh + substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ + --replace "RUN+=\"/bin/sh" "RUN+=\"${runtimeShell}" + + substituteInPlace $out/lib/libsane.la \ + --replace "-ljpeg" "-L${lib.getLib libjpeg}/lib -ljpeg" + + # net.conf conflicts with the file generated by the nixos module + rm $out/etc/sane.d/net.conf + '' + lib.concatStrings (builtins.map installFirmware compatFirmware); + + meta = with lib; { + description = "SANE (Scanner Access Now Easy) backends"; + longDescription = '' + Collection of open-source SANE backends (device drivers). + SANE is a universal scanner interface providing standardized access to + any raster image scanner hardware: flatbed scanners, hand-held scanners, + video- and still-cameras, frame-grabbers, etc. For a list of supported + scanners, see http://www.sane-project.org/sane-backends.html. + ''; + homepage = "http://www.sane-project.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peti ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix deleted file mode 100644 index 88d47b5893..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/generic.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv -, gettext, pkg-config -, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp - -# List of { src name backend } attibute sets - see installFirmware below: -, extraFirmware ? [] - -# For backwards compatibility with older setups; use extraFirmware instead: -, gt68xxFirmware ? null, snapscanFirmware ? null - -# Passed from versioned package (e.g. default.nix, git.nix): -, version, src, ... -}: - -stdenv.mkDerivation { - inherit src version; - - name = "sane-backends-${version}"; - - outputs = [ "out" "doc" "man" ]; - - nativeBuildInputs = [ - gettext - pkg-config - ]; - - buildInputs = [ - avahi - libgphoto2 - libieee1284 - libjpeg - libpng - libtiff - libusb1 - libv4l - net-snmp - ]; - - enableParallelBuilding = true; - - configureFlags = [] - ++ lib.optional (avahi != null) "--enable-avahi" - ++ lib.optional (libusb1 != null) "--with-usb" - ; - - postInstall = let - - compatFirmware = extraFirmware - ++ lib.optional (gt68xxFirmware != null) { - src = gt68xxFirmware.fw; - inherit (gt68xxFirmware) name; - backend = "gt68xx"; - } - ++ lib.optional (snapscanFirmware != null) { - src = snapscanFirmware; - name = "your-firmwarefile.bin"; - backend = "snapscan"; - }; - - installFirmware = f: '' - mkdir -p $out/share/sane/${f.backend} - ln -sv ${f.src} $out/share/sane/${f.backend}/${f.name} - ''; - - in '' - mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules - # the created 49-libsane references /bin/sh - substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \ - --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}" - - substituteInPlace $out/lib/libsane.la \ - --replace "-ljpeg" "-L${libjpeg.out}/lib -ljpeg" - - # net.conf conflicts with the file generated by the nixos module - rm -f $out/etc/sane.d/net.conf - '' + lib.concatStrings (builtins.map installFirmware compatFirmware); - - meta = with lib; { - description = "SANE (Scanner Access Now Easy) backends"; - longDescription = '' - Collection of open-source SANE backends (device drivers). - SANE is a universal scanner interface providing standardized access to - any raster image scanner hardware: flatbed scanners, hand-held scanners, - video- and still-cameras, frame-grabbers, etc. For a list of supported - scanners, see http://www.sane-project.org/sane-backends.html. - ''; - homepage = "http://www.sane-project.org/"; - license = licenses.gpl2Plus; - - maintainers = with maintainers; [ peti ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/git.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/git.nix deleted file mode 100644 index 2edd739068..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/git.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchgit, ... } @ args: - -callPackage ./generic.nix (args // { - version = "2017-12-01"; - src = fetchgit { - sha256 = "0qf7d7268kdxnb723c03m6icxhbgx0vw8gqvck2q1w5b948dy9g8"; - rev = "e895ee55bec8a3320a0e972b32c05d35b47fe226"; - url = "https://gitlab.com/sane-project/backends.git"; - }; -}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix index 8646a6716a..70b3c71c0b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archivy/default.nix @@ -1,15 +1,15 @@ -{ lib, python3, fetchPypi, appdirs, attrs, requests, -beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, -pypandoc, python-dotenv, python-frontmatter, tinydb, validators, -watchdog, wtforms, html2text, flask-compress }: +{ lib, buildPythonApplication, fetchPypi, appdirs, attrs +, beautifulsoup4, click-plugins, elasticsearch, flask-compress +, flask_login, flask_wtf, html2text, python-dotenv, python-frontmatter +, requests, tinydb, validators, werkzeug, wtforms }: -python3.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "archivy"; - version = "1.0.2"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "6f706b925175852d8101a4afe2304ab7ee7d56e9658538b9a8e49e925978b87e"; + sha256 = "sha256-yUXsTPb5oJYZA9MlHz7eLowRjD/ltq5VLTHeOMqcL/M="; }; # Relax some dependencies @@ -30,18 +30,17 @@ python3.pkgs.buildPythonApplication rec { beautifulsoup4 click-plugins elasticsearch + flask-compress flask_login flask_wtf - pypandoc + html2text python-dotenv python-frontmatter - tinydb requests + tinydb validators - watchdog + werkzeug wtforms - html2text - flask-compress ]; # __init__.py attempts to mkdir in read-only file system diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 039dfe59ff..69f0d58159 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = [ cmake makeWrapper ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { alembic (opensubdiv.override { inherit cudaSupport; }) tbb - makeWrapper embree gmp + pugixml ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { openvdb ] else [ - pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL + llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit diff --git a/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coolreader/default.nix index d043823a06..dc32cbf2c2 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.53"; + version = "3.2.55"; src = fetchFromGitHub { owner = "buggins"; repo = pname; rev = "cr${version}"; - sha256 = "sha256-5it70cwRV56OMZI4dny5uwxWgoF42tjcEC4g3MC548s="; + sha256 = "sha256-gYAaYGEjw7p6y4h5j6j/4Ld+b37Nv+kt04Wp+qb8gzY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index fbfd592db4..76a5541f6d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -46,13 +46,13 @@ let in mkDerivation rec { pname = "crow-translate"; - version = "2.8.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "crow-translate"; repo = "crow-translate"; rev = version; - sha256 = "sha256-kpr3Xn1ZLBS1fVhhJ/sxo8UgB4M+SdOVhddnU8pNUfA="; + sha256 = "sha256-fmlNUhNorV/MUdfdDXM6puAblTTa6p2slVT/EKy5THg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/curaengine/stable.nix b/third_party/nixpkgs/pkgs/applications/misc/curaengine/stable.nix index 23041c2fe3..148553da16 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/curaengine/stable.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/curaengine/stable.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation { }; postPatch = '' - sed -i 's,--static,,g' Makefile + substituteInPlace Makefile --replace "--static" "" + '' + lib.optionalString stdenv.isi686 '' + substituteInPlace Makefile --replace "-flto" "" ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 73295c96e4..6cbc7ffd47 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4/67GwNIRcbC6qYe5s8DD16b2uVcG0DI1ScQk31Ffk0="; + sha256 = "sha256-Fy202w1lUrymnpnCmWwnbpMsda7JrZ3B0c+a9UtKsSA="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 273077b3bd..edce14d057 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -150,6 +150,6 @@ python3.pkgs.buildPythonApplication { homepage = "https://electrum.org/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ehmry joachifm np prusnak ]; + maintainers = with maintainers; [ joachifm np prusnak ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/freeplane/default.nix b/third_party/nixpkgs/pkgs/applications/misc/freeplane/default.nix new file mode 100644 index 0000000000..0568198f41 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/freeplane/default.nix @@ -0,0 +1,118 @@ +{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_5, which }: + +let + pname = "freeplane"; + version = "1.8.11"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "release-${version}"; + sha256 = "07xjx9pf62dvy8lx6vnbwwcn1zqy89cmdmwy792k7gb12wz81nnc"; + }; + + deps = stdenv.mkDerivation { + name = "${pname}-deps"; + inherit src; + + nativeBuildInputs = [ jdk11 perl gradle_5 ]; + + buildPhase = '' + GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon jar + ''; + + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0r7f6713m0whh5hlk1id7z9j5v9494r41sivn9fzl63q70kzz92g"; + }; + + # Point to our local deps repo + gradleInit = writeText "init.gradle" '' + logger.lifecycle 'Replacing Maven repositories with ${deps}...' + gradle.projectsLoaded { + rootProject.allprojects { + buildscript { + repositories { + clear() + maven { url '${deps}' } + } + } + repositories { + clear() + maven { url '${deps}' } + } + } + } + settingsEvaluated { settings -> + settings.pluginManagement { + repositories { + maven { url '${deps}' } + } + } + } + ''; + + # downloaded from unicode.org and twemoji.maxcdn.com by code in freeplane/emoji.gradle + # the below hash is for versions of freeplane that use twemoji 12.1.4, and emoji 12.1 + emoji = stdenv.mkDerivation rec { + name = "${pname}-emoji"; + inherit src; + + nativeBuildInputs = [ jdk11 gradle_5 ]; + + buildPhase = '' + GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} emojiGraphicsClasses emojiListClasses + ''; + + installPhase = '' + mkdir -p $out/emoji/txt $out/resources/images + cp freeplane/build/emoji/txt/emojilist.txt $out/emoji/txt + cp -r freeplane/build/emoji/resources/images/emoji/. $out/resources/images/emoji + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3"; + }; + +in stdenv.mkDerivation rec { + inherit pname version src; + + buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ jdk11 gradle_5 ]; + + buildPhase = '' + mkdir -p -- ./freeplane/build/emoji/{txt,resources/images} + cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt + cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji + GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share + + cp -a ./BIN/. $out/share/${pname} + makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \ + --set FREEPLANE_BASE_DIR $out/share/${pname} \ + --set JAVA_HOME ${jdk11} \ + --prefix PATH : ${lib.makeBinPath [ jdk11 which ]} + runHook postInstall + ''; + + meta = with lib; { + description = "Mind-mapping software"; + homepage = "https://freeplane.org/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ chaduffy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 438d466ab5..ad0970e0fe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.0"; + version = "1.17.1"; src = fetchPypi { inherit pname version; - sha256 = "bf5196b9e18a45d62d7e823894f12def310264a258956882cbac13b5e856bf00"; + sha256 = "1cfaa3a617d5d222d4b9b41634b1bdede2673a8620d6b0e62fb755ae224ca2ac"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-org/default.nix b/third_party/nixpkgs/pkgs/applications/misc/go-org/default.nix new file mode 100644 index 0000000000..cc2225af07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/go-org/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "go-org"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "niklasfasching"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nMZzRbu3lxunIlnnmb49Ljt8oSiYpj+8gZ0u/OFRRDM="; + }; + + vendorSha256 = "sha256-njx89Ims7GZql8sbVmH/E9gM/ONRWiPRLVs+FzsCSzI="; + + postInstallCheck = '' + $out/bin/go-org > /dev/null + ''; + + meta = with lib; { + description = "Org-mode parser and static site generator in go"; + homepage = "https://niklasfasching.github.io/go-org"; + license = licenses.mit; + maintainers = with maintainers; [ payas ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix index 08bf01aea6..691ebb4ba6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix @@ -1,7 +1,6 @@ { lib , boost , fetchFromGitHub -, fetchpatch , installShellFiles , mkDerivationWith , muparser @@ -11,36 +10,20 @@ , qtsvg , qttools , runtimeShell -, gcc8Stdenv +, stdenv }: -let - stdenv = gcc8Stdenv; -in - - # Doesn't build with gcc9 mkDerivationWith stdenv.mkDerivation rec { pname = "librecad"; - version = "2.2.0-rc1"; + version = "2.2.0-rc2"; src = fetchFromGitHub { owner = "LibreCAD"; repo = "LibreCAD"; rev = version; - sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3"; + sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; }; - patches = [ - ./fix_qt_5_11_build.patch - ( - fetchpatch { - # Fix missing app name and icon on Wayland. - url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch"; - sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5"; - } - ) - ]; - postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} @@ -88,16 +71,11 @@ mkDerivationWith stdenv.mkDerivation rec { qttools ]; - enableParallelBuilding = true; - meta = with lib; { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kiwi - viric - ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ kiwi viric ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/third_party/nixpkgs/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch deleted file mode 100644 index 04701e5ab1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp -index 835e47d..2c878e8 100644 ---- a/librecad/src/ui/forms/qg_commandwidget.cpp -+++ b/librecad/src/ui/forms/qg_commandwidget.cpp -@@ -27,6 +27,7 @@ - - #include - -+#include - #include - #include - #include -diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp -index 2beaceb..84068ad 100644 ---- a/librecad/src/ui/generic/colorwizard.cpp -+++ b/librecad/src/ui/generic/colorwizard.cpp -@@ -27,6 +27,7 @@ - #include "colorwizard.h" - #include "ui_colorwizard.h" - -+#include - #include - #include - #include -diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp -index 7c35144..0e394f2 100644 ---- a/librecad/src/ui/generic/widgetcreator.cpp -+++ b/librecad/src/ui/generic/widgetcreator.cpp -@@ -27,6 +27,7 @@ - #include "widgetcreator.h" - #include "ui_widgetcreator.h" - -+#include - #include - #include - #include diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix new file mode 100644 index 0000000000..6595cb3a91 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "logseq"; + version = "0.0.13"; + + src = fetchurl { + url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; + sha256 = "0a7c33f7d5ylcy6lqkpxp78wwyi4n5q4jdy7b8nx7p34sn2jnpf7"; + name = "${pname}-${version}.AppImage"; + }; + + appimageContents = appimageTools.extract { + name = "${pname}-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} $out/share/applications + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace Exec=Logseq Exec=${pname} \ + --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "A local-first, non-linear, outliner notebook for organizing and sharing your personal knowledge base"; + homepage = "https://github.com/logseq/logseq"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ weihua ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/update.sh b/third_party/nixpkgs/pkgs/applications/misc/logseq/update.sh new file mode 100755 index 0000000000..9f83eefad1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts + +version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)" +update-source-version logseq "$version" diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix new file mode 100644 index 0000000000..666009b99a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-qt/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchFromGitHub +, wrapQtAppsHook +, pkg-config +, qmake +, qtquickcontrols2 +, SDL2 +, SDL2_ttf +, libva +, libvdpau +, libxkbcommon +, alsaLib +, libpulseaudio +, openssl +, libopus +, ffmpeg +}: + +stdenv.mkDerivation rec { + pname = "moonlight-qt"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "moonlight-stream"; + repo = pname; + rev = "v${version}"; + sha256 = "e7fwb76zzidtF1COqrQ6gSF7bCX20j/CGjPu1Cb4HGc="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + pkg-config + qmake + ]; + + buildInputs = [ + qtquickcontrols2 + SDL2 + SDL2_ttf + libva + libvdpau + libxkbcommon + alsaLib + libpulseaudio + openssl + libopus + ffmpeg + ]; + + meta = with lib; { + description = "Play your PC games on almost any device"; + homepage = "https://moonlight-stream.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix index 61c395e64a..333e3cd931 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -22,24 +22,28 @@ in stdenv.mkDerivation rec { sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48"; }; - patches = - lib.optional stdenv.isDarwin ./darwin.patch ++ [ + patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [ (fetchpatch { - name = "pdfocr.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; - sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; - }) + name = "pdfocr.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; + sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; + }) (fetchpatch { - name = "pdf-layer.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; - sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; - }) + name = "pdf-layer.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; + sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; + }) (fetchpatch { - name = "pixmap.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; - sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; - }) - ]; + name = "pixmap.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; + sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; + }) + (fetchpatch { + name = "CVE-2021-3407.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a"; + sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6"; + }) + ]; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c diff --git a/third_party/nixpkgs/pkgs/applications/misc/portfolio-filemanager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/portfolio-filemanager/default.nix new file mode 100644 index 0000000000..6b4946976b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/portfolio-filemanager/default.nix @@ -0,0 +1,71 @@ +{ lib +, python3 +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gtk3 +, libhandy +, librsvg +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "portfolio"; + version = "0.9.10"; + + format = "other"; + + src = fetchFromGitHub { + owner = "tchx84"; + repo = "Portfolio"; + rev = "v${version}"; + sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4"; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + glib + gobject-introspection + gtk3 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gobject-introspection + libhandy + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + postInstall = '' + ln -s dev.tchx84.Portfolio "$out/bin/portfolio" + ''; + + meta = with lib; { + description = "A minimalist file manager for those who want to use Linux mobile devices"; + homepage = "https://github.com/tchx84/Portfolio"; + changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix index fafd91f781..1bdcd6ea8a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qtbitcointrader/default.nix @@ -31,6 +31,5 @@ mkDerivation { homepage = "https://centrabit.com/"; license = licenses.gpl3; platforms = qt5.qtbase.meta.platforms; - maintainers = [ maintainers.ehmry ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi/wrapper.nix index 6115544e79..2f98fe1641 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, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [] }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: symlinkJoin { name = "rofi-${rofi-unwrapped.version}"; @@ -29,6 +29,8 @@ symlinkJoin { ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ ${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''} + ${lib.optionalString symlink-dmenu "ln -s ${rofi-unwrapped}/bin/rofi $out/bin/dmenu"} + rm $out/bin/rofi-theme-selector makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \ --prefix XDG_DATA_DIRS : $out/share diff --git a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix index 840b37351c..5032836ab9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "2.2.0"; + version = "2.8.0"; sha256 = { - x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv"; + x86_64-linux = "sha256-W8+LzWMPDCrFZCm9p/Gcj7OXqJw/gs7lMxTKjOQChQY="; }.${system} or throwSystem; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix new file mode 100644 index 0000000000..c9581fe79f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "sunwait"; + version = "2020-10-26"; + + src = fetchFromGitHub { + owner = "risacher"; + repo = "sunwait"; + rev = "102cb417ecbb7a3757ba9ee4b94d6db3225124c4"; + sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax"; + }; + + installPhase = '' + install -Dm755 sunwait -t $out/bin + ''; + + meta = with lib; { + description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights"; + homepage = "https://github.com/risacher/sunwait"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ etu ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix index 2c5db1fe15..7904af3e7e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.3.1-1"; + version = "0.3.1-2"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "0wclzlix0a2naxbdg3wym7yw19p2wqpcjmkf7gn8cs00shrmzjld"; + sha256 = "sha256-SLJ4mwBafLGL5pneMTHLc4S4Tgds2xLqByWFH95TK1k="; }; - cargoSha256 = "0vi26v9mvx298kx6k5g7h8dnn7r208an9knadc23vxcrrxjr6pn5"; + cargoSha256 = "sha256-a+4oOkO90TObfYnq9NZsWy5RmYFYN1BKvUKxpvjiJc8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index 601380fc6c..8866e2a07c 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.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mHMBhYI9pJkuK/6tCg1fXPjTfGFe0gkMzplesuFvl5M="; + sha256 = "sha256-OOsBo+NCfn++2XyfQVoeEPcbSv645Ng7g9s4W7X2xg4="; }; - cargoSha256 = "sha256-XmLobbVTYO8dA8YVtI/ntlD1RB9sO3poP6NBdDOPIlE="; + cargoSha256 = "sha256-PW8f4PZGctHd8YBBRvmueR8UgtyDQZpqf2lTU1t68iM="; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix index f3764ce60f..a7037522c6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.31"; + version = "1.32"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "1mzafbpc1c211byf8bnwl13by7vi8xvxlaykyrajb1bj0ynbmmgp"; + sha256 = "sha256-Ss8kdfUAMC8v05rdt2SoO6vPyssG5v8gOzdf/v18cdg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5a71b9d707..0971dd3b63 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,975 @@ { - version = "86.0.1"; + version = "87.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ach/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ach/firefox-87.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b9006b2c0251ae2264a60be3763dcf9610f3a8569f2a05f266e59c8232400e8c"; + sha256 = "656c92c9a588aed2059f4f68968735f884db6ee94b0619d983bd4affd2100174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/af/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/af/firefox-87.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7f4268d613acee2e003fe8042dc2e969bd0f6f14b906b35ce6b8c727fbb13d76"; + sha256 = "0f8fe2b470177df3525fbf533934c66a5e4abdaa3dfb7848962ac148b224592d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/an/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/an/firefox-87.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8a892626b4f34413423f4da61d7e0099e215bc9e597092bbd625445e27998d17"; + sha256 = "a96ae593965364871d35ba0fd6dcd1029254110ee59f4a7abe27cf6d273c7be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ar/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ar/firefox-87.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "c837e97ca8b46de448fbc9fd2120ffbb735474ade8a6f64f7ded8dbdfc4c7406"; + sha256 = "58eaefaba44b4b0592442e709604b597c74fd81390f8fcc410a8e605956a0bdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ast/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ast/firefox-87.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8c3b990b899d70c46827ac5a7f32faf9cf44bfba195283bf47d277ccc8da8cbe"; + sha256 = "ca33473b77b8a57c305fe89cdd66b95810441aa54295ed687736a24c9160e45f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/az/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/az/firefox-87.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8fa2a9e6cb6c70fd92b43e2ae145956337f87dd21b468ac375a90a7d18551bce"; + sha256 = "6965f0b68279228a575dfb503eabae8d75f32e0fa8de119f4d48f0e9ec36d61c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/be/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/be/firefox-87.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "dddbf1e9eb8ecc928b534ef5fd77cb52edd0c67f68a522bbc377d5943cfaaa90"; + sha256 = "a19d6d94cc15d269dbddccae06b4c92a3436e57d45dbebe8c6a2ff23df66fd28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bg/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bg/firefox-87.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c4eac8234b58f40b40ec5be3fc37817f768d35804f2f923b9d0effa5cf906782"; + sha256 = "885a44cf0acedc5ffbfcc73cce41f6eb2dcab13d070eeb156e64277b346a4fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bn/firefox-87.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "41efed647c468ad3da21090e11a4bb861d26106471e0543c3709016d1ca2bd06"; + sha256 = "09773257768f061819fa92ec229c1f94b217c04e78781d8e59a8dc1225f92be7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/br/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/br/firefox-87.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "53076688c25034f02b3c30455fbdbea0287bfdd8d5100c0f5edb77ad32955f36"; + sha256 = "23ec95e130593c51384a64165c33f02c4c5af753313fbaf8fa0f94bca1184506"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/bs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/bs/firefox-87.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "304d9fa41a95f6abf61c16f765ec4651a159af0cabb09b1ce76f805d27746dc4"; + sha256 = "30455df45e86894fd5a75ef6b9989b64f49da8ac8bee9656ea2724cfca59555c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca-valencia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca-valencia/firefox-87.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e845d6cbff2cd88b9e1f7526e8aa9eac4aa53c116301ba861e1beb04f9deb4e7"; + sha256 = "8ca8a4ee40ac57140560c3aeb664d60be5ecd8842f328544924a97d910c02303"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ca/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ca/firefox-87.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5159eb68a571fb035c4621cbeae9d7a88d40172876a00b3ab6512a8701f43f59"; + sha256 = "3cc1cd1c7657a704d3c6c1a42934eac75439c05af5617d2d24991d62d412237e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cak/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cak/firefox-87.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "efab62e54fa41a65d5989078ee594dc2c2e8c355bd656828321cc342cc167def"; + sha256 = "160c598f55c012fc92c0882f7062a82b8057177398edfcdeb41c60aa83570f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cs/firefox-87.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1cc3e58c1c2790bd13346b752b2209bc8db08a9470960e06857913a70a7826dc"; + sha256 = "1209d5401b55441126bcc64faa9d7692c92d2c009a40587923c048bec0cf2508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/cy/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/cy/firefox-87.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "230d79e979cdc350164fe37ea4ba84183db935ba973efab1ab14b56f0a12344f"; + sha256 = "d177530e3e31900a38e9127b5d60bcc3b937c76e8b12b13c289a29e2afd06c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/da/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/da/firefox-87.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "04d50be5260cafde33729aca15cd9731f6fb1550da2db86719e6d672639607fb"; + sha256 = "2e623b11e18d38dee391863115af75fae4119894a89606aa6f4194d04a1773c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/de/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/de/firefox-87.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a4b5c447cb34b91ac5053153e73520d9f5fc8b06a390f5694cda6bc2131efe12"; + sha256 = "a29837d6c062ded4aed732cee06fe23773a57d62aecbca1e1a56c9d7a37423df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/dsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/dsb/firefox-87.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "eea691c668126056cb1e4137cf4f6e8d40fe46f79a00c73ccd59723cfb63e404"; + sha256 = "cf584f97b136444861845bf1db0fe9d65d809f4a167a0f8bed780f94048fbb12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/el/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/el/firefox-87.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d6774ba0cdc0e89091cb57bc1669927f58ed9811617cfbd358567e2a85f977d2"; + sha256 = "73d03707575ef3270f7419d031fc85babdc498b1576d316abac273cd88dde30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-CA/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-CA/firefox-87.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8cb49ea8e3db760de1f3d97f1583f4219c3039d09632f5ef186311145aa2c3c9"; + sha256 = "1d11c8a1f23df4e88668beecee244f2d0743b006e46d96e4a6a35bffc341569d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-GB/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-GB/firefox-87.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2ee2ead0c7765e9e5744dff5d7bdfe2ac890cb6859362426bf8244e393f1bb5a"; + sha256 = "d885931198cf3958fca683ee4c301f25610f6b4d5777068fd812bd53048aecb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/en-US/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/en-US/firefox-87.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d419da5168312f5d023481668fb4767a27799f02248b4ea90fef98a54ab73b86"; + sha256 = "3c9207bee0a998634c4fd12293acfae207d16508749ad405bf1e8717d06acf02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eo/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eo/firefox-87.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0b73a3695f0291c3afdc1635976e6129f94d72d9a9a422ebd3a0cfbbb9343697"; + sha256 = "3d57787fc840f80271f4d26810f347929a96479ca58bd416bf1f94e3499a07b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-AR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-AR/firefox-87.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4fe2c2428ce205054d16ee33f432dd865e4d919b63f7c2f0a458bd5b80c9c0b8"; + sha256 = "294c83cce5bbead7c263e950ed8bb2787d4735f4086521726400ef97c5d26b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-CL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-CL/firefox-87.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f5d1850c5c10051b04a445001a2991e52a3c1b93002b3534030e85ee0a3c6b5f"; + sha256 = "4e57c8a517084eee27edb6ad706a250ebb323419407f1ef9c9f9ae4f0dc8d8b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-ES/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-ES/firefox-87.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b99f0532bdc3ab04c421442cf0ea4c24db19a87104ad7d2eff51acb0a383b154"; + sha256 = "9cdea632b1c1365d3c6ec08e9acd154819d081f025473b027da8d5e873da66bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/es-MX/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/es-MX/firefox-87.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "56bc322d4c7c160fe1bf095039b5b6e31fcfa234bd5d66ba0995f22af49f5bae"; + sha256 = "3698541ca4e9eb7f5c422082cbacd407870ffb170c9f9d0fe5f0c55dfe2b5449"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/et/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/et/firefox-87.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "962dcd00ed62c5ca6ef86ede3e965e699f403435de9ce933457dac940141c293"; + sha256 = "86a1986a7c63f63c559d36d3d42e95def0eb8a89075879c3253156e80ed161c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/eu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/eu/firefox-87.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2ba0643490d449ad39b07e98713f8693ecc16b368cc459a9ea89a35a1ed74978"; + sha256 = "5db12874991a1583ec09c934e18c93225b9831acc857d8c1b633f48c65e7a415"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fa/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fa/firefox-87.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "11566ef20d466b2930841f4fce2f92960ceeb1771b82449c274f6a4fcfb85e0d"; + sha256 = "5066d7b66933924442d683aaa19aec9385b66eaf49a55b155653ffba57c287d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ff/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ff/firefox-87.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "110cbb0d3662bbc73273535abd2846091bb16dda3c221a60a2f7023ef756f764"; + sha256 = "35c8271fa506fcb43c20ccafb928b109125f3a17f80870a82365bc36f787b5ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fi/firefox-87.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "decb87ed765911a9564e15dd97fc7e35164b0af1ab84167dcd598689c8972d30"; + sha256 = "a3a0dc8cee1db20eb795aea5e94efafc96fc624e50159d8be7f449a093ffd291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fr/firefox-87.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "31fa08ae30af62b65b39c16718ee6c6f132cb157a92fc149a3d36870016abde1"; + sha256 = "d9c1cdbbe2bacb06608f60745ab213cf80b27051c6b58f0ed7ef834b839da7fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/fy-NL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/fy-NL/firefox-87.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f75d128c1c6a1b3171132f20f42aca2b798180e1d58f20e264d4defa0e4508d8"; + sha256 = "6f15a66cee03b494edf6a68641e0d5f886fe8528e23b9e129b11702cb9a4442e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ga-IE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ga-IE/firefox-87.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9902efeb4b30b0935be5dec5a7f85c4ec659b8d8f236e012b2d1187a52f3b667"; + sha256 = "31fcb9d815afc52db6328b076d89eab85a89d4553748ee7741912d23c420fea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gd/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gd/firefox-87.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "42c779be313524a365dd59013f5486e79b0378d0dc4fe805b5a6769d44ac98d0"; + sha256 = "c9d0b868022bf5c0335ed488df0d6006541cdb7609f8854aedf22b931017ed31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gl/firefox-87.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "cc5d2239946d4b01e31b6da4604a75862f501cc529aecd7962956d4af4dcc970"; + sha256 = "b546355345950e17202c4f2676731b0fe126d4d551131648f10e8c61cb8a2f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gn/firefox-87.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4a94e0f10f9002721ac57e622da7ab43cd1788683288564e87f667069fdac427"; + sha256 = "51c403ad0460db69e2ed6213410d9fe2cb6ae9a5f100bd4f5ac7d36cc68b65c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/gu-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/gu-IN/firefox-87.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f81a85e1bea666d339774e0cadd316fccf52752c11a0b5a53a82ac22d6d8dabf"; + sha256 = "dad776c9a4809c574967bb18d1ef96ab8eb5e95df713fe88fce044b755951550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/he/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/he/firefox-87.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "347130466e2f42d06707d56e486b4f262874e50c36b69e2badcb7287ff73376b"; + sha256 = "972135a17b091e8338762c4f3e9c60d826dd8b4f4e65c22d6cb07daabac95558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hi-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hi-IN/firefox-87.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9600a709b7e4b2bb8f0c57cde08627aff892341cd68edda563cb4d0366ca13f6"; + sha256 = "5eec4571d25c0c62a0d773af25b2be93d158e06302a6e5d47a0fa60f0819941a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hr/firefox-87.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "bea906c0745f77fc99a830594a2eef1ce609b03596a93cefaaf49044edd483c3"; + sha256 = "3183694fccb7a9560911d3d0813bf22ef79e1fdc8e72a5547258ff28b5ddbb6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hsb/firefox-87.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "56bf66c8f38567771b57e9f6008b0e86845cd71873b8ee4aa2c056e2c47d3f9c"; + sha256 = "82c02b623b0833468950a174a6c46bbf6c657252f0f876abb48e5b839a51f0c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hu/firefox-87.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e7da1098e56e1ad7e1baa3b6075defc6169e28306846c77c8f26c424c748f565"; + sha256 = "0db68343a32b3a69b323b8cf7eade47a453499e092eae5d57414739e2ea92619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/hy-AM/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/hy-AM/firefox-87.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ce3660bf256ed1cccb9c73d0c895907c68104f7f1cc28e7163363a060a747036"; + sha256 = "65b9c3902feac56c5563fe24a8c1d0f3510fca9b90062f88e4072a0ef6258c06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ia/firefox-87.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b6ebccd0e4c84d71e7da95ae99d6fa2e1a95fe94d6ed200fbf23ea7ff22aff70"; + sha256 = "50023eb339a5886cabdf7b71a65ab130fd0a5609cf18ceec9266100ce96e7c92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/id/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/id/firefox-87.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7d6844743e6a3e56a29f9d5ee599850bdef09f449de70f14e03664c02bebb31a"; + sha256 = "9a7279bcaeed8c6f6c44c4af728eddada5a96fd3c0204d10cd647d09721ec4e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/is/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/is/firefox-87.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "28bc14cf54090b9f52ae8fcbc7703f201407520e72f5aa6cd0b9f953d4db1777"; + sha256 = "697d1ac2cbc467d8526b8cf6a525b21a22fecb78f421936901ed3ecf91911146"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/it/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/it/firefox-87.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1d1a9a7108ebcc0cb796dadbdd9ddf0d8943e5d21c6d56588f33c583e7517b8a"; + sha256 = "4f51f5c632f21a0b589e2c358972f69107ccde6a32c5619e5b9273cd54198e98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ja/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ja/firefox-87.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "64342a2674eba04cda7f38e7382b7b2fa93efa1b5c555f0a01e6c59314913f31"; + sha256 = "2ce4af36d057c26f8b9f95b3c578dc738ea9ee80fbbb20f0c7257312499fb3bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ka/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ka/firefox-87.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "38fd38b9a257ba42928e72fed0c3047e000d2a603d37eba1d879ac1d3a87c371"; + sha256 = "9d4d54895d3237c7431c367a5c9fc07b99b11c91a1645e89fa7668111bb70ffd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kab/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kab/firefox-87.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "24570eeeaf5129ce8891320efe6a77203a3eb213285c71c9f2312da1c1d15303"; + sha256 = "4e67ce270e0a56f5acbe61a22368bc011ccf420201716bd36f5aec42a5d477bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kk/firefox-87.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cbc294b8e6988e2e010d08608fd1a822f05cf54bb3b3d6772eea13f1a17ee491"; + sha256 = "c1f1feaad98c108f73d575c2b59c3ff2fa26f9fb97a8d30182aeb4bd587063b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/km/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/km/firefox-87.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "ba9acd0c686ea2ef2d6d8af279c6cd75852021d16aa9e6d8a0bb429de605d8fc"; + sha256 = "f99973849aa9e9ca4f7534cc6eb3bb7ccd75cf95f600a4a124dd2750da16d2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/kn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/kn/firefox-87.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "bba2d328021359961fc0bdf7f5676fe47d72476b4bdb54cd41b09506f49ef0c5"; + sha256 = "4625c75234dfdd35aaa383ebcef3ba9e093c73aec2ca524a0f7b5b28a2438de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ko/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ko/firefox-87.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "983f9e165840452aae854b780a480c215f3e030801ff8184424d53b541e1c8b0"; + sha256 = "d65454c1b36d26d7df7a1eb510f73e7fea47431c6e51dc2119ae6932e11f351e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lij/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lij/firefox-87.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "d57f27ef2a5ab4d8032cb823fa9cb6fc566baced92517dca8ed61560641af96d"; + sha256 = "ef7668799697e1d9c35661f1f6c403307a6deb6b2f265a2906d8baa699c224a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lt/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lt/firefox-87.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1866f926855aed60846004450b34fb341faddc992cfc603ad2b689019e888c8c"; + sha256 = "bd34fdcad69d3e0c79e226899d0df49e5244a4072446fd1cb7a290261f8473c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/lv/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/lv/firefox-87.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ac79432c516df059b15737c1bb492a3eec6dcd5261a2ebe17698720ae7085cae"; + sha256 = "34c379fa36cb7d1de95c99bfae8476f57a40d6d041941ad1884a8314f8511499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mk/firefox-87.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "5d9eefd2926d1554d1feb4526c460506315a805c7e149ca4f87e0ebcb24b3d12"; + sha256 = "4a9020fd5864d35efda8ee36454d72392ef3d2e5c50f0bcd6e6f3326dc8fb984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/mr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/mr/firefox-87.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a5095a4eeea48bea9c52b843023756a9912a979aa8441aa2160785287bdefd1a"; + sha256 = "6195db5fcfb95148c243d7fa4675fac0467f1093191bbb02dba714723a4f833a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ms/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ms/firefox-87.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "47b1bc88d7a5f3d0feddbdb0d9e30a5cd9e420b85f3fb360bd6429a4ca1e4bc2"; + sha256 = "95410958dbe73ead9ef89fcd81bdc3bd0bc6079cb8997962fd43fa07c6b546c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/my/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/my/firefox-87.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "420e4b3ef4b31bd850374fdd4098e41d455d02ab2bbf52b5c575d28ea6350afe"; + sha256 = "c43a08c4410d7d5d48c29ebbb96765d45dcd20335125bc664f5593d56440e8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nb-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nb-NO/firefox-87.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6f6656a5370de01fc90eeeab8088d69d71c2e55cd9793b285f0bb88b61d44131"; + sha256 = "7f39e801ca6ce05bf6398b914acff4a3cd9016503a4401f9b51f92bd4b2c6737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ne-NP/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ne-NP/firefox-87.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "e7ac9e8e6914624349fd4cbb230faa96eed54502ec8019cdf2032606654e4464"; + sha256 = "b3ccaa031229d8e369f1acedb49bd159d282cd771205beb2876a8c7d4fc90413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nl/firefox-87.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a425e62f533d9e360ec2690946cd9ec5fa4f7da9ce6891558fb50a1bf3be6adc"; + sha256 = "3647e87528883cd7bc3310000f77237dac6dc57b62b664c434b16b9bf736930c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/nn-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/nn-NO/firefox-87.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "69c939c97646fcd628fe3facd0643c2d43790d7997b902a921190b6269dbf88e"; + sha256 = "3a94b93c5bd68f82ff9d310295f6397b902390061d21c0560a0906415e7150f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/oc/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/oc/firefox-87.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6a4c2ace18b9e00ee25a4600e115af847d305e60d89335203209d5a519ce89fc"; + sha256 = "a6fcecb568052565e051879487b34fce54b0e3ca3cc761dd27749d949153523b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pa-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pa-IN/firefox-87.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d81d8fda4acd4ccad2cae15a47123cecdd91afa66f93cd635ea13ed6af074fa8"; + sha256 = "14b10789c0d94e60c85be5594a0a11654a31e60518c78c04e4bea2b5e64843bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pl/firefox-87.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cb4b300ff0e8e8b0d874dce5349202b8b29e5a4ff79ab6044df74a53f5c72dc8"; + sha256 = "44aadea74c71dc86d7a5e0cbc04acbe2e26e46add5daaf0f8b31c4a17b439346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-BR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-BR/firefox-87.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "654cc5d0a0e35823733e6c9d440c43e4483233a4423c6c9bcaf91cb8fcbeb5ae"; + sha256 = "057eb47c7f45a1c0005a508bb36ee04b3edfce0e23e175fa311c9f1cc49b7e03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/pt-PT/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/pt-PT/firefox-87.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a944bf18dc7490ce80779af4cce82c20521b48ddb691ed5504d70075116af0d7"; + sha256 = "dd33f93ef7acd1e183902bd85b292b7073beb9fca3b46279f0405bcd06016771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/rm/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/rm/firefox-87.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "674921eeca942cc77b08e8c33a273d327357d90df7be91140e468517a59a7cbd"; + sha256 = "dd7649d8de678648f54a6dab7a66246abb6b514ccb5044eebff5f6689bae99d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ro/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ro/firefox-87.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8cbc8f6246455b6deae4a8e619f065ba218b59e711747033b08adffbed8498d1"; + sha256 = "bcbc82632f8a6802285f23bf0238738a5abe5e77d70596261cf7fbe6649c9560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ru/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ru/firefox-87.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6d2f6c1d4d8503ee78769c69c97a3cbefa6544a8a1ffb662f10460b6d78fa209"; + sha256 = "bedcd965e2a460bbe2aef0fad6bfe524044ad29225d26009d5311b8796bcb64f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/si/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/si/firefox-87.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "af33afea872e8e2b8825a01d5fcbc40a5b7674813b60735855b5fd0b886c57ac"; + sha256 = "bb93e1dc7621094f32e385632844169a8dc51369be8c5ca459dc17708e1d1ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sk/firefox-87.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7ecd39362865c864d6a5412bed20f8946019e3cb845923ce2ee30112d8e6444b"; + sha256 = "d7dfbfcded930a7d8aa03e482c66004202824256255cf08aee5a84a41d825285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sl/firefox-87.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "93c000e695b37f389356d4f3c48c55de6839688826c507e0cf76fee105409dfa"; + sha256 = "3ab06c56331850805e8e925deefb3cd0d21913fe88e04d6cd16ad9c59041d444"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/son/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/son/firefox-87.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "25df54b6e83be77fa22622905d17667a5db613eca263582daffea9c0079031cc"; + sha256 = "6b93d5b1eeaf64ed591a285b1384d63dec16f388609c845e12f4565ed2bb32af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sq/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sq/firefox-87.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6c8eb230a6de1b5056e530bd76ef0d6f6f35ee29a9d814440c6c2a32460b2de1"; + sha256 = "834a04d54a73886c58d0360c675b137b44a69b34003e5d77ba8516397e976874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sr/firefox-87.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a7b82f4383608dae512dd528068d9b4b2d4ca194f118098b328fd1b817bed14c"; + sha256 = "d629d7004fd5c3298e61ec154c7983b8b7bcc4ee8552ebbd53df81eec85e5cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/sv-SE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/sv-SE/firefox-87.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "dd856d068f32271ad024649c945ea4665faabf81a4057a8c7efe4f1cce302eb2"; + sha256 = "c3d19f42894dac47f78684ea1a9bc9d7a6fbfd51b4186bcb06679a6666a280e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ta/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/szl/firefox-87.0.tar.bz2"; + locale = "szl"; + arch = "linux-x86_64"; + sha256 = "3572e4ef3dc20960e60f342e0dcbb4ca374c9184cf84c40d644c3677b8dbf4b8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ta/firefox-87.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "9cb7ec3e3150a3594ae1a460b70d81ce1ddb9fe42696710a0e7eb1baf7c5aa17"; + sha256 = "b2f40c2f906fa1cdc67ba12faaab62468e71b9c9ec1c28790db56a4728e5f897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/te/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/te/firefox-87.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a3960a97ab3a7a28fe8c218457fe36a5f72827d602ebced3ff74d02f9941100a"; + sha256 = "81f135e5b9e1c90cb22baee13c5ebd5d2a954f3d3a31be74489eb9bbf4dda7ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/th/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/th/firefox-87.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c342893afcc7b68ba09c8875a55bec4ef2a8c5af40c0ae96a13a662eb0d73115"; + sha256 = "dac4e7326e9a2b0c6eec8361ebcf23afc95087f5fabb964c7802856bd8de02cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tl/firefox-87.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "3b0de00b254c2d984bbece1d3ca3acaffdc316a44d7270f4cff4c35425310913"; + sha256 = "9be7f3be1ebdfc19c8da8a70b1eef8108c6508dc6c37b39824ef11756f62768c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/tr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/tr/firefox-87.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "db36a0260fe69a99d3c834e526a6bdd305334490dd3e644dbd8a48606487209e"; + sha256 = "d7be3f1cab9759042cc30002063764dc66a9f622df71291daf93faa204090b02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/trs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/trs/firefox-87.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "94bc2723028e39d161bb7e95a27e9ce935671c80646674aecc871205a6c602ae"; + sha256 = "31b5dc1f40614975a8e3fa05caa0dd8dcab6b15dd0ff1ac4626d9c19b3e763ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uk/firefox-87.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7ad9a53018e54fcdb860cacc5fad9eb34a08e879ab69d47af21eb31f3d6c2803"; + sha256 = "a53842d484e2a632931a72b16b3c8e30c902dc1e46c3cf2a7711bea1fd0911b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/ur/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/ur/firefox-87.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "6d333e34bb8a332efbff91b9f7d69092b69e377c324693b765eb48b49a7ba108"; + sha256 = "1353882717c9ae8e35523ab403870fb08f06ddec2df0730637195b1ee112e746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/uz/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/uz/firefox-87.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5d111ce8b55637ab03c94fef0ed2e5737bbeee4f80a1ca4ff1847c2e9133c31d"; + sha256 = "43feb49aefcd292f61faadda2771251017c6104038ab1474d43f5cae1e8ee3ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/vi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/vi/firefox-87.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7fafefae0afc2142a01d7304cfeda60ce1f6302c29abe2d906391dcafea0f25a"; + sha256 = "d74a8de627e877e9c28cd19832605e039398dcea312a4784099151972d380516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/xh/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/xh/firefox-87.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "0d177c264ec9b357be2e616fb02958b4c9d7c6baf292f3c76bbeae84fd2202bf"; + sha256 = "3251086b6f58c311906c49a6b499db17eaa3122a8ffcafb6f303db0489530560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-CN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-CN/firefox-87.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2203d75b4a62bfe3cbb51c02665420700ea00686b7b9d4002b9a9a6ddca13f36"; + sha256 = "4d3471f60685d251b10dd1dc06610bb3ebf9d7a4e03616a6f6d988278868dc05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-x86_64/zh-TW/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-x86_64/zh-TW/firefox-87.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7d19a8791c79c0bd9fa03ea568f896221cf6432c826f4a59f99ec78139966817"; + sha256 = "8fcfa5987a0cfa37d5408c88701378e970960d21d181342ea2a3d6c43f4e4cc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ach/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ach/firefox-87.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "caa9485d62e682e5b06e39528857975d1c862ef23e62c9f4147c5db4027c867f"; + sha256 = "42ba93ba360aac202bd0b653a982dea3c1ea0d5cd6c530deef47c29c189c197f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/af/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/af/firefox-87.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ea114ce9ca7f2c4e5675d25224ffaf7805ec9361097ff47649bd4371937032f7"; + sha256 = "9aef316b230194ec02ebb1e7780e61d85b1a4cd398d56ec0c5238bfb9af8278d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/an/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/an/firefox-87.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "c022590875868195664c4920a3da7bec6bf9942a233190176827d603529a74f1"; + sha256 = "a645abc8fafb548a495efdf9e88ce96af06d0fa4703ed5ea6b63ae79d309f3f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ar/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ar/firefox-87.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "66ac4afbde7ed45e1d0239e3364c62f788ac26c8bd652b5c571a9f965ae632ce"; + sha256 = "c85e9eaf8480ec226eab70a8b434f56fbd5f4f8a7e57f13b341d478142e4ef99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ast/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ast/firefox-87.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "3962d9728bc8a0fde06ab64d6da1f40328938db7689db7b402919191c5286f3e"; + sha256 = "96a1fe1ab748ba2f99a23fd149f1d0b60a27f4d96ad12bb2473ec0393597e968"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/az/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/az/firefox-87.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "84e786225936123aec5c0f2bb27df9dafcd1ceb2e50e8235749dbc081adfd4eb"; + sha256 = "52d3bc8e60196814f7ed1d1732faf32b4129a25379e9f526db7e6b755bbd5746"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/be/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/be/firefox-87.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0cfac785cbb8f0c179788dca2a54484473cdfd5e0618894665bbc70d4c2e36f5"; + sha256 = "8cadf14d2ce8341e8a6a11a298203e121125d12ca63833642186b79ae79b5643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bg/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bg/firefox-87.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8c99908f307fa77fe6e92e58d26ea295471e6421181218fd0ca022c767e1f5f2"; + sha256 = "b60d8361c16f9b200255e6a904fdbf8da00a6f33a95280e456b471d54cac75d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bn/firefox-87.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "28b303305691ea7f8228580135acde6c17d745719a96e82c60b8d6738fdf2bde"; + sha256 = "1818bdfc297e2928255c006f8772478ce574c34748102ef64c5645ff59e3e2c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/br/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/br/firefox-87.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "83a76a0e7dad03453178dbb3a792aab03500359b623851b9a6ec9a4c1e0af084"; + sha256 = "7989cb7ba1a6984891c6eaa48a35b09281d0b8c7532c46cb1c87008bff5b68fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/bs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/bs/firefox-87.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0700c7d655136ac51134a6da9def1747a27d84ee21b523dfcc6f30042f9b8632"; + sha256 = "d618086558e44219582ff263d9555855bd562e0a8b9d588c2a03734d003e1138"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca-valencia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca-valencia/firefox-87.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d7738e186c6bd3f4a35c53bc6cf39876ad7774a45bbb3a44529c322f48a490b0"; + sha256 = "8f74cf450192bc9dfd2877269f98663ebeb06fdd0cd6d25db3261e5d1f6b36c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ca/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ca/firefox-87.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ca63b150369c02a048ddbfaaa2f2faeb2729fb46086937c97a93d684975e2837"; + sha256 = "dee6a1ded1c10b4771294435c23e433ed209dfe55db9cbcc0454b0da23d26cec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cak/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cak/firefox-87.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2a8a8ebe18dce87a021c71e87e2815b227b03e3251d141f044c083d7a4c942dd"; + sha256 = "9e55f71f4040c21d79fabe4487cf5b660baca37c23875a31015e70a520fe0737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cs/firefox-87.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5e60175642fa8260c4125b90412564fbd49b8f91ca204c30dc687108273184db"; + sha256 = "3121a7d49718ebf6c9a8babe0f57962547b54b99864f917d045f78ea4a4aede7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/cy/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/cy/firefox-87.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ee6e49cc30f01f5604cdb317801ced10c24809ed64f6505f44b6a33cb359641a"; + sha256 = "02c5a049462f3d4c0a538a62756af8b4e59b1acdfc4d92d43639ee3a27e568a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/da/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/da/firefox-87.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8c447626d889aa067bd758a56e4dce720f01192e283c7e01997c6f85f0265f89"; + sha256 = "8bc3ad5f69850d0fd4c91ef2296462fc2c641e8eb9835ac5ffe88a9dd518821a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/de/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/de/firefox-87.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "12d52ecbf5c4b9313c3e9cb61a353f812319142c6b20594f7fbee01a339d98ef"; + sha256 = "2e9e562e10477f4a54d677bf2cd6becf87e4f40336fea8f4337f5e7d928f28f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/dsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/dsb/firefox-87.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "5064e20ca27adaf48d5c4041c12db3738c95b9143f667ddbc28230ef9387b28e"; + sha256 = "fc1881741d5aeaa5cc34e9b86515c8ad637984d88814c48f8f014dfab55bf02c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/el/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/el/firefox-87.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a625d2caf3be1a5039a90c3515d1598b5acb87a4e4df4e0ea22f0a63b0405ae7"; + sha256 = "cc44c88c82adbdcde8690825851711b48212a49aa74b7485cc51d234a5027cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-CA/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-CA/firefox-87.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "cc1c18c8d4d53495fc4236c95b353bbe40c3de16ded002b2bb991a824fc67210"; + sha256 = "c6a32c84bd3ed42ee801a5780cf45a6061fc8b37de4220907a98d674831c0a00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-GB/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-GB/firefox-87.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "c76f7607b28bfee12eebf2aae7590fea71ed2a4f3bb0ce3903f0331187640122"; + sha256 = "cbf4e049602873ae13eabc2176657bdfb95fd4277360991ab4ef2a4e7be697f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/en-US/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/en-US/firefox-87.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fe6bb788d3c5264943ae5a287cee691f6aea8b3502f11e386f6d723a08dc545f"; + sha256 = "9127aee106dd9f09fac0c3cb89c5d75553384da4ec9be5943b60a5f55f31fccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eo/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eo/firefox-87.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "39af3debe06726ddd02a4914bfecda2d023d9445e7c735e8974ad73f45955298"; + sha256 = "7f75cb2fa8c73bc98a4d5b0f60ddbc66eff63a9caa271b98bb8eb4897fecdd49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-AR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-AR/firefox-87.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2d66f2f28958157da1dfda56827f5330f6d7b9fb192899b2ad60ecd6d18e9505"; + sha256 = "090b13b1698e70c0d13409ffac5b45a044356556e3ecab970fd34907e16cfc11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-CL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-CL/firefox-87.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "cb69afb6ac3b47721176934047ec9ab3b1127b7d36da7b9ae9af9aec72bb8289"; + sha256 = "1453a40f9c2ae6794dc886d1c5462e4341141fe84792e32a08b0e6c4ac5183c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-ES/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-ES/firefox-87.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3c0ae2ce17078ef568ac71d5cf8ceb0769fdb8298ce17c58468cf57ab7a95af8"; + sha256 = "3dc986b05c389dab03cacd1672c8621f1ec93e5781dd79ec18358e3a1f2e8f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/es-MX/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/es-MX/firefox-87.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cd07a75c8c96ac8d31cb988d9d394e5e2eb9bb6cfd6df33d6e60d38a6406a4a8"; + sha256 = "e6b18f0adf5ff99d1c7f84dbabc00b44ad7c3c2a4b95586f58d18421f28dfa1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/et/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/et/firefox-87.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "cced1ea2d54c9d305b61ff1d1025aaa5f23bfe86fca3b0e915f2dcde1384d042"; + sha256 = "573cabc8b8eed9e80d43ce960660737fad1f3bf43266d3e72ea475bec931eb9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/eu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/eu/firefox-87.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9105eebe6f606292b82eda26eb68b399dd13e1756f1ca88395f0b7714089ea4a"; + sha256 = "5b3d1ecd842b30029fa1749ad7a1aa6486bf96f977d5f274ecababe7909c71b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fa/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fa/firefox-87.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "9956fc5949d1e111265dfcd71373d8ada4cb2f554b9ffa2dbda0c430296ece56"; + sha256 = "41edf84920463d8c1f6ac8a8c0c5068143652129ec42377e3a3973d54e8477c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ff/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ff/firefox-87.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "02a6a2f711db26b74094744e9f198ddc05a1188fef0fa330949e9e5056c7ffba"; + sha256 = "492d2b1307558b1b19b5d1d88bcc0eb151d00ebc1331356520068597614919f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fi/firefox-87.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "368c2a59f1446d61a7a27892ddaaa5f933cbbcb9e3f238db5f9e9cb77873e37c"; + sha256 = "f495c5d6965c2fdfd06d23616f4b017c600e07efc22984be743c3eadcb5eceb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fr/firefox-87.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d543125a0e0402245064dc763eafcb3b00237c217a929b04f44db6755319ae2d"; + sha256 = "ba0cbea290a3911a6bc24fd52e726234f90213b05756a57aeeb01a8ebcc7af73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/fy-NL/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/fy-NL/firefox-87.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ad28252c39eac70b9ce15631c65dfe520950d36212a547587978c635bf835187"; + sha256 = "9e9dfcea10f89836b3d63420f90f992b123dcec3beceb3eb739d47b15ced4a1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ga-IE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ga-IE/firefox-87.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a16c0117757cadacc408f95a81e38b7f7e9489a4b6ceef30b8a65796fa6a2ca2"; + sha256 = "316b6877a46f452d628509bf94c4e729080d93cb8590d8c17f9ce030823a3b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gd/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gd/firefox-87.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "83b61f8e5801607f7b71fe2fa5fd7aede2cd56e4b46b25057935afb23f28ba01"; + sha256 = "34f2b2660f76ca13697ca029fe06cbdada7e8a0ee3f703c55b5290af4f59d687"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gl/firefox-87.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a603031b44679e8e9dfa14c2094690c786b4ded18d736bb16d683e978346fefe"; + sha256 = "b61531887132193a3b68fc1394682305bf242bb8244f19c6e6dc158b0e6dda61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gn/firefox-87.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "5146bded3c264c6a77a9e4e9a1c5523e63858eed5077e8ded56d52b94fafa7fc"; + sha256 = "286d7c949488a93370055dc650a70825df689b496de47382c7c326d0be16cf11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/gu-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/gu-IN/firefox-87.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "d177f05815889cd026879d6ddb3c03d3c62bb3b2787ca68a97902671977400e7"; + sha256 = "c04e2f3cd9514b8494122af0baa474b2e3ac91d62939ec1117f3b07efbffecc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/he/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/he/firefox-87.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "c3534b56a9fb43e959c8c6055f6af0c1ce9e512bee8786fa4a1028ba0813cd73"; + sha256 = "9f4436ba36fe3d73f22c0837fa124e712c58169d9db1cccaad91187d895f4b95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hi-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hi-IN/firefox-87.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "a4885b1515cee1352bd534de17742af432502169d8cf2f34426950a5482647cc"; + sha256 = "e1c3674ef1a401c6f8f5f9f3f4cfdc9a858fc670f71d0b09d79677820ed6ddb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hr/firefox-87.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "1d9d49b4360efa296ec8b6750aaf8e09a24d749e3694d30dca446480b350a733"; + sha256 = "7dc0f6c2cf38f90741a8c0a2f5df22b32abb6399d9b24cc827f1ae972a481b23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hsb/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hsb/firefox-87.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "65b890ced9ffc672d92d8fe998ff4f5deb485f22ec4d1525525fac81ed30c2e6"; + sha256 = "d59ee63de2bcb95575a782294cad35a0ea99eb4c8e4bde8539cd20326d85b41b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hu/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hu/firefox-87.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "90e32c53ad910ecce1558c99f10514775b72efc207451e9c61127051c92fe450"; + sha256 = "c9d13a693183290db6a62eda37da63f0d1535db5604a6f62d88b990ac3ea39ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/hy-AM/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/hy-AM/firefox-87.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "02c1dc969487809e432f4053b39b996ffcf51c81c7827146d3cd7a25ff050abf"; + sha256 = "7edb84df00e57987f4cbef235a1fecc22b6dd7aaafe101f62e002e4e59caf56e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ia/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ia/firefox-87.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "81d027c3facbe67258151046d9aa53a7d832d1a120aa671532524c87b79efe80"; + sha256 = "501cafeb34aef4d8dae63f47446abf8b04dcfee93b9931ec06f809823a6c675a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/id/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/id/firefox-87.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7a54acb6b8f14cac3d2a7e21fba5990dbaab9d4efef8d2a55642ff120905cbd9"; + sha256 = "9913aec5634c32300c2f556017be415ef6516a4380af3e597b2abd8e449e82a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/is/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/is/firefox-87.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c1611ebeceaf431883e5dd61b15aef2954007feaea3cc7503573216ba4cbcb0e"; + sha256 = "71b1bf3205043c5c23988de6955a51091ec812e82701d0f37c12e937ed774b69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/it/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/it/firefox-87.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "76042e19b820c69b1d7d39f3be87069142a4fb6c0327b8f67f78b87821454cc9"; + sha256 = "7a842251175a2db53e0bec3b65c2db0007a1fe5d84ec126fa9029c6d9dbc732c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ja/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ja/firefox-87.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6e2d8fe15275935a02e3f07ebf14b61f657a35cdff262d50e3a0f10e3ff587be"; + sha256 = "6a8aa33e333fcfa9bb2a011d08af0d10b445be1a22dacc4458c121e8943b1f62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ka/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ka/firefox-87.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "93f59b3150795ee6a1d5cd446cd0147f5ccee359939fcecae63a262f28eea0ca"; + sha256 = "f2d2cc7b079e0ca69de3568b10bdf6d7f74ef7f8b0bd05a89442be41df3d2239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kab/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kab/firefox-87.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "d71c30914f32b0f5f25c1492e94d0a397997f946f1ff58c85997d9c6c55ddd4e"; + sha256 = "7211457301c54fed01aa3b0735fc7f0814d4fbfeb7862ebe438f5cebf7fed6e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kk/firefox-87.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9c3b1b80d46c75526c5c9b53229e74aa7cb7219a3110218ecbd099e1d05037ac"; + sha256 = "8b18ac077d961279b2bb179ea37819de964e488ab528d4591ce2479ecae167ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/km/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/km/firefox-87.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "95b59cdaa6caeb5cfbcfc673faed614650dbd44458c79684ca7f2ee4ef678e4f"; + sha256 = "6b06454f9e061ae6d099ffbb2079d92538b32eb619d12858c3d759f004c427c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/kn/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/kn/firefox-87.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "31d79f5609140fb213e19b60d638811ef576bb3db8be533aa92a02ffd22d4df5"; + sha256 = "4b8d711f0f33c850d2bf39f16ef0da7e004374445ad8bb3e69e0b74ff0765cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ko/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ko/firefox-87.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f05215e9004a651b239475bf02de19709fb2ceacd99f0da22ba4ae91dfd899f6"; + sha256 = "f6da2239dc4e457623a64f2ac5e56868e70115941ddd3c19093ba180a3aeea7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lij/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lij/firefox-87.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "309ce372ace38efc2cd907df32d18fad97e8fe66728c52efcbc36a36e91163f4"; + sha256 = "fc45263e353af69c7dc2e5d74edefa793b0f1d2bb86f496dd75ad66bdfc7ffe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lt/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lt/firefox-87.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "1426fae07194ec4dde7fd797631cbb561726af5b1c255b72c13a96b54034a440"; + sha256 = "f030574f0bfb8574ce07159fdd213f1e21c4293bf7e1961080e6ef10f7f14b42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/lv/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/lv/firefox-87.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "48be4205b0d9ba8de2545a73950a4c2836db3d046707ae5db7e2cba0dadaa3a5"; + sha256 = "7648c4616260b09161a3431120fd99c97c5630347ad4ac196956eae4cb4b18f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mk/firefox-87.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6cc5019e2d41510a67cec8850451fa16e868da753dceb8a38a0cec893814f07a"; + sha256 = "c7bfcf5ee846d340d454d6cce2e66c0245bca10d1b74887170ba3820c392155a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/mr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/mr/firefox-87.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "ba73c1ceac1ad36912f6367a23bcdc4455627d16f2bb589cde4abb5304b06d67"; + sha256 = "808207c6efa62312abf14091992022a3d37ba906c8003316d6af943228ba534a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ms/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ms/firefox-87.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "09935a83eb75eb9f89847d9b279c5728c524bef37d063969ec3e44346ef74c12"; + sha256 = "f836343cd1116657b8f8f28f49df99b36a13a4255d0499945953b64934f80e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/my/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/my/firefox-87.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "55b7adcbe1bb47dc49e1d51d99fa3b3a9aa3028a56fe2c53848ec9591503360a"; + sha256 = "1c01f7dcea9ecbf1af3cc29cb38aa8cd928dc6c10f67fdb20f98a588951336de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nb-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nb-NO/firefox-87.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "87e7f1d1ecb402f9484e40078a3460b18aa41d88f0bedf61edeb937474ab3e69"; + sha256 = "f196268af59a118a4c5ca50b5c7f9ace27d642fd1952085dd693f09462eb27a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ne-NP/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ne-NP/firefox-87.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "0c5e84344df03c41ab835c3af847772d13fe48d3395fc2aeef020eab04f76baa"; + sha256 = "6a80edda7e3b0f97282840eaacd9d4d003e6562c4931a14736bd1aba6ea8eb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nl/firefox-87.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "75f54fc189ee6f43277066a2600bd340375fa5820e64dc340a3ac93a1f0a6ea0"; + sha256 = "495a43b18aa2078bd86468cbd1545ea04b0fc63c847a459156489c18432fe5ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/nn-NO/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/nn-NO/firefox-87.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e1dd0adfc33ac73890d849c685d3072a8bfbe6ad3b5ad0bcfa0a04c9ec817c1c"; + sha256 = "a3d58b74e2ee2c97a2b4aa5855040f34f79024df55d8de6623991df61cfc3b46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/oc/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/oc/firefox-87.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2eea8f40976373fa98d7d32c016dbf0e05fb8f53f3c0f038a087220ea91999a6"; + sha256 = "c71e444eb03df8c4b28dc34d4cfc32db2471ba12389f448c28a9dc03fc0dbfb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pa-IN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pa-IN/firefox-87.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "03c1dface09201be51bd8df92a420b67ce885a712231754dec5e42a4e5cb8cd8"; + sha256 = "69eedac3a7f2912f179e2c5838f4dbe109c1b1c570ea1f375d5563a622553f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pl/firefox-87.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1d4fad5713d1b6606551aa9b9527c4919e548fc9fb50b921404609dd7a43c76f"; + sha256 = "106012905a00d898ad3fa43c733c1f568c0df2e74165276feb5b3f5eb79a3b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-BR/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-BR/firefox-87.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "53defe8219ee88152a542e24526a3bb9d75e0117e606a3e976d798f441acd64e"; + sha256 = "18434861a77abb7810008af068589250ae5621c1719ed4d37643c7aa3607070a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/pt-PT/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/pt-PT/firefox-87.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d91483eca2e1972ce6a0ac97b0393a9cf28a36eb1e923cd863d37b8fc66f4edd"; + sha256 = "b27fc0941804f4bedf10c15e26fd14fc381416a2c29fbe9b4d01f328e2164022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/rm/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/rm/firefox-87.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "926234371843aae60cc81886ab7ebaca7bceb6f705ab9d2560ddf996e46f6aa3"; + sha256 = "2283c43282caeee2798a93af96979e46a103b3ab7c645e72384fe19973c49534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ro/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ro/firefox-87.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "9c63bcf8b603b65f355460d0de6827e363ec0797bddb9d446e116b641a5f430e"; + sha256 = "6d7ba9b40f17f373c4eb151a4bbf6399d27a8e5071342d25a374afc67914bace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ru/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ru/firefox-87.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f4cb8e70dd3c0b2bb97b28c6f85654786f65daf6705559a3dba87a5aa4f0ae18"; + sha256 = "77341829394b41ed8cf63090c30b993e3a540b838bb476239398795eb026442b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/si/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/si/firefox-87.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "b305cfa2be37591ae0bf49de8da37ffa3a5c69b242196073d84124dd02dd094e"; + sha256 = "b7aaa753f54ca1aa5172c39e9899c662f62cb81628f29d29ed8774c68697d1fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sk/firefox-87.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "23772e40241f955d20a1579f283c6d648e180ae7da21ef0a914156733f89e6a6"; + sha256 = "fc70db60786a652dfa0d8614c24bb4b5cb46849a468903723c9e9cdfebd9eb52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sl/firefox-87.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7213f902b853bbce4594db2f5555e437a82adaeb506a9d1421ff9015d29a9659"; + sha256 = "392eccb8277c76b4178b6fb74c8974ad31e0b36fe8778b5933b37f6249d3c9b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/son/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/son/firefox-87.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "7b45520bd7305b28803bd4e2f22d41216707754ef46cf6981f0c299b03efeedc"; + sha256 = "c95c7ff206a42cf5c4caba9a3377834c1b8b4d258de566efed15ab0815b64726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sq/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sq/firefox-87.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "11b0b971a705d483f3dd7fab066d034f0a30dd95e16bb7d7aece44d8ccabf450"; + sha256 = "7eb9cbe937262ed47711df80143b49d369bfb185119a3fb51f8a723bb99b1f9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sr/firefox-87.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "07369958e98d1959be2e52b33145ed1075dd85220de38fcaf617d207217a0066"; + sha256 = "4d4b88503ccc6d5f5c16988c626027516681d265b32ee205324919a170caa1b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/sv-SE/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/sv-SE/firefox-87.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "7671a24d1b81b26c34a21cedea05b6c132963045d3cbc28ee264f9c56302cefd"; + sha256 = "fe2fdf76541c95166fae7b9d1c0b3390552968ac0a8f47f2e23da750c8b8753a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ta/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/szl/firefox-87.0.tar.bz2"; + locale = "szl"; + arch = "linux-i686"; + sha256 = "af91e1a4d0afefd890ce9ab04ac800427670a314089b67dc41e12bfa43ecf112"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ta/firefox-87.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "bf605ceac99dfc2ed058ada9bb9fbd7ae56fdea3453d7dea23ca13dc284391bb"; + sha256 = "043162612ff54115953c25333fcc03d801176db1d379cb7c94f22c0da5a1ae00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/te/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/te/firefox-87.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8aea95f2069a59cbb575f386a7e90d04ecd0f4c4139aefc6dcba54b9b56e7aac"; + sha256 = "2fca2c54dd357d8d5e3bb8804dbc3cfcc7fd1c17f538eaf1e1fd60c95baf7252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/th/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/th/firefox-87.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4985ee399155bd0854c9b9068fa747f396855b1251610c3261fc5c7da5e5894c"; + sha256 = "b049f6cc876fce2d57387d2c90afff4f261baf38e582821656efd455fdbadc03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tl/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tl/firefox-87.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d328338029e0282ca5e3c7e0bcff73faddfbb4bdcb47a2978622c80e2dd8d0b3"; + sha256 = "be18fe1caae3a85e3a48b0a5a45cb175bd11c31d1cfbe726dbe4952c50338299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/tr/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/tr/firefox-87.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a438f5504b0fb62173a8a739645e7f269647e33316a35a96c5dce71d9d87bb0a"; + sha256 = "5c43338e0fc0138c280f9231e05c14a553d2b0504053b5c090adb7ecb96cf8d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/trs/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/trs/firefox-87.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "41c90f6a5de249fc5b0dcec21d5d2684b5d3be2767d6073529101f31bec569a5"; + sha256 = "510ee9988f4d1c6e0e50fc07d00d2aa80380f89f8db4b0655c7a9c0aaf07fc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uk/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uk/firefox-87.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "06419fe5e671a6476500a8ecfe736237adbafdb39148d56d514fc7f07ff09e87"; + sha256 = "a01aa11750b6027f01b45763d691c425b65aa577fe9fcae6f492b40bb8ff6056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/ur/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/ur/firefox-87.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f5c1729584fc7843da5febf2411196d4615d4d5b490dc9a0f7b0709496b61ad0"; + sha256 = "f2e83dfd361dc8abfc3fab5554d1c545b216a05f57718aa1f8976f7c2dda3b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/uz/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/uz/firefox-87.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1a898dae70288fac86c0ff36b92731e7b3400652b5bef485db73cd8ed933e8b"; + sha256 = "4c570ba3aa3480efd63ba230b550d750a49289b3bafe9ede881b28184ac26ca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/vi/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/vi/firefox-87.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "7c12e8fe3b30ae8b8bb106a3ce866b23dcdcdb7924ca41e8c9b3d541e0300963"; + sha256 = "846862d789b275ba1184b1f65a95570043ee1f8e2f7da5678252c192a8d31966"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/xh/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/xh/firefox-87.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "97f40f99c9d0204db12d1da1e58088dac2fcd02be6f4fd5c477d20f0149d1f56"; + sha256 = "5c5a88654bcec7a8c5bb7245567270542823a377c7843a6b14d8f12cf57b7b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-CN/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-CN/firefox-87.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "309e7670632171133fef52c1426a1f42fb4e14c4d99a8f9543439b21105425f4"; + sha256 = "b7774306c5941feb5b7abf4fbc3e3d3af854145fff741f561708b5ee94d1816b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/86.0.1/linux-i686/zh-TW/firefox-86.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/87.0/linux-i686/zh-TW/firefox-87.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5993ffa86327a42ea91aa884e90bdb8626d4108a8299acb2f80623e8aaf3ed3e"; + sha256 = "d115d7086947003940bc270b6a83aa612324f7913e044a194c1e05648e241b17"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 925374d38e..7a3fc9b9a0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,16 +7,16 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "86.0.1"; + ffversion = "87.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "e613cdcadfd71a01800a72c08c590032605ca8a8a0ba93326ffba93c2819f629fd620c23d00ca1274b203adc20acfe5d7913fee240ff14819fb1377ed08b1214"; + sha512 = "c1c08be2283e7a162c8be2f2647ec2bb85cab592738dc45e4b4ffb72969229cc0019a30782a4cb27f09a13b088c63841071dd202b3543dfba295140a7d6246a4"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco lovesegfault ]; + maintainers = with lib.maintainers; [ eelco lovesegfault hexa ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -32,16 +32,16 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.8.0esr"; + ffversion = "78.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0160aa6c408c2af66d24b74cf98e1a07ab1604e7b93ffcde79201f9d68e41e896ef965f1904de52d5dd82ffedae33ac96e93b871727bf5dd5983c5af2f1f439f"; + sha512 = "28582fc0a03fb50c0a817deb1083817bb7f2f5d38e98439bf655ed4ee18c83568b3002a59ef76edf357bfb11f55832a221d14130f116aac19d850768fba3ac8b"; }; meta = { description = "A web browser built from Firefox Extended Support Release source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = with lib.maintainers; [ eelco hexa ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index ec57bcfae1..a6cf5ad531 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.21"; + version = "2.22"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8"; + sha256 = "sha256-A2SYazp/Ho4xcb6jYrU/ceHdM2CohC1m/cZVgOvCCE0="; }; buildInputs = with lib; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 57a4155e17..96355789eb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon +{ lib, stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon, libxshmfence , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , alsaLib, dbus, cups, libexif, ffmpeg_3, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.6.2165.36-1"; + version = "3.7.2218.45-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08"; + sha256 = "11q3whw01nbwvzccgn55b4lkr7dzlql961406r6by8xqvf8zgmp4"; }; unpackPhase = '' @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ - stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon + stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libxshmfence libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd freetype fontconfig libXrender libuuid expat glib nss nspr diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index d82c6b4574..eb2e5e049c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,26 +1,39 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: + +let + version = "0.10.0"; + + manifests = fetchzip { + url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; + sha256 = "Der1Ud27eIV450KkxDTF2frmeKEHKsg6vJgdXE+3548="; + stripRoot = false; + }; +in buildGoModule rec { + inherit version; + pname = "fluxcd"; - version = "0.8.2"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1yrjgjagh7jfzgvnj9wr71mk34x7yf66fwyby73f1pfi2cg49nhp"; + sha256 = "iJ6UyHbF4+RvfNoOuHt6X2R6XhpBe+t76deldwY5P2c="; }; - vendorSha256 = "0acxbmc4j1fcdja0s9g04f0kd34x54yfqismibfi40m2gzbg6ljr"; + vendorSha256 = "Z0keCr+KZ593c6a/56lYJwOgXu5hrUSn6N3NFf2LDUM="; nativeBuildInputs = [ installShellFiles ]; - doCheck = false; - subPackages = [ "cmd/flux" ]; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + postUnpack = '' + cp -r ${manifests} source/cmd/flux/manifests + ''; + doInstallCheck = true; installCheckPhase = '' $out/bin/flux --version | grep ${version} > /dev/null diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index ccfeb6ed87..32ecc8b7c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.4"; + version = "3.6.5"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-4oJ/undqDSNn+Xn8eFEgOx+7263tmdXTHxXBkyFLpsE="; + sha256 = "sha256-FOBSGXVIb4mLDHMqOljZ04W0q/H/HOuFm9Cl2kK027s="; }; vendorSha256 = "sha256-mktq5Dnk1mBO2yy5SeMDxa/akXdO5i2WafMTGtH53H8="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 11e2b0a291..26591ff397 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0cr7ap9yfd9flcph98rxap2f46fc3v689v31mc8n7vxi9jr07irh"; + sha256 = "sha256-xxWbojMY0je1mkp2TMuIhIsimVKdHvbkTMozlU9RbTQ="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "01g50sfk0k7v60m3anfiq2w9pzl2wpa985s22ciq911h3fscka3f"; + vendorSha256 = "sha256-Q/l/GH6NSZdMMwTJ5spVEGZclnzcWpUW+zOwRXYQjxc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix index ae9380c513..577e52ed49 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kpt"; - version = "0.37.1"; + version = "0.38.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4SGCYkx9U6XNUrJfVPgNEhFA75CF8GOrtS4BSm6f7mM="; + sha256 = "sha256-MBZa4LdpCZnVVbjzkYpPi9/CYGqVLeYy2N/AS1PSYBE="; }; - vendorSha256 = "sha256-y/l9k3oTrN+9OGgyiVzCyYi+6lJpcKaEygirytbn9aI="; + vendorSha256 = "sha256-P0cN8aw62nPD1OlUAw1E36YxptxtPqqruZfDDG4Ag2w="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index c218e1b492..12127e223a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.20.4"; + version = "1.20.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0nni351ya688dphdkpyq94p3wjw2kigg85kmalwdpv5wpz1abl5g"; + sha256 = "sha256-RDaD7tlTtAucW8ido9FumKb5E9n6F9H8HwxQ9TPyOLk="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 84a6cd644e..62c12ac8af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,20 +10,20 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { - owner = "AkihiroSuda"; + owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ="; + sha256 = "sha256-0q3UmlXzW0fGYPc1IptuIbCMnKW4pyDm1KxkRqU2voA="; }; - vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4="; + vendorSha256 = "sha256-QVvID9rrOFngL94LWN75HSnyTgh3F0KaScWxMIKUqDM="; nativeBuildInputs = [ makeWrapper installShellFiles ]; - preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in + preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in '' buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=") ''; @@ -36,9 +36,6 @@ buildGoModule rec { --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ --prefix CNI_PATH : "${cni-plugins}/bin" - # nerdctl panics without XDG_RUNTIME_DIR set - export XDG_RUNTIME_DIR=$TMPDIR - installShellCompletion --cmd nerdctl \ --bash <($out/bin/nerdctl completion bash) ''; @@ -52,8 +49,8 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://github.com/AkihiroSuda/nerdctl/"; - changelog = "https://github.com/AkihiroSuda/nerdctl/releases/tag/v${version}"; + homepage = "https://github.com/containerd/nerdctl/"; + changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}"; description = "A Docker-compatible CLI for containerd"; license = licenses.asl20; maintainers = with maintainers; [ jk ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index a4f15586ad..485eba2721 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.13.4"; + version = "0.14.1"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-jbGEkBBXb1dDv4E7vEPVyvDahz27Kpyo3taenCH/vfw="; + sha256 = "sha256-+CzY/ifH+U3I36uHXyO2FSkPCz+SWRpSPnxfd2LHHhY="; }; - vendorSha256 = "sha256-rzxtLaGUl8hxcJ+GWlrkjN+f7mb0lXrtkHj/pBO8HzQ="; + vendorSha256 = "sha256-wtpXqIixjRYYSIPe43Q5627g6mu05WdvwCi9cXVgCBs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index f344b8c3eb..8f4324f434 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -5,7 +5,7 @@ let rev = "f6e19140201d6bf2f1274bf6567087bc25154210"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.20.0"; # Do not forget to update `rev` above + version = "0.50.0"; # Do not forget to update `rev` above buildFlagsArray = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -17,13 +17,13 @@ buildGoModule rec { ''; src = fetchFromGitHub { - sha256 = "11qawsv82i1pl4mwfc85wb4fbq961bplvmygnjfm79m8z87863ri"; + sha256 = "sha256-LhprsDlWZjNRE6pu7V9WBszy/+bNpn5KoRopIoWvdsg="; rev = "v${version}"; repo = "sonobuoy"; owner = "vmware-tanzu"; }; - vendorSha256 = "1kxzd4czv8992y7y47la5jjrbhk76sxcj3v5sx0k4xplgki7np6i"; + vendorSha256 = "sha256-0Vx74nz0djJB12UPybo2Z8KVpSyKHuKPFymh/Rlpv88="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4ec886a34f..8e15238f10 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -511,10 +511,12 @@ }, "kubernetes-alpha": { "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha", "repo": "terraform-provider-kubernetes-alpha", - "rev": "nightly20200608", - "sha256": "1g171sppf3kq5qlp6g0qqdm0x8lnpizgw8bxjlhp9b6cl4kym70m", - "version": "nightly20200608" + "rev": "v0.3.2", + "sha256": "0lgh42fvfwvj6cw8i7800k016ay4babqiz38q0y7apq4s7vs62sb", + "vendorSha256": null, + "version": "0.3.2" }, "launchdarkly": { "owner": "terraform-providers", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 6b878cec92..daa9f486bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -40,6 +40,6 @@ buildGoModule rec { "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix index b032d3de33..38bc05b1f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,27 +3,23 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.22.1"; + version = "2.23"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - sha256 = "1j3z34dhqw0f1v6v2lfwcvzqnm2kr2940bgxibfi0npacp74izh3"; + sha256 = "0a0g9km515kipqmz6c09aj3lgy3nkzqwgnp87fh8f2vr098fn144"; }; - cargoSha256 = "08ywaka1lib8yrqjmfx1i37f7b33y3i6jj7f50pwhw8n6lr9f7lc"; + cargoSha256 = "11dn1ixc7i29cv8kpqfkmikdqzr2v79vlyfxcvjwhgd0r34w4xhn"; - postPatch = '' - substituteInPlace Makefile --replace "|| true" "" - '' - # TODO: Check if that's still needed - + lib.optionalString stdenv.isDarwin '' - # Allow other ncurses versions on Darwin - substituteInPlace config.sh \ - --replace "ncurses5.4" "ncurses" - '' - ; + # TODO: Check if that's still needed + postPatch = lib.optionalString stdenv.isDarwin '' + # Allow other ncurses versions on Darwin + substituteInPlace config.sh \ + --replace "ncurses5.4" "ncurses" + ''; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index b4c1e95087..f8e9fcc87b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.52.2"; + version = "3.53.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-wHiIFpKKJuiGPH3CaxWGROcb7ylAbffS7aN9xIENbN8="; + sha256 = "sha256-MJXnYN9PVADttNqj3hshLElHk2Dy9FzE67clMMh85CA="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 diff --git a/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix b/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix new file mode 100644 index 0000000000..940756855b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/giara/default.nix @@ -0,0 +1,68 @@ +{ lib +, fetchFromGitLab +, meson +, gobject-introspection +, pkg-config +, ninja +, python3 +, wrapGAppsHook +, gtk3 +, gdk-pixbuf +, webkitgtk +, gtksourceview4 +, libhandy +, glib-networking +}: + +python3.pkgs.buildPythonApplication rec { + pname = "giara"; + version = "0.3"; + + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = pname; + rev = version; + sha256 = "004qmkfrgd37axv0b6hfh6v7nx4pvy987k5yv4bmlmkj9sbqm6f9"; + }; + + nativeBuildInputs = [ + meson + gobject-introspection + pkg-config + ninja + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + gdk-pixbuf + webkitgtk + gtksourceview4 + libhandy + glib-networking + ]; + + pythonPath = with python3.pkgs; [ + pygobject3 + pycairo + dateutil + praw + pillow + mistune + beautifulsoup4 + ]; + + # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + meta = with lib; { + description = "A Reddit app, built with Python, GTK and Handy; Created with mobile Linux in mind"; + maintainers = with maintainers; [ dasj19 ]; + homepage = "https://gitlab.gnome.org/World/giara"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix index ca6537fdfb..23a4aebb02 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -88,8 +88,6 @@ stdenv.mkDerivation rec { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; - # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2) - broken = true; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index fe7a2e3ba0..764a5ac3db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg -, at-spi2-atk, libuuid, at-spi2-core }: +, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.68.0.100"; + version = "8.69.0.77"; rpath = lib.makeLibraryPath [ alsaLib @@ -40,8 +40,11 @@ let pango stdenv.cc.cc systemd - libv4l + libv4l + libdrm + mesa + libxkbcommon xorg.libxkbfile xorg.libX11 xorg.libXcomposite @@ -65,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "gHjgQRdNABO+R+fcDurHDAQtZpckIxLbODM6Txz+LH4="; + sha256 = "PaqlPp+BRS0cH7XI4x1/5HqYti63rQThmTtPaghIQH0="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 91617a2678..7c9714b355 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { pname = "irssi"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; + # Fix irssi on GLib >2.62 input being stuck after entering a NUL byte + # See https://github.com/irssi/irssi/issues/1180 - remove after next update. + patches = fetchpatch { + url = "https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch"; + sha256 = "1ad1p7395n8dfmv97wrf751wwzgncqfh9fp27kq5kfdvh661da1i"; + }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 163faf02af..67ddcf5997 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -55,6 +55,10 @@ mkDerivation rec { sqlite ]; + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" + ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 0174d13301..f86eefe668 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libX11 , mkDerivation, qtbase, qttools, qtmultimedia, qtscript , libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }: @@ -14,30 +14,32 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtbase qttools qtmultimedia qtscript boost bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext + buildInputs = [ qtbase qttools qtmultimedia qtscript bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext (perl.withPackages (p: with p; [ GetoptLong - RpcXML TermShellUI ])) ] ++ lib.optional stdenv.isDarwin libiconv; cmakeFlags = [ - "-DUSE_ASPELL=ON" - "-DFREE_SPACE_BAR_C=ON" - "-DUSE_MINIUPNP=ON" - "-DLOCAL_MINIUPNP=ON" "-DDBUS_NOTIFY=ON" - "-DUSE_JS=ON" - "-DPERL_REGEX=ON" - "-DUSE_CLI_XMLRPC=ON" - "-DWITH_SOUNDS=ON" + "-DFREE_SPACE_BAR_C=ON" "-DLUA_SCRIPT=ON" + "-DPERL_REGEX=ON" + "-DUSE_ASPELL=ON" + "-DUSE_CLI_JSONRPC=ON" + "-DUSE_MINIUPNP=ON" + "-DUSE_JS=ON" "-DWITH_LUASCRIPTS=ON" + "-DWITH_SOUNDS=ON" ]; + postInstall = '' + ln -s $out/bin/$pname-qt $out/bin/$pname + ''; + preFixup = '' - substituteInPlace $out/bin/eiskaltdcpp-cli-xmlrpc \ + substituteInPlace $out/bin/eiskaltdcpp-cli-jsonrpc \ --replace "/usr/local" "$out" ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix index 3ceeb4b002..d80165c440 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.74"; + version = "2.81"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29"; + sha256 = "sha256-qwKxlmE59V+rXtuYWBMwD1O7OO4gb36lN8syFyQ6uLc="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 7242a1a7ff..a226085c51 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.31"; + version = "2.34"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-0s/hcRUuskU4TZqk5h4A51mkEJ6uUZS42mKDQvSx3I4="; + sha256 = "sha256-YQL9xx4dpT1psZqLiF5ojQcEY2EI0szWTS4oOPbG7Co="; }; - vendorSha256 = "sha256-QpGRQQbNchj0T9USRnALjvOGd2cV+JUgJeRgfjK8n5o="; + vendorSha256 = "sha256-8o/Y5SXMgDrid1a5KTQieiVrWce0wcgrhPbSsbravEI="; subPackages = [ "weed" ]; 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 7382e1aba4..58ff92b548 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "1g3sjkc6p9w3mm7lnr513zwjh7y945hx311b6g068q2lywisqf0x"; + sha256 = "0vdasz3qph73xb9y831bnr1hpcw0669n9zckqn95v1bsjc936313"; }; modRoot = "./agent"; - vendorSha256 = "1l8x9cvisjb8smnsg91v04j1vvawpjzp0lcq0ahw8slz8rfdm80c"; + vendorSha256 = "059772rd1l7zyf2vlqjm35hg8ibmjc1p6cfazqd47n8mqqlqkilw"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index 17c72e8a33..a586cea47a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.5"; + name = "homebank-5.5.1"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU="; + sha256 = "sha256-m7OeqtPExo0ry+IeL2xKUnTjo/OFr7Ky/3OuX9mY2gg="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index ea6fc1d777..75c6b57047 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -476,11 +476,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2020-09-29.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; - sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; + name = "language-subtag-registry-2020-12-18.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-12-18.tar.bz2"; + sha256 = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1"; md5 = ""; - md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; + md5name = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1-language-subtag-registry-2020-12-18.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -546,11 +546,11 @@ md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { - name = "libnumbertext-1.0.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.6.tar.xz"; - sha256 = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57"; + name = "libnumbertext-1.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz"; + sha256 = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc"; md5 = ""; - md5name = "739f220b34bf7cb731c09de2921771d644d37dfd276c45564401e5759f10ae57-libnumbertext-1.0.6.tar.xz"; + md5name = "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc-libnumbertext-1.0.7.tar.xz"; } { name = "ltm-1.0.zip"; @@ -735,11 +735,11 @@ md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz"; } { - name = "postgresql-9.2.24.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"; - sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126"; + name = "postgresql-13.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2"; + sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f"; md5 = ""; - md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; + md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2"; } { name = "Python-3.8.4.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 6fbc8c5cfc..ab320f0678 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "1"; - patch = "0"; - tweak = "3"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1rpk90g1g8m70nrj4lwkg50aiild73d29yjlgyrgg8wx6hzq7l4y"; + sha256 = "1vz028hzbc4n8jznigs419ygylz1vp426dprrkm62bzckv2p1rfn"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0m6cxyrxig8akv9183xdn6ialmjddicn676149nm506yc5y0szmi"; + sha256 = "1vidv8077f394zn87b2ng1hsld0hgr1zb1p9lmjx0n9k7s7clavh"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1kvsi28n8x3gxpiszxh84x05aw23i3z4id63pgw2s7mfclby52k9"; + sha256 = "14wn0lvvplsj194jdqqv184xx0adb4mm8bjflddvcqsl7xsfqx27"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/semantik/default.nix b/third_party/nixpkgs/pkgs/applications/office/semantik/default.nix new file mode 100644 index 0000000000..371dd52a84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/semantik/default.nix @@ -0,0 +1,90 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, wafHook +, pkg-config +, cmake +, qtbase +, python3 +, qtwebengine +, qtsvg +, ncurses6 +, kio +, kauth +, kiconthemes +, kconfigwidgets +, kxmlgui +, kcoreaddons +, kconfig +, kwidgetsaddons +, ki18n +, sonnet +, kdelibs4support +}: + +mkDerivation rec { + pname = "semantik"; + version = "1.2.5"; + + src = fetchFromGitLab { + owner = "ita1024"; + repo = "semantik"; + rev = "semantik-${version}"; + sha256 = "0dkg6mbnsbvbis17iz8v59wlhld93nc51abnkbyqvvkyyiqb006c"; + }; + + patches = [ ./qt5.patch ]; + + postPatch = '' + echo "${lib.getDev qtwebengine}" + substituteInPlace wscript \ + --replace @Qt5Base_dev@ "${lib.getDev qtbase}" \ + --replace @KF5KIOCore_dev@ "${lib.getDev kio}" \ + --replace @KF5Auth_dev@ "${lib.getDev kauth}" \ + --replace @KF5IconThemes_dev@ "${lib.getDev kiconthemes}" \ + --replace @KF5ConfigWidgets_dev@ "${lib.getDev kconfigwidgets}" \ + --replace @KF5XmlGui_dev@ "${lib.getDev kxmlgui}" \ + --replace @KF5CoreAddons_dev@ "${lib.getDev kcoreaddons}" \ + --replace @KF5Config_dev@ "${lib.getDev kconfig}" \ + --replace @KF5WidgetsAddons_dev@ "${lib.getDev kwidgetsaddons}" \ + --replace @KF5I18n_dev@ "${lib.getDev ki18n}" \ + --replace @KF5SonnetUi_dev@ "${lib.getDev sonnet}" \ + --replace @Qt5Svg@ "${qtsvg}" \ + --replace @Qt5Svg_dev@ "${lib.getDev qtsvg}" \ + --replace @Qt5WebEngine@ "${qtwebengine}" \ + --replace @Qt5WebEngine_dev@ "${lib.getDev qtwebengine}" \ + --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support" + ''; + + nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config wafHook cmake ]; + + buildInputs = [ + qtbase + qtwebengine + qtsvg + ncurses6 + kio + kauth + kiconthemes + kconfigwidgets + kxmlgui + kcoreaddons + kconfig + kwidgetsaddons + ki18n + sonnet + kdelibs4support + ]; + + wafConfigureFlags = [ + "--qtlibs=${lib.getLib qtbase}/lib" + ]; + + meta = with lib; { + description = "A mind-mapping application for KDE"; + license = licenses.mit; + homepage = "https://waf.io/semantik.html"; + maintainers = [ maintainers.shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/semantik/qt5.patch b/third_party/nixpkgs/pkgs/applications/office/semantik/qt5.patch new file mode 100644 index 0000000000..6d41babdff --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/semantik/qt5.patch @@ -0,0 +1,78 @@ +diff --color -ur a/wscript b/wscript +--- a/wscript 2020-08-17 19:49:43.389864343 +0200 ++++ b/wscript 2020-08-18 00:22:51.172556519 +0200 +@@ -149,6 +149,26 @@ + if not conf.env.QT_LRELEASE: conf.fatal('Semantik requires the program lrelease (from the Qt linguist package? - compilation only)') + conf.find_program('python3', var='PYTHON') + conf.load('python') ++ conf.env.HAVE_QT5SVG = 1 ++ conf.env.DEFINES_QT5SVG = [ 'QT_SVG_LIB' ] ++ conf.env.INCLUDES_QT5SVG = [ '@Qt5Svg_dev@/include/QtSvg' ] ++ conf.env.LIBPATH_QT5SVG = '@Qt5Svg@/lib' ++ conf.env.LIB_QT5SVG = [ 'Qt5Svg', 'Qt5Core', 'Qt5Gui', 'Qt5Widgets' ] ++ conf.env.HAVE_QT5WEBENGINEWIDGETS = 1 ++ conf.env.DEFINES_QT5WEBENGINEWIDGETS = [ 'QT_WEBENGINEWIDGETS_LIB' ] ++ conf.env.INCLUDES_QT5WEBENGINEWIDGETS = [ '@Qt5WebEngine_dev@/include/QtWebEngineWidgets' ] ++ conf.env.LIBPATH_QT5WEBENGINEWIDGETS = '@Qt5WebEngine@/lib' ++ conf.env.LIB_QT5WEBENGINEWIDGETS = [ ++ 'Qt5WebEngineWidgets', ++ 'Qt5Core', ++ 'Qt5Gui', ++ 'Qt5WebEngineCore', ++ 'Qt5Widgets', ++ 'Qt5Network', ++ 'Qt5Quick', ++ 'Qt5PrintSupport' ++ ] ++ print("conf.env.LIB_QT5SVG : ",conf.env) + if not conf.env.LIB_QT5SVG: conf.fatal('Could not find Qt5Svg - Semantik requires Qt >= 5') + if not conf.env.LIB_QT5WEBENGINEWIDGETS: conf.fatal('Could not find Qt5WebEngineWidgets - check `pkg-config --libs Qt5WebEngineWidgets`') + if not conf.env.LIB_QT5DBUS: conf.fatal('Install Qt Dbus') +@@ -186,7 +206,11 @@ + raise ValueError('Could not find QT_HOST_DATA') + + specpath = conf.cmd_and_log(conf.env.QMAKE + ['-query', 'QMAKE_SPEC'], quiet=0, stdout=True) ++ path = "@Qt5Base_dev@" ++ print("\n\n[log] specpath = ",specpath,"\n") ++ print("\n\n[log] path = ",path,"\n") + specpath = os.path.join(path, 'mkspecs', specpath.strip()) ++ print("\n\n[log] specpath = ",specpath,"\n") + if not os.path.exists(specpath): + raise ValueError('No spec path, cannot build') + +@@ -196,17 +220,28 @@ + + conf.env.append_value('INCLUDES_KDECORE', specpath) + +- libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets', +- 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui', +- 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore', +- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi'] ++ libs = { ++ 'KF5KIOCore': '@KF5KIOCore_dev@', ++ 'KF5Auth': '@KF5Auth_dev@', ++ 'KF5KIOWidgets': '@KF5KIOCore_dev@', ++ 'KF5IconThemes': '@KF5IconThemes_dev@', ++ 'KF5ConfigWidgets': '@KF5ConfigWidgets_dev@', ++ 'KF5XmlGui': '@KF5XmlGui_dev@', ++ 'KF5CoreAddons': '@KF5CoreAddons_dev@', ++ 'KF5ConfigGui': '@KF5Config_dev@', ++ 'KF5ConfigCore': '@KF5Config_dev@', ++ 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@', ++ 'KF5I18n': '@KF5I18n_dev@', ++ 'KF5SonnetUi': '@KF5SonnetUi_dev@', ++ } + +- for lib in libs: ++ for lib,mkspec_path in libs.items(): ++ print("[log] mkspec : ", mkspec_path) + name = lib[3:] + if not name.startswith('K') and name != 'SonnetUi': + name = 'K' + name +- +- p = '%s/qt_%s.pri' % (path, name) ++ p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name) ++ print("[log] path :",path,", name : ",name) + for line in Utils.readf(p).splitlines(): + lst = line.strip().split(' = ') + if lst[0].endswith('.name'): diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 1a4350ca71..21b6b1c579 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -1,17 +1,8 @@ -From 5be803a1171855f976a5b607970fa3949db72181 Mon Sep 17 00:00:00 2001 -From: Christian Kampka -Date: Mon, 9 Dec 2019 19:40:27 +0100 -Subject: [PATCH] Use console logger instead of rolling files - ---- - src/services/log.js | 26 +++----------------------- - 1 file changed, 3 insertions(+), 23 deletions(-) - diff --git a/src/services/log.js b/src/services/log.js -index 1514c209..456c3749 100644 +index b4c39e99..4c249154 100644 --- a/src/services/log.js +++ b/src/services/log.js -@@ -1,35 +1,15 @@ +@@ -1,14 +1,5 @@ "use strict"; -const fs = require('fs'); @@ -21,49 +12,50 @@ index 1514c209..456c3749 100644 - fs.mkdirSync(dataDir.LOG_DIR, 0o700); -} - --const logger = require('simple-node-logger').createRollingFileLogger({ -- errorEventName: 'error', -- logDirectory: dataDir.LOG_DIR, -- fileNamePattern: 'trilium-.log', -- dateFormat:'YYYY-MM-DD' --}); +-let logFile = null; - - function info(message) { - // info messages are logged asynchronously - setTimeout(() => { - console.log(message); + const SECOND = 1000; + const MINUTE = 60 * SECOND; + const HOUR = 60 * MINUTE; +@@ -16,41 +7,7 @@ const DAY = 24 * HOUR; + + const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n'; + +-let todaysMidnight = null; - -- logger.info(message); - }, 0); +-initLogFile(); +- +-function getTodaysMidnight() { +- const now = new Date(); +- +- return new Date(now.getFullYear(), now.getMonth(), now.getDate()); +-} +- +-function initLogFile() { +- todaysMidnight = getTodaysMidnight(); +- +- const path = dataDir.LOG_DIR + '/trilium-' + formatDate() + '.log'; +- +- if (logFile) { +- logFile.end(); +- } +- +- logFile = fs.createWriteStream(path, {flags: 'a'}); +-} +- +-function checkDate(millisSinceMidnight) { +- if (millisSinceMidnight >= DAY) { +- initLogFile(); +- } +-} +- + function log(str) { +- const millisSinceMidnight = Date.now() - todaysMidnight.getTime(); +- +- checkDate(millisSinceMidnight); +- +- logFile.write(formatTime(millisSinceMidnight) + ' ' + str + NEW_LINE); +- + console.log(str); } - function error(message) { - message = "ERROR: " + message; - -- // we're using .info() instead of .error() because simple-node-logger emits weird error for showError() -- // errors are logged synchronously to make sure it doesn't get lost in case of crash -- logger.info(message); -- - console.trace(message); - } - -@@ -45,12 +25,12 @@ function request(req) { - if (req.url.includes(".js.map") || req.url.includes(".css.map")) { - return; - } -- -- logger.info(req.method + " " + req.url); -+ if(process.env.DEBUG) -+ console.log(req.method + " " + req.url); - } - - module.exports = { - info, - error, - request --}; -\ No newline at end of file -+}; --- -2.23.0 - diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index cb0781f74e..4692828601 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook, zlib, libxkbfile }: +{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, wrapGAppsHook }: let description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; @@ -14,21 +14,21 @@ let meta = with lib; { inherit description; homepage = "https://github.com/zadam/trilium"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ emmanuelrosa dtzWill ]; + maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.43.4"; + version = "0.46.5"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0kjysam5alsmnj93fcqq1ivawnra42gn7dch99rrfmvbkxp7hhr8"; + sha256 = "157yp8375aviy77i42s7wdzc5igs7ll3v6vjzy30l8i5zis7hry2"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "128mvmp15mjpb5ipkmr0yn7ahby26shbix3f8q094f4zpxjp83zx"; + sha256 = "0bc1p99hr12pj94z48wwdbiw4cwpq3sanxaadbc8vxiyb4mcv706"; }; in { @@ -58,6 +58,7 @@ in { buildInputs = atomEnv.packages ++ [ gtk3 ]; installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/share/trilium mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} @@ -67,6 +68,7 @@ in { ln -s ${trilium_svg} $out/share/icons/hicolor/scalable/apps/trilium.svg cp ${desktopItem}/share/applications/* $out/share/applications + runHook postInstall ''; # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) @@ -91,16 +93,20 @@ in { buildInputs = [ stdenv.cc.cc.lib - zlib - libxkbfile ]; - patches = [ ./0001-Use-console-logger-instead-of-rolling-files.patch ] ; + patches = [ + # patch logger to use console instead of rolling files + ./0001-Use-console-logger-instead-of-rolling-files.patch + ]; + installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/share/trilium-server cp -r ./* $out/share/trilium-server + runHook postInstall ''; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/btlejack/default.nix b/third_party/nixpkgs/pkgs/applications/radio/btlejack/default.nix new file mode 100644 index 0000000000..198c090b0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/btlejack/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchFromGitHub, pyserial, halo }: + +buildPythonApplication rec { + pname = "btlejack"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "virtualabs"; + repo = "btlejack"; + rev = "v${version}"; + sha256 = "1r17079kx7dvsrbmw5sgvz3vj5m3pn2543gxj2xmw4s0lcihy378"; + }; + + postPatch = '' + sed -i "s|^.*'argparse',$||" setup.py + ''; + + propagatedBuildInputs = [ pyserial halo ]; + + meta = with lib; { + homepage = "https://github.com/virtualabs/btlejack"; + description = "Bluetooth Low Energy Swiss-army knife"; + license = licenses.mit; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix index 8d9ea7a391..74a6b49558 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.56"; + version = "2.57"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "0z83p3ifdkv5dds8s6fqqbycql1zmgppdc7ygqmm12z5zlrl9p12"; + sha256 = "sha256-kx/WqtNDaJQyVehxZ3weddXyaM1knX+fCuv47A9GaH0="; }; nativeBuildInputs = [ pkg-config file ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index 93e8e62ac7..bb523cddd1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.34"; + version = "14.31.35"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-i+c4qS/IdLDPHk5ZHRhjOwkdvh8srU/mhOiHIkCN5Vo="; + sha256 = "sha256-uB7d27eicfmE1TpjLAxUoC8LBYAOrg3B48M1/CxWZdg="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gnucap/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gnucap/default.nix new file mode 100644 index 0000000000..c51e5de93d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gnucap/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "gnucap"; + version = "20210107"; + + src = fetchurl { + url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz"; + sha256 = "12rlwd4mfc54qq1wrx5k8qk578xls5z4isf94ybkf2z6qxk4mhnj"; + }; + + doCheck = true; + + meta = with lib; { + description = "Gnu Circuit Analysis Package"; + longDescription = '' +Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives. +It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis. + ''; + homepage = "http://www.gnucap.org/"; + changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.raboof ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index 2ac5a7dd67..560e8dd733 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -8,7 +8,7 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses -, buildIde ? !(stdenv.isDarwin && lib.versionAtLeast version "8.10") +, buildIde ? true , glib, gnome3, wrapGAppsHook , csdp ? null , version, coq-version ? null, diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix index 822cb0a2bd..245ddcedee 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix @@ -32,6 +32,7 @@ , ntl , numpy , pari +, pkgconfig # the python module, not the pkg-config alias , pkg-config , planarity , ppl @@ -85,6 +86,7 @@ buildPythonPackage rec { cypari2 jinja2 numpy + pkgconfig boost arb brial diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index 89bdc41554..25215d7abb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.06.6"; + version = "21.02.0"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w"; + sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix new file mode 100644 index 0000000000..af252da04f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/networking/sumo/default.nix @@ -0,0 +1,68 @@ +{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal, + git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, + libpng, libtiff, openscenegraph , proj, python3, python37Packages, + stdenv, swig, xercesc, xorg, zlib }: + +stdenv.mkDerivation rec { + pname = "sumo"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "eclipse"; + repo = "sumo"; + rev = "v${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1w9im1zz8xnkdwmv4v11kn1xcqm889268g1fw4y2s9f6shi41mxx"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + git + swig + ]; + + buildInputs = [ + bzip2 + eigen + ffmpeg + fox_1_6 + gdal + gl2ps + gpp + gtest + jdk + libGL + libGLU + libX11 + libjpeg + libpng + libtiff + openscenegraph + proj + python37Packages.setuptools + xercesc + zlib + python3 + ] ++ (with xorg; [ + libXcursor + libXext + libXfixes + libXft + libXrandr + libXrender + ]); + + meta = with lib; { + description = "The SUMO traffic simulator"; + longDescription = '' + Eclipse SUMO is an open source, highly + portable, microscopic and continuous traffic simulation package + designed to handle large networks. It allows for intermodal + simulation including pedestrians and comes with a large set of + tools for scenario creation. + ''; + homepage = "https://github.com/eclipse/sumo"; + license = licenses.epl20; + maintainers = with maintainers; [ mtreca ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index 63642af708..2631bae57e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -21,19 +21,21 @@ }: let - version = "1.6.4"; + version = "1.7.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result # and avoid unnecessary rebuilds as it can take relatively long # to generate + # + # For every bump, make sure that the hash is still accurate. stimulusGenerator = stdenv.mkDerivation { pname = "foot-generate-alt-random-writes"; inherit version; src = fetchurl { url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; - sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz"; + sha256 = "019bdiqfi3wx2lwrv3nhq83knc1r3lmqd5zgisa33wwshm2kyv7p"; }; dontUnpack = true; @@ -87,7 +89,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "0awv53l3039s1rnkhdkzc0gwawlnd1m8cl4qhaijhxzzq68w0dfb"; + sha256 = "0w07fw7y31g891335ji3fm783r4dsk5py82qp0zx6z3rfr07paby"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index c9570bb134..cc36dc9ff5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -9,11 +9,11 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.4"; + version = "1.13.5"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-Q9wM+TGgE9oFFzg6516bG7iFNjhxOxPMLKtTHghA/OU="; + sha256 = "08c5gp4qp65mnq4ggzfmyc7n3zcp0js86fz4nj5p249zs9vn1ypd"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index b3a5d25c93..df9f225536 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.8.6", - "repo_hash": "0izzvr4bw86nbrqkf44gkcf63ham10cw4vp5yk0ylgm7w0kimv8v", + "version": "13.9.4", + "repo_hash": "0gwxjmph3ac5v0h5zz8664412yq09cka5p4amdbxk7hna24igksz", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.8.6-ee", + "rev": "v13.9.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.8.6", - "GITLAB_PAGES_VERSION": "1.34.0", - "GITLAB_SHELL_VERSION": "13.15.1", - "GITLAB_WORKHORSE_VERSION": "8.59.2" + "GITALY_SERVER_VERSION": "13.9.4", + "GITLAB_PAGES_VERSION": "1.35.0", + "GITLAB_SHELL_VERSION": "13.17.0", + "GITLAB_WORKHORSE_VERSION": "8.63.2" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 1a9f3ea8fd..d2b3d2ea0e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,23 +1,23 @@ source 'https://rubygems.org' -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.4' gem 'rdoc', '~> 6.0' -gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false -gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false +gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false +gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.3.gitlab.1', require: false gem 'grpc', '~> 1.30.2' gem 'sentry-raven', '~> 3.0', require: false gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.13.2' +gem 'gitlab-labkit', '~> 0.15.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE -gem 'licensee', '~> 8.9.0' +gem 'licensee', '~> 9.14.1' gem 'google-protobuf', '~> 3.12' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index acfc05c874..83c5f20f73 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -24,6 +24,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) ast (2.4.1) binding_ninja (0.2.3) builder (3.2.4) @@ -35,8 +37,9 @@ GEM concurrent-ruby (1.1.7) crass (1.0.6) diff-lcs (1.3) + dotenv (2.7.6) equalizer (0.0.11) - erubi (1.9.0) + erubi (1.10.0) escape_utils (1.2.1) factory_bot (5.0.2) activesupport (>= 4.2.0) @@ -51,23 +54,24 @@ GEM mini_mime (~> 1.0) rugged (>= 0.25.1) github-markup (1.7.0) - gitlab-gollum-lib (4.2.7.9) + gitlab-gollum-lib (4.2.7.10.gitlab.1) gemojione (~> 3.2) github-markup (~> 1.6) - gitlab-gollum-rugged_adapter (~> 0.4.4.2) + gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1) nokogiri (>= 1.6.1, < 2.0) rouge (~> 3.1) sanitize (~> 4.6.4) stringex (~> 2.6) - gitlab-gollum-rugged_adapter (0.4.4.2) + gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1) mime-types (>= 1.15) - rugged (~> 0.25) - gitlab-labkit (0.13.2) - actionpack (>= 5.0.0, < 6.1.0) - activesupport (>= 5.0.0, < 6.1.0) + rugged (~> 1.0) + gitlab-labkit (0.15.0) + actionpack (>= 5.0.0, < 7.0.0) + activesupport (>= 5.0.0, < 7.0.0) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) + pg_query (~> 1.3) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) google-protobuf (3.12.4) @@ -83,10 +87,14 @@ GEM jaeger-client (1.1.0) opentracing (~> 0.3) thrift - json (2.3.1) - licensee (8.9.2) - rugged (~> 0.24) - loofah (2.8.0) + json (2.5.1) + licensee (9.14.1) + dotenv (~> 2.0) + octokit (~> 4.17) + reverse_markdown (~> 1.0) + rugged (>= 0.24, < 2.0) + thor (>= 0.19, < 2.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -94,7 +102,7 @@ GEM method_source (0.9.2) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_mime (1.0.2) mini_portile2 (2.5.0) minitest (5.14.2) @@ -105,11 +113,15 @@ GEM racc (~> 1.4) nokogumbo (1.5.0) nokogiri + octokit (4.20.0) + faraday (>= 0.9) + sawyer (~> 0.8.0, >= 0.5.3) opentracing (0.5.0) optimist (3.0.1) parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) + pg_query (1.3.0) proc_to_ast (0.1.0) coderay parser @@ -118,6 +130,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) + public_suffix (4.0.6) racc (1.5.2) rack (2.2.3) rack-test (1.1.0) @@ -133,8 +146,10 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.2.0) - redis (4.1.3) + redis (4.2.5) regexp_parser (1.8.1) + reverse_markdown (1.4.0) + nokogiri rexml (3.2.4) rouge (3.26.0) rspec (3.8.0) @@ -168,16 +183,20 @@ GEM rubocop-ast (0.2.0) parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - rugged (0.28.4.1) + rugged (1.0.1) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) + sawyer (0.8.2) + addressable (>= 2.3.5) + faraday (> 0.8, < 2.0) sentry-raven (3.0.4) faraday (>= 1.0) stringex (2.8.5) + thor (1.1.0) thread_safe (0.3.6) - thrift (0.11.0.0) + thrift (0.13.0) timecop (0.9.1) tzinfo (1.2.9) thread_safe (~> 0.1) @@ -200,21 +219,21 @@ DEPENDENCIES factory_bot faraday (~> 1.0) github-linguist (~> 7.12) - gitlab-gollum-lib (~> 4.2.7.9) - gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.13.2) + gitlab-gollum-lib (~> 4.2.7.10.gitlab.1) + gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1) + gitlab-labkit (~> 0.15.0) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.12) grpc (~> 1.30.2) grpc-tools (= 1.30.2) - licensee (~> 8.9.0) + licensee (~> 9.14.1) pry (~> 0.12.2) rbtrace rdoc (~> 6.0) rspec rspec-parameterized rubocop (~> 0.69) - rugged (~> 0.28) + rugged (~> 1.0.1) sentry-raven (~> 3.0) timecop diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index db2ac513b2..37e97522fa 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,7 +33,7 @@ let }; }; in buildGoModule rec { - version = "13.8.6"; + version = "13.9.4"; pname = "gitaly"; src = fetchFromGitLab { @@ -43,7 +43,7 @@ in buildGoModule rec { sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A="; }; - vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM="; + vendorSha256 = "10ssx0dvbzg70vr2sgnhzijnjxfw6533wdjxwakj62rpfayklp51"; passthru = { inherit rubyEnv; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9159b62c8d..7b4928918f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -49,6 +49,17 @@ }; version = "0.2.0"; }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; ast = { groups = ["default" "development" "test"]; platforms = []; @@ -134,6 +145,16 @@ }; version = "1.3"; }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; equalizer = { source = { remotes = ["https://rubygems.org"]; @@ -147,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; escape_utils = { source = { @@ -226,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y21k8bix3h2qdys2kz2z831cclmx3zc15x67cp8s945dkmh39sj"; + sha256 = "0r6smbqnh0m84fxwb2g11qjfbcsljfin4vhnf43nmmbql2l1i3ah"; type = "gem"; }; - version = "4.2.7.9"; + version = "4.2.7.10.gitlab.1"; }; gitlab-gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -237,21 +258,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4"; + sha256 = "0rqi9h6k32azljmx2q0zibvs1m59wgh879h04jflxkcqyzj6wyyj"; type = "gem"; }; - version = "0.4.4.2"; + version = "0.4.4.3.gitlab.1"; }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgd61xdclihifcdivddfs1gipxy1ql0kf9q47k9h0xisscyjhd2"; + sha256 = "1l9bsjszp5zyzbdsr9ls09d4yr2sb0xjc40x4rv7fbzk19n9xs71"; type = "gem"; }; - version = "0.13.2"; + version = "0.15.0"; }; gitlab-markup = { groups = ["default"]; @@ -336,23 +357,25 @@ version = "1.1.0"; }; json = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; licensee = { - dependencies = ["rugged"]; + dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; + sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5"; type = "gem"; }; - version = "8.9.2"; + version = "9.14.1"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -360,10 +383,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; + sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -398,10 +421,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; mini_mime = { groups = ["default"]; @@ -473,6 +496,17 @@ }; version = "1.5.0"; }; + octokit = { + dependencies = ["faraday" "sawyer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; + type = "gem"; + }; + version = "4.20.0"; + }; opentracing = { groups = ["default"]; platforms = []; @@ -514,6 +548,16 @@ }; version = "2.7.2.0"; }; + pg_query = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf"; + type = "gem"; + }; + version = "1.3.0"; + }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; source = { @@ -540,6 +584,16 @@ }; version = "0.12.2"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; racc = { groups = ["default"]; platforms = []; @@ -627,10 +681,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh"; + sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48"; type = "gem"; }; - version = "4.1.3"; + version = "4.2.5"; }; regexp_parser = { groups = ["default" "development" "test"]; @@ -642,6 +696,17 @@ }; version = "1.8.1"; }; + reverse_markdown = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + type = "gem"; + }; + version = "1.4.0"; + }; rexml = { groups = ["default" "development" "test"]; platforms = []; @@ -764,10 +829,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx"; + sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn"; type = "gem"; }; - version = "0.28.4.1"; + version = "1.0.1"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; @@ -778,6 +843,17 @@ }; version = "4.6.6"; }; + sawyer = { + dependencies = ["addressable" "faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + type = "gem"; + }; + version = "0.8.2"; + }; sentry-raven = { dependencies = ["faraday"]; groups = ["default"]; @@ -799,6 +875,16 @@ }; version = "2.8.5"; }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + type = "gem"; + }; + version = "1.1.0"; + }; thread_safe = { source = { remotes = ["https://rubygems.org"]; @@ -812,10 +898,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q"; type = "gem"; }; - version = "0.11.0.0"; + version = "0.13.0"; }; timecop = { source = { @@ -867,4 +953,4 @@ }; version = "2.4.2"; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index dcd24bab3c..c86c63a565 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.15.1"; + version = "13.17.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 05be0e1681..64e1668ba0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.59.2"; + version = "8.63.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "sha256-hMcE7dlUw34DyUO0v5JxwvvEh/HC2emrIKc1K1U4bPE="; + sha256 = "1vjk7r7228p2gblx9nmqiz70ckbllg1p3bwkyfd4m49jhp13hryi"; }; - vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; + vendorSha256 = "0hc02nxw5jp1mhpjcx1f2a2dfaq7ji4qkf5g7lbpd1rzhqwp6zsz"; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 23b58d721f..ec253c37b3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -1,3 +1,5 @@ +# frozen_string_literal: true + source 'https://rubygems.org' gem 'rails', '~> 6.0.3.1' @@ -10,12 +12,12 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'default_value_for', '~> 3.3.0' +gem 'default_value_for', '~> 3.4.0' # Supported DBs gem 'pg', '~> 1.1' -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0.1' gem 'grape-path-helpers', '~> 1.6.1' gem 'faraday', '~> 1.0' @@ -25,8 +27,8 @@ gem 'marginalia', '~> 1.10.0' gem 'devise', '~> 4.7.2' # TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) gem 'bcrypt', '3.1.12' -gem 'doorkeeper', '~> 5.3.0' -gem 'doorkeeper-openid_connect', '~> 1.7.4' +gem 'doorkeeper', '~> 5.5.0.rc2' +gem 'doorkeeper-openid_connect', '~> 1.7.5' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' @@ -81,7 +83,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap', '~> 0.16.3' # API -gem 'grape', '~> 1.5.1' +gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' @@ -103,7 +105,7 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.11.0' +gem 'hamlit', '~> 2.14.4' # Files attachments gem 'carrierwave', '~> 1.3' @@ -154,7 +156,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'asciidoctor-kroki', '~> 0.2.2', require: false +gem 'asciidoctor-kroki', '~> 0.4.0', require: false gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' @@ -266,7 +268,7 @@ gem 'babosa', '~> 1.0.2' gem 'loofah', '~> 2.2' # Working with license -gem 'licensee', '~> 8.9' +gem 'licensee', '~> 9.14.1' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.7' @@ -284,6 +286,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2' gem 'rack-proxy', '~> 0.6.0' gem 'sassc-rails', '~> 2.1.0' +gem 'autoprefixer-rails', '10.2.0.0' gem 'terser', '1.0.2' gem 'addressable', '~> 2.7' @@ -292,7 +295,7 @@ gem 'gon', '~> 6.2' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' -gem "gitlab-license", "~> 1.0" +gem "gitlab-license", "~> 1.3" # Protect against bruteforcing gem 'rack-attack', '~> 6.3.0' @@ -339,6 +342,7 @@ end group :development do gem 'brakeman', '~> 4.2', require: false gem 'danger', '~> 8.0.6', require: false + gem 'lefthook', '~> 0.7', require: false gem 'letter_opener_web', '~> 1.3.4' @@ -346,12 +350,12 @@ group :development do gem 'better_errors', '~> 2.7.1' # thin instead webrick - gem 'thin', '~> 1.7.0' + gem 'thin', '~> 1.8.0' end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'bullet', '~> 6.1.0' + gem 'bullet', '~> 6.1.3' gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext'] gem 'pry-rails', '~> 0.3.9' gem 'pry-remote' @@ -360,7 +364,7 @@ group :development, :test do gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 6.1.0' - gem 'rspec-rails', '~> 4.0.1' + gem 'rspec-rails', '~> 4.0.2' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' @@ -375,7 +379,7 @@ group :development, :test do gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false - gem 'bundler-audit', '~> 0.6.1', require: false + gem 'bundler-audit', '~> 0.7.0.1', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -465,7 +469,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.8.0.pre.rc2' +gem 'gitaly', '~> 13.9.0.pre.rc1' gem 'grpc', '~> 1.30.2' @@ -478,7 +482,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' -gem 'gitlab-experiment', '~> 0.4.5' +gem 'gitlab-experiment', '~> 0.4.9' # Structured logging gem 'lograge', '~> 0.5' @@ -520,3 +524,5 @@ gem 'webauthn', '~> 2.3' # IPAddress utilities gem 'ipaddress', '~> 0.8.3' + +gem 'parslet', '~> 1.8' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 26a757a768..1b6701e8e3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -81,10 +81,10 @@ GEM faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.4) - asciidoctor (2.0.10) + asciidoctor (2.0.12) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.2.2) + asciidoctor-kroki (0.4.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) @@ -94,6 +94,8 @@ GEM attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.1) + autoprefixer-rails (10.2.0.0) + execjs awesome_print (1.8.0) awrence (1.1.1) aws-eventstream (1.1.0) @@ -145,12 +147,12 @@ GEM brakeman (4.2.1) browser (4.2.0) builder (3.2.4) - bullet (6.1.0) + bullet (6.1.3) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - bundler-audit (0.6.1) + bundler-audit (0.7.0.1) bundler (>= 1.2.0, < 3) - thor (~> 0.18) + thor (>= 0.18, < 2) byebug (11.1.3) capybara (3.34.0) addressable @@ -205,7 +207,7 @@ GEM git css_parser (1.7.0) addressable - daemons (1.2.6) + daemons (1.3.1) danger (8.0.6) claide (~> 1.0) claide-plugins (>= 0.9.2) @@ -225,8 +227,8 @@ GEM html-pipeline declarative (0.0.20) declarative-option (0.1.0) - default_value_for (3.3.0) - activerecord (>= 3.2.0, < 6.1) + default_value_for (3.4.0) + activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) derailed_benchmarks (1.8.1) @@ -260,11 +262,12 @@ GEM docile (1.3.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.3.3) + doorkeeper (5.5.0.rc2) railties (>= 5) - doorkeeper-openid_connect (1.7.4) + doorkeeper-openid_connect (1.7.5) doorkeeper (>= 5.2, < 5.5) json-jwt (>= 1.11.0) + dotenv (2.7.6) dry-configurable (0.12.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5.0) @@ -417,12 +420,12 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.8.0.pre.rc2) + gitaly (13.9.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-experiment (0.4.5) + gitlab-experiment (0.4.9) activesupport (>= 3.0) scientist (~> 1.5, >= 1.5.0) gitlab-fog-azure-rm (1.0.0) @@ -440,7 +443,7 @@ GEM jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) - gitlab-license (1.0.0) + gitlab-license (1.3.0) gitlab-mail_room (0.0.8) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) @@ -492,7 +495,7 @@ GEM signet (~> 0.14) gpgme (2.0.20) mini_portile2 (~> 2.3) - grape (1.5.1) + grape (1.5.2) activesupport builder dry-types (>= 1.1) @@ -557,7 +560,7 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.11.0) + hamlit (2.14.4) temple (>= 0.8.2) thor tilt @@ -658,6 +661,7 @@ GEM rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) + lefthook (0.7.2) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (1.3.4) @@ -671,8 +675,12 @@ GEM toml (= 0.2.0) with_env (= 1.1.0) xml-simple - licensee (8.9.2) - rugged (~> 0.24) + licensee (9.14.1) + dotenv (~> 2.0) + octokit (~> 4.17) + reverse_markdown (~> 1.0) + rugged (>= 0.24, < 2.0) + thor (>= 0.19, < 2.0) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -753,7 +761,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.15.0) + octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) oj (3.10.6) @@ -987,6 +995,8 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) + reverse_markdown (1.4.0) + nokogiri rexml (3.2.4) rinku (2.0.0) rotp (2.1.2) @@ -999,12 +1009,12 @@ GEM rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) + rspec-core (3.10.1) rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) + rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-parameterized (0.4.2) @@ -1013,17 +1023,17 @@ GEM proc_to_ast rspec (>= 2.13, < 4) unparser - rspec-rails (4.0.1) + rspec-rails (4.0.2) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) - rspec-core (~> 3.9) - rspec-expectations (~> 3.9) - rspec-mocks (~> 3.9) - rspec-support (~> 3.9) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) rspec-retry (0.6.1) rspec-core (> 3.3) - rspec-support (3.10.0) + rspec-support (3.10.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.6) @@ -1069,7 +1079,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (2.0.0) - rugged (0.28.4.1) + rugged (1.0.1) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) @@ -1170,11 +1180,11 @@ GEM execjs (>= 0.3.0, < 3) test-prof (0.12.0) text (1.3.1) - thin (1.7.2) + thin (1.8.0) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.20.3) + thor (1.1.0) thread_safe (0.3.6) thrift (0.14.0) tilt (2.0.10) @@ -1281,10 +1291,11 @@ DEPENDENCIES asana (~> 0.10.3) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-kroki (~> 0.2.2) + asciidoctor-kroki (~> 0.4.0) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) + autoprefixer-rails (= 10.2.0.0) awesome_print aws-sdk-cloudformation (~> 1) aws-sdk-core (~> 3) @@ -1301,8 +1312,8 @@ DEPENDENCIES bootstrap_form (~> 4.2.0) brakeman (~> 4.2) browser (~> 4.2) - bullet (~> 6.1.0) - bundler-audit (~> 0.6.1) + bullet (~> 6.1.3) + bundler-audit (~> 0.7.0.1) capybara (~> 3.34.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) @@ -1316,7 +1327,7 @@ DEPENDENCIES danger (~> 8.0.6) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) - default_value_for (~> 3.3.0) + default_value_for (~> 3.4.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks device_detector @@ -1325,8 +1336,8 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.3) discordrb-webhooks-blackst0ne (~> 3.3) - doorkeeper (~> 5.3.0) - doorkeeper-openid_connect (~> 1.7.4) + doorkeeper (~> 5.5.0.rc2) + doorkeeper-openid_connect (~> 1.7.5) ed25519 (~> 1.2) elasticsearch-api (~> 6.8.2) elasticsearch-model (~> 6.1) @@ -1357,13 +1368,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.8.0.pre.rc2) + gitaly (~> 13.9.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-experiment (~> 0.4.5) + gitlab-experiment (~> 0.4.9) gitlab-fog-azure-rm (~> 1.0) gitlab-labkit (= 0.14.0) - gitlab-license (~> 1.0) + gitlab-license (~> 1.3) gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) @@ -1376,7 +1387,7 @@ DEPENDENCIES google-api-client (~> 0.33) google-protobuf (~> 3.12) gpgme (~> 2.0.19) - grape (~> 1.5.1) + grape (~> 1.5.2) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.6.1) grape_logging (~> 1.7) @@ -1388,7 +1399,7 @@ DEPENDENCIES gssapi guard-rspec haml_lint (~> 0.36.0) - hamlit (~> 2.11.0) + hamlit (~> 2.14.4) hangouts-chat (~> 0.0.5) hashie hashie-forbidden_attributes @@ -1410,9 +1421,10 @@ DEPENDENCIES knapsack (~> 1.17) kramdown (~> 2.3.0) kubeclient (~> 4.9.1) + lefthook (~> 0.7) letter_opener_web (~> 1.3.4) license_finder (~> 6.0) - licensee (~> 8.9) + licensee (~> 9.14.1) lockbox (~> 0.3.3) lograge (~> 0.5) loofah (~> 2.2) @@ -1452,6 +1464,7 @@ DEPENDENCIES omniauth_openid_connect (~> 0.3.5) org-ruby (~> 0.9.12) parallel (~> 1.19) + parslet (~> 1.8) peek (~> 1.1) pg (~> 1.1) pg_query (~> 1.3.0) @@ -1487,7 +1500,7 @@ DEPENDENCIES rouge (~> 3.26.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized - rspec-rails (~> 4.0.1) + rspec-rails (~> 4.0.2) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) @@ -1496,7 +1509,7 @@ DEPENDENCIES ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) - rugged (~> 0.28) + rugged (~> 1.0.1) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) scss_lint (~> 0.59.0) @@ -1521,7 +1534,7 @@ DEPENDENCIES sys-filesystem (~> 1.1.6) terser (= 1.0.2) test-prof (~> 0.12.0) - thin (~> 1.7.0) + thin (~> 1.8.0) thrift (>= 0.14.0) timecop (~> 0.9.1) toml-rb (~> 1.0.0) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index d13ca29863..64d38a9a27 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -242,10 +242,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; + sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.12"; }; asciidoctor-include-ext = { dependencies = ["asciidoctor"]; @@ -264,10 +264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5"; + sha256 = "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w"; type = "gem"; }; - version = "0.2.2"; + version = "0.4.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -322,6 +322,17 @@ }; version = "1.0.1"; }; + autoprefixer-rails = { + dependencies = ["execjs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p9j0sxw0nm27x7wj0n8a9zikwb0v8b6varr601rcgymsjj2v7wy"; + type = "gem"; + }; + version = "10.2.0.0"; + }; awesome_print = { groups = ["development" "test"]; platforms = []; @@ -599,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9"; + sha256 = "04wm807czdixpgnqp446vj8vc7dj96k26p90rmwll9ahlib37mmm"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.3"; }; bundler-audit = { dependencies = ["thor"]; @@ -610,10 +621,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq"; + sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j"; type = "gem"; }; - version = "0.6.1"; + version = "0.7.0.1"; }; byebug = { groups = ["default" "development" "test"]; @@ -910,10 +921,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; + sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; type = "gem"; }; - version = "1.2.6"; + version = "1.3.1"; }; danger = { dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; @@ -987,10 +998,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08hwnnqm3bxd4n627isliq79zysdlmfkf813403v0b4mkhika5my"; + sha256 = "03zln3mp8wa734jl7abd6gby08xq8j6n4y2phzxfsssscx8xrlim"; type = "gem"; }; - version = "3.3.0"; + version = "3.4.0"; }; deprecation_toolkit = { dependencies = ["activesupport"]; @@ -1114,10 +1125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01scvhvrw44ksv1aaywpp9kfm4c8qs4gwnnha40r5mq0vpc0qrny"; + sha256 = "1mdjnw5n2r3hclg4gmzx19w750sdcxw9y6dhcawbzb9wrbzj58wk"; type = "gem"; }; - version = "5.3.3"; + version = "5.5.0.rc2"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; @@ -1125,10 +1136,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yylcg4j7msxma0s8rx8990bfgr0c414a7vafs3gpgmbwy47wq45"; + sha256 = "1cj7b45lxiifi6pw8gnylfzlhji572v0pj896rbyqjwyzlgj1sid"; type = "gem"; }; - version = "1.7.4"; + version = "1.7.5"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; }; dry-configurable = { dependencies = ["concurrent-ruby" "dry-core"]; @@ -1798,10 +1819,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kns9lw8gdxm61vyvf3jin448zrl2h3qdx2ggilzxig28hdi0vha"; + sha256 = "137gr4nbxhcyh4s60r2z0js8q2bfnmxiggwnf122wp9csywlnyg2"; type = "gem"; }; - version = "13.8.0.pre.rc2"; + version = "13.9.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1830,10 +1851,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v8ygrc2c98rz72za59g313n1mmr18jdbzr965lkp2zv2rw7cs9n"; + sha256 = "0skqg90i6qdpm7dhy8bv99gk8siwgm6mpr675790ngri1ns4f5xk"; type = "gem"; }; - version = "0.4.5"; + version = "0.4.9"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1862,10 +1883,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih"; + sha256 = "04846kr8pw0fkw4mavakai978raq5d2kjna4rawxpc3dqlr897g4"; type = "gem"; }; - version = "1.0.0"; + version = "1.3.0"; }; gitlab-mail_room = { groups = ["default"]; @@ -2059,10 +2080,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lizcma35sygkd3q7zjv13mrr905ncn80f1ym6n305s75kc0pk9n"; + sha256 = "0adf01kihxbmh8q84r6zyfgdmpbyb0lwcar3fi8j6bl6qcsbgwqx"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2233,10 +2254,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13wkrvyldk21xlc9illam495fpgf7w7bksaj8y6n00y036wmbg60"; + sha256 = "1gjbdni9jdpsdahrx2q7cvrc6jkrzpf9rdi0rli8mdvwi9xjafz5"; type = "gem"; }; - version = "2.11.0"; + version = "2.14.4"; }; hana = { groups = ["default"]; @@ -2705,6 +2726,16 @@ }; version = "2.4.3"; }; + lefthook = { + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17bv6zfdzwbbh8n0iw8zgjngsvyp2imrrfshj62yrlxpka9ka0z3"; + type = "gem"; + }; + version = "0.7.2"; + }; letter_opener = { dependencies = ["launchy"]; groups = ["default" "development"]; @@ -2739,15 +2770,15 @@ version = "6.0.0"; }; licensee = { - dependencies = ["rugged"]; + dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; + sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5"; type = "gem"; }; - version = "8.9.2"; + version = "9.14.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -3236,10 +3267,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yg6dhd028j74sm8hpw9w7bwfwlkml9wiis7nq20ivfsbcz4g8ac"; + sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq"; type = "gem"; }; - version = "4.15.0"; + version = "4.20.0"; }; oj = { groups = ["default"]; @@ -4260,6 +4291,17 @@ }; version = "3.1.2"; }; + reverse_markdown = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + type = "gem"; + }; + version = "1.4.0"; + }; rexml = { groups = ["default" "development" "test"]; platforms = []; @@ -4339,10 +4381,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n2rdv8f26yw8c6asymc0mgddyr5d2b5n6mfvpd3n6lnpf1jdyv2"; + sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4350,10 +4392,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j37dvnvfbjwj8dqx27yfvz0frl7f2jc1abqg99h0ppriz9za6dc"; + sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.1"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -4361,10 +4403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pz89y1522i6f8wzrg72ykmch3318ih87nlpl0y1ghsrs5hqymw3"; + sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.2"; }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; @@ -4383,10 +4425,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs"; + sha256 = "0aw5knjij21kzwis3vkcmqc16p55lbig1wq0i37093qga7zfsdg1"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.2"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -4404,10 +4446,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j0n28i6zci5j7gg370bdy87dy43hlwx6dw428d9kamf5a0i2klz"; + sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl"; type = "gem"; }; - version = "3.10.0"; + version = "3.10.2"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -4616,10 +4658,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx"; + sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn"; type = "gem"; }; - version = "0.28.4.1"; + version = "1.0.1"; }; safe_yaml = { groups = ["default" "test"]; @@ -5124,20 +5166,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; + sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5"; type = "gem"; }; - version = "1.7.2"; + version = "1.8.0"; }; thor = { groups = ["default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "0.20.3"; + version = "1.1.0"; }; thread_safe = { groups = ["default" "development" "test"]; @@ -5590,4 +5632,4 @@ }; version = "2.4.2"; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix index a9e255417d..916f5f6027 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -770,19 +770,27 @@ }; } { - name = "_gitlab_at.js___at.js_1.5.5.tgz"; + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; path = fetchurl { - name = "_gitlab_at.js___at.js_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.5.tgz"; - sha1 = "5f6bfe6baaef360daa9b038fa78798d7a6a916b4"; + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; + name = "_gitlab_at.js___at.js_1.5.7.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-6.0.0.tgz"; - sha1 = "deb18f63808af1cb1cc117a92558f07edb1e2256"; + name = "_gitlab_at.js___at.js_1.5.7.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz"; + sha1 = "1ee6f838cc4410a1d797770934df91d90df8179e"; + }; + } + { + name = "_gitlab_eslint_plugin___eslint_plugin_8.0.0.tgz"; + path = fetchurl { + name = "_gitlab_eslint_plugin___eslint_plugin_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.0.0.tgz"; + sha1 = "e8d30fd98e2102f417617d0c60ef1810520a8ac6"; }; } { @@ -794,11 +802,11 @@ }; } { - name = "_gitlab_svgs___svgs_1.178.0.tgz"; + name = "_gitlab_svgs___svgs_1.182.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.178.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.178.0.tgz"; - sha1 = "069edb8abb4c7137d48f527592476655f066538b"; + name = "_gitlab_svgs___svgs_1.182.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.182.0.tgz"; + sha1 = "600cb577c598ff63325c3f6f049e3254abdbb580"; }; } { @@ -810,11 +818,11 @@ }; } { - name = "_gitlab_ui___ui_25.11.3.tgz"; + name = "_gitlab_ui___ui_27.4.6.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_25.11.3.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-25.11.3.tgz"; - sha1 = "54719d1276f417e66904f9f951671633f1647006"; + name = "_gitlab_ui___ui_27.4.6.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-27.4.6.tgz"; + sha1 = "2364c2ba981024cdce32b4657c5f0eb2ae781a4d"; }; } { @@ -969,6 +977,14 @@ sha1 = "2b5a3ab3f918cca48a8c754c08168e3f03eba61b"; }; } + { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + path = fetchurl { + name = "_npmcli_move_file___move_file_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz"; + sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464"; + }; + } { name = "_nuxt_opencollective___opencollective_0.3.0.tgz"; path = fetchurl { @@ -1186,11 +1202,19 @@ }; } { - name = "_types_json_schema___json_schema_7.0.6.tgz"; + name = "_types_json_schema___json_schema_7.0.7.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + name = "_types_json_schema___json_schema_7.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; } { @@ -1330,147 +1354,147 @@ }; } { - name = "_webassemblyjs_ast___ast_1.8.5.tgz"; + name = "_webassemblyjs_ast___ast_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_ast___ast_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz"; - sha1 = "51b1c5fe6576a34953bf4b253df9f0d490d9e359"; + name = "_webassemblyjs_ast___ast_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"; + sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964"; }; } { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz"; - sha1 = "1ba926a2923613edce496fd5b02e8ce8a5f49721"; + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; + sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4"; }; } { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz"; - sha1 = "c49dad22f645227c5edb610bdb9697f1aab721f7"; + name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; + sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2"; }; } { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz"; - sha1 = "fea93e429863dd5e4338555f42292385a653f204"; + name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; + sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00"; }; } { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz"; - sha1 = "9a740ff48e3faa3022b1dff54423df9aa293c25e"; + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; + sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27"; }; } { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz"; - sha1 = "ba0b7d3b3f7e4733da6059c9332275d860702452"; + name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; + sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8"; }; } { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz"; - sha1 = "def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"; + name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; + sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07"; }; } { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz"; - sha1 = "537a750eddf5c1e932f3744206551c91c1b93e61"; + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; + sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790"; }; } { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz"; - sha1 = "74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"; + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; + sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346"; }; } { - name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz"; - sha1 = "712329dbef240f36bf57bd2f7b8fb9bf4154421e"; + name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; + sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"; }; } { - name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz"; - sha1 = "044edeb34ea679f3e04cd4fd9824d5e35767ae10"; + name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; + sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95"; }; } { - name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz"; - sha1 = "a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"; + name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; + sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab"; }; } { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz"; - sha1 = "962da12aa5acc1c131c81c4232991c82ce56e01a"; + name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; + sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf"; }; } { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz"; - sha1 = "54840766c2c1002eb64ed1abe720aded714f98bc"; + name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; + sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c"; }; } { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz"; - sha1 = "b24d9f6ba50394af1349f510afa8ffcb8a63d264"; + name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; + sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61"; }; } { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz"; - sha1 = "21576f0ec88b91427357b8536383668ef7c66b8d"; + name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; + sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e"; }; } { - name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_parser___wast_parser_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz"; - sha1 = "e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"; + name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; + sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914"; }; } { - name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz"; - sha1 = "114bbc481fd10ca0e23b3560fa812748b0bae5bc"; + name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; + sha1 = "4935d54c85fef637b00ce9f52377451d00d47899"; }; } { @@ -1553,14 +1577,6 @@ sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } - { - name = "acorn_walk___acorn_walk_6.2.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz"; - sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"; - }; - } { name = "acorn_walk___acorn_walk_7.2.0.tgz"; path = fetchurl { @@ -1570,11 +1586,11 @@ }; } { - name = "acorn___acorn_6.3.0.tgz"; + name = "acorn___acorn_6.4.2.tgz"; path = fetchurl { - name = "acorn___acorn_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz"; - sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e"; + name = "acorn___acorn_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; + sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; }; } { @@ -1633,6 +1649,14 @@ sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; }; } + { + name = "ajv___ajv_7.0.4.tgz"; + path = fetchurl { + name = "ajv___ajv_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz"; + sha1 = "827e5f5ae32f5e5c1637db61f253a112229b5e2f"; + }; + } { name = "amdefine___amdefine_1.0.1.tgz"; path = fetchurl { @@ -1657,6 +1681,14 @@ sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; }; } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } { name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; path = fetchurl { @@ -1914,11 +1946,11 @@ }; } { - name = "array_includes___array_includes_3.0.3.tgz"; + name = "array_includes___array_includes_3.1.2.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + name = "array_includes___array_includes_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz"; + sha1 = "a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8"; }; } { @@ -1946,11 +1978,11 @@ }; } { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; + sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123"; }; } { @@ -2017,6 +2049,14 @@ sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; }; } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + }; + } { name = "async_foreach___async_foreach_0.1.3.tgz"; path = fetchurl { @@ -2130,11 +2170,11 @@ }; } { - name = "babel_loader___babel_loader_8.0.6.tgz"; + name = "babel_loader___babel_loader_8.2.2.tgz"; path = fetchurl { - name = "babel_loader___babel_loader_8.0.6.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz"; - sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"; + name = "babel_loader___babel_loader_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz"; + sha1 = "9363ce84c10c9a40e6c753748e1441b60c8a0b81"; }; } { @@ -2330,11 +2370,11 @@ }; } { - name = "bn.js___bn.js_4.11.8.tgz"; + name = "bn.js___bn.js_4.11.9.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.8.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz"; - sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; + name = "bn.js___bn.js_4.11.9.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; + sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; }; } { @@ -2466,11 +2506,11 @@ }; } { - name = "browserslist___browserslist_4.12.0.tgz"; + name = "browserslist___browserslist_4.16.1.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.12.0.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz"; - sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d"; + name = "browserslist___browserslist_4.16.1.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.1.tgz"; + sha1 = "bf757a2da376b3447b800a16f0f1c96358138766"; }; } { @@ -2562,11 +2602,11 @@ }; } { - name = "cacache___cacache_13.0.1.tgz"; + name = "cacache___cacache_15.0.5.tgz"; path = fetchurl { - name = "cacache___cacache_13.0.1.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz"; - sha1 = "a8000c21697089082f85287a1aec6e382024a71c"; + name = "cacache___cacache_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz"; + sha1 = "69162833da29170d6732334643c60e005f5f17d0"; }; } { @@ -2593,6 +2633,14 @@ sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; }; } + { + name = "call_bind___call_bind_1.0.2.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + }; + } { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; path = fetchurl { @@ -2698,11 +2746,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001178.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz"; - sha1 = "40615a3c416a047c5a4d45673e5257bf128eb3b5"; + name = "caniuse_lite___caniuse_lite_1.0.30001178.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz"; + sha1 = "3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc"; }; } { @@ -2737,14 +2785,6 @@ sha1 = "f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"; }; } - { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; - }; - } { name = "chalk___chalk_1.1.3.tgz"; path = fetchurl { @@ -2753,6 +2793,14 @@ sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } { name = "chalk___chalk_3.0.0.tgz"; path = fetchurl { @@ -2809,14 +2857,6 @@ sha1 = "21e421ad3d84055952dab4a43a04e73cd425d3ed"; }; } - { - name = "chardet___chardet_0.7.0.tgz"; - path = fetchurl { - name = "chardet___chardet_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; - sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; - }; - } { name = "charenc___charenc_0.0.2.tgz"; path = fetchurl { @@ -2849,6 +2889,14 @@ sha1 = "42d837d5239688d55f303003a508230fa6727142"; }; } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + }; + } { name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; path = fetchurl { @@ -2905,22 +2953,6 @@ sha1 = "538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"; }; } - { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; - }; - } - { - name = "cli_width___cli_width_2.2.0.tgz"; - path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; - }; - } { name = "clipboard___clipboard_1.7.1.tgz"; path = fetchurl { @@ -2937,14 +2969,6 @@ sha1 = "52921296eec0fdf77ead1749421b21c968647376"; }; } - { - name = "cliui___cliui_4.1.0.tgz"; - path = fetchurl { - name = "cliui___cliui_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; - sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; - }; - } { name = "cliui___cliui_5.0.0.tgz"; path = fetchurl { @@ -3097,6 +3121,14 @@ sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; }; } + { + name = "colorette___colorette_1.2.1.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; + sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + }; + } { name = "colors___colors_1.3.3.tgz"; path = fetchurl { @@ -3178,11 +3210,11 @@ }; } { - name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz"; + name = "compression_webpack_plugin___compression_webpack_plugin_5.0.2.tgz"; path = fetchurl { - name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.1.tgz"; - sha1 = "be7a343e6dfbccbd64a77c5fbe29627d140fc321"; + name = "compression_webpack_plugin___compression_webpack_plugin_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-5.0.2.tgz"; + sha1 = "df84e682cfa1fb2a230e71cf83d50c323d5369c2"; }; } { @@ -3234,11 +3266,11 @@ }; } { - name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz"; path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz"; - sha1 = "72bc13b483c0276801681871d4898516f8f54fdd"; + name = "confusing_browser_globals___confusing_browser_globals_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz"; + sha1 = "30d1e7f3d1b882b25ec4933d1d1adac353d20a59"; }; } { @@ -3378,11 +3410,11 @@ }; } { - name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz"; + name = "copy_webpack_plugin___copy_webpack_plugin_5.1.2.tgz"; path = fetchurl { - name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz"; - sha1 = "5481a03dea1123d88a988c6ff8b78247214f0b88"; + name = "copy_webpack_plugin___copy_webpack_plugin_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; + sha1 = "8a889e1dcafa6c91c6cd4be1ad158f1d3823bae2"; }; } { @@ -3402,11 +3434,11 @@ }; } { - name = "core_js___core_js_3.6.4.tgz"; + name = "core_js___core_js_3.8.3.tgz"; path = fetchurl { - name = "core_js___core_js_3.6.4.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz"; - sha1 = "440a83536b458114b9cb2ac1580ba377dc470647"; + name = "core_js___core_js_3.8.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz"; + sha1 = "c21906e1f14f3689f93abcc6e26883550dd92dd0"; }; } { @@ -3473,14 +3505,6 @@ sha1 = "607461d4e7aa7a7fe15a26834b14b7f0c2801562"; }; } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } { name = "cross_spawn___cross_spawn_3.0.1.tgz"; path = fetchurl { @@ -3489,6 +3513,14 @@ sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; }; } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } { name = "cross_spawn___cross_spawn_7.0.3.tgz"; path = fetchurl { @@ -3521,14 +3553,6 @@ sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; }; } - { - name = "crypto_random_string___crypto_random_string_3.0.1.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.0.1.tgz"; - sha1 = "29d7dc759d577a768afb3b7b2765dd9bd7ffe36a"; - }; - } { name = "css_b64_images___css_b64_images_0.2.5.tgz"; path = fetchurl { @@ -4426,11 +4450,11 @@ }; } { - name = "dot_prop___dot_prop_4.2.0.tgz"; + name = "dot_prop___dot_prop_4.2.1.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; - sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; + name = "dot_prop___dot_prop_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz"; + sha1 = "45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"; }; } { @@ -4482,11 +4506,11 @@ }; } { - name = "echarts___echarts_4.6.0.tgz"; + name = "echarts___echarts_4.9.0.tgz"; path = fetchurl { - name = "echarts___echarts_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/echarts/-/echarts-4.6.0.tgz"; - sha1 = "b5a47a1046cec93ceeef954f9ee54751340558ec"; + name = "echarts___echarts_4.9.0.tgz"; + url = "https://registry.yarnpkg.com/echarts/-/echarts-4.9.0.tgz"; + sha1 = "a9b9baa03f03a2a731e6340c55befb57a9e1347d"; }; } { @@ -4522,19 +4546,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz"; - sha1 = "89f716db3afc4bb482ea2aaaa16c4808f89f762a"; + name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz"; + sha1 = "8b884f50296c2ae2a9997f024d0e3e57facc2b94"; }; } { - name = "elliptic___elliptic_6.4.0.tgz"; + name = "elliptic___elliptic_6.5.4.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz"; - sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + name = "elliptic___elliptic_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; + sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; }; } { @@ -4569,14 +4593,6 @@ sha1 = "0ebf3666b5414097971d34994e299fce75cdbafc"; }; } - { - name = "emojis_list___emojis_list_2.1.0.tgz"; - path = fetchurl { - name = "emojis_list___emojis_list_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; - }; - } { name = "emojis_list___emojis_list_3.0.0.tgz"; path = fetchurl { @@ -4625,14 +4641,6 @@ sha1 = "54332506f42f2edc71690d2f2a42349359f3bf7d"; }; } - { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; - path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; - sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"; - }; - } { name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz"; path = fetchurl { @@ -4641,6 +4649,22 @@ sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; }; } + { + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; + sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } { name = "ent___ent_2.2.0.tgz"; path = fetchurl { @@ -4690,11 +4714,11 @@ }; } { - name = "es_abstract___es_abstract_1.17.4.tgz"; + name = "es_abstract___es_abstract_1.18.0_next.2.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.4.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz"; - sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184"; + name = "es_abstract___es_abstract_1.18.0_next.2.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; + sha1 = "088101a55f0541f595e7e057199e27ddc8f3a5c2"; }; } { @@ -4729,6 +4753,14 @@ sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } { name = "escape_goat___escape_goat_2.1.1.tgz"; path = fetchurl { @@ -4761,14 +4793,6 @@ sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; }; } - { - name = "escaper___escaper_2.5.3.tgz"; - path = fetchurl { - name = "escaper___escaper_2.5.3.tgz"; - url = "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz"; - sha1 = "8b8fe90ba364054151ab7eff18b4ce43b1e13ab5"; - }; - } { name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { @@ -4778,11 +4802,11 @@ }; } { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.2.1.tgz"; path = fetchurl { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz"; - sha1 = "8a7bcb9643d13c55df4dd7444f138bf4efa61e17"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz"; + sha1 = "8a2eb38455dc5a312550193b319cdaeef042cd1e"; }; } { @@ -4794,35 +4818,35 @@ }; } { - name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz"; + name = "eslint_import_resolver_jest___eslint_import_resolver_jest_3.0.0.tgz"; path = fetchurl { - name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.2.tgz"; - sha1 = "8720fbe8b8498e95cb2bc6ef52b46b713aedaa59"; + name = "eslint_import_resolver_jest___eslint_import_resolver_jest_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-3.0.0.tgz"; + sha1 = "fd61da30fe58f4c1074af1f069b4267c70a91fd6"; }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz"; - sha1 = "58f15fb839b8d0576ca980413476aab2472db66a"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; }; } { - name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz"; + name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.13.0.tgz"; path = fetchurl { - name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz"; - sha1 = "771ae561e887ca4e53ee87605fbb36c5e290b0f5"; + name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.13.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.0.tgz"; + sha1 = "5cb19cf4b6996c8a2514aeb10f909e2c70488dc3"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz"; - sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; }; } { @@ -4842,19 +4866,19 @@ }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz"; - sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; + sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702"; }; } { - name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz"; + name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.2.tgz"; path = fetchurl { - name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.0.tgz"; - sha1 = "4f6d41b1a8622348c97559cbcd29badffa74dbfa"; + name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.2.tgz"; + sha1 = "50cc20d603b02b37727f8d174d4b83b9b8ef25a5"; }; } { @@ -4866,11 +4890,11 @@ }; } { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz"; path = fetchurl { - name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.1.tgz"; - sha1 = "1c364cb863a38cc1570c8020155b6004cca62178"; + name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.5.0.tgz"; + sha1 = "6c12e3aae172bfd3363b7ac8c3f3e944704867f4"; }; } { @@ -4882,11 +4906,11 @@ }; } { - name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.5.0.tgz"; path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz"; - sha1 = "2526ef0c010c218824a89423dbe6ddbe76f04fd6"; + name = "eslint_plugin_vue___eslint_plugin_vue_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.5.0.tgz"; + sha1 = "cc6d983eb22781fa2440a7573cf39af439bb5725"; }; } { @@ -4906,19 +4930,11 @@ }; } { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz"; - sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"; - }; - } - { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; - sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; }; } { @@ -4930,19 +4946,27 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; }; } { - name = "eslint___eslint_6.8.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; path = fetchurl { - name = "eslint___eslint_6.8.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; - sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + }; + } + { + name = "eslint___eslint_7.19.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.19.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz"; + sha1 = "6719621b196b5fad72e43387981314e5d0dc3f41"; }; } { @@ -4953,6 +4977,14 @@ sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; }; } + { + name = "espree___espree_7.3.1.tgz"; + path = fetchurl { + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + }; + } { name = "esprima___esprima_4.0.1.tgz"; path = fetchurl { @@ -4962,19 +4994,19 @@ }; } { - name = "esquery___esquery_1.0.1.tgz"; + name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -4985,6 +5017,14 @@ sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; }; } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { @@ -5153,14 +5193,6 @@ sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; }; } - { - name = "external_editor___external_editor_3.1.0.tgz"; - path = fetchurl { - name = "external_editor___external_editor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; - sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; - }; - } { name = "extglob___extglob_2.0.4.tgz"; path = fetchurl { @@ -5250,19 +5282,11 @@ }; } { - name = "faye_websocket___faye_websocket_0.10.0.tgz"; + name = "faye_websocket___faye_websocket_0.11.3.tgz"; path = fetchurl { - name = "faye_websocket___faye_websocket_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; - }; - } - { - name = "faye_websocket___faye_websocket_0.11.1.tgz"; - path = fetchurl { - name = "faye_websocket___faye_websocket_0.11.1.tgz"; - url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz"; - sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; + name = "faye_websocket___faye_websocket_0.11.3.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz"; + sha1 = "5c0e9a8968e8912c286639fde977a8b209f2508e"; }; } { @@ -5281,14 +5305,6 @@ sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; }; } - { - name = "figures___figures_3.2.0.tgz"; - path = fetchurl { - name = "figures___figures_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; - sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; - }; - } { name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; path = fetchurl { @@ -5297,6 +5313,14 @@ sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; }; } + { + name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; + sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + }; + } { name = "file_loader___file_loader_5.1.0.tgz"; path = fetchurl { @@ -5362,11 +5386,11 @@ }; } { - name = "find_cache_dir___find_cache_dir_3.0.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.0.0.tgz"; - sha1 = "cd4b7dd97b7185b7e17dbfe2d6e4115ee3eeb8fc"; + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; }; } { @@ -5425,6 +5449,14 @@ sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; }; } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + }; + } { name = "flatted___flatted_2.0.0.tgz"; path = fetchurl { @@ -5433,6 +5465,14 @@ sha1 = "55122b6536ea496b4b44893ee2608141d10d9916"; }; } + { + name = "flatted___flatted_3.1.1.tgz"; + path = fetchurl { + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + }; + } { name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; path = fetchurl { @@ -5449,14 +5489,6 @@ sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; }; } - { - name = "font_awesome___font_awesome_4.7.0.tgz"; - path = fetchurl { - name = "font_awesome___font_awesome_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; - }; - } { name = "for_in___for_in_1.0.2.tgz"; path = fetchurl { @@ -5617,14 +5649,6 @@ sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; }; } - { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; - }; - } { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { @@ -5633,6 +5657,14 @@ sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; }; } + { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + }; + } { name = "get_package_type___get_package_type_0.1.0.tgz"; path = fetchurl { @@ -5706,19 +5738,19 @@ }; } { - name = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz"; + name = "gettext_extractor_vue___gettext_extractor_vue_5.0.0.tgz"; path = fetchurl { - name = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-4.0.2.tgz"; - sha1 = "16e1cdbdaf37e5bdf3cb0aff63685bdc5e74e906"; + name = "gettext_extractor_vue___gettext_extractor_vue_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-5.0.0.tgz"; + sha1 = "dc463868d49e14097c4545c8ed4851d8d3edd6dd"; }; } { - name = "gettext_extractor___gettext_extractor_3.4.3.tgz"; + name = "gettext_extractor___gettext_extractor_3.5.3.tgz"; path = fetchurl { - name = "gettext_extractor___gettext_extractor_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.4.3.tgz"; - sha1 = "882679cefc71888eb6e69297e6b2dc14c0384fef"; + name = "gettext_extractor___gettext_extractor_3.5.3.tgz"; + url = "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.5.3.tgz"; + sha1 = "6ed46931c154a7485a80fa8b91b835ff7b8d0411"; }; } { @@ -5769,14 +5801,6 @@ sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201"; }; } - { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha1 = "997605ad2345f27f51539bea26574421215c7780"; - }; - } { name = "global_modules___global_modules_1.0.0.tgz"; path = fetchurl { @@ -5785,6 +5809,14 @@ sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; }; } + { + name = "global_modules___global_modules_2.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; + }; + } { name = "global_prefix___global_prefix_1.0.2.tgz"; path = fetchurl { @@ -6178,11 +6210,11 @@ }; } { - name = "html_entities___html_entities_1.2.1.tgz"; + name = "html_entities___html_entities_1.4.0.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + name = "html_entities___html_entities_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz"; + sha1 = "cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"; }; } { @@ -6249,6 +6281,14 @@ sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; } + { + name = "http_parser_js___http_parser_js_0.5.3.tgz"; + path = fetchurl { + name = "http_parser_js___http_parser_js_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz"; + sha1 = "01d2709c79d41698bb01d4decc5e9da4e4a033d9"; + }; + } { name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; path = fetchurl { @@ -6266,11 +6306,11 @@ }; } { - name = "http_proxy___http_proxy_1.18.0.tgz"; + name = "http_proxy___http_proxy_1.18.1.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; - sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + sha1 = "401541f0534884bbf95260334e72f88ee3976549"; }; } { @@ -6402,11 +6442,11 @@ }; } { - name = "import_fresh___import_fresh_3.2.1.tgz"; + name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; }; } { @@ -6441,14 +6481,6 @@ sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; }; } - { - name = "imports_loader___imports_loader_0.8.0.tgz"; - path = fetchurl { - name = "imports_loader___imports_loader_0.8.0.tgz"; - url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz"; - sha1 = "030ea51b8ca05977c40a3abfd9b4088fe0be9a69"; - }; - } { name = "imurmurhash___imurmurhash_0.1.4.tgz"; path = fetchurl { @@ -6530,11 +6562,11 @@ }; } { - name = "inherits___inherits_2.0.3.tgz"; + name = "inherits___inherits_2.0.4.tgz"; path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; }; } { @@ -6546,19 +6578,19 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "inherits___inherits_2.0.3.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; } { - name = "inquirer___inquirer_7.0.4.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "inquirer___inquirer_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz"; - sha1 = "99af5bde47153abca23f5c7fc30db247f39da703"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { @@ -6570,11 +6602,11 @@ }; } { - name = "interpret___interpret_1.2.0.tgz"; + name = "interpret___interpret_1.4.0.tgz"; path = fetchurl { - name = "interpret___interpret_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz"; - sha1 = "d5061a6224be58e8083985f5014d844359576296"; + name = "interpret___interpret_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; + sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; }; } { @@ -6585,14 +6617,6 @@ sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; }; } - { - name = "invert_kv___invert_kv_2.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; - sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; - }; - } { name = "ip_regex___ip_regex_2.1.0.tgz"; path = fetchurl { @@ -6706,11 +6730,11 @@ }; } { - name = "is_callable___is_callable_1.1.5.tgz"; + name = "is_callable___is_callable_1.2.3.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; - sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; + name = "is_callable___is_callable_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; + sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; }; } { @@ -6881,6 +6905,14 @@ sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141"; }; } + { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + }; + } { name = "is_npm___is_npm_4.0.0.tgz"; path = fetchurl { @@ -6978,27 +7010,11 @@ }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_regex___is_regex_1.1.2.tgz"; path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - } - { - name = "is_regex___is_regex_1.0.5.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; - sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; - }; - } - { - name = "is_regexp___is_regexp_1.0.0.tgz"; - path = fetchurl { - name = "is_regexp___is_regexp_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; - sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + name = "is_regex___is_regex_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz"; + sha1 = "81c8ebde4db142f2cf1c53fc86d6a45788266251"; }; } { @@ -7025,6 +7041,14 @@ sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; }; } + { + name = "is_string___is_string_1.0.5.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + }; + } { name = "is_symbol___is_symbol_1.0.2.tgz"; path = fetchurl { @@ -7729,6 +7753,14 @@ sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; }; } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } { name = "json_schema___json_schema_0.2.3.tgz"; path = fetchurl { @@ -7754,11 +7786,11 @@ }; } { - name = "json3___json3_3.3.2.tgz"; + name = "json3___json3_3.3.3.tgz"; path = fetchurl { - name = "json3___json3_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz"; - sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; + name = "json3___json3_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz"; + sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"; }; } { @@ -7905,6 +7937,14 @@ sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; }; } + { + name = "khroma___khroma_1.2.0.tgz"; + path = fetchurl { + name = "khroma___khroma_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/khroma/-/khroma-1.2.0.tgz"; + sha1 = "46dcc9d7533923c228b51724db108f11fec108d8"; + }; + } { name = "killable___killable_1.0.1.tgz"; path = fetchurl { @@ -7938,11 +7978,11 @@ }; } { - name = "kind_of___kind_of_6.0.2.tgz"; + name = "kind_of___kind_of_6.0.3.tgz"; path = fetchurl { - name = "kind_of___kind_of_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz"; - sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051"; + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; }; } { @@ -7977,14 +8017,6 @@ sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; }; } - { - name = "lcid___lcid_2.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; - sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; - }; - } { name = "leven___leven_3.1.0.tgz"; path = fetchurl { @@ -8001,6 +8033,14 @@ sha1 = "842a9ee98d2075aa7faeedbe32679e9205f46f77"; }; } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } { name = "levn___levn_0.3.0.tgz"; path = fetchurl { @@ -8081,14 +8121,6 @@ sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; }; } - { - name = "loader_utils___loader_utils_1.2.3.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz"; - sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7"; - }; - } { name = "loader_utils___loader_utils_1.4.0.tgz"; path = fetchurl { @@ -8386,11 +8418,11 @@ }; } { - name = "loglevel___loglevel_1.6.7.tgz"; + name = "loglevel___loglevel_1.7.1.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.7.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz"; - sha1 = "b3e034233188c68b889f5b862415306f565e2c56"; + name = "loglevel___loglevel_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz"; + sha1 = "005fde2f5e6e47068f935ff28573e125ef72f197"; }; } { @@ -8465,6 +8497,14 @@ sha1 = "1da27e6710271947695daf6848e847f01d84b920"; }; } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } { name = "lz_string___lz_string_1.4.4.tgz"; path = fetchurl { @@ -8482,11 +8522,11 @@ }; } { - name = "make_dir___make_dir_3.0.0.tgz"; + name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { - name = "make_dir___make_dir_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz"; - sha1 = "1b5f39f6b9270ed33f9f054c5c0f84304989f801"; + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; }; } { @@ -8505,22 +8545,6 @@ sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; }; } - { - name = "mamacro___mamacro_0.0.3.tgz"; - path = fetchurl { - name = "mamacro___mamacro_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz"; - sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; - }; - } - { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - path = fetchurl { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; - }; - } { name = "map_cache___map_cache_0.2.2.tgz"; path = fetchurl { @@ -8673,14 +8697,6 @@ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; } - { - name = "mem___mem_4.3.0.tgz"; - path = fetchurl { - name = "mem___mem_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; - sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; - }; - } { name = "memory_fs___memory_fs_0.2.0.tgz"; path = fetchurl { @@ -8697,6 +8713,14 @@ sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; }; } + { + name = "memory_fs___memory_fs_0.5.0.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; + sha1 = "324c01288b88652966d161db77838720845a8e3c"; + }; + } { name = "meow___meow_3.7.0.tgz"; path = fetchurl { @@ -8746,11 +8770,11 @@ }; } { - name = "mermaid___mermaid_8.5.2.tgz"; + name = "mermaid___mermaid_8.9.0.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.5.2.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.5.2.tgz"; - sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8"; + name = "mermaid___mermaid_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.0.tgz"; + sha1 = "e569517863ab903aa5389cd746b68ca958a8ca7c"; }; } { @@ -8850,11 +8874,11 @@ }; } { - name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz"; + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; path = fetchurl { - name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; - sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; }; } { @@ -8881,14 +8905,6 @@ sha1 = "fba4c8191339e13ecf4d61beb03f070103f3d954"; }; } - { - name = "minimist___minimist_0.0.8.tgz"; - path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - } { name = "minimist___minimist_1.1.3.tgz"; path = fetchurl { @@ -8905,6 +8921,14 @@ sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } + { + name = "minimist___minimist_0.0.8.tgz"; + path = fetchurl { + name = "minimist___minimist_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } { name = "minipass_collect___minipass_collect_1.0.2.tgz"; path = fetchurl { @@ -8937,6 +8961,14 @@ sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; }; } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + }; + } { name = "miragejs___miragejs_0.1.40.tgz"; path = fetchurl { @@ -8970,11 +9002,11 @@ }; } { - name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz"; + name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { - name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; }; } { @@ -9065,14 +9097,6 @@ sha1 = "6e7de86a570872ab17058adea7160bbeca814dde"; }; } - { - name = "mute_stream___mute_stream_0.0.8.tgz"; - path = fetchurl { - name = "mute_stream___mute_stream_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; - sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; - }; - } { name = "nan___nan_2.14.1.tgz"; path = fetchurl { @@ -9138,19 +9162,19 @@ }; } { - name = "node_fetch___node_fetch_2.6.0.tgz"; + name = "node_fetch___node_fetch_2.6.1.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz"; - sha1 = "e633456386d4aa55863f676a7ab0daa8fdecb0fd"; + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; }; } { - name = "node_forge___node_forge_0.9.0.tgz"; + name = "node_forge___node_forge_0.10.0.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz"; - sha1 = "d624050edbb44874adca12bb9a52ec63cb782579"; + name = "node_forge___node_forge_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; + sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; }; } { @@ -9194,11 +9218,11 @@ }; } { - name = "node_releases___node_releases_1.1.58.tgz"; + name = "node_releases___node_releases_1.1.70.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.58.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz"; - sha1 = "8ee20eef30fa60e52755fcc0942def5a734fe935"; + name = "node_releases___node_releases_1.1.70.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz"; + sha1 = "66e0ed0273aa65666d7fe78febe7634875426a08"; }; } { @@ -9370,11 +9394,11 @@ }; } { - name = "object_inspect___object_inspect_1.7.0.tgz"; + name = "object_inspect___object_inspect_1.9.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; - sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + name = "object_inspect___object_inspect_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz"; + sha1 = "c90521d74e1127b67266ded3394ad6116986533a"; }; } { @@ -9394,19 +9418,19 @@ }; } { - name = "object.assign___object.assign_4.1.0.tgz"; + name = "object.assign___object.assign_4.1.2.tgz"; path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; }; } { - name = "object.entries___object.entries_1.1.1.tgz"; + name = "object.entries___object.entries_1.1.3.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; - sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; + name = "object.entries___object.entries_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz"; + sha1 = "c601c7f168b62374541a07ddbd3e2d5e4f7711a6"; }; } { @@ -9418,11 +9442,11 @@ }; } { - name = "object.values___object.values_1.1.0.tgz"; + name = "object.values___object.values_1.1.2.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz"; - sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9"; + name = "object.values___object.values_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz"; + sha1 = "7a2015e06fcb0f546bd652486ce8583a4731c731"; }; } { @@ -9505,6 +9529,14 @@ sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } { name = "orderedmap___orderedmap_1.0.0.tgz"; path = fetchurl { @@ -9537,14 +9569,6 @@ sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; } - { - name = "os_locale___os_locale_3.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; - sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; - }; - } { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -9569,14 +9593,6 @@ sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; }; } - { - name = "p_defer___p_defer_1.0.0.tgz"; - path = fetchurl { - name = "p_defer___p_defer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - } { name = "p_each_series___p_each_series_2.1.0.tgz"; path = fetchurl { @@ -9593,14 +9609,6 @@ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; } - { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; - }; - } { name = "p_limit___p_limit_1.2.0.tgz"; path = fetchurl { @@ -9650,11 +9658,11 @@ }; } { - name = "p_map___p_map_3.0.0.tgz"; + name = "p_map___p_map_4.0.0.tgz"; path = fetchurl { - name = "p_map___p_map_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz"; - sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; }; } { @@ -10017,14 +10025,6 @@ sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; }; } - { - name = "pixelmatch___pixelmatch_4.0.2.tgz"; - path = fetchurl { - name = "pixelmatch___pixelmatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz"; - sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; - }; - } { name = "pkg_dir___pkg_dir_2.0.0.tgz"; path = fetchurl { @@ -10049,22 +10049,6 @@ sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; }; } - { - name = "pkg_up___pkg_up_2.0.0.tgz"; - path = fetchurl { - name = "pkg_up___pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; - }; - } - { - name = "pngjs___pngjs_3.3.3.tgz"; - path = fetchurl { - name = "pngjs___pngjs_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz"; - sha1 = "85173703bde3edac8998757b96e5821d0966a21b"; - }; - } { name = "pofile___pofile_1.0.11.tgz"; path = fetchurl { @@ -10090,11 +10074,11 @@ }; } { - name = "portfinder___portfinder_1.0.25.tgz"; + name = "portfinder___portfinder_1.0.28.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.25.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz"; - sha1 = "254fd337ffba869f4b9d37edc298059cb4d35eca"; + name = "portfinder___portfinder_1.0.28.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; + sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; }; } { @@ -10265,6 +10249,14 @@ sha1 = "cc9378beffe46a02cbc4506a0477d05fcea9a8e2"; }; } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } { name = "prelude_ls___prelude_ls_1.1.2.tgz"; path = fetchurl { @@ -10658,11 +10650,11 @@ }; } { - name = "querystringify___querystringify_2.1.0.tgz"; + name = "querystringify___querystringify_2.2.0.tgz"; path = fetchurl { - name = "querystringify___querystringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz"; - sha1 = "7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"; + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; }; } { @@ -10674,11 +10666,11 @@ }; } { - name = "randombytes___randombytes_2.0.6.tgz"; + name = "randombytes___randombytes_2.1.0.tgz"; path = fetchurl { - name = "randombytes___randombytes_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz"; - sha1 = "d302c522948588848a8d300c932b44c24231da80"; + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; }; } { @@ -10714,11 +10706,11 @@ }; } { - name = "raw_loader___raw_loader_4.0.0.tgz"; + name = "raw_loader___raw_loader_4.0.2.tgz"; path = fetchurl { - name = "raw_loader___raw_loader_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.0.tgz"; - sha1 = "d639c40fb9d72b5c7f8abc1fb2ddb25b29d3d540"; + name = "raw_loader___raw_loader_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz"; + sha1 = "1aac6b7d1ad1501e66efdac1522c73e59a584eb6"; }; } { @@ -10898,11 +10890,11 @@ }; } { - name = "regexpp___regexpp_2.0.1.tgz"; + name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { - name = "regexpp___regexpp_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; - sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; }; } { @@ -11058,11 +11050,11 @@ }; } { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; + name = "require_from_string___require_from_string_2.0.2.tgz"; path = fetchurl { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; }; } { @@ -11177,14 +11169,6 @@ sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; }; } - { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; - }; - } { name = "ret___ret_0.1.15.tgz"; path = fetchurl { @@ -11209,14 +11193,6 @@ sha1 = "ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"; }; } - { - name = "rimraf___rimraf_2.7.1.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; - }; - } { name = "rimraf___rimraf_2.6.3.tgz"; path = fetchurl { @@ -11265,14 +11241,6 @@ sha1 = "b50e6b34583f3dd89329a2f23a8a2be072845911"; }; } - { - name = "run_async___run_async_2.3.0.tgz"; - path = fetchurl { - name = "run_async___run_async_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; - }; - } { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { @@ -11289,14 +11257,6 @@ sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; }; } - { - name = "rxjs___rxjs_6.5.4.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; - sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; - }; - } { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -11378,11 +11338,11 @@ }; } { - name = "scope_css___scope_css_1.2.1.tgz"; + name = "schema_utils___schema_utils_3.0.0.tgz"; path = fetchurl { - name = "scope_css___scope_css_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz"; - sha1 = "c35768bc900cad030a3e0d663a818c0f6a57f40e"; + name = "schema_utils___schema_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; + sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; }; } { @@ -11418,11 +11378,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.7.tgz"; + name = "selfsigned___selfsigned_1.10.8.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.7.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz"; - sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"; + name = "selfsigned___selfsigned_1.10.8.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; + sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; }; } { @@ -11450,11 +11410,11 @@ }; } { - name = "semver___semver_7.3.2.tgz"; + name = "semver___semver_7.3.4.tgz"; path = fetchurl { - name = "semver___semver_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; - sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; }; } { @@ -11489,6 +11449,14 @@ sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; }; } + { + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa"; + }; + } { name = "serve_index___serve_index_1.9.1.tgz"; path = fetchurl { @@ -11658,11 +11626,11 @@ }; } { - name = "slugify___slugify_1.3.1.tgz"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; path = fetchurl { - name = "slugify___slugify_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.1.tgz"; - sha1 = "f572127e8535329fbc6c1edb74ab856b61ad7de2"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; }; } { @@ -11730,19 +11698,19 @@ }; } { - name = "sockjs_client___sockjs_client_1.4.0.tgz"; + name = "sockjs_client___sockjs_client_1.5.0.tgz"; path = fetchurl { - name = "sockjs_client___sockjs_client_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz"; - sha1 = "c9f2568e19c8fd8173b4997ea3420e0bb306c7d5"; + name = "sockjs_client___sockjs_client_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz"; + sha1 = "2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add"; }; } { - name = "sockjs___sockjs_0.3.19.tgz"; + name = "sockjs___sockjs_0.3.21.tgz"; path = fetchurl { - name = "sockjs___sockjs_0.3.19.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz"; - sha1 = "d976bbe800af7bd20ae08598d582393508993c0d"; + name = "sockjs___sockjs_0.3.21.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz"; + sha1 = "b34ffb98e796930b60a0cfa11904d6a339a7d417"; }; } { @@ -11866,11 +11834,11 @@ }; } { - name = "spdy___spdy_4.0.1.tgz"; + name = "spdy___spdy_4.0.2.tgz"; path = fetchurl { - name = "spdy___spdy_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz"; - sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"; + name = "spdy___spdy_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; + sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; }; } { @@ -11922,11 +11890,11 @@ }; } { - name = "ssri___ssri_7.1.0.tgz"; + name = "ssri___ssri_8.0.0.tgz"; path = fetchurl { - name = "ssri___ssri_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz"; - sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d"; + name = "ssri___ssri_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz"; + sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808"; }; } { @@ -11985,14 +11953,6 @@ sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; }; } - { - name = "stickyfilljs___stickyfilljs_2.1.0.tgz"; - path = fetchurl { - name = "stickyfilljs___stickyfilljs_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/stickyfilljs/-/stickyfilljs-2.1.0.tgz"; - sha1 = "46dabb599d8275d185bdb97db597f86a2e3afa7b"; - }; - } { name = "stream_browserify___stream_browserify_2.0.1.tgz"; path = fetchurl { @@ -12057,14 +12017,6 @@ sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; }; } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; - }; - } { name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { @@ -12082,19 +12034,19 @@ }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.3.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; + sha1 = "a22bd53cca5c7cf44d7c9d5c732118873d6cd18b"; }; } { - name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.3.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha1 = "440314b15996c866ce8a0341894d45186200c5d9"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; + sha1 = "9b4cb590e123bb36564401d59824298de50fd5aa"; }; } { @@ -12177,14 +12129,6 @@ sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; }; } - { - name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; - path = fetchurl { - name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz"; - sha1 = "7a5625eff8a2b226cf8947a11254da96e13dae89"; - }; - } { name = "strip_eof___strip_eof_1.0.0.tgz"; path = fetchurl { @@ -12218,11 +12162,11 @@ }; } { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7"; + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; }; } { @@ -12273,6 +12217,14 @@ sha1 = "1bc4c4ce878107e7c396b19226d91ba28268911a"; }; } + { + name = "stylis___stylis_3.5.4.tgz"; + path = fetchurl { + name = "stylis___stylis_3.5.4.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz"; + sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe"; + }; + } { name = "sugarss___sugarss_2.0.0.tgz"; path = fetchurl { @@ -12281,14 +12233,6 @@ sha1 = "ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"; }; } - { - name = "supports_color___supports_color_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; - }; - } { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { @@ -12305,6 +12249,14 @@ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; }; } + { + name = "supports_color___supports_color_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } { name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { @@ -12361,6 +12313,14 @@ sha1 = "6e0f88fdae3692793d1077fd172a4667afe986a6"; }; } + { + name = "table___table_6.0.7.tgz"; + path = fetchurl { + name = "table___table_6.0.7.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; + sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + }; + } { name = "taffydb___taffydb_2.6.2.tgz"; path = fetchurl { @@ -12393,6 +12353,14 @@ sha1 = "0ca8848562c7299b8b446ff6a4d60cdbb23edc40"; }; } + { + name = "tar___tar_6.0.5.tgz"; + path = fetchurl { + name = "tar___tar_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; + sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; + }; + } { name = "term_size___term_size_2.2.0.tgz"; path = fetchurl { @@ -12497,14 +12465,6 @@ sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; }; } - { - name = "through___through_2.3.8.tgz"; - path = fetchurl { - name = "through___through_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - } { name = "thunky___thunky_0.1.0.tgz"; path = fetchurl { @@ -12793,6 +12753,14 @@ sha1 = "08ec0d3fc2c3a39e4a46eae5610b69fafa6babd0"; }; } + { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + path = fetchurl { + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + }; + } { name = "tslib___tslib_1.13.0.tgz"; path = fetchurl { @@ -12833,6 +12801,14 @@ sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } { name = "type_check___type_check_0.3.2.tgz"; path = fetchurl { @@ -12849,14 +12825,6 @@ sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; }; } - { - name = "type_fest___type_fest_0.5.2.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz"; - sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2"; - }; - } { name = "type_fest___type_fest_0.6.0.tgz"; path = fetchurl { @@ -12898,11 +12866,11 @@ }; } { - name = "typescript___typescript_3.9.7.tgz"; + name = "typescript___typescript_4.1.5.tgz"; path = fetchurl { - name = "typescript___typescript_3.9.7.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; - sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; + name = "typescript___typescript_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz"; + sha1 = "123a3b214aaff3be32926f0d8f1f6e704eb89a72"; }; } { @@ -13170,11 +13138,11 @@ }; } { - name = "url_parse___url_parse_1.4.4.tgz"; + name = "url_parse___url_parse_1.4.7.tgz"; path = fetchurl { - name = "url_parse___url_parse_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz"; - sha1 = "cac1556e95faa0303691fec5cf9d5a1bc34648f8"; + name = "url_parse___url_parse_1.4.7.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz"; + sha1 = "a8a83535e8c00a316e403a5db4ac1b9b853ae278"; }; } { @@ -13282,11 +13250,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz"; - sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"; + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; }; } { @@ -13474,11 +13442,11 @@ }; } { - name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; + name = "vue_eslint_parser___vue_eslint_parser_7.4.1.tgz"; path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz"; - sha1 = "894085839d99d81296fa081d19643733f23d7559"; + name = "vue_eslint_parser___vue_eslint_parser_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.4.1.tgz"; + sha1 = "e4adcf7876a7379758d9056a72235af18a587f92"; }; } { @@ -13618,19 +13586,19 @@ }; } { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; path = fetchurl { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; - sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"; + sha1 = "38500072ee6ece66f3769936950ea1771be1c957"; }; } { - name = "watchpack___watchpack_1.7.2.tgz"; + name = "watchpack___watchpack_1.7.5.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz"; - sha1 = "c02e4d4d49913c3e7e122c3325365af9d331e9aa"; + name = "watchpack___watchpack_1.7.5.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz"; + sha1 = "1267e6c55e0b9b5be44c2023aed5437a2c26c453"; }; } { @@ -13666,19 +13634,19 @@ }; } { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz"; path = fetchurl { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz"; - sha1 = "39b3a8f829ca044682bc6f9e011c95deb554aefd"; + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz"; + sha1 = "f6f94db108fb574e415ad313de41a2707d33ef3c"; }; } { - name = "webpack_cli___webpack_cli_3.3.11.tgz"; + name = "webpack_cli___webpack_cli_3.3.12.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_3.3.11.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz"; - sha1 = "3bf21889bf597b5d82c38f215135a411edfdc631"; + name = "webpack_cli___webpack_cli_3.3.12.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; + sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a"; }; } { @@ -13690,11 +13658,11 @@ }; } { - name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.11.2.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.10.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz"; - sha1 = "f35945036813e57ef582c2420ef7b470e14d3af0"; + name = "webpack_dev_server___webpack_dev_server_3.11.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz"; + sha1 = "695ebced76a4929f0d5de7fd73fafe185fe33708"; }; } { @@ -13722,19 +13690,19 @@ }; } { - name = "webpack___webpack_4.42.0.tgz"; + name = "webpack___webpack_4.46.0.tgz"; path = fetchurl { - name = "webpack___webpack_4.42.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz"; - sha1 = "b901635dd6179391d90740a63c93f76f39883eb8"; + name = "webpack___webpack_4.46.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz"; + sha1 = "bf9b4404ea20a073605e0a011d188d77cb6ad542"; }; } { - name = "websocket_driver___websocket_driver_0.6.5.tgz"; + name = "websocket_driver___websocket_driver_0.7.4.tgz"; path = fetchurl { - name = "websocket_driver___websocket_driver_0.6.5.tgz"; - url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + name = "websocket_driver___websocket_driver_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760"; }; } { @@ -13841,14 +13809,6 @@ sha1 = "45fda3ef76aca815771a89107399ee4119b430ac"; }; } - { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - } { name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; path = fetchurl { @@ -14081,14 +14041,6 @@ sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8"; }; } - { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; - sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; - }; - } { name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { @@ -14105,22 +14057,6 @@ sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; }; } - { - name = "yargs___yargs_12.0.5.tgz"; - path = fetchurl { - name = "yargs___yargs_12.0.5.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; - sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; - }; - } - { - name = "yargs___yargs_13.2.4.tgz"; - path = fetchurl { - name = "yargs___yargs_13.2.4.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz"; - sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83"; - }; - } { name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { @@ -14178,11 +14114,11 @@ }; } { - name = "zrender___zrender_4.2.0.tgz"; + name = "zrender___zrender_4.3.2.tgz"; path = fetchurl { - name = "zrender___zrender_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/zrender/-/zrender-4.2.0.tgz"; - sha1 = "d001302e155f28de1f9fc7fcd5c254bad28471cf"; + name = "zrender___zrender_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/zrender/-/zrender-4.3.2.tgz"; + sha1 = "ec7432f9415c82c73584b6b7b8c47e1b016209c6"; }; } ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile index beff147c37..9e844a1e01 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' gem "bundler", ">= 1.5.0" -gem 'rails', '5.2.4.2' +gem 'rails', '5.2.4.5' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem "rouge", "~> 3.12.0" gem "request_store", "~> 1.4.1" @@ -12,8 +12,8 @@ gem "actionpack-xml_parser" gem "roadie-rails", (RUBY_VERSION < "2.5" ? "~> 1.3.0" : "~> 2.1.0") gem "mimemagic" gem "mail", "~> 2.7.1" -gem "csv", "~> 3.1.1" -gem "nokogiri", "~> 1.10.0" +gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1') +gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1') gem "i18n", "~> 1.6.0" gem "rbpdf", "~> 1.20.0" @@ -38,7 +38,7 @@ end # Optional Markdown support, not for JRuby group :markdown do - gem "redcarpet", "~> 3.5.0" + gem 'redcarpet', '~> 3.5.1' end # Include database gems for the database adapters NixOS supports diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock index 60aed5e179..c71a1b7bdd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.2) - actionpack (= 5.2.4.2) + actioncable (5.2.4.5) + actionpack (= 5.2.4.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) + actionmailer (5.2.4.5) + actionpack (= 5.2.4.5) + actionview (= 5.2.4.5) + activejob (= 5.2.4.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.2) - actionview (= 5.2.4.2) - activesupport (= 5.2.4.2) + actionpack (5.2.4.5) + actionview (= 5.2.4.5) + activesupport (= 5.2.4.5) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.4.2) - activesupport (= 5.2.4.2) + actionview (5.2.4.5) + activesupport (= 5.2.4.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.2) - activesupport (= 5.2.4.2) + activejob (5.2.4.5) + activesupport (= 5.2.4.5) globalid (>= 0.3.6) - activemodel (5.2.4.2) - activesupport (= 5.2.4.2) - activerecord (5.2.4.2) - activemodel (= 5.2.4.2) - activesupport (= 5.2.4.2) + activemodel (5.2.4.5) + activesupport (= 5.2.4.5) + activerecord (5.2.4.5) + activemodel (= 5.2.4.5) + activesupport (= 5.2.4.5) arel (>= 9.0) - activestorage (5.2.4.2) - actionpack (= 5.2.4.2) - activerecord (= 5.2.4.2) + activestorage (5.2.4.5) + actionpack (= 5.2.4.5) + activerecord (= 5.2.4.5) marcel (~> 0.3.1) - activesupport (5.2.4.2) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -48,7 +48,7 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) arel (9.0.0) - ast (2.4.0) + ast (2.4.2) builder (3.2.4) capybara (3.25.0) addressable @@ -59,21 +59,21 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) childprocess (3.0.0) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.8) crass (1.0.6) - css_parser (1.7.1) + css_parser (1.9.0) addressable - csv (3.1.2) - docile (1.3.2) - erubi (1.9.0) + csv (3.1.9) + docile (1.3.5) + erubi (1.10.0) globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) i18n (1.6.0) concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) - json (2.3.0) - loofah (2.5.0) + json (2.5.1) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -81,61 +81,63 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) - mimemagic (0.3.4) + mimemagic (0.3.5) mini_magick (4.9.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.0) - mocha (1.11.2) + mini_portile2 (2.5.0) + minitest (5.14.4) + mocha (1.12.0) mysql2 (0.5.3) - net-ldap (0.16.2) - nio4r (2.5.2) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - parallel (1.19.1) - parser (2.7.1.0) - ast (~> 2.4.0) + net-ldap (0.16.3) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + parallel (1.20.1) + parser (3.0.0.0) + ast (~> 2.4.1) pg (1.1.4) - public_suffix (4.0.4) - puma (3.12.4) - rack (2.2.2) + public_suffix (4.0.6) + puma (3.12.6) + racc (1.5.2) + rack (2.2.3) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.2) - actioncable (= 5.2.4.2) - actionmailer (= 5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) - activemodel (= 5.2.4.2) - activerecord (= 5.2.4.2) - activestorage (= 5.2.4.2) - activesupport (= 5.2.4.2) + rails (5.2.4.5) + actioncable (= 5.2.4.5) + actionmailer (= 5.2.4.5) + actionpack (= 5.2.4.5) + actionview (= 5.2.4.5) + activejob (= 5.2.4.5) + activemodel (= 5.2.4.5) + activerecord (= 5.2.4.5) + activestorage (= 5.2.4.5) + activesupport (= 5.2.4.5) bundler (>= 1.3.0) - railties (= 5.2.4.2) + railties (= 5.2.4.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.2) - actionpack (= 5.2.4.2) - activesupport (= 5.2.4.2) + railties (5.2.4.5) + actionpack (= 5.2.4.5) + activesupport (= 5.2.4.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (13.0.1) + rake (13.0.3) rbpdf (1.20.1) htmlentities rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) - redcarpet (3.5.0) - regexp_parser (1.7.0) + redcarpet (3.5.1) + regexp_parser (1.8.2) request_store (1.4.1) rack (>= 1.4) roadie (4.0.0) @@ -158,7 +160,7 @@ GEM rack (>= 1.1) rubocop (>= 0.72.0) ruby-openid (2.9.2) - ruby-progressbar (1.10.1) + ruby-progressbar (1.11.0) rubyzip (2.3.0) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) @@ -168,24 +170,24 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sprockets (4.0.0) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (1.6.1) - websocket-driver (0.7.1) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.24) + yard (0.9.26) PLATFORMS ruby @@ -204,14 +206,14 @@ DEPENDENCIES mocha (>= 1.4.0) mysql2 (~> 0.5.0) net-ldap (~> 0.16.0) - nokogiri (~> 1.10.0) + nokogiri (~> 1.11.1) pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.4.2) + rails (= 5.2.4.5) rails-dom-testing rbpdf (~> 1.20.0) - redcarpet (~> 3.5.0) + redcarpet (~> 3.5.1) request_store (~> 1.4.1) roadie-rails (~> 2.1.0) rouge (~> 3.12.0) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix index ab5b4ffded..37905e273d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let - version = "4.1.1"; + version = "4.1.2"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5"; + sha256 = "13i2rlkpdwkdhidpdb5r2zxwxna00r71rh248kzfhgy5a5rkj8ky"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix index a8fd6eba6f..e110c1bf54 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v"; + sha256 = "1rlx5597621jmdzpf8mhfm52d0fcz1izdj94k58l4sln4gw0x73j"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z"; + sha256 = "19y5y2dypqakk39smcmyslic8wnffzc0670d2zjadsrgsg850gyp"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax"; + sha256 = "1dh83klnrhfi94s066ahfl2bxaqxqc0sqga71bvcgn8xmcl56bhq"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp"; + sha256 = "0kxf9gd52hh33z6015gsfsnyavly29f15lbsljlai68r7qc2j89c"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi"; + sha256 = "1mb4s49vbrxyg3pba76z3llbzclm8d4zcjhalf4yrfq5y357kkya"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di"; + sha256 = "0qc4bjxnkjrlqpz2k7hllqk30ydad5m2q7pbqzdr0hxzycavxz7m"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5"; + sha256 = "1smg691az7r2bsydfj2d46mr2d5sm0lq3ydwvfv6hl5c3y1y5jfg"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9"; + sha256 = "12i3an3vxg0fqjvr4mi0b3nnsb8jpcphkmz1717nb7lsy3wm4081"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -135,10 +135,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; builder = { groups = ["default"]; @@ -176,10 +176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.8"; }; crass = { groups = ["default"]; @@ -197,40 +197,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; + sha256 = "0xs4ind9xd099rb52b73pch8ha143dl8bhivqsbba4wrvxpbx751"; type = "gem"; }; - version = "1.7.1"; + version = "1.9.0"; }; csv = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5"; + sha256 = "07mgyalwdxaxnff86j5p6n5szmhqz7nrlkb40826mzggrmva8v1m"; type = "gem"; }; - version = "3.1.2"; + version = "3.1.9"; }; docile = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + sha256 = "1bpdrsdqwv80qqc3f4xxzpii13lx9mlx3zay4bnmmscrx8c0p63z"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.5"; }; erubi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; globalid = { dependencies = ["activesupport"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.1"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -290,10 +290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; + sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck"; type = "gem"; }; - version = "2.5.0"; + version = "2.9.0"; }; mail = { dependencies = ["mini_mime"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p"; + sha256 = "1qfqb9w76kmpb48frbzbyvjc0dfxh5qiw1kxdbv2y2kp6fxpa1kf"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.5"; }; mini_magick = { groups = ["minimagick"]; @@ -362,30 +362,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; + sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; minitest = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.4"; }; mocha = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4"; + sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a"; type = "gem"; }; - version = "1.11.2"; + version = "1.12.0"; }; mysql2 = { groups = ["default"]; @@ -410,41 +410,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; + sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; type = "gem"; }; - version = "0.16.2"; + version = "0.16.3"; }; nio4r = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"; + sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5"; type = "gem"; }; - version = "2.5.2"; + version = "2.5.7"; }; nokogiri = { - dependencies = ["mini_portile2"]; + dependencies = ["mini_portile2" "racc"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; + sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; type = "gem"; }; - version = "1.10.9"; + version = "1.11.2"; }; parallel = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.19.1"; + version = "1.20.1"; }; parser = { dependencies = ["ast"]; @@ -452,10 +452,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7"; + sha256 = "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml"; type = "gem"; }; - version = "2.7.1.0"; + version = "3.0.0.0"; }; pg = { groups = ["default"]; @@ -480,30 +480,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.4"; + version = "4.0.6"; }; puma = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs"; + sha256 = "1ypkyqhysb2vvdvkl4w923yvpmi228gld4kbargb1i2d4sa9s49a"; type = "gem"; }; - version = "3.12.4"; + version = "3.12.6"; + }; + racc = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + type = "gem"; + }; + version = "1.5.2"; }; rack = { groups = ["default" "openid" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; @@ -533,10 +543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4"; + sha256 = "1nzsm1fqqnhlvgcfrrpsmcv2znldfkyq5c9z7k08p2p54jrd8kfd"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -566,10 +576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16"; + sha256 = "1qwgjwfzkm4q7wby30c9r724w1sp1bywbqfmpv20lq3zdcrf1rfd"; type = "gem"; }; - version = "5.2.4.2"; + version = "5.2.4.5"; }; rainbow = { groups = ["default" "test"]; @@ -586,10 +596,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; type = "gem"; }; - version = "13.0.1"; + version = "13.0.3"; }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; @@ -617,20 +627,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; + sha256 = "0bvk8yyns5s1ls437z719y5sdv9fr8kfs8dmr6g8s761dv5n8zvi"; type = "gem"; }; - version = "3.5.0"; + version = "3.5.1"; }; regexp_parser = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2"; + sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.2"; }; request_store = { dependencies = ["rack"]; @@ -723,10 +733,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; type = "gem"; }; - version = "1.10.1"; + version = "1.11.0"; }; rubyzip = { groups = ["default" "test"]; @@ -776,10 +786,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap"; + sha256 = "0ikgwbl6jv3frfiy3xhg5yxw9d0064rgzghar1rg391xmrc4gm38"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.2"; }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; @@ -787,20 +797,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; + sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; thread_safe = { groups = ["default" "test"]; @@ -818,10 +828,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; unicode-display_width = { groups = ["default" "test"]; @@ -839,20 +849,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; + sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.3"; }; websocket-extensions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; xpath = { dependencies = ["nokogiri"]; @@ -870,9 +880,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; + sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; type = "gem"; }; - version = "0.9.24"; + version = "0.9.26"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix b/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix new file mode 100644 index 0000000000..d691882a2c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/corrscope/default.nix @@ -0,0 +1,55 @@ +{ lib +, mkDerivationWith +, python3Packages +, wrapQtAppsHook +, ffmpeg +, qtbase +}: + +mkDerivationWith python3Packages.buildPythonApplication rec { + pname = "corrscope"; + version = "0.7.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0m62p3jlbx5dlp3j8wn1ka1sqpffsxbpsgv2h5cvj1n1lsgbss2s"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'attrs>=18.2.0,<19.0.0' 'attrs>=18.2.0' \ + --replace 'numpy>=1.15,<2.0,!=1.19.4' 'numpy>=1.15,<2.0' + ''; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + buildInputs = [ ffmpeg qtbase ]; + + propagatedBuildInputs = with python3Packages; [ appdirs attrs click matplotlib numpy pyqt5 ruamel_yaml ]; + + dontWrapQtApps = true; + + preFixup = '' + makeWrapperArgs+=( + --prefix PATH : ${ffmpeg}/bin + "''${qtWrapperArgs[@]}" + ) + ''; + + preCheck = "export HOME=$TEMP"; + + meta = with lib; { + description = "Render wave files into oscilloscope views, featuring advanced correlation-based triggering algorithm"; + longDescription = '' + Corrscope renders oscilloscope views of WAV files recorded from chiptune (game music from + retro sound chips). + + Corrscope uses "waveform correlation" to track complex waves (including SNES and Sega + Genesis/FM synthesis) which jump around on other oscilloscope programs. + ''; + homepage = "https://github.com/corrscope/corrscope"; + license = licenses.bsd2; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix new file mode 100644 index 0000000000..a5de2142d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron }: + +stdenv.mkDerivation rec { + pname = "freetube"; + version = "0.12.0"; + + src = fetchurl { + url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; + sha256 = "151fcm1swsasrwzm93fddx669q4xlfl3d58q1w58nyv7r6kh4fda"; + }; + + appimageContents = appimageTools.extractType2 { + name = "${pname}-${version}"; + inherit src; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} $out/share/applications + + cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + cp -a ${appimageContents}/freetube.desktop $out/share/applications/${pname}.desktop + cp -a ${appimageContents}/usr/share/icons $out/share + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar + ''; + + meta = with lib; { + description = "An Open Source YouTube app for privacy"; + homepage = "https://freetubeapp.io/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ryneeverett ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix index bfce47b7b2..d122cacc87 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/certifi/default.nix @@ -17,5 +17,6 @@ buildKodiAddon rec { homepage = "https://certifi.io"; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.mpl20; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix index 1e37f6b46e..7c069592c6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/chardet/default.nix @@ -17,5 +17,6 @@ buildKodiAddon rec { homepage = "https://github.com/Freso/script.module.chardet"; description = "Universal encoding detector"; license = licenses.lgpl2Only; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/controllers/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/controllers/default.nix index bd29b7c0f7..825ad5d53f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/controllers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/controllers/default.nix @@ -16,6 +16,7 @@ buildKodiAddon rec { meta = with lib; { description = "Add support for different gaming controllers."; platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; + license = licenses.odbl; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/dateutil/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/dateutil/default.nix new file mode 100644 index 0000000000..665858d3d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/dateutil/default.nix @@ -0,0 +1,27 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six }: + +buildKodiAddon rec { + pname = "dateutil"; + namespace = "script.module.dateutil"; + version = "2.8.1+matrix.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "1jr77017ihs7j3455i72af71wyvs792kbizq4539ccd98far8lm7"; + }; + + propagatedBuildInputs = [ + six + ]; + + passthru.updateScript = addonUpdateScript { + attrPath = "kodi.packages.dateutil"; + }; + + meta = with lib; { + homepage = "https://dateutil.readthedocs.io/en/stable/"; + description = "Extensions to the standard Python datetime module"; + license = with licenses; [ asl20 bsd3 ]; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix index abe5635e82..662a45188e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/idna/default.nix @@ -17,5 +17,6 @@ buildKodiAddon rec { homepage = "https://github.com/Freso/script.module.idna"; description = "Internationalized Domain Names for Python"; license = licenses.bsd3; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix index cd4c5aca11..136efe8a24 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstream-adaptive/default.nix @@ -23,6 +23,7 @@ buildKodiBinaryAddon rec { homepage = "https://github.com/peak3d/inputstream.adaptive"; description = "Kodi inputstream addon for several manifest types"; platforms = platforms.all; - maintainers = with maintainers; [ sephalon ]; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index 2bbcc6d9d2..b42c32fed1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -17,5 +17,6 @@ buildKodiAddon rec { homepage = "https://github.com/emilsvennesson/script.module.inputstreamhelper"; description = "A simple Kodi module that makes life easier for add-on developers relying on InputStream based add-ons and DRM playback"; license = licenses.mit; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/jellyfin/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/jellyfin/default.nix new file mode 100644 index 0000000000..03a037ce53 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/jellyfin/default.nix @@ -0,0 +1,49 @@ +{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals }: +let + python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); +in +buildKodiAddon rec { + pname = "jellyfin"; + namespace = "plugin.video.jellyfin"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "jellyfin"; + repo = "jellyfin-kodi"; + rev = "v${version}"; + sha256 = "0fx20gmd5xlg59ks4433qh2b3jhbs5qrnc49zi4rkqqr4jr4nhnn"; + }; + + nativeBuildInputs = [ + python + ]; + + prePatch = '' + substituteInPlace .config/generate_xml.py \ + --replace "'jellyfin-kodi/release.yaml'" "'release.yaml'" \ + --replace "'jellyfin-kodi/addon.xml'" "'addon.xml'" + ''; + + buildPhase = '' + ${python}/bin/python3 .config/generate_xml.py py3 + ''; + + postInstall = '' + mv /build/source/addon.xml $out${addonDir}/${namespace}/ + ''; + + propagatedBuildInputs = [ + requests + dateutil + six + kodi-six + signals + ]; + + meta = with lib; { + homepage = "https://jellyfin.org/"; + description = "A whole new way to manage and view your media library"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/joystick/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/joystick/default.nix index 321ddce905..a1b9c3eeee 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/joystick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/joystick/default.nix @@ -11,11 +11,12 @@ buildKodiBinaryAddon rec { sha256 = "1dhj4afr9kj938xx70fq5r409mz6lbw4n581ljvdjj9lq7akc914"; }; + extraBuildInputs = [ tinyxml udev ]; + meta = with lib; { description = "Binary addon for raw joystick input."; platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; }; - - extraBuildInputs = [ tinyxml udev ]; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-six/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-six/default.nix new file mode 100644 index 0000000000..b4f1169b36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/kodi-six/default.nix @@ -0,0 +1,23 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "kodi-six"; + namespace = "script.module.kodi-six"; + version = "0.1.3.1"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x"; + }; + + passthru.updateScript = addonUpdateScript { + attrPath = "kodi.packages.kodi-six"; + }; + + meta = with lib; { + homepage = "https://github.com/romanvm/kodi.six"; + description = "Wrappers around Kodi Python API for seamless Python 2/3 compatibility"; + license = licenses.gpl3Only; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix index a1b2557652..bd0c98137a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/myconnpy/default.nix @@ -17,5 +17,6 @@ buildKodiAddon rec { homepage = "http://dev.mysql.com/doc/connector-python/en/index.html"; description = "MySQL Connector/Python"; license = licenses.gpl2Only; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix index 20440153f7..e187fad973 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -1,4 +1,5 @@ -{ lib, buildKodiAddon, fetchFromGitHub, signals, inputstreamhelper, requests, myconnpy }: +{ lib, buildKodiAddon, fetchFromGitHub, signals, inputstream-adaptive, inputstreamhelper, requests, myconnpy }: + buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; @@ -13,6 +14,7 @@ buildKodiAddon rec { propagatedBuildInputs = [ signals + inputstream-adaptive inputstreamhelper requests myconnpy @@ -22,5 +24,6 @@ buildKodiAddon rec { homepage = "https://github.com/CastagnaIT/plugin.video.netflix"; description = "Netflix VOD Services Add-on"; license = licenses.mit; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix index 430b9be3fd..8896a94c9c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pdfreader/default.nix @@ -14,6 +14,7 @@ buildKodiAddon rec { meta = with lib; { homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; - maintainers = with maintainers; [ edwtjo ]; + license = licenses.gpl2Plus; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix index 3920120b90..ba1a0241ff 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix @@ -11,12 +11,13 @@ buildKodiBinaryAddon rec { sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm"; }; + extraBuildInputs = [ jsoncpp libhdhomerun ]; + meta = with lib; { homepage = "https://github.com/kodi-pvr/pvr.hdhomerun"; description = "Kodi's HDHomeRun PVR client addon"; platforms = platforms.all; - maintainers = with maintainers; [ titanous ]; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; }; - - extraBuildInputs = [ jsoncpp libhdhomerun ]; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix index 935238758a..5c55873e81 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hts/default.nix @@ -15,7 +15,7 @@ buildKodiBinaryAddon rec { homepage = "https://github.com/kodi-pvr/pvr.hts"; description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; - maintainers = with maintainers; [ cpages ]; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; }; - } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix index b508eae8c7..9f160b4fa6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-iptvsimple/default.nix @@ -11,12 +11,13 @@ buildKodiBinaryAddon rec { sha256 = "062i922qi0izkvn7v47yhyy2cf3fa7xc3k95b1gm9abfdwkk8ywr"; }; + extraBuildInputs = [ zlib pugixml ]; + meta = with lib; { homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; description = "Kodi's IPTV Simple client addon"; platforms = platforms.all; license = licenses.gpl2Plus; + maintainers = teams.kodi.members; }; - - extraBuildInputs = [ zlib pugixml ]; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix index 05288b74b6..7d79abd087 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/requests/default.nix @@ -24,5 +24,6 @@ buildKodiAddon rec { homepage = "http://python-requests.org"; description = "Python HTTP for Humans"; license = licenses.asl20; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix index 9d49e63272..bba7b112e9 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/signals/default.nix @@ -17,5 +17,6 @@ buildKodiAddon rec { homepage = "https://github.com/ruuk/script.module.addon.signals"; description = "Provides signal/slot mechanism for inter-addon communication"; license = licenses.lgpl21Only; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/six/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/six/default.nix new file mode 100644 index 0000000000..8d7b8f936f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/six/default.nix @@ -0,0 +1,23 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: + +buildKodiAddon rec { + pname = "six"; + namespace = "script.module.six"; + version = "1.14.0+matrix.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "1f9g43j4y5x7b1bgbwqqfj0p2bkqjpycj17dj7a9j271mcr5zhwb"; + }; + + passthru.updateScript = addonUpdateScript { + attrPath = "kodi.packages.six"; + }; + + meta = with lib; { + homepage = "https://pypi.org/project/six/"; + description = "Python 2 and 3 compatibility utilities"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-controller/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-controller/default.nix index 5eee0eff94..d2b79029f7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-controller/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-controller/default.nix @@ -16,7 +16,6 @@ buildKodiBinaryAddon rec { meta = with lib; { description = "Binary addon for steam controller."; platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; + maintainers = teams.kodi.members; }; - } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-launcher/default.nix index cb140b4fb4..c4a695b8f8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/steam-launcher/default.nix @@ -23,6 +23,7 @@ buildKodiAddon { restart/maximise. Running pre/post Steam scripts can be configured via the addon. ''; - maintainers = with maintainers; [ edwtjo ]; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/svtplay/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/svtplay/default.nix index cc7d350fa3..db4fbb642c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/svtplay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/svtplay/default.nix @@ -21,6 +21,7 @@ buildKodiAddon rec { is the preferred video format by the plugin. ''; platforms = platforms.all; - maintainers = with maintainers; [ edwtjo ]; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix index e814698791..e3127a8d11 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/urllib3/default.nix @@ -17,5 +17,6 @@ buildKodiAddon rec { homepage = "https://urllib3.readthedocs.io/en/latest/"; description = "HTTP library with thread-safe connection pooling, file post, and more"; license = licenses.mit; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix index 13100b0dd3..6819f7bfdc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-libarchive/default.nix @@ -11,12 +11,12 @@ buildKodiBinaryAddon rec { sha256 = "1q62p1i6rvqk2zv6f1cpffkh95lgclys2xl4dwyhj3acmqdxd9i5"; }; + extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; + meta = with lib; { description = "LibArchive Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ minijackson ]; + maintainers = teams.kodi.members; }; - - extraBuildInputs = [ libarchive lzma bzip2 zlib lz4 lzo openssl ]; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix index 7910ab640e..e41f008281 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/vfs-sftp/default.nix @@ -11,12 +11,12 @@ buildKodiBinaryAddon rec { sha256 = "06w74sh8yagrrp7a7rjaz3xrh1j3wdqald9c4b72c33gpk5997dk"; }; + extraBuildInputs = [ openssl libssh zlib ]; + meta = with lib; { description = "SFTP Virtual Filesystem add-on for Kodi"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ minijackson ]; + maintainers = teams.kodi.members; }; - - extraBuildInputs = [ openssl libssh zlib ]; } diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-addon.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-addon.nix index cd768b6fa9..572d5dda80 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-addon.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-addon.nix @@ -11,11 +11,15 @@ toKodiAddon (stdenv.mkDerivation ({ extraRuntimeDependencies = [ ]; installPhase = '' + runHook preInstall + cd $src/$sourceDir d=$out${addonDir}/${namespace} mkdir -p $d sauce="." [ -d ${namespace} ] && sauce=${namespace} cp -R "$sauce/"* $d + + runHook postInstall ''; } // attrs)) diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-binary-addon.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-binary-addon.nix index 74ce508ab6..e0ca5d1cf6 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-binary-addon.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/build-kodi-binary-addon.nix @@ -24,8 +24,12 @@ toKodiAddon (stdenv.mkDerivation ({ # and the non-wrapped kodi lib/... folder before even trying to dlopen # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use installPhase = let n = namespace; in '' + runHook preInstall + make install ln -s $out/lib/addons/${n}/${n}.so.${version} $out${addonDir}/${n}/${n}.so.${version} ${extraInstallPhase} + + runHook postInstall ''; } // attrs)) diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index 2a713324c3..1b665418f3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -237,6 +237,6 @@ in stdenv.mkDerivation { homepage = "https://kodi.tv/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ titanous edwtjo peterhoeg sephalon ]; + maintainers = teams.kodi.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix index cec6468c43..817daf31d0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/makemkv/default.nix @@ -13,21 +13,21 @@ }: let - version = "1.15.4"; + version = "1.16.3"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-Reun5hp7Rnsf6N5yL6iQ1Vbhnz/AKnt/jYRqyOK625o="; + hash = "sha256-G2XceMwiFu4fWT4L3HJzDB/rD3eSX6ko6RdVw72QLzg="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-gtBi1IRNF5ASk/ZdzkDmOuEIT9gazNaRNCftqbLEP+M="; + hash = "sha256-YUGozP9B6vmWQ4WxctSbezzu+0yLJXNKQk9TwnQF8F0="; }; in mkDerivation { pname = "makemkv"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix new file mode 100644 index 0000000000..cda15b2674 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/thumbnail.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub, lib, python3, stdenv }: + +stdenv.mkDerivation rec { + pname = "mpv_thumbnail_script"; + version = "unstable-2020-01-16"; + + src = fetchFromGitHub { + owner = "theamm"; + repo = pname; + rev = "682becf5b5115c2a206b4f0bdee413d4be8b5bef"; + sha256 = "0dgfrb8ypc5vlq35kzn423fm6l6348ivl85vb6j3ccc9a51xprw3"; + }; + + nativeBuildInputs = [ python3 ]; + + postPatch = '' + patchShebangs concat_files.py + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/mpv/scripts + cp mpv_thumbnail_script_{client_osc,server}.lua $out/share/mpv/scripts + runHook postInstall + ''; + + passthru.scriptName = "mpv_thumbnail_script_{client_osc,server}.lua"; + + meta = with lib; { + description = "A lua script to show preview thumbnails in mpv's OSC seekbar"; + homepage = "https://github.com/theamm/mpv_thumbnail_script"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix new file mode 100644 index 0000000000..c44db31f50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }: + +stdenv.mkDerivation rec { + pname = "catatonit"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = pname; + rev = "v${version}"; + sha256 = "ciJ1MI7jr5P2PgxIykQ+BiwNUO8lQHGt0+U8CNbc5bI="; + }; + + patches = [ + # Fix compilation with musl + (fetchpatch { + url = "https://github.com/openSUSE/catatonit/commit/75014b1c3099245b7d0f44f24d7f6dc4888a45fd.patch"; + sha256 = "sha256-9VMNUT1U90ocjvE7EXYfLxuodDwTXXHYg89qqa5Jq0g="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + + doInstallCheck = true; + installCheckPhase = '' + readelf -d $out/bin/catatonit | grep 'There is no dynamic section in this file.' + ''; + + passthru.tests = { inherit (nixosTests) podman; }; + + meta = with lib; { + description = "A container init that is so simple it's effectively brain-dead"; + homepage = "https://github.com/openSUSE/catatonit"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ erosennin ] ++ teams.podman.members; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix index 4c2d82ce63..bd54401e23 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix @@ -3,7 +3,7 @@ { name ? "debian-build" , diskImage -, src, lib, stdenv, vmTools, checkinstall +, src, stdenv, vmTools, checkinstall , fsTranslation ? false , # Features provided by this package. debProvides ? [] @@ -21,7 +21,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( prePhases = "installExtraDebsPhase sysInfoPhase"; } - // removeAttrs args ["vmTools"] // + // removeAttrs args ["vmTools" "lib"] // { name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); diff --git a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index ebd171c654..6e21220918 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix index 36aee979f0..bdc7b55d9c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY="; + sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv"; }; nativeBuildInputs = [ @@ -16,20 +16,24 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ + adwaita-icon-theme breeze-icons - gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons mv kora* $out/share/icons/ for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme + gtk-update-icon-cache -f $theme done + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index d1d8b91bda..597c6577cb 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c0fe8e827d5ec71141700f5d5a90a6f6616ecbc5.tar.gz"; - sha256 = "16is1cipkfiabbh01i247vqfviwzjpfhgf6pkli61wwlhnk0q95s"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fd3fefef13b49cbcd9a08b46c2aa4ceb204de5e0.tar.gz"; + sha256 = "1dr4bqsisizw3qn9qxjpbk0rjri6s0gv9g9717cwfcixy940af2s"; } diff --git a/third_party/nixpkgs/pkgs/data/themes/juno/default.nix b/third_party/nixpkgs/pkgs/data/themes/juno/default.nix new file mode 100644 index 0000000000..9e1580a6a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/juno/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "juno"; + version = "0.0.1"; + + srcs = [ + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno.tar.xz"; + sha256 = "1cghsn9qagcf1nlga5cal0aqch6hkjm5wk6ja791zxhdqy3crx1i"; + }) + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-mirage.tar.xz"; + sha256 = "0zh6bc85svmwh8qrhpn8mim0pj322x2x2i9sxnp7p1938p5z5m2b"; + }) + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-ocean.tar.xz"; + sha256 = "0m2wgmcn12dfq5badzlpzjc8792ba9hi32c79vfvqawdn1q3hrdx"; + }) + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-palenight.tar.xz"; + sha256 = "1hn2l0m76x61ixjd253hi7czm65asdjdhqvvlv7idbccc40pvrak"; + }) + ]; + + sourceRoot = "."; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Juno* $out/share/themes + rm $out/share/themes/*/{LICENSE,README.md} + runHook postInstall + ''; + + meta = with lib; { + description = "GTK themes inspired by epic vscode themes"; + homepage = "https://github.com/EliverLara/Juno"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.gvolpe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index f5dae739ea..24709d0f2a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "34"; + version = "35"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "0p9sk8cv2z242d5783gx2m4l1x9vg5fy1a7yr1wcfshvajlrj23m"; + sha256 = "sha256-xVoXVVEULZZnoYEXl1x96Tjs8hOvs9/sOAUVMj9kKCo="; }; # This package has a Makefile, but it's used for building a zip for diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix new file mode 100644 index 0000000000..e71a0bd023 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, extra-cmake-modules +, kwindowsystem +, plasma-framework +, qtx11extras +}: + +mkDerivation rec { + pname = "plasma-applet-virtual-desktop-bar"; + version = "unstable-2021-02-20"; + + src = fetchFromGitHub { + owner = "wsdfhjxc"; + repo = "virtual-desktop-bar"; + rev = "3e9bbddb8def8da65071a1c325eaa06598e8a473"; + sha256 = "192ns6c2brzq46pg385n0v1ydbz52aaa8f5dgfw5251hrw9c7bxg"; + }; + + buildInputs = [ + kwindowsystem plasma-framework qtx11extras + ]; + + nativeBuildInputs = [ + extra-cmake-modules + ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + meta = with lib; { + description = "Manage virtual desktops dynamically in a convenient way"; + homepage = "https://github.com/wsdfhjxc/virtual-desktop-bar"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix index c4cbc44b37..82985523c4 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -131,6 +131,7 @@ let plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; plasma-vault = callPackage ./plasma-vault {}; plasma-workspace = callPackage ./plasma-workspace {}; @@ -143,6 +144,7 @@ let thirdParty = let inherit (libsForQt5) callPackage; in { plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; + plasma-applet-virtual-desktop-bar = callPackage ./3rdparty/addons/virtual-desktop-bar.nix { }; kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix index 37632ab2f7..cf815b8082 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/discover.nix @@ -1,10 +1,34 @@ -{ - mkDerivation, lib, - extra-cmake-modules, gettext, kdoctools, python, - appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux, - qtbase, qtquickcontrols2, - karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels, - knewstuff, kwindowsystem, kxmlgui, plasma-framework +{ mkDerivation +, lib +, extra-cmake-modules +, gettext +, kdoctools +, python +, appstream-qt +, discount +, flatpak +, fwupd +, ostree +, packagekit-qt +, pcre +, util-linux +, qtbase +, qtquickcontrols2 +, qtx11extras +, karchive +, kcmutils +, kconfig +, kcrash +, kdbusaddons +, kdeclarative +, kidletime +, kio +, kirigami2 +, kitemmodels +, knewstuff +, kwindowsystem +, kxmlgui +, plasma-framework }: mkDerivation { @@ -13,9 +37,29 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ # discount is needed for libmarkdown - appstream-qt discount flatpak fwupd ostree packagekit-qt pcre util-linux + appstream-qt + discount + flatpak + fwupd + ostree + packagekit-qt + pcre + util-linux qtquickcontrols2 - karchive kconfig kcrash kdbusaddons kdeclarative kio kirigami2 kitemmodels knewstuff kwindowsystem kxmlgui + qtx11extras + karchive + kcmutils + kconfig + kcrash + kdbusaddons + kdeclarative + kidletime + kio + kirigami2 + kitemmodels + knewstuff + kwindowsystem + kxmlgui plasma-framework ]; } diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix new file mode 100644 index 0000000000..6b875745d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -0,0 +1,32 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtquickcontrols2 +, kconfig +, kcoreaddons +, ki18n +, kiconthemes +, kitemmodels +, kitemviews +, knewstuff +, libksysguard +, qtbase +}: + +mkDerivation { + name = "plasma-systemmonitor"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + qtquickcontrols2 + kconfig + kcoreaddons + ki18n + kitemmodels + kitemviews + knewstuff + kiconthemes + libksysguard + ]; +} diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix index a9f51e50a2..9e3776e8e2 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,8 +1,19 @@ -{ - mkDerivation, lib, extra-cmake-modules, shared-mime-info, - libpthreadstubs, libXcursor, libXdmcp, - qtbase, qtquickcontrols2, qtx11extras, - karchive, ki18n, kio, knewstuff +{ mkDerivation +, lib +, extra-cmake-modules +, shared-mime-info +, libpthreadstubs +, libXcursor +, libXdmcp +, qtbase +, qtquickcontrols2 +, qtx11extras +, karchive +, kcmutils +, kdeclarative +, ki18n +, kio +, knewstuff }: mkDerivation { @@ -10,8 +21,16 @@ mkDerivation { meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - libpthreadstubs libXcursor libXdmcp - qtquickcontrols2 qtx11extras - karchive ki18n kio knewstuff + libpthreadstubs + libXcursor + libXdmcp + qtquickcontrols2 + qtx11extras + karchive + kcmutils + kdeclarative + ki18n + kio + knewstuff ]; } diff --git a/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix b/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix index 733e7e0b14..17e87f2cb6 100644 --- a/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/arduino/platformio/core.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, buildPythonApplication, fetchpatch -, bottle, click, colorama, semantic-version +{ stdenv, lib, buildPythonApplication, bottle +, click, click-completion, colorama, semantic-version , lockfile, pyserial, requests , tabulate, pyelftools, marshmallow , pytest, tox, jsondiff @@ -79,8 +79,8 @@ in buildPythonApplication rec { inherit version src; propagatedBuildInputs = [ - bottle click colorama git lockfile - pyserial requests semantic-version + bottle click click-completion colorama git + lockfile pyserial requests semantic-version tabulate pyelftools marshmallow ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 31a7346108..0bcfcafaae 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -1,4 +1,4 @@ -sourcePerArch: +{ sourcePerArch, knownVulnerabilities ? [] }: { swingSupport ? true # not used for now , lib, stdenv @@ -48,6 +48,7 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms maintainers = with lib.maintainers; [ taku0 ]; + inherit knownVulnerabilities; }; }; in result diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index ed8935b004..95e72facae 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -1,4 +1,4 @@ -sourcePerArch: +{ sourcePerArch, knownVulnerabilities ? [] }: { stdenv , lib @@ -107,6 +107,7 @@ let result = stdenv.mkDerivation rec { description = "AdoptOpenJDK, prebuilt OpenJDK binary"; platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms maintainers = with lib.maintainers; [ taku0 ]; + inherit knownVulnerabilities; }; }; in result diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index d1db77215d..7fec8fd3ff 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot; - jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot; - jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9; - jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9; + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; }; + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.hotspot; }; + jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.openj9; }; + jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.openj9; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index 755ffaab27..e802e2eea5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot; - jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot; - jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9; - jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jre.openj9; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix index 48806143c8..2654c4f9e7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.hotspot; - jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.hotspot; - jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.openj9; - jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.openj9; + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; + jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; + jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix index 1bd7bb8844..c33d6afad1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.hotspot; - jre-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.hotspot; - jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.openj9; - jre-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.openj9; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix index e440903ad5..6941a6dd0d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.hotspot; - jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.hotspot; - jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jdk.openj9; - jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk14.mac.jre.openj9; + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; + jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; + jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix index 90ae65ba97..756b419434 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.hotspot; - jre-hotspot = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.hotspot; - jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jdk.openj9; - jre-openj9 = import ./jdk-linux-base.nix sources.openjdk14.linux.jre.openj9; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.hotspot; knownVulnerabilities = ["Support ended"]; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.openj9; knownVulnerabilities = ["Support ended"]; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jre.openj9; knownVulnerabilities = ["Support ended"]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix index b9b67f271a..d627fd9311 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.hotspot; - jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.hotspot; - jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jdk.openj9; - jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk15.mac.jre.openj9; + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; }; + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; }; + jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; }; + jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix index d48f9312dd..6663d9778b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.hotspot; - jre-hotspot = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.hotspot; - jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jdk.openj9; - jre-openj9 = import ./jdk-linux-base.nix sources.openjdk15.linux.jre.openj9; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jre.openj9; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix index a170e0141c..5e2d42276c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.hotspot; - jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.hotspot; - jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jdk.openj9; - jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk8.mac.jre.openj9; + jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; }; + jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.hotspot; }; + jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.openj9; }; + jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.openj9; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix index 4937eace49..c2a4085f73 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix @@ -2,8 +2,8 @@ let sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.hotspot; - jre-hotspot = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.hotspot; - jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jdk.openj9; - jre-openj9 = import ./jdk-linux-base.nix sources.openjdk8.linux.jre.openj9; + jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; }; + jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.hotspot; }; + jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.openj9; }; + jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jre.openj9; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix index 50274c9eca..ea56b85dec 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix @@ -21,7 +21,7 @@ in description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code"; homepage = "https://bucklescript.github.io"; license = licenses.lgpl3; - maintainers = with maintainers; [ turbomack gamb anmonteiro ]; + maintainers = with maintainers; [ turbomack gamb ]; platforms = platforms.all; }; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix index 00fb7c6d9b..a38d44e37e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/combine-packages.nix @@ -4,9 +4,9 @@ let cli = builtins.head packages; in assert lib.assertMsg ((builtins.length packages) != 0) ''You must include at least one package, e.g - `with dotnetCorePackages; combinePackages { - packages = [ sdk_3_0 aspnetcore_2_1 ]; - };`'' ; + `with dotnetCorePackages; combinePackages [ + sdk_3_0 aspnetcore_2_1 + ];`'' ; buildEnv { name = "dotnet-core-combined"; paths = packages; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix index 333c8c2027..6981bcbd8f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, haskell, nodejs +, haskell, haskellPackages, nodejs , fetchurl, fetchpatch, makeWrapper, writeScriptBin # Rust dependecies , rustPlatform, openssl, pkg-config, Security @@ -7,7 +7,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc8103.override { + hsPkgs = haskellPackages.override { overrides = self: super: with haskell.lib; with lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -80,8 +80,8 @@ let # Needed for elm-format indents = self.callPackage ./packages/indents.nix {}; bimap = self.callPackage ./packages/bimap.nix {}; - avh4-lib = self.callPackage ./packages/avh4-lib.nix {}; - elm-format-lib = self.callPackage ./packages/elm-format-lib.nix {}; + avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {}); + elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {}); elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index f7ec7b6ee2..fc4fbb34c5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -86,7 +86,6 @@ let else if targetPlatform.isWindows then "mcf" else "single"}" "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ] ++ lib.optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [ # libsanitizer requires netrom/netrom.h which is not # available in uclibc. diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix deleted file mode 100644 index 8360463054..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix +++ /dev/null @@ -1,268 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - - # aarch64 outputs otherwise exceed 2GB limit -, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = dontStrip: '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' - # We only need to build stage1 on most cross-compilation because - # we will be running the compiler on the native system. In some - # situations, like native Musl compilation, we need the compiler - # to actually link to our new Libc. The iOS simulator is a special - # exception because we can’t actually run simulators binaries - # ourselves. - + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + lib.optionalString dontStrip '' - STRIP_CMD = : - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; - -in -stdenv.mkDerivation (rec { - version = "8.10.1"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "1xgdl6ig5jzli3bg054vfryfkg0y6wggf68g66c32sr67bw0ffsf"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK dontStrip}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti ]; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - - dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix deleted file mode 100644 index a42dfce646..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix +++ /dev/null @@ -1,267 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - - # aarch64 outputs otherwise exceed 2GB limit -, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; - -in -stdenv.mkDerivation (rec { - version = "8.10.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "02w8n085bw38vyp694j0lfk5wcnwkdaj7hhp0saj71x74533lmww"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - - # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 - ./issue-18549.patch - ] ++ lib.optionals stdenv.isDarwin [ - # Make Block.h compile with c++ compilers. Remove with the next release - (fetchpatch { - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; - sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; - }) - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti ]; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix deleted file mode 100644 index fe160259f2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.3.nix +++ /dev/null @@ -1,264 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - - # aarch64 outputs otherwise exceed 2GB limit -, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; - -in -stdenv.mkDerivation (rec { - version = "8.10.3"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0cdrdvs5qnqr93cr9zvrlfjv2xr671kjjghnsw4afa4hahcq7p6c"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - ] ++ lib.optionals stdenv.isDarwin [ - # Make Block.h compile with c++ compilers. Remove with the next release - (fetchpatch { - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; - sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; - }) - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti ]; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix deleted file mode 100644 index 5f83c2b2af..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ /dev/null @@ -1,191 +0,0 @@ -{ lib, stdenv, substituteAll -, fetchurl, perl, gcc, llvm -, ncurses5, gmp, glibc, libiconv -, llvmPackages -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; - -let - useLLVM = !stdenv.targetPlatform.isx86; - - libPath = lib.makeLibraryPath ([ - ncurses5 gmp - ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libiconv); - - libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" - + "LD_LIBRARY_PATH"; - - glibcDynLinker = assert stdenv.isLinux; - if stdenv.hostPlatform.libc == "glibc" then - # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. - ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' - else - "${lib.getLib glibc}/lib/ld-linux*"; - -in - -stdenv.mkDerivation rec { - version = "8.2.2"; - - name = "ghc-${version}-binary"; - - src = fetchurl ({ - i686-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; - sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy"; - }; - x86_64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; - sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8"; - }; - armv7l-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; - sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46"; - }; - aarch64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz"; - sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7"; - }; - x86_64-darwin = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr"; - }; - }.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform")); - - nativeBuildInputs = [ perl ]; - propagatedBuildInputs = lib.optionals useLLVM [ llvmPackages.llvm ]; - - # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location/ - ${libEnvVar} = libPath; - - postUnpack = - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - # not enough room in the object files for the full path to libiconv :( - for exe in $(find . -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - done - '' + - - # Some scripts used during the build need to have their shebangs patched - '' - patchShebangs ghc-${version}/utils/ - patchShebangs ghc-${version}/configure - '' + - - # Strip is harmful, see also below. It's important that this happens - # first. The GHC Cabal build system makes use of strip by default and - # has hardcoded paths to /usr/bin/strip in many places. We replace - # those below, making them point to our dummy script. - '' - mkdir "$TMP/bin" - for i in strip; do - echo '#! ${stdenv.shell}' > "$TMP/bin/$i" - chmod +x "$TMP/bin/$i" - done - PATH="$TMP/bin:$PATH" - '' + - # We have to patch the GMP paths for the integer-gmp package. - '' - find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; - '' + lib.optionalString stdenv.isDarwin '' - find . -name base.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; - '' + - # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.isLinux '' - find . -type f -perm -0100 -exec patchelf \ - --replace-needed libncurses${lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ - --replace-needed libtinfo.so libtinfo.so.5 \ - --interpreter ${glibcDynLinker} {} \; - - sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 - '' + - # We're kludging a glibc bindist into working with non-glibc... - # Here we patch up the use of `__strdup` (part of glibc binary ABI) - # to instead use `strdup` since musl doesn't provide __strdup - # (`__strdup` is defined to be an alias of `strdup` anyway[1]). - # [1] http://refspecs.linuxbase.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic/baselib---strdup-1.html - # Use objcopy magic to make the change: - lib.optionalString stdenv.hostPlatform.isMusl '' - find ./ghc-${version}/rts -name "libHSrts*.a" -exec ''${OBJCOPY:-objcopy} --redefine-sym __strdup=strdup {} \; - ''; - - configurePlatforms = [ ]; - configureFlags = - let - gcc-clang-wrapper = substituteAll { - inherit (stdenv) shell; - isExecutable = true; - src = ./gcc-clang-wrapper.sh; - }; - in - [ "--with-gmp-libraries=${lib.getLib gmp}/lib" - "--with-gmp-includes=${lib.getDev gmp}/include" - ] ++ lib.optional stdenv.isDarwin "--with-gcc=${gcc-clang-wrapper}" - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - - # Stripping combined with patchelf breaks the executables (they die - # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) - dontStrip = true; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - preFixup = lib.optionalString stdenv.isLinux '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' + lib.optionalString stdenv.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - for exe in $(find "$out" -type f -executable); do - isScript $exe && continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe - done - - for file in $(find "$out" -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - ''; - - doInstallCheck = true; - installCheckPhase = '' - unset ${libEnvVar} - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - passthru = { - targetPrefix = ""; - enableShared = true; - }; - - meta.license = lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "armv7l-linux" "aarch64-linux"]; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix deleted file mode 100644 index 8237f27241..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix +++ /dev/null @@ -1,275 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' - # We only need to build stage1 on most cross-compilation because - # we will be running the compiler on the native system. In some - # situations, like native Musl compilation, we need the compiler - # to actually link to our new Libc. The iOS simulator is a special - # exception because we can’t actually run simulators binaries - # ourselves. - + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; - -in -stdenv.mkDerivation (rec { - version = "8.6.5"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - - (fetchpatch { # https://phabricator.haskell.org/D5123 - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff"; - name = "D5123.diff"; - sha256 = "140lmnqxra7xkwy370c5pyf8dgdwgmbpcrs1dapnwr2dh8bavn8c"; - }) - (fetchpatch { # https://github.com/haskell/haddock/issues/900 - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; - name = "loadpluginsinmodules.diff"; - sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - # See #63511 - the only unstripped file is the debug rts which isn't meant to - # be stripped. - dontStrip = true; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - '' - # Temporary work-around for https://github.com/NixOS/nixpkgs/issues/66277 - + lib.optionalString hostPlatform.isAarch64 '' - rm -rf "$doc/share/doc/ghc/html/libraries" - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti ]; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix deleted file mode 100644 index 144e464597..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix +++ /dev/null @@ -1,263 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = dontStrip: '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' - # We only need to build stage1 on most cross-compilation because - # we will be running the compiler on the native system. In some - # situations, like native Musl compilation, we need the compiler - # to actually link to our new Libc. The iOS simulator is a special - # exception because we can’t actually run simulators binaries - # ourselves. - + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + lib.optionalString dontStrip '' - STRIP_CMD = : - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; - -in -stdenv.mkDerivation (rec { - version = "8.8.2"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "02qa6wgjpxgakg7hv4zfdlrx9k7zxa5i02wnr6y9fsv8j16sbkh1"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK dontStrip}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti ]; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - - dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix deleted file mode 100644 index 9e99207d9a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix +++ /dev/null @@ -1,268 +0,0 @@ -{ lib, stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 -, # LLVM is conceptually a run-time-only depedendency, but for - # non-x86, we need LLVM to bootstrap later stages, so it becomes a - # build-time dependency too. - buildLlvmPackages, llvmPackages - -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp - -, # If enabled, use -fPIC when compiling static libs. - enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform - - # aarch64 outputs otherwise exceed 2GB limit -, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 - -, # Whether to build dynamic libs for the standard library (on the target - # platform). Static libs are always built. - enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt - -, # Whether to build terminfo. - enableTerminfo ? !stdenv.targetPlatform.isWindows - -, # What flavour to build. An empty string indicates no - # specific flavour and falls back to ghc default values. - ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # Whether to disable the large address space allocator - # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ - disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 -}: - -assert !enableIntegerSimple -> gmp != null; - -let - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - inherit (bootPkgs) ghc; - - # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; - - buildMK = dontStrip: '' - BuildFlavour = ${ghcFlavour} - ifneq \"\$(BuildFlavour)\" \"\" - include mk/flavours/\$(BuildFlavour).mk - endif - DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' - # We only need to build stage1 on most cross-compilation because - # we will be running the compiler on the native system. In some - # situations, like native Musl compilation, we need the compiler - # to actually link to our new Libc. The iOS simulator is a special - # exception because we can’t actually run simulators binaries - # ourselves. - + lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} - CrossCompilePrefix = ${targetPrefix} - HADDOCK_DOCS = NO - BUILD_SPHINX_HTML = NO - BUILD_SPHINX_PDF = NO - '' + lib.optionalString dontStrip '' - STRIP_CMD = : - '' + lib.optionalString (!enableProfiledLibs) '' - GhcLibWays = "v dyn" - '' + lib.optionalString enableRelocatedStaticLibs '' - GhcLibHcOpts += -fPIC - GhcRtsHcOpts += -fPIC - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - EXTRA_CC_OPTS += -std=gnu99 - ''; - - # Splicer will pull out correct variations - libDeps = platform: lib.optional enableTerminfo ncurses - ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp - ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; - - toolsForTarget = [ - pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; - - targetCC = builtins.head toolsForTarget; - - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; - -in -stdenv.mkDerivation (rec { - version = "8.8.3"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "128g932i3wix6ic03v04nh5755vyjiidzri9iybwad72yfmc1p70"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - patches = [ - # See upstream patch at - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build - # from source distributions, the auto-generated configure script needs to be - # patched as well, therefore we use an in-tree patch instead of pulling the - # upstream patch. Don't forget to check backport status of the upstream patch - # when adding new GHC releases in nixpkgs. - ./respect-ar-path.patch - ]; - - postPatch = "patchShebangs ."; - - # GHC is a bit confused on its cross terminology. - preConfigure = '' - for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do - export "''${env#TARGET_}=''${!env}" - done - # GHC is a bit confused on its cross terminology, as these would normally be - # the *host* tools. - export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" - export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" - # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" - export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" - export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" - export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" - export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" - export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" - export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - - echo -n "${buildMK dontStrip}" > mk/build.mk - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" - '' + lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' - sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets - '' + lib.optionalString targetPlatform.isMusl '' - echo "patching llvm-targets for musl targets..." - echo "Cloning these existing '*-linux-gnu*' targets:" - grep linux-gnu llvm-targets | sed 's/^/ /' - echo "(go go gadget sed)" - sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets - echo "llvm-targets now contains these '*-linux-musl*' targets:" - grep linux-musl llvm-targets | sed 's/^/ /' - - echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" - # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) - for x in configure aclocal.m4; do - substituteInPlace $x \ - --replace '*-android*|*-gnueabi*)' \ - '*-android*|*-gnueabi*|*-musleabi*)' - done - ''; - - # TODO(@Ericson2314): Always pass "--target" and always prefix. - configurePlatforms = [ "build" "host" ] - ++ lib.optional (targetPlatform != hostPlatform) "target"; - - # `--with` flags for libraries needed for RTS linker - configureFlags = [ - "--datadir=$doc/share/doc/ghc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - ] ++ lib.optionals (libffi != null) [ - "--with-system-libffi" - "--with-ffi-includes=${targetPackages.libffi.dev}/include" - "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" - "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" - "--with-iconv-libraries=${libiconv}/lib" - ] ++ lib.optionals (targetPlatform != hostPlatform) [ - "--enable-bootstrap-with-devel-snapshot" - ] ++ lib.optionals useLdGold [ - "CFLAGS=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" - "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" - ] ++ lib.optionals (disableLargeAddressSpace) [ - "--disable-large-address-space" - ]; - - # Make sure we never relax`$PATH` and hooks support for compatibility. - strictDeps = true; - - # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; - - nativeBuildInputs = [ - perl autoconf automake m4 python3 sphinx - ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour - ]; - - # For building runtime libs - depsBuildTarget = toolsForTarget; - - buildInputs = [ perl bash ] ++ (libDeps hostPlatform); - - propagatedBuildInputs = [ targetPackages.stdenv.cc ] - ++ lib.optional useLLVM llvmPackages.llvm; - - depsTargetTarget = map lib.getDev (libDeps targetPlatform); - depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; - - checkTarget = "test"; - - hardeningDisable = [ "format" ] ++ lib.optional stdenv.targetPlatform.isMusl "pie"; - - postInstall = '' - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs targetPrefix; - - inherit llvmPackages; - inherit enableShared; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with lib.maintainers; [ marcweber andres peti ]; - timeout = 24 * 3600; - inherit (ghc.meta) license platforms; - }; - - dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); - -} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ - dontPatchELF = true; - noAuditTmpdir = true; -}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index b371cadb1d..50031f5acd 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.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C56aM3FFnjtTQawQOnITVGXK5XSA/Pk7surt8MJHZK0="; + sha256 = "sha256-NCLPatJWpvYKM+QdJB/Gfldlz5MQynWZB8o4x4cf5cA="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-AkkXV1cOM5YFvG5dUt7VarSzWyBZmvFMW08n1KqSAxY="; + cargoSha256 = "sha256-Tvb6QJubV8FS8UER++bEhst7Z0hVw42TCl+wOzZzi8Y="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix index 37515b5039..64d57e3e81 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix index c42e07eac4..88a412f6cb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" ] ++ lib.optionals (stdenv.isDarwin) [ "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" "-DCOMPILER_RT_BUILD_XRAY=OFF" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix index 909c6b1905..81dbe7048e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix index 6e47ffe8ac..11d46289af 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix index 6320a3405d..0f91f3c5e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix index 2e49ef1734..a9dabebb59 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix index 2ab9dc8ffa..1e9aa1d5d1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # The compiler-rt build infrastructure sniffs supported platforms on Darwin # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" ]; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix index 361bfdeb3c..9382105476 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/default.nix @@ -7,10 +7,11 @@ let }; jdk = stdenv.mkDerivation rec { - name = "zulu15.28.51-ca-jdk15.0.1"; + pname = "zulu15.28.51-ca-jdk"; + version = "15.0.1"; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/${pname}${version}-macosx_x64.tar.gz"; sha256 = "0h738pbnwcn7pjp0qyryzazqj5nw5sy2f8l0ycl39crm9ia6akvh"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix index 5da1ec7701..8910d7f1e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/pony-corral.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation ( rec { pname = "corral"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "0kydx4psl6k4n46as9xc5xwbwapibm6g7haxds7y9d392807qfqk"; + sha256 = "sha256-YJZ1jGMOeZKGZaTrWO2mtR94F0voC2DXaghi0LytF7I="; }; buildInputs = [ ponyc ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix b/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix index 8b74f46fd0..7381e7c89f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/urn/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation { description = "Yet another Lisp variant which compiles to Lua"; license = licenses.bsd3; maintainers = with maintainers; [ CrazedProgrammer ]; + platforms = platforms.all; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 2a6bfc7ad3..c4dd7d74eb 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -14,7 +14,7 @@ in mkCoqDerivation { defaultVersion = lib.switch coq.coq-version [ { case = "8.13"; out = "1.9.4"; } { case = "8.12"; out = "1.8.0"; } - { case = "8.11"; out = "1.6.0_8.11"; } + { case = "8.11"; out = "1.6.1_8.11"; } ] null; release."1.9.4".sha256 = "0nii7238mya74f9g6147qmpg6gv6ic9b54x5v85nb6q60d9jh0jq"; release."1.9.3".sha256 = "198irm800fx3n8n56vx1c6f626cizp1d7jfkrc6ba4iqhb62ma0z"; @@ -22,7 +22,10 @@ in mkCoqDerivation { release."1.8.1".sha256 = "1fbbdccdmr8g4wwpihzp4r2xacynjznf817lhijw6kqfav75zd0r"; release."1.8.0".sha256 = "13ywjg94zkbki22hx7s4gfm9rr87r4ghsgan23xyl3l9z8q0idd1"; release."1.7.0".sha256 = "1ws5cqr0xawv69prgygbl3q6dgglbaw0vc397h9flh90kxaqgyh8"; + release."1.6.1_8.11".sha256 = "0yyyh35i1nb3pg4hw7cak15kj4y6y9l84nwar9k1ifdsagh5zq53"; + release."1.6.1_8.11".version = "1.6.1"; release."1.6.0_8.11".sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; + release."1.6.0_8.11".version = "1.6.0"; release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index ad242777ec..a374229e53 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -72,15 +72,6 @@ self: super: { hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; }; - # Backport fix for bash: compgen: command not found - # which happens in nix-shell when a non-interactive bash is on PATH - # PR to master: https://github.com/pcapriotti/optparse-applicative/pull/408 - optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch { - name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff"; - url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; - sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; - }); - # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { postPatch = "sed -i s/home/tmp/ test/Spec.hs"; @@ -93,33 +84,26 @@ self: super: { # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; - # Tests require older tasty + # Tests require older versions of tasty. + cborg = (doJailbreak super.cborg).override { base16-bytestring = self.base16-bytestring_0_1_1_7; }; hzk = dontCheck super.hzk; + resolv = doJailbreak super.resolv; + tdigest = doJailbreak super.tdigest; + text-short = doJailbreak super.text-short; + tree-diff = doJailbreak super.tree-diff; # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; - # Depends on broken "lss" package. - snaplet-lss = dontDistribute super.snaplet-lss; - - # Depends on broken "NewBinary" package. - ASN1 = dontDistribute super.ASN1; - - # Depends on broken "frame" package. - frame-markdown = dontDistribute super.frame-markdown; - - # Depends on broken "Elm" package. - hakyll-elm = dontDistribute super.hakyll-elm; - haskelm = dontDistribute super.haskelm; - snap-elm = dontDistribute super.snap-elm; - - # Depends on broken "hails" package. - hails-bin = dontDistribute super.hails-bin; - bindings-levmar = overrideCabal super.bindings-levmar (drv: { extraLibraries = [ pkgs.blas ]; }); + # Requires wrapQtAppsHook + qtah-cpp-qt5 = overrideCabal super.qtah-cpp-qt5 (drv: { + buildDepends = [ pkgs.qt5.wrapQtAppsHook ]; + }); + # The Haddock phase fails for one reason or another. deepseq-magic = dontHaddock super.deepseq-magic; feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 @@ -215,9 +199,6 @@ self: super: { # 2020-06-05: HACK: does not pass own build suite - `dontCheck` hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix); - # https://github.com/haskell-nix/hnix-store/issues/127 - hnix-store-core = addTestToolDepend super.hnix-store-core self.tasty-discover; - # Fails for non-obvious reasons while attempting to use doctest. search = dontCheck super.search; @@ -235,13 +216,7 @@ self: super: { angel = dontCheck super.angel; apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw - aws = appendPatch (dontCheck super.aws) # needs aws credentials - (pkgs.fetchpatch { - # https://github.com/aristidb/aws/pull/271 - # bump a version bound - url = https://github.com/aristidb/aws/commit/3639262ccd6761dea76f052692ac3aefbd254723.patch; - sha256 = "0nxaspldgayqjnidda8w7wps5gdpr2wz6vynl7vkaw8kzxks9bci"; - }); + aws = doJailbreak (dontCheck super.aws); # needs aws credentials, jailbreak for base16-bytestring aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw binary-search = dontCheck super.binary-search; @@ -339,6 +314,7 @@ self: super: { nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; network = dontCheck super.network; + network_2_6_3_1 = dontCheck super.network_2_6_3_1; # package is missing files for test network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; @@ -462,9 +438,6 @@ self: super: { # https://github.com/afcowie/locators/issues/1 locators = dontCheck super.locators; - # Test suite won't compile against tasty-hunit 0.9.x. - zlib = dontCheck super.zlib; - # Test suite won't compile against tasty-hunit 0.10.x. binary-parser = dontCheck super.binary-parser; binary-parsers = dontCheck super.binary-parsers; @@ -554,9 +527,6 @@ self: super: { # https://github.com/liyang/thyme/issues/36 thyme = dontCheck super.thyme; - # https://github.com/k0ral/hbro-contrib/issues/1 - hbro-contrib = dontDistribute super.hbro-contrib; - # Elm is no longer actively maintained on Hackage: https://github.com/NixOS/nixpkgs/pull/9233. Elm = markBroken super.Elm; elm-build-lib = markBroken super.elm-build-lib; @@ -828,9 +798,12 @@ self: super: { # Jailbreak is necessary to break out of tasty < 1.x dependency. cryptohash-sha256 = markUnbroken (doJailbreak super.cryptohash-sha256); + # The test suite has all kinds of out-dated dependencies, so it feels easier + # to just disable it. + cryptohash-sha1 = dontCheck super.cryptohash-sha1; + cryptohash-md5 = dontCheck super.cryptohash-md5; + # Needs tasty-quickcheck ==0.8.*, which we don't have. - cryptohash-sha1 = doJailbreak super.cryptohash-sha1; - cryptohash-md5 = doJailbreak super.cryptohash-md5; gitHUD = dontCheck super.gitHUD; githud = dontCheck super.githud; @@ -973,7 +946,10 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - niv = generateOptparseApplicativeCompletion "niv" super.niv; + niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: { + # Needs override because of: https://github.com/nmattia/niv/issues/312 + optparse-applicative = self.optparse-applicative_0_15_1_0; + })); ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu; stack = generateOptparseApplicativeCompletion "stack" super.stack; @@ -1336,7 +1312,7 @@ self: super: { commonmark-extensions = dontCheck super.commonmark-extensions; # Testsuite trying to run `which haskeline-examples-Test` - haskeline_0_8_1_1 = dontCheck super.haskeline_0_8_1_1; + haskeline_0_8_1_2 = dontCheck super.haskeline_0_8_1_2; # Tests for list-t, superbuffer, and stm-containers # depend on HTF and it is broken, 2020-08-23 @@ -1403,10 +1379,7 @@ self: super: { # PATH. update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal - (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: { - optparse-generic = self.optparse-generic_1_4_4; - optparse-applicative = self.optparse-applicative_0_16_1_0; - })) deps) (drv: { + (addTestToolDepends super.update-nix-fetchgit deps) (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; postInstall = drv.postInstall or "" + '' wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${ @@ -1424,6 +1397,16 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; + # 2021-03-19: Too restrictive upper bound on optparse-applicative + stylish-haskell = doJailbreak super.stylish-haskell; + + # 2021-03-19: https://github.com/facebookincubator/retrie/issues/24 + retrie = doJailbreak super.retrie; + + # Jailbreak because of restrictive upper bound on base16-bytestring + # 2021-03-19: https://github.com/Avi-D-coder/implicit-hie-cradle/pull/8 + implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; + # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0); @@ -1433,7 +1416,8 @@ self: super: { # 2021-03-21 Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 - ghcide = dontCheck super.ghcide; + # Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595 + ghcide = doJailbreak (dontCheck super.ghcide); # 2020-03-09: Tests broken in hackage release # fixed on upstream, but not released in hiedb 0.3.0.1 @@ -1510,7 +1494,7 @@ self: super: { # 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124 heist = doJailbreak super.heist; - hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_1; }); + hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_2; }); # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; @@ -1661,4 +1645,38 @@ self: super: { # Test suite does not compile. feed = dontCheck super.feed; + spacecookie = overrideCabal super.spacecookie (old: { + buildTools = (old.buildTools or []) ++ [ pkgs.installShellFiles ]; + # let testsuite discover the resulting binary + preCheck = '' + export SPACECOOKIE_TEST_BIN=./dist/build/spacecookie/spacecookie + '' + (old.preCheck or ""); + # install man pages shipped in the sdist + postInstall = '' + installManPage docs/man/* + '' + (old.postInstall or ""); + }); + + # Patch and jailbreak can be removed at next release, chatter > 0.9.1.0 + # * Remove dependency on regex-tdfa-text + # * Jailbreak as bounds on cereal are too strict + # * Disable test suite which doesn't compile + # https://github.com/creswick/chatter/issues/38 + chatter = appendPatch + (dontCheck (doJailbreak (super.chatter.override { regex-tdfa-text = null; }))) + (pkgs.fetchpatch { + url = "https://github.com/creswick/chatter/commit/e8c15a848130d7d27b8eb5e73e8a0db1366b2e62.patch"; + sha256 = "1dzak8d12h54vss5fxnrclygz0fz9ygbqvxd5aifz5n3vrwwpj3g"; + }); + + # test suite doesn't compile anymore due to changed hunit/tasty APIs + fullstop = dontCheck super.fullstop; + + # https://github.com/jgm/pandoc/issues/7163 + pandoc = dontCheck super.pandoc; + + # Too strict version bounds on cryptonite. + # Issue reported upstream, no bug tracker url yet. + darcs = doJailbreak super.darcs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/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 f1af62b1f5..c4bab1f078 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 @@ -42,19 +42,17 @@ self: super: { unix = null; xhtml = null; - cabal-install = super.cabal-install.override { - Cabal = super.Cabal_3_4_0_0; - hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; }; - # Usung dontCheck to break test dependency cycles - edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); - random = super.random_1_2_0; - }; + # cabal-install needs more recent versions of Cabal and random, but an older + # version of base16-bytestring. + cabal-install = super.cabal-install.overrideScope (self: super: { + Cabal = self.Cabal_3_4_0_0; + base16-bytestring = self.base16-bytestring_0_1_1_7; + random = dontCheck super.random_1_2_0; # break infinite recursion + hashable = doJailbreak super.hashable; # allow random 1.2.x + }); # cabal-install-parsers is written for Cabal 3.4 - cabal-install-parsers = super.cabal-install-parsers.override { - Cabal = super.Cabal_3_4_0_0; - base16-bytestring = super.base16-bytestring_1_0_1_0; - }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; }; # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; @@ -91,4 +89,5 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix deleted file mode 100644 index bd9f43e90c..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # Suitable LLVM version. - llvmPackages = pkgs.llvmPackages; - - # Disable GHC 8.2.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-compact = null; - ghc-heap = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hoopl = null; - hpc = null; - integer-gmp = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - terminfo = null; - time = null; - transformers = null; - unix = null; - xhtml = null; - - # These are now core libraries in GHC 8.4.x. - mtl = self.mtl_2_2_2; - parsec = self.parsec_3_1_14_0; - stm = self.stm_2_5_0_0; - text = self.text_1_2_4_0; - - # Needs Cabal 3.0.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; }; - - # https://github.com/bmillwood/applicative-quoters/issues/6 - applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; - sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; - }); - - # https://github.com/nominolo/ghc-syb/issues/20 - ghc-syb-utils = dontCheck super.ghc-syb-utils; - - # Upstream failed to distribute the testsuite for 8.2 - # https://github.com/alanz/ghc-exactprint/pull/60 - ghc-exactprint = dontCheck super.ghc-exactprint; - - # Reduction stack overflow; size = 38 - # https://github.com/jystic/hadoop-tools/issues/31 - hadoop-rpc = - let patch = pkgs.fetchpatch - { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch"; - sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; - stripLen = 1; - }; - in appendPatch super.hadoop-rpc patch; - - # Custom Setup.hs breaks with Cabal 2 - # https://github.com/NICTA/coordinate/pull/4 - coordinate = - let patch = pkgs.fetchpatch - { url = "https://github.com/NICTA/coordinate/pull/4.patch"; - sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy"; - }; - in appendPatch super.coordinate patch; - - # https://github.com/purescript/purescript/issues/3189 - purescript = doJailbreak (super.purescript); - - # These packages need Cabal 2.2.x, which is not the default. - cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); - - # Older GHC versions need these additional dependencies. - ListLike = addBuildDepend super.ListLike self.semigroups; - base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; - - # ghc versions prior to 8.8.x needs additional dependency to compile successfully. - ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; - -} diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix deleted file mode 100644 index 6831c7c327..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ pkgs, haskellLib }: - -with haskellLib; - -self: super: { - - # This compiler version needs llvm 5.x. - llvmPackages = pkgs.llvmPackages_5; - - # Disable GHC 8.4.x core libraries. - array = null; - base = null; - binary = null; - bytestring = null; - Cabal = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-boot = null; - ghc-boot-th = null; - ghc-compact = null; - ghc-heap = null; - ghc-prim = null; - ghci = null; - haskeline = null; - hpc = null; - integer-gmp = null; - mtl = null; - parsec = null; - pretty = null; - process = null; - rts = null; - stm = null; - template-haskell = null; - terminfo = null; - text = null; - time = null; - transformers = null; - unix = null; - xhtml = null; - - # Needs Cabal 3.2.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; }); - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; }; - - # Restricts aeson to <1.4 - # https://github.com/purescript/purescript/pull/3537 - purescript = doJailbreak super.purescript; - - # https://github.com/jcristovao/enclosed-exceptions/issues/12 - enclosed-exceptions = dontCheck super.enclosed-exceptions; - - # https://github.com/jaor/xmobar/issues/356 - xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; }); - hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x - - # Reduction stack overflow; size = 38 - # https://github.com/jystic/hadoop-tools/issues/31 - hadoop-rpc = - let patch = pkgs.fetchpatch - { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch"; - sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; - stripLen = 1; - }; - in appendPatch super.hadoop-rpc patch; - - # stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent - # version of yaml. Go figure. We avoid overrideScope here because using it to - # change Cabal would re-compile every single package instead of just those - # that have it as an actual library dependency. The explicit overrides are - # more verbose but friendlier for Hydra. - stack = (doJailbreak super.stack).override { - Cabal = self.Cabal_2_4_1_0; - hpack = self.hpack.override { Cabal = self.Cabal_2_4_1_0; }; - hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_1_0; }; - }; - - # Older GHC versions need these additional dependencies. - aeson = addBuildDepend super.aeson self.contravariant; - base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; - - # Newer versions don't compile. - resolv = self.resolv_0_1_1_2; - - # The old Haddock cannot process the newer documentation syntax. - fast-logger = dontHaddock super.fast-logger; - - # ghc versions prior to 8.8.x needs additional dependency to compile successfully. - ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; - hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; - -} diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 996d218260..00797c0c86 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -52,15 +52,17 @@ self: super: { haddock = self.haddock_2_23_1; haddock-api = self.haddock-api_2_23_1; - # These builds need newer versions of Cabal. + # This build needs a newer version of Cabal. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; }; - cabal-install = super.cabal-install.override { - Cabal = super.Cabal_3_4_0_0; - hackage-security = super.hackage-security.override { Cabal = super.Cabal_3_4_0_0; }; - # Using dontCheck to break test dependency cycles - edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); - random = super.random_1_2_0; - }; + + # cabal-install needs more recent versions of Cabal and random, but an older + # version of base16-bytestring. + cabal-install = super.cabal-install.overrideScope (self: super: { + Cabal = self.Cabal_3_4_0_0; + base16-bytestring = self.base16-bytestring_0_1_1_7; + random = dontCheck super.random_1_2_0; # break infinite recursion + hashable = doJailbreak super.hashable; # allow random 1.2.x + }); # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index e3099bfe51..1b8b087326 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -43,12 +43,14 @@ self: super: { unix = null; xhtml = null; - # Build cabal-install with the compiler's native Cabal. - cabal-install = (doJailbreak super.cabal-install).override { - # Use dontCheck to break test dependency cycles - edit-distance = dontCheck (super.edit-distance.override { random = super.random_1_2_0; }); - random = super.random_1_2_0; - }; + # cabal-install needs more recent versions of random, but an older + # version of base16-bytestring. + cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { + Cabal = null; + base16-bytestring = self.base16-bytestring_0_1_1_7; + random = dontCheck super.random_1_2_0; # break infinite recursion + hashable = doJailbreak super.hashable; # allow random 1.2.x + }); # Jailbreaks & Version Updates async = doJailbreak super.async; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix deleted file mode 100644 index 00a8c8d520..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ /dev/null @@ -1,209 +0,0 @@ -# GHCJS package fixes -# -# Please insert new packages *alphabetically* -# in the OTHER PACKAGES section. -{ pkgs, haskellLib }: - -let - removeLibraryHaskellDepends = pnames: depends: - builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends; -in - -with haskellLib; - -self: super: - -## GENERAL SETUP BASE PACKAGES - - let # The stage 1 packages - stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null); - # The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb - stage2 = super.ghc.mkStage2 { - inherit (self) callPackage; - }; - in stage1 // stage2 // { - - # GHCJS does not ship with the same core packages as GHC. - # https://github.com/ghcjs/ghcjs/issues/676 - stm = self.stm_2_5_0_0; - ghc-compact = self.ghc-compact_0_1_0_0; - - network = addBuildTools super.network (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); - zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); - unix-compat = addBuildTools super.unix-compat (pkgs.lib.optional pkgs.buildPlatform.isDarwin pkgs.buildPackages.darwin.libiconv); - - # LLVM is not supported on this GHC; use the latest one. - inherit (pkgs) llvmPackages; - - inherit (self.ghc.bootPkgs) - jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; - - # Don't set integer-simple to null! - # GHCJS uses integer-gmp, so any package expression that depends on - # integer-simple is wrong. - #integer-simple = null; - - # These packages are core libraries in GHC 8.6..x, but not here. - bin-package-db = null; - haskeline = self.haskeline_0_7_5_0; - hpc = self.hpc_0_6_0_3; - terminfo = self.terminfo_0_4_1_4; - xhtml = self.xhtml_3000_2_2_1; - -## OTHER PACKAGES - - # haddock throws the error: No input file(s). - fail = dontHaddock super.fail; - - cereal = addBuildDepend super.cereal [ self.fail ]; - - entropy = overrideCabal super.entropy (old: { - postPatch = old.postPatch or "" + '' - # cabal doesn’t find ghc in this script, since it’s in the bootPkgs - sed -e '/Simple.Program/a import Distribution.Simple.Program.Types' \ - -e 's|mConf.*=.*$|mConf = Just $ simpleConfiguredProgram "ghc" (FoundOnSystem "${self.ghc.bootPkgs.ghc}/bin/ghc")|g' -i Setup.hs - ''; - }); - - # https://github.com/kazu-yamamoto/logger/issues/97 - fast-logger = overrideCabal super.fast-logger (old: { - postPatch = old.postPatch or "" + '' - # remove the Safe extensions, since ghcjs-boot directory - # doesn’t provide Trustworthy - sed -ie '/LANGUAGE Safe/d' System/Log/FastLogger/*.hs - cat System/Log/FastLogger/Date.hs - ''; - }); - - # experimental - ghcjs-ffiqq = self.callPackage - ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim - }: - mkDerivation { - pname = "ghcjs-ffiqq"; - version = "0.1.0.0"; - src = pkgs.fetchFromGitHub { - owner = "ghcjs"; - repo = "ghcjs-ffiqq"; - rev = "b52338c2dcd3b0707bc8aff2e171411614d4aedb"; - sha256 = "08zxfm1i6zb7n8vbz3dywdy67vkixfyw48580rwfp48rl1s2z1c7"; - }; - libraryHaskellDepends = [ - base template-haskell ghcjs-base split containers text ghc-prim - ]; - description = "FFI QuasiQuoter for GHCJS"; - license = pkgs.lib.licenses.mit; - }) {}; - # experimental - ghcjs-vdom = self.callPackage - ({ mkDerivation, base, ghc-prim, ghcjs-ffiqq, ghcjs-base, ghcjs-prim - , containers, split, template-haskell - }: - mkDerivation rec { - pname = "ghcjs-vdom"; - version = "0.2.0.0"; - src = pkgs.fetchFromGitHub { - owner = "ghcjs"; - repo = pname; - rev = "1c1175ba22eca6d7efa96f42a72290ade193c148"; - sha256 = "0c6l1dk2anvz94yy5qblrfh2iv495rjq4qmhlycc24dvd02f7n9m"; - }; - libraryHaskellDepends = [ - base ghc-prim ghcjs-ffiqq ghcjs-base ghcjs-prim containers split - template-haskell - ]; - license = pkgs.lib.licenses.mit; - description = "bindings for https://github.com/Matt-Esch/virtual-dom"; - }) {}; - - ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { - libraryHaskellDepends = with self; [ - ghcjs-base ghcjs-dom-jsffi text transformers - ]; - configureFlags = [ "-fjsffi" "-f-webkit" ]; - }); - - ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { - libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ]; - isLibrary = true; - }); - - ghc-paths = overrideCabal super.ghc-paths (drv: { - patches = [ ./patches/ghc-paths-nix-ghcjs.patch ]; - }); - - http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; - # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* - - # These are the correct dependencies specified when calling `cabal2nix --compiler ghcjs` - # By default, the `miso` derivation present in hackage-packages.nix - # does not contain dependencies suitable for ghcjs - miso = overrideCabal super.miso (drv: { - libraryHaskellDepends = with self; [ - BoundedChan bytestring containers ghcjs-base aeson base - http-api-data http-types network-uri scientific servant text - transformers unordered-containers vector - ]; - }); - - pqueue = overrideCabal super.pqueue (drv: { - postPatch = '' - sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs - sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs - sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs - sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs - sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs - sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs - ''; - }); - - profunctors = overrideCabal super.profunctors (drv: { - preConfigure = '' - sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs - ''; - }); - - protolude = doJailbreak super.protolude; - - # reflex 0.3, made compatible with the newest GHCJS. - reflex = overrideCabal super.reflex (drv: { - src = pkgs.fetchFromGitHub { - owner = "ryantrinkle"; - repo = "reflex"; - rev = "cc62c11a6cde31412582758c236919d4bb766ada"; - sha256 = "1j4vw0636bkl46lj8ry16i04vgpivjc6bs3ls54ppp1wfp63q7w4"; - }; - }); - - # reflex-dom 0.2, made compatible with the newest GHCJS. - reflex-dom = overrideCabal super.reflex-dom (drv: { - src = pkgs.fetchFromGitHub { - owner = "ryantrinkle"; - repo = "reflex-dom"; - rev = "639d9ca13c2def075e83344c9afca6eafaf24219"; - sha256 = "0166ihbh3dbfjiym9w561svpgvj0x4i8i8ws70xaafi0cmpsxrar"; - }; - libraryHaskellDepends = - removeLibraryHaskellDepends [ - "glib" "gtk3" "webkitgtk3" "webkitgtk3-javascriptcore" "raw-strings-qq" "unix" - ] drv.libraryHaskellDepends; - }); - - transformers-compat = overrideCabal super.transformers-compat (drv: { - configureFlags = []; - }); - - # triggers an internal pattern match failure in haddock - # https://github.com/haskell/haddock/issues/553 - wai = dontHaddock super.wai; - - base-orphans = dontCheck super.base-orphans; - distributive = dontCheck super.distributive; - - # https://github.com/glguy/th-abstraction/issues/53 - th-abstraction = dontCheck super.th-abstraction; - # https://github.com/dreixel/syb/issues/21 - syb = dontCheck super.syb; - # https://github.com/ghcjs/ghcjs/issues/677 - hspec-core = dontCheck super.hspec-core; -} diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 263cf833b1..08fb8aa88f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -73,8 +73,11 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 + - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. + - ghcide < 1.1 # To stay hls 1.0 compatible + - hls-retrie-plugin < 1.0.0.1 # To stay hls 1.0 compatible - # Stackage Nightly 2021-03-12 + # Stackage Nightly 2021-03-17 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -88,7 +91,7 @@ default-package-overrides: - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 - - aeson-combinators ==0.0.4.1 + - aeson-combinators ==0.0.5.0 - aeson-commit ==1.3 - aeson-compat ==0.3.9 - aeson-default ==0.9.1.0 @@ -208,10 +211,10 @@ default-package-overrides: - amazonka-waf ==1.6.1 - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - - amqp ==0.21.0 + - amqp ==0.22.0 - amqp-utils ==0.6.1.0 - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.10.3 + - ansi-terminal ==0.11 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - apecs ==0.9.2 @@ -228,7 +231,6 @@ default-package-overrides: - approximate-equality ==1.1.0.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 @@ -278,7 +280,7 @@ default-package-overrides: - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 - base16 ==0.3.0.1 - - base16-bytestring ==0.1.1.7 + - base16-bytestring ==1.0.1.0 - base16-lens ==0.1.3.2 - base32 ==0.2.0.0 - base32-lens ==0.1.1.1 @@ -375,6 +377,7 @@ default-package-overrides: - bugzilla-redhat ==0.3.1 - burrito ==1.2.0.1 - butcher ==1.3.3.2 + - buttplug-hs-core ==0.1.0.0 - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 @@ -412,7 +415,7 @@ default-package-overrides: - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - - casa-types ==0.0.1 + - casa-types ==0.0.2 - cased ==0.1.0.0 - case-insensitive ==1.2.1.0 - cases ==0.1.4 @@ -457,7 +460,7 @@ default-package-overrides: - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - circular ==0.3.1.1 - - citeproc ==0.3.0.8 + - citeproc ==0.3.0.9 - clash-ghc ==1.2.5 - clash-lib ==1.2.5 - clash-prelude ==1.2.5 @@ -477,18 +480,15 @@ default-package-overrides: - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.21 - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - code-page ==0.2.1 - - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - - Color ==0.3.0 + - Color ==0.3.1 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 - colour ==2.3.5 - - colourista ==0.1.0.0 - combinatorial ==0.1.0.1 - - comfort-array ==0.4 + - comfort-array ==0.4.1 - comfort-graph ==0.0.3.1 - commonmark ==0.1.1.4 - commonmark-extensions ==0.2.0.4 @@ -501,7 +501,7 @@ default-package-overrides: - compensated ==0.8.3 - compiler-warnings ==0.1.0 - composable-associations ==0.1.0.0 - - composable-associations-aeson ==0.1.0.0 + - composable-associations-aeson ==0.1.0.1 - composite-aeson ==0.7.4.0 - composite-aeson-path ==0.7.4.0 - composite-aeson-refined ==0.7.4.0 @@ -514,7 +514,7 @@ default-package-overrides: - composition ==1.0.2.1 - composition-extra ==2.0.0 - concise ==0.1.0.1 - - concurrency ==1.11.0.0 + - concurrency ==1.11.0.1 - concurrent-extra ==0.7.0.12 - concurrent-output ==1.10.12 - concurrent-split ==0.0.1.1 @@ -528,7 +528,7 @@ default-package-overrides: - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.2.0 - conferer ==1.1.0.0 - - conferer-aeson ==1.1.0.0 + - conferer-aeson ==1.1.0.1 - conferer-hspec ==1.1.0.0 - conferer-warp ==1.1.0.0 - ConfigFile ==1.1.4 @@ -556,7 +556,6 @@ default-package-overrides: - core-text ==0.3.0.0 - countable ==1.0 - country ==0.2.1 - - cpio-conduit ==0.7.0 - cpphs ==1.20.9.1 - cprng-aes ==0.6.1 - cpu ==0.1.2 @@ -577,7 +576,7 @@ default-package-overrides: - cryptohash-sha1 ==0.11.100.1 - cryptohash-sha256 ==0.11.102.0 - cryptohash-sha512 ==0.11.100.1 - - cryptonite ==0.27 + - cryptonite ==0.28 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - crypto-numbers ==0.2.7 @@ -628,7 +627,7 @@ default-package-overrides: - data-forest ==0.1.0.8 - data-has ==0.4.0.0 - data-hash ==0.2.0.1 - - data-interval ==2.0.1 + - data-interval ==2.1.0 - data-inttrie ==0.1.4 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 @@ -649,12 +648,12 @@ default-package-overrides: - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.4 - - Decimal ==0.5.1 + - Decimal ==0.5.2 - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - deferred-folds ==0.9.17 - - dejafu ==2.4.0.1 + - dejafu ==2.4.0.2 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 @@ -691,12 +690,13 @@ default-package-overrides: - dlist-nonempty ==0.1.1 - dns ==4.0.1 - dockerfile ==0.2.0 - - doclayout ==0.3 + - doclayout ==0.3.0.2 - doctemplates ==0.9 - doctest ==0.16.3 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.3 - doctest-exitcode-stdio ==0.0 + - doctest-extract ==0.1 - doctest-lib ==0.1 - doldol ==0.4.1.2 - do-list ==1.0.1 @@ -712,7 +712,7 @@ default-package-overrides: - dual ==0.1.1.1 - dublincore-xml-conduit ==0.1.0.2 - dunai ==0.7.0 - - duration ==0.1.0.0 + - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - dyre ==0.8.12 @@ -794,7 +794,7 @@ default-package-overrides: - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 - - experimenter ==0.1.0.4 + - experimenter ==0.1.0.10 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 @@ -844,6 +844,7 @@ default-package-overrides: - fixed-length ==0.2.2 - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.6.0.0 + - fix-whitespace ==0.0.5 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.2 @@ -951,7 +952,7 @@ default-package-overrides: - ghc-byteorder ==4.11.0.0.10 - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - - ghc-events ==0.15.1 + - ghc-events ==0.16.0 - ghc-exactprint ==0.6.4 - ghcid ==0.8.7 - ghci-hexcalc ==0.1.1.0 @@ -969,7 +970,7 @@ default-package-overrides: - ghc-typelits-extra ==0.4.2 - ghc-typelits-knownnat ==0.7.5 - ghc-typelits-natnormalise ==0.7.4 - - ghc-typelits-presburger ==0.5.2.0 + - ghc-typelits-presburger ==0.6.0.0 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -991,8 +992,7 @@ default-package-overrides: - gingersnap ==0.3.1.0 - gi-pango ==1.0.23 - githash ==0.1.5.0 - - github ==0.26 - - github-release ==1.3.6 + - github-release ==1.3.7 - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 @@ -1016,6 +1016,7 @@ default-package-overrides: - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 + - graphula ==2.0.0.3 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 @@ -1032,7 +1033,6 @@ default-package-overrides: - hackage-db ==2.1.0 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - - hadolint ==1.23.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.4 - half ==0.3.1 @@ -1078,11 +1078,11 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.4.0.0 + - headroom ==0.4.1.0 - heap ==1.0.4 - heaps ==0.3.6.1 - hebrew-time ==0.1.2 - - hedgehog ==1.0.4 + - hedgehog ==1.0.5 - hedgehog-corpus ==0.2.0 - hedgehog-fakedata ==0.0.1.4 - hedgehog-fn ==1.0 @@ -1095,18 +1095,17 @@ default-package-overrides: - hexml ==0.3.4 - hexml-lens ==0.2.1 - hexpat ==0.20.13 - - hexstring ==0.11.1 - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hgrev ==0.2.6 - hidapi ==0.1.5 - - hie-bios ==0.7.4 + - hie-bios ==0.7.5 - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 - hinotify ==0.4.1 - - hint ==0.9.0.3 + - hint ==0.9.0.4 - hjsmin ==0.2.0.4 - hkd-default ==1.1.0.0 - hkgr ==0.2.7 @@ -1152,9 +1151,10 @@ default-package-overrides: - hsinstall ==2.6 - HSlippyMap ==3.0.1 - hslogger ==1.3.1.0 - - hslua ==1.2.0 + - hslua ==1.3.0.1 - hslua-aeson ==1.0.3.1 - hslua-module-doclayout ==0.2.0.1 + - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - HsOpenSSL ==0.11.5.1 @@ -1180,10 +1180,11 @@ default-package-overrides: - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 - - hspec-wai ==0.10.1 - - hspec-wai-json ==0.10.1 + - hspec-wai ==0.11.0 + - hspec-wai-json ==0.11.0 - hs-php-session ==0.0.9.3 - - hsshellscript ==3.4.5 + - hsshellscript ==3.5.0 + - hs-tags ==0.1.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 - HsYAML ==0.2.1.0 @@ -1196,9 +1197,9 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - - http2 ==2.0.5 + - http2 ==2.0.6 - HTTP ==4000.3.15 - - http-api-data ==0.4.1.1 + - http-api-data ==0.4.2 - http-client ==0.6.4.1 - http-client-openssl ==0.3.2.0 - http-client-overrides ==0.1.1.0 @@ -1209,7 +1210,7 @@ default-package-overrides: - http-directory ==0.1.8 - http-download ==0.2.0.0 - httpd-shed ==0.4.1.1 - - http-link-header ==1.0.3.1 + - http-link-header ==1.2.0 - http-media ==0.8.0.0 - http-query ==0.1.0.1 - http-reverse-proxy ==0.6.0 @@ -1286,9 +1287,10 @@ default-package-overrides: - indexed-list-literals ==0.2.1.3 - indexed-profunctors ==0.1 - indexed-traversable ==0.1.1 + - indexed-traversable-instances ==0.1 - infer-license ==0.2.0 - inflections ==0.4.0.6 - - influxdb ==1.9.1 + - influxdb ==1.9.1.1 - ini ==0.4.1 - inj ==1.0 - inline-c ==0.9.1.4 @@ -1344,9 +1346,9 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - - jira-wiki-markup ==1.3.3 + - jira-wiki-markup ==1.3.4 - jose ==0.8.4 - - jose-jwt ==0.9.0 + - jose-jwt ==0.9.1 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1369,6 +1371,7 @@ default-package-overrides: - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 + - keep-alive ==0.2.0.0 - keycode ==0.2.2 - keys ==3.12.3 - ki ==0.2.0.1 @@ -1381,6 +1384,7 @@ default-package-overrides: - kubernetes-webhook-haskell ==0.2.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 + - lackey ==1.0.14 - LambdaHack ==0.9.5.0 - lame ==0.2.0 - language-avro ==0.1.3.1 @@ -1396,7 +1400,7 @@ default-package-overrides: - lapack ==0.3.2 - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.0.1 - - lapack-ffi ==0.0.2 + - lapack-ffi ==0.0.3 - lapack-ffi-tools ==0.1.2.1 - largeword ==1.2.5 - latex ==0.1.0.4 @@ -1432,7 +1436,6 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 - - life-sync ==1.1.1.0 - lifted-async ==0.10.1.3 - lifted-base ==0.2.3.12 - lift-generics ==0.2 @@ -1450,7 +1453,6 @@ default-package-overrides: - list-singleton ==1.0.0.5 - list-t ==1.0.4 - ListTree ==0.2.3 - - little-logger ==0.3.1 - little-rio ==0.2.2 - llvm-hs ==9.0.1 - llvm-hs-pure ==9.0.0 @@ -1523,12 +1525,12 @@ default-package-overrides: - messagepack ==0.5.4 - metrics ==0.4.1.1 - mfsolve ==0.3.2.0 - - microlens ==0.4.11.2 + - microlens ==0.4.12.0 - microlens-aeson ==2.3.1 - microlens-contra ==0.1.0.2 - - microlens-ghc ==0.4.12 + - microlens-ghc ==0.4.13 - microlens-mtl ==0.2.0.1 - - microlens-platform ==0.4.1 + - microlens-platform ==0.4.2 - microlens-process ==0.2.0.2 - microlens-th ==0.4.3.9 - microspec ==0.2.1.3 @@ -1551,7 +1553,7 @@ default-package-overrides: - mixed-types-num ==0.4.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - - mmark ==0.0.7.3 + - mmark ==0.0.7.2 - mmark-cli ==0.0.5.0 - mmark-ext ==0.2.1.3 - mmorph ==1.1.5 @@ -1625,7 +1627,7 @@ default-package-overrides: - mwc-random ==0.14.0.0 - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - - mysql ==0.1.7.3 + - mysql ==0.2 - mysql-simple ==0.4.5 - n2o ==0.11.1 - nagios-check ==0.3.2 @@ -1668,11 +1670,12 @@ default-package-overrides: - nix-paths ==1.0.1 - nonce ==1.0.7 - nondeterminism ==1.4 - - non-empty ==0.3.2 + - non-empty ==0.3.3 - nonempty-containers ==0.3.4.1 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 + - nonempty-zipper ==1.0.0.1 - non-negative ==0.1.2 - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 @@ -1684,7 +1687,7 @@ default-package-overrides: - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 - - numeric-prelude ==0.4.3.2 + - numeric-prelude ==0.4.3.3 - numhask ==0.6.0.2 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 @@ -1729,8 +1732,8 @@ default-package-overrides: - optics-vl ==0.2.1 - optional-args ==1.0.2 - options ==1.2.1.1 - - optparse-applicative ==0.15.1.0 - - optparse-generic ==1.3.1 + - optparse-applicative ==0.16.1.0 + - optparse-generic ==1.4.4 - optparse-simple ==0.1.1.3 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 @@ -1741,8 +1744,8 @@ default-package-overrides: - pager ==0.1.1.0 - pagination ==0.2.2 - pagure-cli ==0.2 - - pandoc ==2.11.4 - - pandoc-plot ==1.1.0 + - pandoc ==2.12 + - pandoc-plot ==1.1.1 - pandoc-types ==1.22 - pantry ==0.5.1.4 - parallel ==3.2.2.0 @@ -1760,8 +1763,9 @@ default-package-overrides: - partial-handler ==1.0.3 - partial-isomorphisms ==0.2.2.1 - partial-semigroup ==0.5.1.8 - - password ==2.1.1.0 - - password-instances ==2.0.0.2 + - password ==3.0.0.0 + - password-instances ==3.0.0.0 + - password-types ==1.0.0.0 - path ==0.7.0 - path-binary-instance ==0.1.0.1 - path-extensions ==0.1.1.0 @@ -1892,7 +1896,7 @@ default-package-overrides: - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto3-wire ==1.1.0 + - proto3-wire ==1.2.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 - protocol-buffers ==2.4.17 @@ -1900,7 +1904,6 @@ default-package-overrides: - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 - proto-lens ==0.7.0.0 - - proto-lens-optparse ==0.1.1.7 - proto-lens-protobuf-types ==0.7.0.0 - proto-lens-protoc ==0.7.0.0 - proto-lens-runtime ==0.7.0.0 @@ -1958,10 +1961,11 @@ default-package-overrides: - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.13 + - ratel ==1.0.14 - rate-limit ==1.4.2 - - ratel-wai ==1.1.4 + - ratel-wai ==1.1.5 - rattle ==0.2 + - rattletrap ==11.0.0 - Rattus ==0.5 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 @@ -1997,7 +2001,7 @@ default-package-overrides: - regex-compat ==0.95.2.1 - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.95.0.0 - - regex-pcre-builtin ==0.95.1.3.8.43 + - regex-pcre-builtin ==0.95.2.3.8.43 - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 @@ -2017,6 +2021,7 @@ default-package-overrides: - req ==3.9.0 - req-conduit ==1.0.0 - rerebase ==1.6.1 + - rescue ==0.4.2.1 - resistor-cube ==0.0.1.2 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 @@ -2088,7 +2093,7 @@ default-package-overrides: - selda-postgresql ==0.1.8.1 - selda-sqlite ==0.1.7.1 - selections ==0.3.0.0 - - selective ==0.4.1.1 + - selective ==0.4.2 - semialign ==1.1.0.1 - semialign-indexed ==1.1 - semialign-optics ==1.1 @@ -2116,7 +2121,6 @@ default-package-overrides: - servant-exceptions ==0.2.1 - servant-exceptions-server ==0.2.1 - servant-foreign ==0.15.3 - - servant-github-webhook ==0.4.2.0 - servant-http-streams ==0.18.2 - servant-machines ==0.15.1 - servant-multipart ==0.12 @@ -2168,15 +2172,15 @@ default-package-overrides: - singleton-bool ==0.1.5 - singleton-nats ==0.4.5 - singletons ==2.7 - - singletons-presburger ==0.5.0.0 + - singletons-presburger ==0.6.0.0 - siphash ==1.0.3 - sitemap-gen ==0.1.0.0 - sized ==1.0.0.0 - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.10.4 - - skylighting-core ==0.10.4 + - skylighting ==0.10.4.1 + - skylighting-core ==0.10.4.1 - slack-api ==0.12 - slack-progressbar ==0.1.0.1 - slist ==0.1.1.0 @@ -2248,7 +2252,7 @@ default-package-overrides: - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13.1 - - store ==0.7.9 + - store ==0.7.10 - store-core ==0.4.4.4 - store-streaming ==0.2.0.3 - stratosphere ==0.59.1 @@ -2256,6 +2260,7 @@ default-package-overrides: - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.0 - streaming-commons ==0.2.2.1 + - streamly ==0.7.3 - streams ==3.3 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 @@ -2277,11 +2282,11 @@ default-package-overrides: - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 - stripe-tests ==2.6.2 - - strive ==5.0.13 + - strive ==5.0.14 - structs ==0.1.5 - structured ==0.1.0.1 - - structured-cli ==2.6.0.0 - - subcategories ==0.1.0.0 + - structured-cli ==2.7.0.1 + - subcategories ==0.1.1.0 - sum-type-boilerplate ==0.1.1 - sundown ==0.6 - superbuffer ==0.3.1.1 @@ -2320,14 +2325,14 @@ default-package-overrides: - tar ==0.5.1.1 - tar-conduit ==0.3.2 - tardis ==0.4.3.0 - - tasty ==1.2.3 - - tasty-ant-xml ==1.1.7 + - tasty ==1.4.1 + - tasty-ant-xml ==1.1.8 - tasty-bench ==0.2.2 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 - tasty-focus ==1.0.1 - - tasty-golden ==2.3.3.2 + - tasty-golden ==2.3.4 - tasty-hedgehog ==1.0.1.0 - tasty-hspec ==1.1.6 - tasty-hunit ==0.10.0.3 @@ -2338,7 +2343,7 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.2 - tasty-rerun ==1.1.18 - - tasty-silver ==3.1.15 + - tasty-silver ==3.2.1 - tasty-smallcheck ==0.8.2 - tasty-test-reporter ==0.1.1.4 - tasty-th ==0.1.7 @@ -2363,7 +2368,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.1.1 + - texmath ==0.12.2 - text-ansi ==0.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 @@ -2373,7 +2378,7 @@ default-package-overrides: - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 - textlocal ==0.1.0.5 - - text-manipulate ==0.2.0.1 + - text-manipulate ==0.3.0.0 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 - text-printer ==0.5.0.1 @@ -2383,11 +2388,11 @@ default-package-overrides: - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.11 - - tfp ==1.0.1.1 + - tfp ==1.0.2 - tf-random ==0.5 - th-abstraction ==0.4.2.0 - th-bang-compat ==0.0.1.0 - - th-compat ==0.1.1 + - th-compat ==0.1.2 - th-constraint-compat ==0.0.1.0 - th-data-compat ==0.1.0.0 - th-desugar ==1.11 @@ -2396,7 +2401,7 @@ default-package-overrides: - these-lens ==1.0.1.2 - these-optics ==1.0.1.2 - these-skinny ==0.7.4 - - th-expand-syns ==0.4.6.0 + - th-expand-syns ==0.4.8.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 - th-lift-instances ==0.1.18 @@ -2447,15 +2452,13 @@ default-package-overrides: - topograph ==1.0.0.1 - torsor ==0.1 - tostring ==0.2.1.1 - - tracing ==0.0.5.2 - - tracing-control ==0.0.6 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 - transformers-compat ==0.6.6 - transformers-fix ==1.0 - traverse-with-class ==1.0.1.0 - - tree-diff ==0.1 + - tree-diff ==0.2 - tree-fun ==0.8.1.0 - tree-view ==0.5.1 - trifecta ==2.1.1 @@ -2468,7 +2471,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.20 + - turtle ==1.5.21 - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 @@ -2504,6 +2507,7 @@ default-package-overrides: - unicode ==0.0.1.1 - unicode-show ==0.1.0.4 - unicode-transforms ==0.3.7.1 + - unification-fd ==0.11.1 - union-find ==0.2 - unipatterns ==0.0.0.0 - uniplate ==1.6.13 @@ -2541,11 +2545,11 @@ default-package-overrides: - utf8-light ==0.4.2 - utf8-string ==1.0.2 - util ==0.1.17.1 - - utility-ht ==0.0.15 + - utility-ht ==0.0.16 - uuid ==1.3.14 - uuid-types ==1.0.4 - validation ==1.1.1 - - validation-selective ==0.1.0.0 + - validation-selective ==0.1.0.1 - validity ==0.11.0.0 - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 @@ -2595,7 +2599,6 @@ default-package-overrides: - wai-feature-flags ==0.1.0.1 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 - - wai-middleware-auth ==0.2.3.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 - wai-middleware-static ==0.9.0 @@ -2629,7 +2632,7 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.0.0.5 - - witherable-class ==0 + - witherable ==0.4.1 - within ==0.2.0.1 - with-location ==0.1.0 - with-utf8 ==1.0.2.2 @@ -2695,7 +2698,6 @@ default-package-overrides: - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.6 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.4 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 @@ -2732,6 +2734,7 @@ extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - Cabal == 3.2.* # required for cabal-install etc. + - base16-bytestring < 1 # required for cabal-install etc. - dhall == 1.29.0 # required for ats-pkg - dhall == 1.37.1 # required for spago 0.19.0. - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 @@ -2750,6 +2753,7 @@ extra-packages: - haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 - haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 - lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - optparse-applicative < 0.16 # needed for niv-0.2.19 package-maintainers: peti: @@ -2871,27 +2875,27 @@ unsupported-platforms: alsa-mixer: [ x86_64-darwin ] alsa-pcm: [ x86_64-darwin ] alsa-seq: [ x86_64-darwin ] - AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ] - barbly: [ i686-linux, x86_64-linux ] + AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] bindings-directfb: [ x86_64-darwin ] - d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin ] - DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ] - dx9base: [ i686-linux, x86_64-linux, x86_64-darwin ] - dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin ] - dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin ] + d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] freenect: [ x86_64-darwin ] FTGL: [ x86_64-darwin ] gi-ostree: [ x86_64-darwin ] - gtk-mac-integration: [ i686-linux, x86_64-linux ] + gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] hcwiid: [ x86_64-darwin ] HFuse: [ x86_64-darwin ] - hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] + hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] lio-fs: [ x86_64-darwin ] midi-alsa: [ x86_64-darwin ] pam: [ x86_64-darwin ] PortMidi: [ x86_64-darwin ] Raincat: [ x86_64-darwin ] - reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] rtlsdr: [ x86_64-darwin ] rubberband: [ x86_64-darwin ] sdl2-mixer: [ x86_64-darwin ] @@ -2899,18 +2903,18 @@ unsupported-platforms: tokyotyrant-haskell: [ x86_64-darwin ] vulkan: [ i686-linux, armv7l-linux ] VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] - Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ] - Win32: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] + Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] xattr: [ x86_64-darwin ] - XInput: [ i686-linux, x86_64-linux, x86_64-darwin ] + XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] xmobar: [ x86_64-darwin ] dont-distribute-packages: @@ -3343,6 +3347,7 @@ broken-packages: - asic - asil - asn + - ASN1 - asn1-codec - asn1-data - assert @@ -4013,7 +4018,6 @@ broken-packages: - Chart-tests - chart-unit - charter - - chatter - chatty-text - chatwork - cheapskate-terminal @@ -5388,6 +5392,7 @@ broken-packages: - fractals - fraction - frag + - frame-markdown - Frames-beam - Frames-dsv - Frames-map-reduce @@ -5450,7 +5455,6 @@ broken-packages: - ftree - ftshell - full-sessions - - fullstop - funbot - funbot-client - funbot-git-hook @@ -5945,6 +5949,7 @@ broken-packages: - hahp - haiji - hailgun-send + - hails-bin - hairy - hakaru - hakismet @@ -5961,6 +5966,7 @@ broken-packages: - hakyll-contrib-links - hakyll-dhall - hakyll-dir-list + - hakyll-elm - hakyll-favicon - hakyll-filestore - hakyll-images @@ -6127,7 +6133,6 @@ broken-packages: - haskell-reflect - haskell-rules - haskell-spacegoo - - haskell-src - haskell-src-exts-observe - haskell-src-exts-prisms - haskell-src-exts-qq @@ -6189,6 +6194,7 @@ broken-packages: - haskellscript - HaskellTorrent - HaskellTutorials + - haskelm - haskelzinc - haskeme - haskey @@ -6623,10 +6629,6 @@ broken-packages: - hopencl - HOpenCV - hopfield - - hoppy-docs - - hoppy-generator - - hoppy-runtime - - hoppy-std - hops - hoq - horizon @@ -6913,6 +6915,7 @@ broken-packages: - http-wget - http2-client-grpc - http2-grpc-proto-lens + - http2-grpc-proto3-wire - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -6960,6 +6963,7 @@ broken-packages: - hw-kafka-avro - hw-prim-bits - hw-simd + - hw-simd-cli - hw-uri - hwall-auth-iitk - hweblib @@ -9180,6 +9184,7 @@ broken-packages: - proto-lens-combinators - proto-lens-descriptors - proto3-suite + - proto3-wire - protobuf-native - protocol - protocol-buffers-descriptor-fork @@ -9254,10 +9259,6 @@ broken-packages: - qr-imager - qr-repa - qsem - - qtah-cpp-qt5 - - qtah-examples - - qtah-generator - - qtah-qt5 - QuadEdge - QuadTree - quantfin @@ -10005,7 +10006,6 @@ broken-packages: - sha1 - shade - shadower - - shake-bench - shake-bindist - shake-cabal-build - shake-dhall @@ -10052,6 +10052,7 @@ broken-packages: - Shpadoinkle-examples - Shpadoinkle-html - Shpadoinkle-router + - Shpadoinkle-template - Shpadoinkle-widgets - shpider - shuffle @@ -10190,6 +10191,7 @@ broken-packages: - snap-auth-cli - snap-blaze-clay - snap-configuration-utilities + - snap-elm - snap-error-collector - snap-extras - snap-routes @@ -10211,6 +10213,7 @@ broken-packages: - snaplet-hdbc - snaplet-hslogger - snaplet-influxdb + - snaplet-lss - snaplet-mandrill - snaplet-mongoDB - snaplet-mongodb-minimalistic @@ -11366,6 +11369,7 @@ broken-packages: - wai-middleware-route - wai-middleware-static-caching - wai-middleware-travisci + - wai-middleware-validation - wai-rate-limit-redis - wai-request-spec - wai-responsible diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 81fc634193..345632ddd8 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -27,7 +27,7 @@ self: { attoparsec base bytestring linear packer ]; description = "3D model parsers"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -581,6 +581,8 @@ self: { ]; description = "ASN.1 support for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "AVar" = callPackage @@ -603,7 +605,7 @@ self: { libraryHaskellDepends = [ base regex-compat Win32 ]; description = "A binding to a part of the ANSI escape code for the console"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "AbortT-monadstf" = callPackage @@ -938,7 +940,7 @@ self: { PrimitiveArray vector ]; description = "Collection of alignment algorithms"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1131,7 +1133,7 @@ self: { base containers mtl poly-rec requirements tagged template-haskell ]; description = "Strongly typed Attribute Grammars implemented using type-level programming"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "AttoBencode" = callPackage @@ -1313,14 +1315,14 @@ self: { pname = "BNFC-meta"; version = "0.6.1"; sha256 = "0snackflcjxza4iqbd85fdsmylwr3bj71nsfrs2s2idc3nlxc7ia"; - revision = "1"; - editedCabalFile = "1lj92qxjf7gbgifhz1p6jw20079x6772gkbhvpd8ba4956dvzna3"; + revision = "2"; + editedCabalFile = "1xg96a83jhz5jiw16yrgm3x5k7fz7zmz6cvggnfmjvw7v7bl69ph"; libraryHaskellDepends = [ alex-meta array base fail happy-meta haskell-src-meta syb template-haskell ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "Baggins" = callPackage @@ -1333,7 +1335,7 @@ self: { editedCabalFile = "16206xd8lm8fkvpxbm19h403264xyjki07s9lam3pgq985xbqk35"; libraryHaskellDepends = [ base cairo containers mtl ]; description = "Tools for self-assembly"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1414,7 +1416,7 @@ self: { base bytestring cassava deepseq directory statistics time vector ]; description = "Benchmark functions with history"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1535,7 +1537,7 @@ self: { filepath parsec ParsecTools StockholmAlignment SVGFonts text vector ]; description = "Libary for Hidden Markov Models in HMMER3 format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1558,7 +1560,7 @@ self: { vector-read-instances zlib ]; description = "Base library for bioinformatics"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1586,7 +1588,7 @@ self: { tasty-silver tasty-th text ]; description = "BLAST-related tools"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1599,7 +1601,7 @@ self: { sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w"; libraryHaskellDepends = [ base bytestring iteratee ]; description = "Vienna / DotBracket / ExtSS parsers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1642,7 +1644,7 @@ self: { directory either-unwrap text vector word8 ]; description = "Ensembl related datastructures and functions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1659,7 +1661,7 @@ self: { base BiobaseXNA bytestring containers filemanip iteratee tuple ]; description = "Importer for FR3D resources"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1704,7 +1706,7 @@ self: { http-conduit hxt mtl network Taxonomy text transformers ]; description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1726,7 +1728,7 @@ self: { either-unwrap hxt text ]; description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1766,7 +1768,7 @@ self: { base criterion lens text transformers ]; description = "Infernal data structures and tools"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1779,7 +1781,7 @@ self: { sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r"; libraryHaskellDepends = [ base bytestring containers iteratee ]; description = "Multiple Alignment Format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1829,7 +1831,7 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "RNA folding training data"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1848,7 +1850,7 @@ self: { filepath lens primitive PrimitiveArray repa split vector ]; description = "Import Turner RNA parameters"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -1899,7 +1901,7 @@ self: { base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector ]; description = "Import Vienna energy parameters"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2025,7 +2027,7 @@ self: { HTTP http-conduit hxt mtl network transformers zip-archive ]; description = "Libary to interface with the NCBI blast REST interface"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2074,7 +2076,7 @@ self: { ]; executableHaskellDepends = [ base cmdargs ]; description = "A tool for posting Haskelly articles to blogs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2127,7 +2129,7 @@ self: { base containers criterion MissingH network-uri parsec ]; description = "A markdown-like markup language designed for blog posts"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2292,7 +2294,7 @@ self: { QuickCheck test-framework test-framework-quickcheck2 ]; description = "Encode/Decode values to/from CBOR"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -2459,7 +2461,7 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "Infernal covariance model comparison"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3321,7 +3323,7 @@ self: { testHaskellDepends = [ base hspec hspec-discover parsec text ]; testToolDepends = [ hspec-discover ]; description = "Libary for parsing Clustal tools output"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -3375,8 +3377,8 @@ self: { }: mkDerivation { pname = "Color"; - version = "0.3.0"; - sha256 = "18aissrpllxll01k203i2agfff89ffah465zvb0yx0lvs8jh2xr7"; + version = "0.3.1"; + sha256 = "1gg15kb6za69w0b3x8pzrqbrh9b8g7g0zwj2a9ajf0wgp8kylp5b"; libraryHaskellDepends = [ base data-default-class deepseq vector ]; testHaskellDepends = [ base colour doctest hspec HUnit JuicyPixels massiv massiv-test @@ -3935,7 +3937,7 @@ self: { transformers-compat utf8-string xml-conduit xml-hamlet ]; description = "RFC 4918 WebDAV support"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "DBFunctor" = callPackage @@ -4016,7 +4018,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base MuCheck ]; description = "Distributed Mutation Analysis framework for MuCheck"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4293,7 +4295,7 @@ self: { utf8-string ]; description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4447,8 +4449,8 @@ self: { }: mkDerivation { pname = "Decimal"; - version = "0.5.1"; - sha256 = "0k7kh05mr2f54w1lpgq1nln0h8k6s6h99dyp5jzsb9cfbb3aap2p"; + version = "0.5.2"; + sha256 = "19w7i9f0lbiyzwa0v3bm95233vi7f1688f0xms6cnjsf88h04ym3"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq HUnit QuickCheck test-framework test-framework-hunit @@ -4676,7 +4678,7 @@ self: { ]; testHaskellDepends = [ base hspec lens mtl text ]; description = "A client library for the DigitalOcean API"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4704,7 +4706,7 @@ self: { librarySystemDepends = [ dsound ]; description = "Partial binding to the Microsoft DirectSound API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {dsound = null;}; "DisTract" = callPackage @@ -4742,7 +4744,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Discussion support system"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -4827,7 +4829,7 @@ self: { PrimitiveArray repa split vector ]; description = "Frameshift-aware alignment of protein sequences with DNA sequences"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5050,7 +5052,7 @@ self: { array base criterion QuickCheck random vector ]; description = "Dynamic time warping of sequences"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5356,7 +5358,7 @@ self: { Taxonomy text transformers ]; description = "Libary to interface with the NCBI Entrez REST service"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5506,7 +5508,7 @@ self: { base containers ghc mtl operational random SafeSemaphore time unix ]; description = "A general data-flow framework"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5526,7 +5528,7 @@ self: { array base containers deepseq Etage fgl mtl parallel random time ]; description = "Data-flow based graph algorithms"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5644,7 +5646,7 @@ self: { libraryHaskellDepends = [ base inline-c ]; testHaskellDepends = [ base hspec inline-c ]; description = "Haskell Foreign Accelerate Interface"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "FComp" = callPackage @@ -5669,7 +5671,7 @@ self: { template-haskell time uu-parsinglib ]; description = "Compose music"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -5698,7 +5700,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ fmodex64 ]; description = "The Haskell FModEx raw API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {fmodex64 = null;}; @@ -5739,7 +5741,9 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -6768,7 +6772,7 @@ self: { sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4"; libraryHaskellDepends = [ base OpenGLRaw ]; description = "Utilities for working with OpenGL matrices"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7103,7 +7107,7 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th vector ]; description = "Hox gene clustering"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7158,7 +7162,7 @@ self: { test-framework-th ]; description = "MCFGs for Genus-1 RNA Pseudoknots"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7440,7 +7444,7 @@ self: { base dataenc download-curl utf8-string xml ]; description = "Interface to Google Suggest API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "GoogleTranslate" = callPackage @@ -7454,7 +7458,7 @@ self: { AttoJson base bytestring dataenc download-curl ]; description = "Interface to Google Translate API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7504,7 +7508,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Grammar products and higher-dimensional grammars"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7524,7 +7528,7 @@ self: { ]; executableHaskellDepends = [ array base mtl ]; description = "Graph500 benchmark-related definitions and data set generator"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7540,7 +7544,7 @@ self: { array base containers Graph500 mtl stm time ]; description = "GraphHammer Haskell graph analyses framework inspired by STINGER"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -7559,7 +7563,7 @@ self: { array base containers Graph500 GraphHammer mtl ]; description = "Test harness for TriangleCount analysis"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8171,7 +8175,7 @@ self: { sha256 = "09h6wfalziw39c2sghj8qw82vyvnl01qlsam6ngkfkdirgj5sg5h"; libraryHaskellDepends = [ base c-storable-deriving ]; description = "A Queue with a random (weighted) pick function"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -8191,7 +8195,9 @@ self: { ''; description = "HFuse is a binding for the Linux FUSE library"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) fuse;}; "HGE2D" = callPackage @@ -8914,7 +8920,7 @@ self: { executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) opencv;}; @@ -9053,7 +9059,7 @@ self: { HROOT-io HROOT-math HROOT-tree template-haskell ]; description = "Haskell binding to the ROOT data analysis framework"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9068,7 +9074,7 @@ self: { base fficxx fficxx-runtime template-haskell ]; description = "Haskell binding to ROOT Core modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9085,7 +9091,7 @@ self: { base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell ]; description = "Haskell binding to ROOT Graf modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9102,7 +9108,7 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT Hist modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9119,7 +9125,7 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT IO modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9136,7 +9142,7 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT Math modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9153,7 +9159,7 @@ self: { base fficxx fficxx-runtime HROOT-core template-haskell ]; description = "Haskell binding to ROOT Tree modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9413,7 +9419,7 @@ self: { unordered-containers ]; description = "The Haskell Test Framework"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9635,7 +9641,7 @@ self: { sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458"; libraryHaskellDepends = [ base bytestring serialport stm ]; description = "An Haskell library to drive the french Minitel through a serial port"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9841,7 +9847,7 @@ self: { ]; testHaskellDepends = [ base Cabal containers HUnit tuple vector ]; description = "Aggression analysis for Tweets on Twitter"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9890,7 +9896,7 @@ self: { executableHaskellDepends = [ base random transformers ]; testHaskellDepends = [ base hspec transformers ]; description = "The classic game of Hangman"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9934,7 +9940,7 @@ self: { process sox template-haskell uu-parsinglib vector ]; description = "Harmony Analysis and Retrieval of Music"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -9957,7 +9963,7 @@ self: { uu-parsinglib ]; description = "Parsing and unambiguously representing musical chords"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "HasBigDecimal" = callPackage @@ -9985,7 +9991,7 @@ self: { librarySystemDepends = [ CacBDD ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Haskell bindings for CacBDD"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {CacBDD = null;}; @@ -10003,7 +10009,7 @@ self: { base haskell98 hmatrix hmatrix-special mtl parsec random ]; description = "A Haskell library for inference using Gaussian processes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10061,7 +10067,7 @@ self: { base containers directory ghc-prim HList tagged ]; description = "HaskRel, Haskell as a DBMS with support for the relational algebra"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -10827,6 +10833,21 @@ self: { license = lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.6"; + sha256 = "1gkx6kk03ziz9wk6iwxcdpf1ig8a9whwv3yjbzmqrwkp7fh1wdrw"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -10950,7 +10971,7 @@ self: { text ]; description = "Pure Haskell YAML 1.2 processor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "HsYAML-aeson" = callPackage @@ -11065,7 +11086,7 @@ self: { ]; benchmarkHaskellDepends = [ array base criterion Munkres random ]; description = "A Linear Sum Assignment Problem (LSAP) solver"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Hydrogen" = callPackage @@ -11101,7 +11122,7 @@ self: { libraryHaskellDepends = [ array base QuickCheck ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Code for the Haskell course taught at the University of Seville"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11293,7 +11314,7 @@ self: { sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "A library for writing Imperative style haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11444,7 +11465,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "DSL for IRC bots"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11578,7 +11599,7 @@ self: { sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp"; libraryHaskellDepends = [ base hosc ]; description = "control JackMiniMix"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -11756,8 +11777,8 @@ self: { pname = "JuicyPixels-blurhash"; version = "0.1.0.3"; sha256 = "0kgl2j7990p8q5yrkn0wgaszc9fzva1pc3277j11k1lbjsymz360"; - revision = "3"; - editedCabalFile = "1mspqkmvn5j6xs3cb882szbnrzaxf0p2nyyxkfqfnbma204cs2fi"; + revision = "4"; + editedCabalFile = "0jxrcv4x3xr3v4lka0z5b13ywdic5f1dh19ivshrvad3xnv7kx0g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -12483,7 +12504,7 @@ self: { pipes-parse ]; description = "Library for RedPitaya"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12564,7 +12585,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory filepath unix ]; description = "A simple sandboxing tool for Haskell packages"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12596,7 +12617,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory random SDL SDL-ttf ]; description = "A Snake II clone written using SDL"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -12726,7 +12747,7 @@ self: { libraryHaskellDepends = [ base binary bytestring HTF mtl ]; testHaskellDepends = [ base binary bytestring HTF mtl ]; description = "Algorithmic Doom map generation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13051,7 +13072,7 @@ self: { libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl ]; description = "Generate MASM code from haskell"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13064,7 +13085,7 @@ self: { sha256 = "0yh84vybrxs6bv3z4qx4n9m4xwsb4kw21l35s5v4gg8yllgbb79r"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13084,7 +13105,7 @@ self: { ]; executableHaskellDepends = [ cmdargs split ]; description = "Folding algorithm based on nucleotide cyclic motifs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13179,7 +13200,7 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-th ]; description = "A GLPK backend to the MIP library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) glpk;}; @@ -13302,7 +13323,7 @@ self: { sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn"; libraryHaskellDepends = [ base ]; description = "Mapping"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13649,7 +13670,7 @@ self: { sha256 = "1n90lfrvfr1ni7ninlxbs4wk0m7mibdpi9sy26ifih51nmk8nziq"; libraryHaskellDepends = [ base numeric-prelude ]; description = "Modular arithmetic via Numeric-Prelude"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "Moe" = callPackage @@ -13930,7 +13951,7 @@ self: { sha256 = "1dglyak17db7q9nd6s255w2zh8lh192vidyjvgvh53vbybymb20z"; libraryHaskellDepends = [ base containers split ]; description = "Morse code"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "MuCheck" = callPackage @@ -13950,7 +13971,7 @@ self: { temporary time ]; description = "Automated Mutation Testing"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13966,7 +13987,7 @@ self: { libraryHaskellDepends = [ base HUnit MuCheck ]; executableHaskellDepends = [ base HUnit MuCheck ]; description = "Automated Mutation Testing for HUnit tests"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13982,7 +14003,7 @@ self: { libraryHaskellDepends = [ base hspec hspec-core MuCheck ]; executableHaskellDepends = [ base hspec hspec-core MuCheck ]; description = "Automated Mutation Testing for Hspec tests"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -13998,7 +14019,7 @@ self: { libraryHaskellDepends = [ base MuCheck QuickCheck ]; executableHaskellDepends = [ base MuCheck QuickCheck ]; description = "Automated Mutation Testing for QuickCheck tests"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14014,7 +14035,7 @@ self: { libraryHaskellDepends = [ base MuCheck smallcheck ]; executableHaskellDepends = [ base MuCheck smallcheck ]; description = "Automated Mutation Testing for SmallCheck tests"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14059,7 +14080,7 @@ self: { transformers unliftio-core vector xml-conduit xml-types ]; description = "interface to MusicBrainz XML2 and JSON web services"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "MusicBrainz-libdiscid" = callPackage @@ -14106,7 +14127,7 @@ self: { base QuickCheck tasty tasty-quickcheck tasty-th vector ]; description = "Most likely order of mutation events in RNA"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14193,7 +14214,7 @@ self: { test-framework-hunit test-framework-quickcheck2 time ]; description = "A Haskell interface to Lego Mindstorms NXT"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {bluetooth = null;}; @@ -14249,7 +14270,7 @@ self: { editedCabalFile = "01ma6068mnwn9f7jpa5g8kkl7lyhl5wnpw9ad44zz9gki1mrw37i"; libraryHaskellDepends = [ base containers random ]; description = "A name generator written in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "NanoProlog" = callPackage @@ -14406,7 +14427,7 @@ self: { sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv"; libraryHaskellDepends = [ base random vector ]; description = "A port of John Skilling's nested sampling C code to Haskell"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "NetSNMP" = callPackage @@ -14736,7 +14757,7 @@ self: { libraryHaskellDepends = [ base containers primes ]; testHaskellDepends = [ base containers HUnit primes ]; description = "A library for number theoretic computations, written in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -14766,7 +14787,7 @@ self: { ADPfusion base ghc-prim mtl primitive PrimitiveArray vector ]; description = "Nussinov78 using the ADPfusion library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15438,7 +15459,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring containers ]; description = "A library for analysis of 3-D protein coordinates"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "PPrinter" = callPackage @@ -15706,7 +15727,7 @@ self: { old-locale process random RSA SafeSemaphore time unix ]; description = "A proven synchronization server for high performance computing"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -15719,7 +15740,7 @@ self: { sha256 = "11vshnbxfl8p38aix4h2b0vms8j58agwxbmhd9pkxai764sl6j7g"; libraryHaskellDepends = [ base parsec ]; description = "Parsec combinators for more complex objects"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "ParserFunction" = callPackage @@ -15768,7 +15789,7 @@ self: { libraryHaskellDepends = [ base cmdargs HTTP network network-uri ]; executableHaskellDepends = [ base cmdargs ]; description = "CLI for pasting to lpaste.net"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "PathTree" = callPackage @@ -15899,7 +15920,7 @@ self: { string-conversions temporary text time ]; description = "Personal Happstack Server Utils"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16017,7 +16038,7 @@ self: { sha256 = "047aw1pka7xsqnshbmirkxd80m92w96xfb0kpi1a22bx0kpgg58w"; libraryHaskellDepends = [ base containers regex-tdfa ]; description = "Pluralize English words"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Pollutocracy" = callPackage @@ -16045,7 +16066,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring network splice ]; description = "high-performance distributed reverse / forward proxy & tunneling for TCP"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16062,7 +16083,9 @@ self: { librarySystemDepends = [ alsaLib ]; description = "A binding for PortMedia/PortMidi"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) alsaLib;}; "PortMidi-simple" = callPackage @@ -16284,7 +16307,7 @@ self: { executableHaskellDepends = [ base ]; doHaddock = false; description = "A networked event handling framework for hooking into other programs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16301,7 +16324,7 @@ self: { base network parsec Pup-Events-PQueue stm transformers ]; description = "A networked event handling framework for hooking into other programs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Pup-Events-Demo" = callPackage @@ -16319,7 +16342,7 @@ self: { Pup-Events-Server stm ]; description = "A networked event handling framework for hooking into other programs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16332,7 +16355,7 @@ self: { sha256 = "0sngiqxzj5kif452s2hn3x1kv257815c5v19dp4wqazbyc373iwx"; libraryHaskellDepends = [ base stm ]; description = "A networked event handling framework for hooking into other programs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Pup-Events-Server" = callPackage @@ -16347,7 +16370,7 @@ self: { base network parsec Pup-Events-PQueue stm transformers ]; description = "A networked event handling framework for hooking into other programs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16532,7 +16555,7 @@ self: { libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "Generator of \"valid\" and \"invalid\" data in a type class"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16557,7 +16580,7 @@ self: { websockets-snap ]; description = "Quick and easy data visualization with Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16683,7 +16706,7 @@ self: { libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec ]; description = "RLP serialization as defined in Ethereum Yellow Paper"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16729,7 +16752,7 @@ self: { base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs ]; description = "RNA secondary structure prediction"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16750,7 +16773,7 @@ self: { containers HsTools primitive PrimitiveArray RNAFold split vector ]; description = "RNA secondary structure folding"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16777,7 +16800,7 @@ self: { ]; executableHaskellDepends = [ bytestring cmdargs file-embed ]; description = "Multi-target RNA sequence design"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16798,7 +16821,7 @@ self: { ]; executableHaskellDepends = [ cmdargs ]; description = "Draw RNA secondary structures"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16832,7 +16855,7 @@ self: { text time vector ViennaRNAParser ]; description = "Unsupervized construction of RNA family models"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16854,7 +16877,7 @@ self: { ]; executableHaskellDepends = [ cmdargs split ]; description = "RNA folding with non-canonical basepairs and base-triplets"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -16932,7 +16955,9 @@ self: { ]; description = "A puzzle game written in Haskell with a cat in lead role"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "Random123" = callPackage @@ -17166,7 +17191,7 @@ self: { base cmdargs cond containers directory ]; description = "A utility for computing distributions of material to review among reviewers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17310,7 +17335,7 @@ self: { test-framework-quickcheck2 ]; description = "Limits the size of a directory's contents"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17714,7 +17739,7 @@ self: { ]; libraryToolDepends = [ c2hsc ]; description = "Declarative coördination language for streaming networks"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -17906,7 +17931,7 @@ self: { pipes-bytestring pipes-parse split ]; description = "A parser for SWMM 5 binary .OUT files"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "SableCC2Hs" = callPackage @@ -18083,7 +18108,7 @@ self: { regex-compat sqlite-simple unix ]; description = "Size limited temp filesystem based on fuse"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18157,7 +18182,7 @@ self: { base cmdargs directory either-unwrap ]; description = "Selects a representative subset of sequences from multiple sequence alignment"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18220,7 +18245,7 @@ self: { base directory filepath hslogger mtl old-locale random time ]; description = "Easy Loggingframework"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -18264,7 +18289,7 @@ self: { filepath mtl parsec QuickCheck regex-tdfa ]; description = "Shell script analysis tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Shellac" = callPackage @@ -18598,6 +18623,39 @@ self: { broken = true; }) {}; + "Shpadoinkle-streaming" = callPackage + ({ mkDerivation, base, lens, Shpadoinkle, streaming, text }: + mkDerivation { + pname = "Shpadoinkle-streaming"; + version = "0.0.0.1"; + sha256 = "1bvrkyj9l8asczfamw26x1hwj8bcxr7812zjm1m91jg4xzipayv2"; + libraryHaskellDepends = [ base lens Shpadoinkle streaming text ]; + description = "Integration of the streaming library with Shpadoinkle continuations"; + license = lib.licenses.bsd3; + }) {}; + + "Shpadoinkle-template" = callPackage + ({ mkDerivation, base, file-embed, html-parse, Shpadoinkle + , Shpadoinkle-backend-static, template-haskell, text + }: + mkDerivation { + pname = "Shpadoinkle-template"; + version = "0.0.0.1"; + sha256 = "1iyxb0hnyfcb4fipwrvzr03g3rai5lc5k7sysrd691l0dsh2jill"; + libraryHaskellDepends = [ + base html-parse Shpadoinkle Shpadoinkle-backend-static + template-haskell text + ]; + testHaskellDepends = [ + base file-embed html-parse Shpadoinkle Shpadoinkle-backend-static + template-haskell text + ]; + description = "Read standard file formats into Shpadoinkle with Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "Shpadoinkle-widgets" = callPackage ({ mkDerivation, aeson, base, compactable, containers , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck @@ -18756,7 +18814,7 @@ self: { libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base Cabal ]; description = "Simple table generator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Sit" = callPackage @@ -18932,7 +18990,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Sonnex is an alternative to Soundex for french language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19278,7 +19336,7 @@ self: { sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6"; libraryHaskellDepends = [ base statistics tuple vector ]; description = "Collection of useful statistical methods"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "StockholmAlignment" = callPackage @@ -19294,7 +19352,7 @@ self: { vector ]; description = "Libary for Stockholm aligmnent format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19448,7 +19506,7 @@ self: { sha256 = "1wbixjgzad3s9jj16kl0gvwg82g3hqvkag9wr5j58w98a4qyqw8i"; libraryHaskellDepends = [ base ]; description = "String manipulation utilities"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "SuffixStructures" = callPackage @@ -19802,7 +19860,7 @@ self: { aeson base bytestring either-unwrap fgl parsec text vector ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19823,7 +19881,7 @@ self: { EntrezHTTP fgl hxt parsec process Taxonomy text vector ]; description = "Tool for parsing, processing, comparing and visualizing taxonomy data"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19853,7 +19911,7 @@ self: { template-haskell text ]; description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -19915,7 +19973,7 @@ self: { process text ]; description = "Generates testcases from program-snippets"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "Theora" = callPackage @@ -19952,7 +20010,7 @@ self: { sha256 = "0rpcv6kw351ykj36f83qdqygrhk4ylqlcgcswxl8gg1v33jaaqmz"; libraryHaskellDepends = [ base ]; description = "Mutable objects that reside in their own threads"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Thrift" = callPackage @@ -20011,7 +20069,7 @@ self: { sha256 = "02plz1y7lmvp3jpl5srsnx2nkl6yhhfn6pqj00szs688cahk2dik"; libraryHaskellDepends = [ base binary bytestring dataenc ]; description = "TigerHash with C implementation"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "TimePiece" = callPackage @@ -20075,7 +20133,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers matrix random ]; description = "Game for Lounge Marmelade"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -20370,7 +20428,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base containers directory time ]; description = "Command Line Typing speed tester"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "UISF" = callPackage @@ -20767,7 +20825,7 @@ self: { ]; testHaskellDepends = [ base hspec parsec ]; description = "Libary for parsing ViennaRNA package output"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "Villefort" = callPackage @@ -20824,7 +20882,7 @@ self: { ]; description = "Bindings to the VulkanMemoryAllocator library"; license = lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; }) {}; "WAVE" = callPackage @@ -21189,12 +21247,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_11_1_0" = callPackage + "Win32_2_12_0_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.11.1.0"; - sha256 = "18rsfx3ca8r7y4ifxn1mggn8j6ppgkn698wsq0pwqb63riva09rk"; + version = "2.12.0.0"; + sha256 = "068k26s1vxwz94w7bkqs9xbkh0z2mp1mimyklarr8rh26v978qin"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -21209,7 +21267,7 @@ self: { libraryHaskellDepends = [ base Win32 ]; description = "Binding to the Win32 console API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "Win32-dhcp-server" = callPackage @@ -21221,7 +21279,7 @@ self: { libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Win32 DHCP Server Management API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "Win32-errors" = callPackage @@ -21238,7 +21296,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck Win32 ]; description = "Alternative error handling for Win32 foreign calls"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "Win32-extras" = callPackage @@ -21253,7 +21311,7 @@ self: { librarySystemDepends = [ imm32 msimg32 ]; description = "Provides missing Win32 API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {imm32 = null; msimg32 = null;}; "Win32-junction-point" = callPackage @@ -21265,7 +21323,7 @@ self: { libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Support for manipulating NTFS junction points"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "Win32-notify" = callPackage @@ -21279,7 +21337,7 @@ self: { libraryHaskellDepends = [ base containers directory Win32 ]; description = "A binding to part of the Win32 library for file notification"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "Win32-security" = callPackage @@ -21293,7 +21351,7 @@ self: { libraryHaskellDepends = [ base text Win32 Win32-errors ]; description = "Haskell bindings to a security-related functions of the Windows API"; license = lib.licenses.mit; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "Win32-services" = callPackage @@ -21306,7 +21364,7 @@ self: { librarySystemDepends = [ Advapi32 ]; description = "Windows service applications"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {Advapi32 = null;}; "Win32-services-wrapper" = callPackage @@ -21322,7 +21380,7 @@ self: { ]; description = "Wrapper code for making a Win32 service"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "Win32-shortcut" = callPackage @@ -21394,7 +21452,7 @@ self: { tasty-th text ]; description = "Bigram word pair alignments"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -21615,7 +21673,7 @@ self: { librarySystemDepends = [ xinput ]; description = "Bindings for the DirectX XInput library"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {inherit (pkgs.xorg) xinput;}; "XML" = callPackage @@ -21646,7 +21704,7 @@ self: { sha256 = "1vdgbmf27ghvyjzkcymsz9fgv9lcss41n5hiyqc58nzg0w18r0ik"; libraryHaskellDepends = [ base parsec ]; description = "A library to parse xml"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "XMMS" = callPackage @@ -21975,10 +22033,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.7.0.0"; - sha256 = "1b4ycsq5g459ynp989kldq6r3ssawr64a2hp3dzy804pwrp8v62m"; - revision = "1"; - editedCabalFile = "057si6f4hz5kda3gyr2b8kni17dmv28z82b64qi142gjr3gx415i"; + version = "0.7.1.0"; + sha256 = "12ay07rfyprdbgf6ndh4ywcklfqnjdk1gdf0xli27a96i86i7x44"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -22005,8 +22061,8 @@ self: { }: mkDerivation { pname = "Z-IO"; - version = "0.7.0.0"; - sha256 = "1yw0ym2iw1hi3jn2xrp1hwi6vbv69d0fpvvz3n2328v4i0ryjdjf"; + version = "0.7.1.0"; + sha256 = "18d2q9fg4ydqpnrzvpcx1arjv4yl2966aax68fz3izgmsbp95k0l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -23328,7 +23384,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "Maybe gives you a cute girl"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "acme-default" = callPackage @@ -23481,7 +23537,7 @@ self: { sha256 = "039pz5lw3p8iy1gaijvbc8296djxcziw70a0rnw0iz3iy29w1fmc"; libraryHaskellDepends = [ base text ]; description = "free your haskell from the tyranny of npm!"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24069,7 +24125,7 @@ self: { parsec-permutation strict text time ]; description = "Convert adblock config files to privoxy format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "addLicenseInfo" = callPackage @@ -24276,7 +24332,7 @@ self: { sha256 = "0cp14n2l3scbsp7f6s4r19ngn2ympns03pm6s07hdkpavvgli1zg"; libraryHaskellDepends = [ base ]; description = "Modelling, rendering and quantitative analysis on attack defense trees"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -24501,20 +24557,19 @@ self: { "aeson-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, doctest, fail, hspec, scientific, text, time - , time-compat, unordered-containers, utf8-string, uuid-types - , vector, void + , deepseq, fail, hspec, scientific, text, time, time-compat + , unordered-containers, utf8-string, uuid-types, vector, void }: mkDerivation { pname = "aeson-combinators"; - version = "0.0.4.1"; - sha256 = "1nvw5n7kfqrrci76350zd3mqvssb775ka4044kxgw0bhdzy3gcpg"; + version = "0.0.5.0"; + sha256 = "1z5fbvpffx2lv3d2wk9g74hmkx1n1yjkwd3vy57f3pp5npja7f3a"; libraryHaskellDepends = [ aeson base bytestring containers fail scientific text time time-compat unordered-containers uuid-types vector void ]; testHaskellDepends = [ - aeson base bytestring doctest hspec text utf8-string + aeson base bytestring hspec text utf8-string ]; benchmarkHaskellDepends = [ aeson base bytestring criterion deepseq text @@ -25389,7 +25444,7 @@ self: { monad-parallel mtl OpenGL sdl2 stm text uuid vector ]; description = "A simple Game Engine using SDL"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26010,7 +26065,7 @@ self: { regex-compat syb temporary unix utf8-string zlib ]; description = "Haskell compiler that produce binary through C language"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26116,8 +26171,8 @@ self: { }: mkDerivation { pname = "alex-meta"; - version = "0.3.0.12"; - sha256 = "0s0yhkl0ymr50agqnsbscw8926jk4044n6scw086ylhcijx3qmxa"; + version = "0.3.0.13"; + sha256 = "0lbralcid373p25m4qhrhrjak87p8wp4as3304sj6ba6xka89q3v"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -26238,7 +26293,7 @@ self: { tf-random transformers ]; description = "Algorithmic automation for various DAWs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -26814,7 +26869,9 @@ self: { libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (Exceptions)"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage @@ -26869,7 +26926,9 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to the ALSA simple mixer API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -26889,7 +26948,9 @@ self: { libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (PCM audio)"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -26925,7 +26986,9 @@ self: { libraryPkgconfigDepends = [ alsaLib ]; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -29654,8 +29717,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.21.0"; - sha256 = "1sni1bl2rmc2fq2zla0h093acd7yisfdizd5wrxclammzav7x0gk"; + version = "0.22.0"; + sha256 = "1yr81pwmjnap5bir9nrmpwakg4rz4fwcjzbkdr8azqbp9x0hr9k2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -29730,7 +29793,7 @@ self: { utf8-string x509-system ]; description = "AMQP toolset for the command line"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "amqp-worker" = callPackage @@ -29857,7 +29920,7 @@ self: { system-fileio system-filepath text ]; description = "Simple literate programming preprocessor"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "anansi-hscolour" = callPackage @@ -29872,7 +29935,7 @@ self: { anansi base bytestring containers hscolour monads-tf text ]; description = "Colorized looms for Anansi"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "anansi-pandoc" = callPackage @@ -29887,7 +29950,7 @@ self: { anansi base bytestring containers monads-tf pandoc text ]; description = "Looms which use Pandoc to parse and produce a variety of formats"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -29928,7 +29991,7 @@ self: { sha256 = "1wn0kap7bw6sp9yi1awcmxh11s5ra4b44qbf97plsvrmpfz15cc5"; libraryHaskellDepends = [ base process ]; description = "Android methods exposed to Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30028,7 +30091,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "A small, general-purpose programming language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30062,7 +30125,7 @@ self: { ]; testHaskellDepends = [ ansi-terminal-game base hspec parsec ]; description = "text-file based ASCII animator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30308,19 +30371,6 @@ self: { }) {}; "ansi-terminal" = callPackage - ({ mkDerivation, base, colour }: - mkDerivation { - pname = "ansi-terminal"; - version = "0.10.3"; - sha256 = "0z5m6ljmdyjyzq0s08rjjdzdj1ry4fz2ni7xlxd86addvwr2wbps"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base colour ]; - description = "Simple ANSI terminal support, with Windows compatibility"; - license = lib.licenses.bsd3; - }) {}; - - "ansi-terminal_0_11" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; @@ -30331,7 +30381,6 @@ self: { libraryHaskellDepends = [ base colour ]; description = "Simple ANSI terminal support, with Windows compatibility"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ansi-terminal-game" = callPackage @@ -30356,7 +30405,7 @@ self: { unidecode ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30414,7 +30463,7 @@ self: { time time-locale-compat yesod yesod-auth ]; description = "A web interface to Antisplice dungeons"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30465,7 +30514,7 @@ self: { ironforge mtl network plugins time transformers ]; description = "This is an IRC bot for Mafia and Resistance"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -30832,7 +30881,7 @@ self: { transformers ]; description = "An engine for text-based dungeons"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31129,7 +31178,7 @@ self: { xdg-basedir ]; description = "Server and community browser for the game Tremulous"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -31289,34 +31338,34 @@ self: { "api-tools" = callPackage ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base - , base16-bytestring, base64-bytestring, bytestring, Cabal - , case-insensitive, cborg, containers, deepseq, happy, lens - , QuickCheck, regex-compat-tdfa, safe, safecopy, scientific + , base16-bytestring, base64-bytestring, bytestring + , case-insensitive, cborg, containers, criterion, deepseq, happy + , lens, QuickCheck, regex-compat-tdfa, safe, safecopy, scientific , serialise, tasty, tasty-hunit, tasty-quickcheck, template-haskell , text, time, unordered-containers, vector }: mkDerivation { pname = "api-tools"; - version = "0.8.0.2"; - sha256 = "0q10vqaf4y3zwa2nrwllxi8ac8ch6jjr4r3s5g6gy51bp04ggzv9"; + version = "0.9.0.0"; + sha256 = "04496r4l598i2m14gj1wpz8a976as0gkbw0745h85ap8hy23vfjx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base16-bytestring - base64-bytestring bytestring Cabal case-insensitive cborg - containers deepseq lens QuickCheck regex-compat-tdfa safe safecopy - scientific serialise template-haskell text time - unordered-containers vector + base64-bytestring bytestring case-insensitive cborg containers + deepseq lens QuickCheck regex-compat-tdfa safe safecopy scientific + serialise template-haskell text time unordered-containers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring deepseq QuickCheck serialise ]; testHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bytestring Cabal cborg + aeson aeson-pretty base base64-bytestring bytestring cborg containers QuickCheck safecopy serialise tasty tasty-hunit tasty-quickcheck template-haskell text time unordered-containers ]; + benchmarkHaskellDepends = [ base criterion text time ]; description = "DSL for generating API boilerplate and docs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -31857,7 +31906,7 @@ self: { base mtl QuickCheck test-framework test-framework-quickcheck2 ]; description = "An applicative parser combinator library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32294,7 +32343,7 @@ self: { transformers unix utf8-string ]; description = "Automatic Rule-Based Time Tracker"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "arcgrid" = callPackage @@ -32631,7 +32680,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory wx ]; description = "An interpreter for the Argh! programming language in wxHaskell"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -32712,7 +32761,7 @@ self: { base bimap containers glib gtk HDBC indents mtl parsec ]; description = "A computer assisted argumentation transcription and editing software"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33087,7 +33136,7 @@ self: { test-framework-quickcheck2 test-framework-th ]; description = "A simple interpreter for arrayForth, the language used on GreenArrays chips"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -33492,7 +33541,7 @@ self: { base random random-shuffle terminfo time ]; description = "ASCII animations for the holidays!"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "ascii-predicates" = callPackage @@ -33614,7 +33663,7 @@ self: { split zlib ]; description = "Process Ascii Vectors for Advantest 93k"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -34436,7 +34485,7 @@ self: { editedCabalFile = "0vh6k6397f3y03y28shx0gf0lvdlb6pdcdhd1j8r1svhjbyphfdp"; libraryHaskellDepends = [ array base containers ghc-prim ]; description = "serialisation for Haskell values with sharing support"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "aterm-utils" = callPackage @@ -35034,7 +35083,7 @@ self: { sha256 = "1jf9065pqmdfshkd0cqiamhivs9an4slqx82n7yj0kkhdxw5lyq4"; libraryHaskellDepends = [ attoparsec base bytestring ]; description = "An ARFF file parser using Attoparsec"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "attoparsec-base64" = callPackage @@ -35299,7 +35348,7 @@ self: { QuickCheck ]; description = "Variable-length integer decoding for Attoparsec"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "attosplit" = callPackage @@ -35660,7 +35709,7 @@ self: { base bytestring colour ghc-prim gloss JuicyPixels random vector ]; description = "Generates and displays patterns from next nearest neighbors cellular automata"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35856,8 +35905,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "39"; - editedCabalFile = "1y77mk83yap8yx5wlybpr06wwy3qvmq0svqc4c6dfyvjd9wjvsdv"; + revision = "40"; + editedCabalFile = "0wsr91a87kikvibl18knwkglawl9m96scdyd539zpgh6djbzmsqf"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -35875,7 +35924,7 @@ self: { rethinkdb-client-driver text ]; description = "Server-side implementation of the Avers storage model"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -35943,29 +35992,59 @@ self: { "aviation-cessna172-diagrams" = callPackage ({ mkDerivation, aviation-cessna172-weight-balance, aviation-units , aviation-weight-balance, base, colour, diagrams-cairo - , diagrams-core, diagrams-lib, directory, doctest, filepath - , hgeometry, lens, mtl, parsec, plots, QuickCheck, quickcheck-text - , template-haskell + , diagrams-core, diagrams-lib, hgeometry, hgeometry-combinatorial + , lens, mtl, plots }: mkDerivation { pname = "aviation-cessna172-diagrams"; - version = "0.0.2"; - sha256 = "05z4z953x16d3flvvh9x1q1cskm0ff802jg1digjhg5n0rqmd7fa"; + version = "0.0.3"; + sha256 = "1hkb32dsxqrhk788vkb669n9kkan951m4slk2x77zmf52cmk8ljw"; libraryHaskellDepends = [ aviation-cessna172-weight-balance aviation-units aviation-weight-balance base colour diagrams-cairo diagrams-core - diagrams-lib hgeometry lens mtl plots - ]; - testHaskellDepends = [ - base directory doctest filepath parsec QuickCheck quickcheck-text - template-haskell + diagrams-lib hgeometry hgeometry-combinatorial lens mtl plots ]; description = "Diagrams for the Cessna 172 aircraft in aviation"; license = "unknown"; hydraPlatforms = lib.platforms.none; - broken = true; - }) {aviation-cessna172-weight-balance = null; - aviation-units = null; aviation-weight-balance = null;}; + }) {}; + + "aviation-cessna172-weight-balance" = callPackage + ({ mkDerivation, aviation-units, aviation-weight-balance, base + , lens + }: + mkDerivation { + pname = "aviation-cessna172-weight-balance"; + version = "0.0.2"; + sha256 = "1lnj3dr7jkc3c3rvg6knwapjvk7cnxf3901df4xn7mqwg996sdgj"; + libraryHaskellDepends = [ + aviation-units aviation-weight-balance base lens + ]; + description = "Weight and Balance for the Cessna 172 aircraft in aviation"; + license = lib.licenses.bsd3; + }) {}; + + "aviation-units" = callPackage + ({ mkDerivation, base, lens }: + mkDerivation { + pname = "aviation-units"; + version = "0.0.2"; + sha256 = "14m3sbic6zppg8hn1i7b6rd40bw731hz6mr393h897jjlvxygcc2"; + libraryHaskellDepends = [ base lens ]; + description = "Units of measurements used in aviation"; + license = lib.licenses.bsd3; + }) {}; + + "aviation-weight-balance" = callPackage + ({ mkDerivation, aviation-units, base, lens }: + mkDerivation { + pname = "aviation-weight-balance"; + version = "0.0.2"; + sha256 = "1pqkqxdhl1a3pbrmjxz9vl3wjp90kic9vi6bjjr2q9i6six1xbjw"; + libraryHaskellDepends = [ aviation-units base lens ]; + description = "Weight and Balance structures used in aviation"; + license = lib.licenses.bsd3; + }) {}; "avl-static" = callPackage ({ mkDerivation, base, QuickCheck, test-framework @@ -36012,6 +36091,8 @@ self: { pname = "avro"; version = "0.5.2.0"; sha256 = "1apvqny4dikx5b7yqxs8a4hsxipl5xvz2i3c5bna1faiagxav1i1"; + revision = "1"; + editedCabalFile = "0081mnhn26824rbdsz1n74i9m21yfkh6y4g3v7ksh933dxagyiij"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -36098,7 +36179,7 @@ self: { sha256 = "0mvfirb41jnjvq4mpky0xpdrh238hjwslfqg82ksnam001sxnpng"; libraryHaskellDepends = [ base ]; description = "A prelude which I can be happy with. Based on base-prelude."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36115,7 +36196,7 @@ self: { aeson attoparsec awesomium-raw base containers text vector ]; description = "High-level Awesomium bindings"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36128,7 +36209,7 @@ self: { sha256 = "175hgqix2j26579g0rrryl86w7qvla95nvf4lwfxsxxwqgcq3zpd"; libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ]; description = "Utilities for using Awesomium with GLUT"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -36143,7 +36224,7 @@ self: { librarySystemDepends = [ awesomium ]; libraryToolDepends = [ c2hs ]; description = "Low-level Awesomium bindings"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {awesomium = null;}; @@ -36590,6 +36671,8 @@ self: { pname = "aws-lambda-runtime"; version = "0.0.0.1"; sha256 = "1yzqqlgi7yb9b5imh6zfmwbc097bj7r0zi8mkk82c81cv5rcjy08"; + revision = "1"; + editedCabalFile = "0gmf698hlxcg241zshn7rl3c2yqkk668inz43xjvahjj4rzqrnjy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36982,7 +37065,7 @@ self: { base Diff directory filepath hspec options process unix ]; description = "A simple DevOps tool which will never \"reach\" enterprice level"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -37203,7 +37286,7 @@ self: { librarySystemDepends = [ babl ]; libraryPkgconfigDepends = [ babl ]; description = "Haskell bindings to BABL library"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {inherit (pkgs) babl;}; "babylon" = callPackage @@ -37726,7 +37809,7 @@ self: { ]; description = "Create status bar menus for macOS from executables"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-darwin" ]; }) {}; "barchart" = callPackage @@ -37951,7 +38034,7 @@ self: { sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263"; libraryHaskellDepends = [ base ]; description = "The IO functions included in base delimited into small, composable classes"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -38030,7 +38113,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "base16-bytestring" = callPackage + "base16-bytestring_0_1_1_7" = callPackage ({ mkDerivation, base, bytestring, ghc-prim }: mkDerivation { pname = "base16-bytestring"; @@ -38042,9 +38125,10 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Fast base16 (hex) encoding and decoding for ByteStrings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "base16-bytestring_1_0_1_0" = callPackage + "base16-bytestring" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -38061,7 +38145,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; description = "RFC 4648-compliant Base16 encodings for ByteStrings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "base16-lens" = callPackage @@ -38863,7 +38946,7 @@ self: { libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; description = "Ability to read, write, and modify BBDB files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "bbi" = callPackage @@ -38985,7 +39068,7 @@ self: { persistent-sqlite persistent-template resourcet text time unix ]; description = "Tools for managing a content store of software packages"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) ostree;}; @@ -39023,7 +39106,7 @@ self: { string-conversions string-qq temporary text time wai warp ]; description = "BDCS API Server"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libgit2-glib;}; @@ -39458,7 +39541,7 @@ self: { utf8-string xhtml ]; description = "Bein is a provenance and workflow management system for bioinformatics"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -39566,7 +39649,7 @@ self: { sha256 = "1zwk05lf76xcdbqrbaid3whmn04injrg7dnlji2v2i5li0pnpr3c"; libraryHaskellDepends = [ base process random time ]; description = "Test the time it takes to run a haskell function"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "benchpress" = callPackage @@ -40098,7 +40181,7 @@ self: { uu-parsinglib ]; description = "A parser for the Billboard chord dataset"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -40362,7 +40445,7 @@ self: { sha256 = "1rb4fpx5hlq661md7nrpgpmi7jjdq3r1ky6q9vxl6f72h085acvl"; libraryHaskellDepends = [ base binary ghc-prim ]; description = "Automatic deriving of Binary using GHC.Generics"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41052,7 +41135,7 @@ self: { librarySystemDepends = [ bfd opcodes ]; libraryToolDepends = [ alex happy ]; description = "Bindings for libbfd, a library of the GNU `binutils'"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {bfd = null; opcodes = null;}; @@ -41066,7 +41149,7 @@ self: { libraryHaskellDepends = [ bindings-DSL ]; librarySystemDepends = [ dttools ]; description = "Bindings to the CCTools WorkQueue C library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {dttools = null;}; @@ -41087,7 +41170,7 @@ self: { librarySystemDepends = [ codec2 ]; executableHaskellDepends = [ base binary bytestring split ]; description = "Very low-level FFI bindings for Codec2"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {inherit (pkgs) codec2;}; "bindings-common" = callPackage @@ -41128,7 +41211,9 @@ self: { libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -41247,7 +41332,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL bindings-glib ]; libraryPkgconfigDepends = [ gts ]; description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {inherit (pkgs) gts;}; "bindings-hamlib" = callPackage @@ -41264,7 +41349,7 @@ self: { librarySystemDepends = [ hamlib ]; executableHaskellDepends = [ base ]; description = "Hamlib bindings for Haskell"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) hamlib;}; @@ -41455,7 +41540,9 @@ self: { librarySystemDepends = [ lxc ]; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -41510,7 +41597,7 @@ self: { base bytestring hspec HUnit QuickCheck quickcheck-io ]; description = "bindings to nettle crypto library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) nettle;}; "bindings-parport" = callPackage @@ -41556,7 +41643,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ potrace ]; description = "Low-level bindings to the potrace bitmap tracing library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {inherit (pkgs) potrace;}; "bindings-ppdev" = callPackage @@ -41589,7 +41676,7 @@ self: { base cmdargs containers directory filepath process text unix ]; description = "Wrapping saga_cmd"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "bindings-sane" = callPackage @@ -41601,7 +41688,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {inherit (pkgs) sane-backends;}; "bindings-sc3" = callPackage @@ -41719,7 +41806,7 @@ self: { editedCabalFile = "0mq2h1j1xd52irb35y9j0znxzpk661w3dl4d5a011sln4jd3f663"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -41799,8 +41886,8 @@ self: { }: mkDerivation { pname = "binsm"; - version = "0.1.1"; - sha256 = "1wiqslvf21xm15rf161lzffk5zzivbxs9sa9v7d257cx4d9qvy15"; + version = "0.1.2"; + sha256 = "1nhdzy3hqqin67i25kgrrcny99lrdr9i6xddr8gjm6b32kqhakhw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -42030,7 +42117,7 @@ self: { libraryHaskellDepends = [ array base binary biocore bytestring ]; executableHaskellDepends = [ array base cmdargs mtl ]; description = "Library and executables for working with SFF files"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42110,7 +42197,7 @@ self: { lens optparse-generic sparse-linear-algebra text text-show vector ]; description = "Plot a colorful tree"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -42165,7 +42252,7 @@ self: { base configurator directory filepath mtl selda selda-sqlite text ]; description = "A small tool that clears qutebrowser cookies"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "bisect-binary" = callPackage @@ -42830,6 +42917,8 @@ self: { pname = "bits-extra"; version = "0.0.2.0"; sha256 = "1c54008kinzcx93kc8vcp7wq7la662m8nk82ax76i9b0gvbkk21f"; + revision = "1"; + editedCabalFile = "1ri4z6zj20qsyyzsrl89sjcm4ir2w6538i6l36a6ffz7f0h0ahng"; libraryHaskellDepends = [ base ghc-prim vector ]; testHaskellDepends = [ base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog @@ -43206,7 +43295,7 @@ self: { ]; testHaskellDepends = [ base QuickCheck ]; description = "The pirate bay client"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "blacktip" = callPackage @@ -43796,7 +43885,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Password entry tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "blink1" = callPackage @@ -44050,7 +44139,7 @@ self: { text ]; description = "BLOSUM generator"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44085,7 +44174,7 @@ self: { base blubber-server bytestring cereal containers gloss network unix ]; description = "The blubber client; connects to the blubber server"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44108,7 +44197,7 @@ self: { process random scotty text transformers unix ]; description = "The blubber server, serves blubber clients"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -44294,6 +44383,8 @@ self: { pname = "board-games"; version = "0.3"; sha256 = "1ylwibyl0j1v0bdrpfnjhdm431npagavxzgi2l5sp0scgpkcyyx7"; + revision = "1"; + editedCabalFile = "0rb5bqjg6r8p2v2wfdhivsbgbn55acdjsj6hcy6bv5w50qmg1l6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44661,7 +44752,7 @@ self: { sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs"; libraryHaskellDepends = [ base bytestring HUnit ]; description = "convert numbers to binary coded lists"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "boolean-normal-forms" = callPackage @@ -44754,7 +44845,7 @@ self: { base containers descrilo directory filepath simtreelo ]; description = "A bookmarks manager with an HTML generator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "boombox" = callPackage @@ -44775,13 +44866,15 @@ self: { }) {}; "boomerang" = callPackage - ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: + ({ mkDerivation, base, mtl, semigroups, template-haskell, text + , th-abstraction + }: mkDerivation { pname = "boomerang"; - version = "1.4.6"; - sha256 = "09angcdqf75f03rh7m02rsqz5rr304dw4c5cszj9alpq4qxlsyqc"; + version = "1.4.7"; + sha256 = "0ngrzwvzils6pqdgbc7hj4l41r19j2n82z78fqh312lnc1nni94i"; libraryHaskellDepends = [ - base mtl semigroups template-haskell text + base mtl semigroups template-haskell text th-abstraction ]; description = "Library for invertible parsing and printing"; license = lib.licenses.bsd3; @@ -45204,7 +45297,7 @@ self: { base containers GLUT hosc hsc3 random ]; description = "audio-visual pseudo-physical simulation of colliding circles"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45475,7 +45568,7 @@ self: { warp-tls ]; description = "a url shortener"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -45756,7 +45849,7 @@ self: { yaml ]; description = "Haskell source code formatter"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "broadcast-chan" = callPackage @@ -45951,7 +46044,7 @@ self: { base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Brotli (RFC7932) compression and decompression"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) brotli;}; @@ -46797,7 +46890,7 @@ self: { testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion ]; description = "Burst detection algorithms"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -46969,11 +47062,41 @@ self: { base bytestring gl-capture GLUT OpenGLRaw repa repa-devil ]; description = "butterfly tilings"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; + "buttplug-hs-core" = callPackage + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, async, base + , bytestring, connection, containers, generic-random, hspec + , network, QuickCheck, quickcheck-instances, raw-strings-qq, text + , unordered-containers, websockets, wuss + }: + mkDerivation { + pname = "buttplug-hs-core"; + version = "0.1.0.0"; + sha256 = "0ayii1hq6p4qnjvyfpv2776ikjh0q4ymxm0lk8q73vk1j6kq1j3y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection containers network + text unordered-containers websockets wuss + ]; + executableHaskellDepends = [ + aeson aeson-casing async base bytestring connection containers + network text unordered-containers websockets wuss + ]; + testHaskellDepends = [ + aeson aeson-casing aeson-pretty base bytestring connection + containers generic-random hspec network QuickCheck + quickcheck-instances raw-strings-qq text unordered-containers + websockets wuss + ]; + description = "Client library for buttplug.io"; + license = lib.licenses.bsd3; + }) {}; + "bv" = callPackage ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { @@ -47384,7 +47507,7 @@ self: { attoparsec attoparsec-varword base bytestring hspec QuickCheck ]; description = "Variable-length integer encoding"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48056,7 +48179,7 @@ self: { base HUnit test-framework test-framework-hunit test-framework-th ]; description = "Translate C code into ATS"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48082,7 +48205,7 @@ self: { transformers ]; description = "C->Haskell FFI tool that gives some cross-language type safety"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "c2hs-extra" = callPackage @@ -48196,7 +48319,7 @@ self: { sha256 = "0hyjb8y4zf7qccyzsms98sd0kgz83q1aqfhgx2f3dq1nprhbg9ld"; libraryHaskellDepends = [ base Cabal filepath ]; description = "Cabal support for creating AppImage applications"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -48298,8 +48421,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.2.1"; - sha256 = "0n17ga3namkldd4mfjla58nlg0j7dyjcamap84bdwiglmrg0iwz4"; + version = "1.0.3.0"; + sha256 = "0xx0a53z7wj75p8dqypr6ys63cpw8acl49358f42xi5lgblvqnca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48796,6 +48919,8 @@ self: { pname = "cabal-install-parsers"; version = "0.4.1"; sha256 = "1djw4l0z8nsaby2qcm08kvn2p1c35ynzdg25vc815dx2wpw38bh3"; + revision = "1"; + editedCabalFile = "1fhjz4hji57sg00nb8jchvm8b13wn9pknnycgcclvxa3s72rqsf5"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -48996,7 +49121,7 @@ self: { simple-cabal simple-cmd simple-cmd-args time unix ]; description = "RPM packaging tool for Haskell Cabal-based packages"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "cabal-scripts" = callPackage @@ -49274,8 +49399,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.16.0"; - sha256 = "0kxxn218r1r9fia72zv8xzb8yji5y2jbwzqz033ljvwbm3abxp2k"; + version = "2.17.0"; + sha256 = "0y91agkhgpzzaf9l7l1h7x516iryj8z2vk1in1h7pyjlxaiak6lm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49320,7 +49445,7 @@ self: { ]; testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; description = "Convert Cabal files into rpm spec files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -50028,7 +50153,7 @@ self: { base containers gtk parsec plot-gtk-ui QuickCheck ]; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50069,7 +50194,7 @@ self: { base containers cpphs lens mtl parsec transformers ]; description = "a logic programming language based on the calculus of constructions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50551,21 +50676,22 @@ self: { "capability" = callPackage ({ mkDerivation, base, constraints, containers, dlist, exceptions , generic-lens, hspec, lens, monad-control, monad-unlift, mtl - , mutable-containers, primitive, safe-exceptions, silently - , streaming, temporary, text, transformers, unliftio, unliftio-core + , mutable-containers, primitive, reflection, safe-exceptions + , silently, streaming, temporary, text, transformers, unliftio + , unliftio-core }: mkDerivation { pname = "capability"; - version = "0.3.0.0"; - sha256 = "1kha2y1x63af43psl708c0iib0ign4jrs2n4s2jl4a0pb7hlcdcz"; + version = "0.4.0.0"; + sha256 = "02dnvzfvn81k15qp41fqd3pk4izg8rfbj7d5f6ry0wfa8d8payq0"; libraryHaskellDepends = [ base constraints dlist exceptions generic-lens lens monad-control - monad-unlift mtl mutable-containers primitive safe-exceptions - streaming transformers unliftio unliftio-core + monad-unlift mtl mutable-containers primitive reflection + safe-exceptions streaming transformers unliftio unliftio-core ]; testHaskellDepends = [ - base containers hspec lens mtl silently streaming temporary text - unliftio + base containers dlist hspec lens mtl silently streaming temporary + text unliftio ]; description = "Extensional capabilities and deriving combinators"; license = lib.licenses.bsd3; @@ -50665,6 +50791,22 @@ self: { broken = true; }) {}; + "caps" = callPackage + ({ mkDerivation, base, mtl, tasty, tasty-hunit, template-haskell + , transformers, typerep-map + }: + mkDerivation { + pname = "caps"; + version = "0.1"; + sha256 = "0i6rzgfbl377g4z76rv48c6a1s4yy9h78bjmvkr2vhq5zv8zqzkk"; + libraryHaskellDepends = [ + base template-haskell transformers typerep-map + ]; + testHaskellDepends = [ base mtl tasty tasty-hunit ]; + description = "Monadic capabilities with late binding"; + license = lib.licenses.bsd3; + }) {}; + "car-pool" = callPackage ({ mkDerivation, base, blaze-html, containers, digestive-functors , digestive-functors-blaze, digestive-functors-happstack @@ -50826,7 +50968,7 @@ self: { highlighting-kate mtl pandoc pango process text time ]; description = "A presentation tool written with Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -50863,7 +51005,7 @@ self: { time transformers tuple ]; description = "Carte: A commandline pastebin server"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -51003,24 +51145,6 @@ self: { }) {}; "casa-types" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, hashable, path-pieces, persistent, text - }: - mkDerivation { - pname = "casa-types"; - version = "0.0.1"; - sha256 = "0f8c4a43rh6zr5cwingxyjfpisipy4x4xc0lpasfjaj4vhjgwqkp"; - revision = "1"; - editedCabalFile = "101hhpwc7nhg2laywv2jnqa3jsjkvbvc30i6cs4srvdv2n87jlcb"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring hashable - path-pieces persistent text - ]; - description = "Types for Casa"; - license = lib.licenses.bsd3; - }) {}; - - "casa-types_0_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, hashable, path-pieces, persistent, text }: @@ -51034,7 +51158,6 @@ self: { ]; description = "Types for Casa"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "casadi-bindings" = callPackage @@ -51058,7 +51181,7 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "mid-level bindings to CasADi"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {casadi = null;}; @@ -51076,7 +51199,7 @@ self: { ]; libraryPkgconfigDepends = [ casadi_control ]; description = "low level bindings to casadi-control"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {casadi_control = null;}; @@ -51094,7 +51217,7 @@ self: { ]; librarySystemDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {casadi = null;}; @@ -51108,7 +51231,7 @@ self: { libraryHaskellDepends = [ base containers vector ]; librarySystemDepends = [ casadi ]; description = "low level bindings to CasADi"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {casadi = null;}; @@ -51126,7 +51249,7 @@ self: { ]; libraryPkgconfigDepends = [ casadi_ipopt_interface ]; description = "low level bindings to casadi-ipopt_interface"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {casadi_ipopt_interface = null;}; @@ -51144,7 +51267,7 @@ self: { ]; libraryPkgconfigDepends = [ casadi_snopt_interface ]; description = "low level bindings to casadi-snopt_interface"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {casadi_snopt_interface = null;}; @@ -52169,7 +52292,7 @@ self: { ]; librarySystemDepends = [ dttools ]; description = "High-level interface to CCTools' WorkQueue library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {dttools = null;}; @@ -52411,7 +52534,7 @@ self: { sha256 = "04mlg1r2qvrwdzcfbf1aqs4bf9n2gc7cwv73fbhld2ji5naa6fwb"; libraryHaskellDepends = [ base cereal ghc-prim ]; description = "Automatic deriving of Serialize using GHC.Generics"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52711,7 +52834,7 @@ self: { unordered-containers utf8-string void ]; description = "Parser for categorial grammars"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52803,7 +52926,7 @@ self: { unordered-containers utf8-string yaml ]; description = "Command line tool"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -52817,7 +52940,7 @@ self: { libraryHaskellDepends = [ base containers JuicyPixels ]; testHaskellDepends = [ base containers hspec JuicyPixels ]; description = "Library decoding chain codes from images"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "chainweb-mining-client" = callPackage @@ -53345,8 +53468,6 @@ self: { ]; description = "A library of simple NLP algorithms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "chatty" = callPackage @@ -53363,7 +53484,7 @@ self: { template-haskell text time transformers unix ]; description = "Some monad transformers and typeclasses for text in- and output abstraction"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "chatty-text" = callPackage @@ -53376,7 +53497,7 @@ self: { editedCabalFile = "11vpzarrbk0jlsnamrnf4xp3gzkgwrbs6x5mr9m5rr4lrw1f9q0v"; libraryHaskellDepends = [ base chatty transformers ]; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -53389,7 +53510,7 @@ self: { sha256 = "1pzg0bf73shwl91x4011khw62wgv33y5862gq110q8g913w4jrjw"; libraryHaskellDepends = [ base mtl text transformers ]; description = "Some utilities every serious chatty-based application may need"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "chatwork" = callPackage @@ -53589,7 +53710,7 @@ self: { QuickCheck quickcheck-text temporary text ]; description = "Generate checklists relevant to a given patch"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54327,7 +54448,7 @@ self: { executableHaskellDepends = [ base binary bytestring text ]; testHaskellDepends = [ base binary bytestring HUnit text ]; description = "Human-readable storage of text/binary objects"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54422,7 +54543,7 @@ self: { uuid wreq ]; description = "Cielo API v3 Bindings for Haskell"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -54457,7 +54578,7 @@ self: { executableHaskellDepends = [ base bytestring groom text ]; testHaskellDepends = [ base hspec ]; description = "Simple C-like programming language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "cinvoke" = callPackage @@ -54827,8 +54948,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.3.0.8"; - sha256 = "0njlb37cxnpikwz9k92d689j477fz9x7chl58s3ljsw9drcgpcvh"; + version = "0.3.0.9"; + sha256 = "0ky4j6nbn6yp3mny1m045n40jfvbr1iiylcf51hsi228y4m5za9s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54881,7 +55002,7 @@ self: { pandoc pandoc-types parsec tagsoup texmath utf8-string yaml ]; description = "A Pandoc filter for processing bibliographic references with citeproc-hs"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55002,7 +55123,7 @@ self: { split ]; description = "Simple CLI RPN calculator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -55603,7 +55724,7 @@ self: { base lifted-base monad-control parallel resourcet transformers ]; description = "Fork of the monad-parallel package using monad-control"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -56555,7 +56676,7 @@ self: { ]; libraryPkgconfigDepends = [ QtCore ]; description = "timer functionality to clock IO commands"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {QtCore = null;}; @@ -56884,7 +57005,7 @@ self: { sha256 = "1h1n349sq2lpikpvzzarz74200b8k7dkdjpp4rpkx79xdlfc58pc"; libraryHaskellDepends = [ base containers tree-fun ]; description = "Calculate the clumpiness of leaf properties in a tree"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "cluss" = callPackage @@ -57367,7 +57488,7 @@ self: { parsec StockholmAlignment template-haskell text vector ]; description = "Detailed visualization of CMs, HMMs and their comparisions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -57750,7 +57871,7 @@ self: { HUnit parsec pretty text ]; description = "A library for manipulating RPM files"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58254,7 +58375,7 @@ self: { base bytestring cassava containers lens optparse-generic split ]; description = "Collapse the duplication output into clones and return their frequencies"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58543,7 +58664,7 @@ self: { linear linearmap-category manifolds semigroups vector-space ]; description = "Instances of the manifold-classes for colour types"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -58861,21 +58982,22 @@ self: { "comfort-array" = callPackage ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , guarded-allocation, non-empty, prelude-compat, primitive - , QuickCheck, semigroups, storable-record, tagged, transformers - , utility-ht + , doctest-exitcode-stdio, doctest-lib, guarded-allocation + , non-empty, prelude-compat, primitive, QuickCheck, semigroups + , storable-record, tagged, transformers, utility-ht }: mkDerivation { pname = "comfort-array"; - version = "0.4"; - sha256 = "0jvksvvslvg5wiqin5pd0q0q8a7snhfjh26a98mdakk8dziw1p1m"; + version = "0.4.1"; + sha256 = "11nsq6yc3sz259nn9vks49rxq5zzrfwqn9fvi10w3vbnq3wjg9i5"; libraryHaskellDepends = [ base containers deepseq guarded-allocation non-empty prelude-compat primitive QuickCheck semigroups storable-record tagged transformers utility-ht ]; testHaskellDepends = [ - base ChasingBottoms containers QuickCheck tagged + base ChasingBottoms containers doctest-exitcode-stdio doctest-lib + QuickCheck tagged ]; description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; @@ -59622,7 +59744,7 @@ self: { sha256 = "0a1pp1jafra1agsx2jizdb33afzg02w6jh4a4pyw5w71kzqfrril"; libraryHaskellDepends = [ base MissingH ]; description = "Haskell functionality for quickly assembling simple compilers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -59739,8 +59861,8 @@ self: { }: mkDerivation { pname = "composable-associations-aeson"; - version = "0.1.0.0"; - sha256 = "0kragi8wfd30yxrndxka5p3bivj1qi8svljcdkqnji32dpnm9myv"; + version = "0.1.0.1"; + sha256 = "0fpjirwk9si1v8jsdrcxbwn3rqc058na9z5lhbnkha2zc6l8w8rw"; libraryHaskellDepends = [ aeson base composable-associations text unordered-containers ]; @@ -60507,8 +60629,8 @@ self: { }: mkDerivation { pname = "concurrency"; - version = "1.11.0.0"; - sha256 = "19a4za0c65gi2a5n882nyi26cgxrsry64rkd3qiqhvzf7m34cjxd"; + version = "1.11.0.1"; + sha256 = "0ds55wpkxlrw2x5ql34p9b05xlycnc4v7962f27a54nhrjfhb2ah"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -60854,7 +60976,7 @@ self: { sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp"; libraryHaskellDepends = [ array base containers random stm time ]; description = "a library for live coding and real-time musical applications"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60867,7 +60989,7 @@ self: { sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p"; doHaddock = false; description = "a library for displaying musical time in a terminal-based clock"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "conductive-hsc3" = callPackage @@ -60883,7 +61005,7 @@ self: { hosc hsc3 random ]; description = "a library with examples of using Conductive with hsc3"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -60896,7 +61018,7 @@ self: { sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi"; libraryHaskellDepends = [ base conductive-base random ]; description = "a library of functions which are useful for composing music"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61450,6 +61572,8 @@ self: { pname = "conferer"; version = "1.1.0.0"; sha256 = "1hkdrqxrac1mbzvd29f6ds4cbihdv0j0daai7yc282myv0varh09"; + revision = "1"; + editedCabalFile = "0xr6910zn9j07gwc9f9dmlgxiagirmpzjzb9vlaqc0qvpawgq201"; libraryHaskellDepends = [ base bytestring containers directory filepath text ]; @@ -61467,10 +61591,8 @@ self: { }: mkDerivation { pname = "conferer-aeson"; - version = "1.1.0.0"; - sha256 = "0kslxj2wcycygj07x7v06fcx2i47dwp96da9djws6mjdmr1a9i96"; - revision = "1"; - editedCabalFile = "1ic6nichx1c3s7fnr2q90hzm1qykg8rkqfwl2k5yhhwb1fdnhb6q"; + version = "1.1.0.1"; + sha256 = "1slz2gbnaca8ydl91rjhpjair90qnybcg6zkxdjrwr9jnxsp95s7"; libraryHaskellDepends = [ aeson base bytestring conferer directory text unordered-containers vector @@ -61801,7 +61923,7 @@ self: { text time unordered-containers ]; description = "Configuration management"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "config-parser" = callPackage @@ -61850,7 +61972,7 @@ self: { base directory filepath unix vty-menu ]; description = "A small program for swapping out dot files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -61912,7 +62034,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "parser for config files, shell variables, command line args"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62206,8 +62328,8 @@ self: { ({ mkDerivation, base, containers, doctest, hedgehog }: mkDerivation { pname = "connections"; - version = "0.2.0"; - sha256 = "1hvfqdjcj4mp2iyx0596710z4f8fm0jlgp819xf2s90rz1b360ya"; + version = "0.3.0"; + sha256 = "0ias6f5nzd83i2x6823ypzp598d8rgp74wmhd4gk7slcyszgpj6l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -62265,7 +62387,7 @@ self: { sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw"; libraryHaskellDepends = [ base ]; description = "console user prompts"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "console-style" = callPackage @@ -62340,7 +62462,7 @@ self: { base contravariant fail semigroups tagged trivial-constraint void ]; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -62848,7 +62970,7 @@ self: { hspec memory mtl resourcet temporary ]; description = "Store and retrieve data from an on-disk store"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -63568,7 +63690,7 @@ self: { pipes-bytestring pipes-csv text vector ]; description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -64645,7 +64767,7 @@ self: { testHaskellDepends = [ base text ]; testPkgconfigDepends = [ python3 ]; description = "Bindings for libpython"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) python3;}; @@ -64896,7 +65018,7 @@ self: { base cmdargs directory process shelly text transformers unix ]; description = "Code review tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -65590,7 +65712,7 @@ self: { mersenne-random-pure64 mtl parallel ]; description = "An offline renderer supporting ray tracing and photon mapping"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66405,28 +66527,6 @@ self: { }) {}; "cryptonite" = callPackage - ({ mkDerivation, base, basement, bytestring, deepseq, gauge - , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit - , tasty-kat, tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.27"; - sha256 = "1c68wvn2b49gijq9day2bzi0axcbdz41ip3j0wdahdhcjfl4a9y8"; - libraryHaskellDepends = [ - base basement bytestring deepseq ghc-prim integer-gmp memory - ]; - testHaskellDepends = [ - base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring deepseq gauge memory random - ]; - description = "Cryptography Primitives sink"; - license = lib.licenses.bsd3; - }) {}; - - "cryptonite_0_28" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck @@ -66446,7 +66546,6 @@ self: { ]; description = "Cryptography Primitives sink"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cryptonite-conduit" = callPackage @@ -66531,7 +66630,7 @@ self: { unordered-containers vector ]; description = "Bindings for Cryptsy cryptocurrency exchange API"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -66999,7 +67098,7 @@ self: { libraryHaskellDepends = [ array base chatty-text chatty-utils ]; executableHaskellDepends = [ array base chatty-text chatty-utils ]; description = "A programming language for text modification"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67817,7 +67916,7 @@ self: { allocated-processor base HOpenCV vector-space ]; description = "Functional Combinators for Computer Vision"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -67848,7 +67947,7 @@ self: { test-framework-quickcheck2 test-framework-smallcheck ]; description = "A subfield of the complex numbers for exact calculation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "cypher" = callPackage @@ -67945,7 +68044,7 @@ self: { executableHaskellDepends = [ base c-storable-deriving vect Win32 ]; description = "A raw binding for the directX 11"; license = lib.licenses.mit; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; d3dxof = null; dxgi = null; dxguid = null;}; @@ -67971,7 +68070,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base directory unix ]; description = "Start background daemons by double-forking"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "daemons" = callPackage @@ -67999,7 +68098,7 @@ self: { test-framework-hunit unix ]; description = "Daemons in Haskell made fun and easy"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "dag" = callPackage @@ -68091,7 +68190,7 @@ self: { utf8-string ]; description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68435,7 +68534,7 @@ self: { base binary bytestring criterion transformers ]; description = "Utility and parser for DarkPlaces demo files"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68453,7 +68552,7 @@ self: { ]; testHaskellDepends = [ base bytestring hspec hspec-core ]; description = "Darkplaces rcon client library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68484,7 +68583,7 @@ self: { text ]; description = "Darplaces rcon utility"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68503,7 +68602,7 @@ self: { libraryToolDepends = [ alex ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; description = "Parser for darkplaces colorful text"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -68525,7 +68624,7 @@ self: { text transformers ]; description = "Convert package Haddock to Dash docsets (IDE docs)"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69090,7 +69189,7 @@ self: { test-framework-quickcheck2 vector ]; description = "Space-efficient and privacy-preserving data dispersal algorithms"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -69479,19 +69578,21 @@ self: { "data-interval" = callPackage ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , extended-reals, hashable, HUnit, lattices, QuickCheck, syb, tasty - , tasty-hunit, tasty-quickcheck, tasty-th + , extended-reals, hashable, HUnit, lattices, QuickCheck + , quickcheck-classes-base, syb, tasty, tasty-hunit + , tasty-quickcheck, tasty-th }: mkDerivation { pname = "data-interval"; - version = "2.0.1"; - sha256 = "0vz73vwbr484s0dxg9y0y1mfbni8aky3hyh93pmzb8zb67gy4cak"; + version = "2.1.0"; + sha256 = "0f4dgpqmp4y9fidlb3z5dlcmv0qb6pqbxbf57jjjz49r7g6adzlq"; libraryHaskellDepends = [ base containers deepseq extended-reals hashable lattices ]; testHaskellDepends = [ base ChasingBottoms containers deepseq hashable HUnit lattices - QuickCheck syb tasty tasty-hunit tasty-quickcheck tasty-th + QuickCheck quickcheck-classes-base syb tasty tasty-hunit + tasty-quickcheck tasty-th ]; description = "Interval datatype, interval arithmetic and interval-based containers"; license = lib.licenses.bsd3; @@ -69657,7 +69758,7 @@ self: { sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8"; libraryHaskellDepends = [ base ]; description = "Utilities for working with sequences within lists"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "data-list-zigzag" = callPackage @@ -71025,7 +71126,7 @@ self: { base containers dbus-core monads-tf text transformers ]; description = "Monadic and object-oriented interfaces to DBus"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71044,7 +71145,7 @@ self: { network parsec text unix vector xml-types ]; description = "Low-level D-Bus protocol implementation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71184,7 +71285,7 @@ self: { sha256 = "1mw0qn7c6ag2w6gn6pwpjf979m3p5v3p9a1kal2x8g8ncx98dcn5"; libraryHaskellDepends = [ base dates time ]; description = "Discordian Date Types for Haskell"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71703,7 +71804,7 @@ self: { wai-websockets warp websockets ]; description = "secure remote debugging"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -71847,7 +71948,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Preprocessing decimal literals more or less as they are (instead of via fractions)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72276,8 +72377,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "2.4.0.1"; - sha256 = "0zysf0hjfdd5iypllbiyih312kl2hsfwiqf6030i7q432yc3f8vd"; + version = "2.4.0.2"; + sha256 = "1hwhyxjjwapk6jgsbs0vh033xbc9b8mr5iqd93vskvvljnb40v9h"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -72423,7 +72524,7 @@ self: { ]; testHaskellDepends = [ base directory filepath hspec ]; description = "A library for detecting file changes"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -72969,7 +73070,7 @@ self: { sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp"; libraryHaskellDepends = [ base data-default ]; description = "Generic instances for enumerating complex data types"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -73220,7 +73321,7 @@ self: { sha256 = "00rk7m54igmrsi8j2fmql7c5wgyg7x5ws8397753470x5k2qv2ap"; libraryHaskellDepends = [ base ]; description = "Loads a list of items with fields"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "descript-lang" = callPackage @@ -73254,7 +73355,7 @@ self: { transformers yaml ]; description = "Library, interpreter, and CLI for Descript programming language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74093,7 +74194,7 @@ self: { tasty-hunit text ]; description = "Convert between Dhall and YAML"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "dhcp-lease-parser" = callPackage @@ -74919,7 +75020,7 @@ self: { test-framework-quickcheck2 transformers ]; description = "Cryptographically secure n-sided dice via rejection sampling"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {}; "dice2tex" = callPackage @@ -74932,7 +75033,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Convert a Diceware wordlist into a printer-ready LaTeX file"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -74947,7 +75048,7 @@ self: { base binary bytestring pretty safe time ]; description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75068,7 +75169,7 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; description = "A parser for diff file formats"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "diff3" = callPackage @@ -75180,7 +75281,7 @@ self: { text-show vector ]; description = "Finds out whether an entity comes from different distributions (statuses)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75352,7 +75453,7 @@ self: { tasty-hunit text ]; description = "Run digestive-functors forms against JSON"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -75550,7 +75651,7 @@ self: { base FontyFruity JuicyPixels Rasterific vector ]; description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "dijkstra-simple" = callPackage @@ -75725,8 +75826,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.3.1"; - sha256 = "1k44bi5ri63qsps0vh24qc32bclp3nqp2qbs6ylxm9k0q76758iw"; + version = "0.1.4"; + sha256 = "09hxy5ac39iqps1bfd1xrwcz9rckywpi99fpx7ikr1lpnvnc5bfb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75737,7 +75838,7 @@ self: { unix x509 x509-store x509-validation ]; description = "Gemini client"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "diophantine" = callPackage @@ -75749,7 +75850,7 @@ self: { libraryHaskellDepends = [ array base ]; libraryToolDepends = [ happy ]; description = "A quadratic diophantine equation solving library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76048,7 +76149,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory ]; description = "Deletes a directory and retains its contents in the parent directory"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -76169,7 +76270,7 @@ self: { sha256 = "0axz9k5j9yfk58icnycr93b6d5fqylgqlxi8v7w5sv1n28hrpvvj"; libraryHaskellDepends = [ base containers ]; description = "DisCoCat implementation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "discord-gateway" = callPackage @@ -76539,7 +76640,7 @@ self: { libraryHaskellDepends = [ base Cabal directory filepath process ]; doHaddock = false; description = "Generate/Upload cabal package to Hackage"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77206,8 +77307,8 @@ self: { }: mkDerivation { pname = "distribution-nixpkgs"; - version = "1.4.0"; - sha256 = "1935lg05bfzwrvppi11r05nhwa1gkmvv0xqv1kqkbc87bk6pvp5g"; + version = "1.5.0"; + sha256 = "07z1dkyzz9sabxda48cy6y2pfyq14sz2m9bv6y6dajn15cy7m3pk"; libraryHaskellDepends = [ aeson base bytestring Cabal containers deepseq language-nix lens pretty process split @@ -77315,7 +77416,7 @@ self: { base containers fasta optparse-applicative pipes semigroups ]; description = "Quantify the diversity of a population"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77451,7 +77552,7 @@ self: { time unix xdg-userdirs ]; description = "Fedora image download tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -77937,7 +78038,7 @@ self: { text ]; description = "Checks Haddock comments for pitfalls and version changes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -78095,8 +78196,8 @@ self: { }: mkDerivation { pname = "doclayout"; - version = "0.3"; - sha256 = "1wmnwq28jcyd6c80srivsnd5znmyl9sgmwwnlk2crwiiwqadbal7"; + version = "0.3.0.2"; + sha256 = "1hfqagf5rmdjjx3xzx153d769b2vwarmyx7k7cwh872cgasndb3q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base mtl safe text ]; testHaskellDepends = [ @@ -78327,6 +78428,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "doctest-extract" = callPackage + ({ mkDerivation, base, doctest-lib, non-empty, optparse-applicative + , pathtype, semigroups, transformers, utility-ht + }: + mkDerivation { + pname = "doctest-extract"; + version = "0.1"; + sha256 = "1ncrq67d6zcqw5al5m2g7q6ys8rxhsq8rrzbj1dlsyl4q63vyrms"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base doctest-lib non-empty optparse-applicative pathtype semigroups + transformers utility-ht + ]; + description = "Alternative doctest implementation that extracts comments to modules"; + license = lib.licenses.bsd3; + }) {}; + "doctest-lib" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -79088,7 +79207,7 @@ self: { sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l"; libraryHaskellDepends = [ base ]; description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79289,7 +79408,7 @@ self: { testSystemDepends = [ dpkg ]; testPkgconfigDepends = [ libdpkg ]; description = "libdpkg bindings"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) dpkg; libdpkg = null;}; @@ -79411,7 +79530,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; description = "A port of asciimoo's drawille to haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -79749,7 +79868,7 @@ self: { sha256 = "1vv32n736ncjsy4psp8zlqmpp0r7mncjq65zwkhq5i99jx4chb1q"; libraryHaskellDepends = [ base parsec ]; description = "Haskell Doge Serialized Object Notation Parser"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80084,7 +80203,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "A computer “algebra” system that knows nothing about algebra, at the core"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80233,8 +80352,8 @@ self: { }: mkDerivation { pname = "duration"; - version = "0.1.0.0"; - sha256 = "18qjn97njhra7brps58rl44vyc0hmfc83prgm519q7dyf3159cd0"; + version = "0.2.0.0"; + sha256 = "1cmgbnri3083gpr16j8yqj5jzbz0q5cxgnrpnbridyyznbp8csvj"; libraryHaskellDepends = [ base parsec template-haskell time ]; testHaskellDepends = [ base doctest hspec parsec template-haskell time @@ -80319,7 +80438,7 @@ self: { libraryPkgconfigDepends = [ dvdread ]; libraryToolDepends = [ c2hs ]; description = "A monadic interface to libdvdread"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {dvdread = null;}; @@ -80420,7 +80539,7 @@ self: { libraryHaskellDepends = [ base Win32 ]; description = "Backend for a binding to the Microsoft DirectX 9 API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "dx9d3d" = callPackage @@ -80433,7 +80552,7 @@ self: { librarySystemDepends = [ d3d9 ]; description = "A binding to the Microsoft DirectX 9 API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {d3d9 = null;}; "dx9d3dx" = callPackage @@ -80446,7 +80565,7 @@ self: { librarySystemDepends = [ d3dx9 ]; description = "A binding to the Microsoft DirectX 9 D3DX API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {d3dx9 = null;}; "dyckword" = callPackage @@ -80649,7 +80768,7 @@ self: { vector-space ]; description = "Interactive diagram windows"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80688,7 +80807,7 @@ self: { base binary bytestring hashable unordered-containers ]; description = "Optionally serializable dynamic state keyed by type"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "dynamodb-simple" = callPackage @@ -80762,7 +80881,7 @@ self: { test-framework-hunit test-framework-quickcheck2 vector ]; description = "your dynamic optimization buddy"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -80783,6 +80902,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "dyre_0_9_1" = callPackage + ({ mkDerivation, base, binary, directory, executable-path, filepath + , io-storage, process, time, unix, xdg-basedir + }: + mkDerivation { + pname = "dyre"; + version = "0.9.1"; + sha256 = "1lrpjvah57p1ld3spcrgqds3claqkd5a9ay8inihl9wws0ifhfmh"; + libraryHaskellDepends = [ + base binary directory executable-path filepath io-storage process + time unix xdg-basedir + ]; + testHaskellDepends = [ base directory process ]; + description = "Dynamic reconfiguration in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dywapitchtrack" = callPackage ({ mkDerivation, base, bytestring, transformers }: mkDerivation { @@ -80980,7 +81117,7 @@ self: { libraryHaskellDepends = [ base hspec ]; testHaskellDepends = [ base hspec ]; description = "Parses command line arguments"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "easy-bitcoin" = callPackage @@ -81051,7 +81188,7 @@ self: { sha256 = "0vj9j41706lalxc2sankpnxrn3mg650wfd4rl6yw32pns6bdq86f"; libraryHaskellDepends = [ base bytestring containers mtl zlib ]; description = "User-friendly creation of EPS, PostScript, and PDF files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "easytensor" = callPackage @@ -81426,7 +81563,7 @@ self: { ghc-events-parallel gtk mtl text zip-archive ]; description = "A Tool to Visualize Parallel Functional Program Executions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -81457,7 +81594,7 @@ self: { ALUT base cmdtheline containers gloss OpenAL random wraparound ]; description = "Top view space combat arcade game"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -82028,7 +82165,7 @@ self: { ]; librarySystemDepends = [ eibclient ]; description = "EIBd Client"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {eibclient = null;}; @@ -82449,7 +82586,7 @@ self: { sha256 = "1am1j05z79prlybq3hg8vr4gwhl354af4dg9y1qr57vpp6gcpfwv"; libraryHaskellDepends = [ base hmatrix safe ]; description = "Find the elbow point"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "electrum-mnemonic" = callPackage @@ -82461,7 +82598,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "elenco-albero" = callPackage @@ -82562,6 +82699,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "eliminators_0_8" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons-base, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.8"; + sha256 = "00prqf3qnhsswigcx87nq9dfaq9vjvzgcgbpnxrpgw9k36p9mdh2"; + libraryHaskellDepends = [ + base extra singleton-nats singletons-base template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons-base ]; + testToolDepends = [ hspec-discover ]; + description = "Dependently typed elimination functions using singletons"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -83366,7 +83522,7 @@ self: { parallel-io pcre-light tasty tasty-hunit ]; description = "Perform basic syntax and deliverability checks on email addresses"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "emailaddress" = callPackage @@ -83474,7 +83630,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "support for embroidery formats in haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84334,7 +84490,7 @@ self: { sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx"; libraryHaskellDepends = [ base ]; description = "Haskell binding for EPANET"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -84562,6 +84718,8 @@ self: { pname = "equational-reasoning"; version = "0.7.0.0"; sha256 = "0l6gyq43byh6cy2pblb9a4qjy7w5k9maa97c076dxlsf53myj01h"; + revision = "1"; + editedCabalFile = "1a8dw9givg0przqrm33kkmff9r0fdv1ih6ik3dqa99ww71cc8q66"; libraryHaskellDepends = [ base containers template-haskell th-desugar void ]; @@ -84691,6 +84849,25 @@ self: { broken = true; }) {}; + "erlang-ffi" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hspec, MissingH, network, random + }: + mkDerivation { + pname = "erlang-ffi"; + version = "1.0.0"; + sha256 = "1vj0i7r4pr3dhyvlgk0mi31ljcq87y69s2vmh4q41m5q4wxz9c42"; + libraryHaskellDepends = [ + base binary bytestring directory filepath MissingH network random + ]; + testHaskellDepends = [ + base binary bytestring directory filepath hspec MissingH network + random + ]; + description = "Send messages to an Erlang node using Haskell"; + license = "GPL"; + }) {}; + "eros" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text }: mkDerivation { @@ -85060,7 +85237,7 @@ self: { aeson attoparsec base bytestring yaml ]; description = "Easy Runtime Templates"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85218,7 +85395,7 @@ self: { yesod-form yesod-static yesod-test ]; description = "Espial is an open-source, web-based bookmarking server"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -85941,8 +86118,8 @@ self: { ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "eveff"; - version = "0.1.0.0"; - sha256 = "1d0bxg1dg66g1yv291cp4jh3xv3caxrddqrwb0g6g1929dl019fa"; + version = "1.0.0.1"; + sha256 = "0668345qdais176w8vbmjklys64ys36m4ppkiyqbad866n0zg7n9"; libraryHaskellDepends = [ base ghc-prim primitive ]; description = "Efficient effect handlers based on evidence translation"; license = lib.licenses.mit; @@ -86196,8 +86373,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.8.3"; - sha256 = "0xk9s8f20xx1xpbc2kbyfv3hhnrj8arim99lrr6wbv8y33qz0pkr"; + version = "0.9.0"; + sha256 = "1cjnkqdnk76839dl4dbpj3vzbkrjwgqryq2j3sgs9mmxfing7ahq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86914,7 +87091,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "Exheres generator for cabal packages"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87282,7 +87459,7 @@ self: { base bimap containers gauge prettyprinter raw-strings-qq ]; description = "Linear programming over exponent pairs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "expand" = callPackage @@ -87328,8 +87505,8 @@ self: { }: mkDerivation { pname = "experimenter"; - version = "0.1.0.4"; - sha256 = "0pzlmq2rb485x0df4ivw5i9sv8n14svy1vhgjqc69vm1p0md57ms"; + version = "0.1.0.10"; + sha256 = "0ys1m510j573f1ydbyilxcmdcizbannn8gm6c6pg0d9lq1avg5aw"; libraryHaskellDepends = [ aeson base bytestring cereal cereal-vector conduit containers deepseq directory esqueleto filepath HaTeX hostname lens matrix @@ -87431,7 +87608,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fully-flexible polymorphic lenses, without any bizarre profunctors"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87444,7 +87621,7 @@ self: { sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y"; libraryHaskellDepends = [ base ]; description = "explicit computation of determinant of small matrices"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -87531,6 +87708,17 @@ self: { broken = true; }) {}; + "exploring-interpreters" = callPackage + ({ mkDerivation, base, containers, fgl, mtl, transformers }: + mkDerivation { + pname = "exploring-interpreters"; + version = "0.2.0.0"; + sha256 = "1q2i68isdyc1fmxz9hcrjy8k3z8ji6xb2xrn4pc3wn0mrlnj1dka"; + libraryHaskellDepends = [ base containers fgl mtl transformers ]; + description = "A generic exploring interpreter for exploratory programming"; + license = lib.licenses.bsd3; + }) {}; + "exposed-containers" = callPackage ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -88699,7 +88887,7 @@ self: { benchmarkHaskellDepends = [ base digits gauge ]; doHaddock = false; description = "Integer-to-digits conversion"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -88842,7 +89030,7 @@ self: { pipes-attoparsec pipes-bytestring pipes-group pipes-text split text ]; description = "A simple, mindless parser for fasta files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89004,7 +89192,7 @@ self: { base bytestring cassava hxt network-uri text ]; description = "Utilities for working with DuckDuckHack's FatHead Instant Answers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89313,7 +89501,7 @@ self: { ]; doHaddock = false; description = "Build and create Fedora package repos and branches"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89331,7 +89519,7 @@ self: { unordered-containers ]; description = "Algo for Formal Concept Analysis"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89601,7 +89789,7 @@ self: { sha256 = "0hynmwic940vmna0czavbp1wx856ad9am7i6r0d2hq8jynrsin5w"; libraryHaskellDepends = [ base ]; description = "Library for Fedora distribution versions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "fedora-haskell-tools" = callPackage @@ -89620,7 +89808,7 @@ self: { process simple-cmd simple-cmd-args split time unix ]; description = "Building and maintenance tools for Fedora Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "fedora-img-dl" = callPackage @@ -89640,7 +89828,7 @@ self: { xdg-userdirs ]; description = "Fedora image download tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -89823,7 +90011,7 @@ self: { raw-strings-qq scotty text transformers wai warp wreq xml ]; description = "Translate syndication feeds"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90151,7 +90339,7 @@ self: { libraryHaskellDepends = [ base ]; doHaddock = false; description = "To be written"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "fenfire" = callPackage @@ -90197,7 +90385,7 @@ self: { tasty-hunit tasty-quickcheck time ]; description = "Generate and verify HMAC-based authentication tokens"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -90833,8 +91021,8 @@ self: { ({ mkDerivation, base, bytestring, filepath, QuickCheck, unix }: mkDerivation { pname = "filepath-bytestring"; - version = "1.4.2.1.6"; - sha256 = "11xrrzdkm5i96dazbz0gi1qp8nnj2lwbnxzwy7f4cnahskz4f4g7"; + version = "1.4.2.1.7"; + sha256 = "00xayqjq2qvb4yj0ppx838cabg5cx9swh0mzfb8c6njk9y5rc41n"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring filepath QuickCheck ]; description = "Library for manipulating RawFilePaths in a cross platform way"; @@ -90870,7 +91058,7 @@ self: { sha256 = "08rb2nafnh5vx7i6i3ddhq4h1s2ffgz8ailap5knr1xl7izgyywp"; libraryHaskellDepends = [ base base-io-access filepath ]; description = "IO Access for filepath"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91162,7 +91350,7 @@ self: { optparse-applicative text tree-fun unordered-containers ]; description = "Find the clumpiness of labels in a tree"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -91231,7 +91419,7 @@ self: { http-directory simple-cmd-args text ]; description = "List http/html files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92014,7 +92202,7 @@ self: { tasty tasty-quickcheck temporary ]; description = "File-backed recursive data structures"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92040,7 +92228,7 @@ self: { old-time QuickCheck text ]; description = "FIX (co)parser"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -92213,7 +92401,7 @@ self: { base binary deepseq HTTP optparse-applicative process ]; description = "Verify FLAC files ripped form CD using AccurateRip™"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "flags-applicative" = callPackage @@ -92376,7 +92564,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory parsec ]; description = "flatten a latex multi-file latex document and remove all comments"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "flatbuffers" = callPackage @@ -92416,6 +92604,26 @@ self: { broken = true; }) {}; + "flatparse" = callPackage + ({ mkDerivation, attoparsec, base, bytesmith, bytestring + , containers, gauge, megaparsec, parsec, primitive + , template-haskell + }: + mkDerivation { + pname = "flatparse"; + version = "0.1.1.1"; + sha256 = "19k1336hf23n440bk5fjw296bs7kqccfa4mhl4wsvfvbsyrzlp09"; + libraryHaskellDepends = [ + base bytestring containers template-haskell + ]; + benchmarkHaskellDepends = [ + attoparsec base bytesmith bytestring gauge megaparsec parsec + primitive + ]; + description = "High-performance parsing from strict bytestrings"; + license = lib.licenses.mit; + }) {}; + "flay" = callPackage ({ mkDerivation, base, constraints, tasty, tasty-quickcheck , transformers @@ -92941,7 +93149,7 @@ self: { directory MonadRandom mtl random ]; description = "Simulate 454 pyrosequencing"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93145,7 +93353,7 @@ self: { resource-pool text time uuid-types yesod-core yesod-static ]; description = "A simple web application as a online practice website for XDU SE 2017 fall SPM"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "fluffy-parser" = callPackage @@ -93160,7 +93368,7 @@ self: { base binary bytestring pandoc parsec postgresql-simple ]; description = "The parser for fluffy to parsec the question bank in .docx type"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93681,7 +93889,7 @@ self: { array base containers gloss optparse-applicative xml ]; description = "Toolset for Folger Shakespeare Library's XML annotated plays"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "follow" = callPackage @@ -93709,7 +93917,7 @@ self: { text time transformers unordered-containers yaml ]; description = "Haskell library to follow content published on any subject"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -93753,7 +93961,7 @@ self: { old-locale strict time ]; description = "Follow Tweets anonymously"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94306,8 +94514,8 @@ self: { }: mkDerivation { pname = "forsyde-shallow"; - version = "3.4.0.1"; - sha256 = "0im5xf8dcalsjk85fyvih042apv3wl54k3jlmdjg7fnm3mgxj1yj"; + version = "3.5.0.0"; + sha256 = "16skihnq2kkxdgliv6780s2lyka1bsm0naws6kz1sy3ggsw0qnp9"; libraryHaskellDepends = [ base directory old-time process random ]; testHaskellDepends = [ base directory doctest hspec old-time process QuickCheck random @@ -94324,7 +94532,7 @@ self: { sha256 = "1hmcicxnxcl99chidkbg1kspjzpxxcw8qh4lrwvmlpz2knzf11g3"; libraryHaskellDepends = [ array-forth base free mtl ]; description = "A simple eDSL for generating arrayForth code"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -94801,6 +95009,8 @@ self: { libraryHaskellDepends = [ base frame pandoc ]; description = "A markdown to Frame GUI writer for Pandoc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "franchise" = callPackage @@ -94929,8 +95139,8 @@ self: { }: mkDerivation { pname = "free-algebras"; - version = "0.1.0.0"; - sha256 = "0s5gj52b3s1hg92cs12qk7y2zgsl546livdzps2qm4fmjc394qj3"; + version = "0.1.0.1"; + sha256 = "13cyy6afp9y3wfv3qihf0ngrvs7rghbx627a88l3yq1l21r0bbj8"; libraryHaskellDepends = [ base containers data-fix dlist free groups kan-extensions mtl transformers @@ -95298,7 +95508,9 @@ self: { libraryPkgconfigDepends = [ libfreenect ]; description = "Interface to the Kinect device"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) freenect; freenect_sync = null; libfreenect = null;}; @@ -95629,7 +95841,7 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 vector ]; description = "A functional image processing library for Haskell"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "friday-devil" = callPackage @@ -95645,7 +95857,7 @@ self: { ]; librarySystemDepends = [ libdevil ]; description = "Uses the DevIL C library to read and write images from and to files and memory buffers"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libdevil;}; @@ -95827,7 +96039,7 @@ self: { sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn"; libraryHaskellDepends = [ base containers mtl ]; description = "Arduino programming without the hassle of C"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -95909,7 +96121,7 @@ self: { libraryHaskellDepends = [ base frpnow vty ]; executableHaskellDepends = [ base containers frpnow vty ]; description = "Program terminal applications with vty and frpnow!"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -96317,8 +96529,6 @@ self: { ]; description = "Simple sentence segmenter"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "funbot" = callPackage @@ -96412,7 +96622,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath pretty process ]; description = "Functional MetaPost is a Haskell frontend to the MetaPost language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -97127,26 +97337,27 @@ self: { ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm , containers, directory, directory-tree, dlist, file-embed - , filepath, free, gitrev, happy, haskeline, language-c-quote - , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel - , parser-combinators, pcg-random, process, process-extras - , QuickCheck, regex-tdfa, sexp-grammar, srcloc, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, terminal-size - , text, time, transformers, unordered-containers, utf8-string - , vector, vector-binary-instances, versions, zip-archive, zlib + , filepath, free, gitrev, happy, hashable, haskeline + , language-c-quote, mainland-pretty, megaparsec, mtl + , neat-interpolation, parallel, parser-combinators, pcg-random + , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, temporary + , terminal-size, text, time, transformers, unordered-containers + , utf8-string, vector, vector-binary-instances, versions + , zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.19.1"; - sha256 = "1nhy1pjqy7na7brpkh72yzcglfrwaz7l325fivfq5niaq85832dd"; + version = "0.19.2"; + sha256 = "0pkb9yqvfbahmq3lmp7ia0c4sfzx1cghnhk4b7z41xbf20qcakrx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary blaze-html bmp bytestring bytestring-to-vector cmark-gfm containers directory directory-tree - dlist file-embed filepath free gitrev haskeline language-c-quote - mainland-pretty megaparsec mtl neat-interpolation parallel - pcg-random process process-extras regex-tdfa sexp-grammar srcloc + dlist file-embed filepath free gitrev hashable haskeline + language-c-quote mainland-pretty megaparsec mtl neat-interpolation + parallel pcg-random process process-extras regex-tdfa srcloc template-haskell temporary terminal-size text time transformers unordered-containers utf8-string vector vector-binary-instances versions zip-archive zlib @@ -97154,8 +97365,8 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base text ]; testHaskellDepends = [ - base containers megaparsec mtl parser-combinators QuickCheck - sexp-grammar tasty tasty-hunit tasty-quickcheck text + base containers megaparsec mtl parser-combinators QuickCheck tasty + tasty-hunit tasty-quickcheck text ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; @@ -97187,7 +97398,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring network unix ]; description = "Simple IP-over-UDP tunnel using TUNTAP"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -97213,7 +97424,7 @@ self: { sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv"; libraryHaskellDepends = [ base transformers ]; description = "realtime resource handling with manual concurrency"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "futures" = callPackage @@ -97350,6 +97561,17 @@ self: { broken = true; }) {}; + "fuzzyfind" = callPackage + ({ mkDerivation, array, base, containers }: + mkDerivation { + pname = "fuzzyfind"; + version = "0.1.0"; + sha256 = "0ghv1paisvy4dn3l7vv499a6k6a4r54ks5bn3jl8zhy65xn5c8nv"; + libraryHaskellDepends = [ array base containers ]; + description = "Fuzzy text matching"; + license = lib.licenses.mit; + }) {}; + "fuzzyset" = callPackage ({ mkDerivation, base, data-default, hspec, ieee754, text , text-metrics, unordered-containers, vector @@ -97464,6 +97686,17 @@ self: { license = lib.licenses.mit; }) {}; + "fxpak" = callPackage + ({ mkDerivation, base, bytestring, serialport }: + mkDerivation { + pname = "fxpak"; + version = "0.0.1"; + sha256 = "07c5za6limzk76if4rnwyq5iawhqp78hlm793y73cxhb65y0g9d0"; + libraryHaskellDepends = [ base bytestring serialport ]; + description = "Interface to the FXPak/FXPak Pro USB interface"; + license = lib.licenses.bsd3; + }) {}; + "g-npm" = callPackage ({ mkDerivation, base, HTTP, json }: mkDerivation { @@ -98023,7 +98256,7 @@ self: { libraryPkgconfigDepends = [ GConf ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GNOME configuration database system"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.gnome2) GConf;}; @@ -98160,7 +98393,7 @@ self: { transformers ]; description = "recursive atomic build system"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "gdp" = callPackage @@ -98187,7 +98420,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base GLUT OpenGLRaw Vec ]; description = "zooming rotating fractal gears graphics demo"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "gedcom" = callPackage @@ -98273,7 +98506,7 @@ self: { librarySystemDepends = [ gegl ]; libraryPkgconfigDepends = [ gegl ]; description = "Haskell bindings to GEGL library"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gegl;}; @@ -98394,6 +98627,8 @@ self: { pname = "gemini-router"; version = "0.1.1.0"; sha256 = "19aq9ri0ixkg0d5g4ickda75dvpq340lwkdxn0ndcbkis9xrvkv9"; + revision = "1"; + editedCabalFile = "07lnx99d3dkjhqcail31zkbmivclzxdj3qjbhijg1cs3fkl57q3q"; libraryHaskellDepends = [ base gemini-server HsOpenSSL network-uri transformers ]; @@ -98407,10 +98642,8 @@ self: { }: mkDerivation { pname = "gemini-server"; - version = "0.2.0.0"; - sha256 = "06sqy3c04s3cjx6p9rzfi23cq34bjs1wbigczcc66i6ahf4x1hz2"; - revision = "1"; - editedCabalFile = "0zw9svhk5wmi56vqmw7630nqhp816xph9ldgc8l3jzspziz350fx"; + version = "0.3.0.0"; + sha256 = "0s9h0lzxz5yjvz8rzw9mx9dba21171960waaqikj2qbbja0iq3k3"; libraryHaskellDepends = [ base bytestring hslogger HsOpenSSL network network-run network-uri text utf8-string @@ -98527,7 +98760,7 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; executableHaskellDepends = [ attoparsec base text ]; description = "Identify a persons gender by their first name"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -99431,7 +99664,7 @@ self: { base bytestring cmdargs directory filepath GenI json text ]; description = "Companion tools for use with the GenI surface realiser"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100351,7 +100584,7 @@ self: { libraryHaskellDepends = [ base ieee754 linear QuickCheck ]; testHaskellDepends = [ base ieee754 linear QuickCheck ]; description = "package for geometry in euklidean 2d space"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100487,7 +100720,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base containers parsec ]; description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS)."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -100813,25 +101046,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; - version = "0.15.1"; - sha256 = "16kh64z60353m6bj9lmv9yzlvydgmi66hm8gc4b22bs69xyh2pxz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = lib.licenses.bsd3; - }) {}; - - "ghc-events_0_16_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: @@ -100848,7 +101062,6 @@ self: { testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -101124,6 +101337,8 @@ self: { pname = "ghc-lib-parser"; version = "9.0.1.20210207"; sha256 = "1gikdcgcgw1paxs5igxgxdfvpjp23963f6vn83m0a6vr88n2haah"; + revision = "1"; + editedCabalFile = "1fkh3xc2pq4k0mz1x92xhby5sqamfsnfm4rlq38p5shybkan7qgl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -101249,7 +101464,7 @@ self: { base criterion directory filepath temporary ]; description = "Happy Haskell Hacking"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -101634,8 +101849,8 @@ self: { }: mkDerivation { pname = "ghc-tags-core"; - version = "0.2.4.0"; - sha256 = "1h2khrvykywdddnhpy6yg2adfjlzdy6i6zib8km5j2zakmhq9s9j"; + version = "0.2.4.1"; + sha256 = "0d1srd72ajp2csyic6wpj6i7818rimqbcg5c3lxj76cz9zpjr1g8"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath-bytestring ghc mtl pipes pipes-attoparsec pipes-bytestring text transformers @@ -101664,8 +101879,8 @@ self: { }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.2.4.0"; - sha256 = "1cpfh3cvad2avissri0cs7ghamg2q3nyifyzlj3dndmzbpjrvxy7"; + version = "0.2.4.1"; + sha256 = "1hzv3s6pys1cqwj3hs1xww52v5yapisw9y3d5fmxzh0s6nawpxf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101813,8 +102028,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-presburger"; - version = "0.5.2.0"; - sha256 = "0ny7paq8ykc4ycag1dlb9mlpv17dh9a6csh22abj6bls5rx4iljr"; + version = "0.6.0.0"; + sha256 = "08jxp7xnpnlkn8429x25sy1r8xg4b4pv5a41bgw08dl0br4941cx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102137,6 +102352,70 @@ self: { license = lib.licenses.asl20; }) {}; + "ghcide_1_1_0_0" = callPackage + ({ mkDerivation, aeson, array, async, base, base16-bytestring + , binary, bytestring, bytestring-encoding, case-insensitive + , containers, cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, extra, filepath + , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check + , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb + , hls-plugin-api, hp2pretty, hslogger, implicit-hie + , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl + , network-uri, opentelemetry, optparse-applicative, parallel + , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck + , quickcheck-instances, record-dot-preprocessor, record-hasfield + , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions + , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unliftio + , unliftio-core, unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "ghcide"; + version = "1.1.0.0"; + sha256 = "1i2xyp2n4g4cpz50wpwmzmknrzqzxnv3b551ibmhdy41v2fh6y5l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async base base16-bytestring binary bytestring + bytestring-encoding case-insensitive containers cryptohash-sha1 + data-default deepseq dependent-map dependent-sum Diff directory + dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable + heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger + implicit-hie-cradle lens lsp lsp-types mtl network-uri + opentelemetry parallel prettyprinter prettyprinter-ansi-terminal + regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake + sorted-list sqlite-simple stm syb text time transformers unix + unliftio unliftio-core unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default directory extra + filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api + lens lsp lsp-test lsp-types optparse-applicative process + safe-exceptions shake text unordered-containers + ]; + testHaskellDepends = [ + aeson base binary bytestring containers data-default directory + extra filepath ghc ghc-typelits-knownnat haddock-library + hls-plugin-api lens lsp lsp-test lsp-types network-uri + optparse-applicative process QuickCheck quickcheck-instances + record-dot-preprocessor record-hasfield rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text + ]; + testToolDepends = [ implicit-hie ]; + benchmarkHaskellDepends = [ + aeson base directory extra filepath optparse-applicative shake + shake-bench text yaml + ]; + benchmarkToolDepends = [ hp2pretty implicit-hie ]; + description = "The core of an IDE"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghcjs-ajax" = callPackage ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { @@ -102506,7 +102785,7 @@ self: { ]; libraryPkgconfigDepends = [ atk ]; description = "Atk bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -102529,7 +102808,7 @@ self: { setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Cairo bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo;}; "gi-cairo-again" = callPackage @@ -102561,7 +102840,7 @@ self: { base gi-cairo gi-cairo-render haskell-gi-base mtl ]; description = "GI friendly Binding to the Cairo library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {}; "gi-cairo-render" = callPackage @@ -102597,7 +102876,7 @@ self: { ]; libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -102621,7 +102900,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -102645,7 +102924,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "Gdk bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; "gi-gdk_4_0_2" = callPackage @@ -102669,7 +102948,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk4 ]; description = "Gdk bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk4;}; @@ -102691,7 +102970,7 @@ self: { ]; libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gdk-pixbuf;}; "gi-gdkx11" = callPackage @@ -102713,7 +102992,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; "gi-gdkx11_4_0_2" = callPackage @@ -102735,7 +103014,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk4-x11 ]; description = "GdkX11 bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {gtk4-x11 = null;}; @@ -102757,7 +103036,7 @@ self: { ]; libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage @@ -102776,7 +103055,7 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "Gio bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage @@ -102795,7 +103074,7 @@ self: { ]; libraryPkgconfigDepends = [ gobject-introspection ]; description = "GIRepository (gobject-introspection) bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage @@ -102814,7 +103093,7 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "GLib bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -102833,7 +103112,7 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "GObject bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; "gi-graphene" = callPackage @@ -102852,7 +103131,7 @@ self: { ]; libraryPkgconfigDepends = [ graphene-gobject ]; description = "Graphene bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {graphene-gobject = null;}; @@ -102878,7 +103157,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk4;}; @@ -102899,7 +103178,7 @@ self: { ]; libraryPkgconfigDepends = [ gstreamer ]; description = "GStreamer bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage @@ -102920,7 +103199,7 @@ self: { ]; libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerAudio bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; @@ -102943,7 +103222,7 @@ self: { ]; libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerBase bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstpbutils" = callPackage @@ -102967,7 +103246,7 @@ self: { ]; libraryPkgconfigDepends = [ gstreamer-pbutils ]; description = "GStreamer Plugins Base Utils bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {gstreamer-pbutils = null;}; @@ -102990,7 +103269,7 @@ self: { ]; libraryPkgconfigDepends = [ gstreamer-tag ]; description = "GStreamer Tag bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {gstreamer-tag = null;}; @@ -103013,7 +103292,7 @@ self: { ]; libraryPkgconfigDepends = [ gst-plugins-base ]; description = "GStreamerVideo bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage @@ -103037,7 +103316,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; "gi-gtk_4_0_3" = callPackage @@ -103061,7 +103340,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk4 ]; description = "Gtk bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk4;}; @@ -103128,7 +103407,7 @@ self: { gi-gtk haskell-gi-base mtl text transformers ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {}; "gi-gtkosxapplication" = callPackage @@ -103149,7 +103428,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; description = "GtkosxApplication bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {gtk-mac-integration-gtk3 = null;}; @@ -103175,7 +103454,7 @@ self: { ]; libraryPkgconfigDepends = [ gtksheet ]; description = "GtkSheet bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {gtksheet = null;}; @@ -103201,7 +103480,7 @@ self: { ]; libraryPkgconfigDepends = [ gtksourceview3 ]; description = "GtkSource bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtksourceview3;}; "gi-handy" = callPackage @@ -103225,7 +103504,7 @@ self: { ]; libraryPkgconfigDepends = [ libhandy ]; description = "libhandy bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libhandy;}; @@ -103246,7 +103525,7 @@ self: { ]; libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; description = "HarfBuzz bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage @@ -103267,7 +103546,7 @@ self: { ]; libraryPkgconfigDepends = [ ibus ]; description = "IBus bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage @@ -103286,7 +103565,7 @@ self: { ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; @@ -103308,7 +103587,7 @@ self: { ]; libraryPkgconfigDepends = [ libnotify ]; description = "Libnotify bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libnotify;}; "gi-ostree" = callPackage @@ -103329,8 +103608,10 @@ self: { ]; libraryPkgconfigDepends = [ ostree ]; description = "OSTree bindings"; - license = lib.licenses.lgpl21; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage @@ -103355,7 +103636,7 @@ self: { setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "Pango bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage @@ -103381,7 +103662,7 @@ self: { setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; description = "PangoCairo bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-poppler" = callPackage @@ -103402,7 +103683,7 @@ self: { ]; libraryPkgconfigDepends = [ poppler_gi ]; description = "Poppler bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) poppler_gi;}; @@ -103425,7 +103706,7 @@ self: { ]; libraryPkgconfigDepends = [ libsecret ]; description = "Libsecret bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage @@ -103446,7 +103727,7 @@ self: { ]; libraryPkgconfigDepends = [ libsoup ]; description = "Libsoup bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsoup;}; "gi-vte" = callPackage @@ -103470,7 +103751,7 @@ self: { ]; libraryPkgconfigDepends = [ vte_291 ]; description = "Vte bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {vte_291 = pkgs.vte;}; "gi-webkit" = callPackage @@ -103492,7 +103773,7 @@ self: { libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; doHaddock = false; description = "WebKit bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; @@ -103517,7 +103798,7 @@ self: { ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2 bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; @@ -103542,7 +103823,7 @@ self: { ]; libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2-WebExtension bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; @@ -103566,7 +103847,7 @@ self: { ]; libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libwnck;}; @@ -103587,7 +103868,7 @@ self: { ]; libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -103715,7 +103996,7 @@ self: { ]; libraryPkgconfigDepends = [ system-glib ]; description = "Binding to GIO"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {system-glib = pkgs.glib;}; "gipeda" = callPackage @@ -103783,7 +104064,7 @@ self: { aeson base bytestring conduit http-conduit text ]; description = "A reliable command-line client for gist.github.com"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -103902,7 +104183,7 @@ self: { checkPhase = ''PATH+=":$PWD" git-annex test''; enableSharedExecutables = false; description = "manage files with git, without checking their contents into git"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; @@ -104010,7 +104291,7 @@ self: { test-framework-quickcheck2 time utf8-string ]; description = "Bindings to the date parsing from Git"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104126,7 +104407,7 @@ self: { http-types network-uri text ]; description = "git-lfs protocol"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "git-mediate" = callPackage @@ -104144,7 +104425,7 @@ self: { optparse-applicative process unix-compat ]; description = "Tool to help resolving git conflicts"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "git-monitor" = callPackage @@ -104248,7 +104529,7 @@ self: { split text time transformers unix unix-compat utf8-string ]; description = "repairs a damaged git repository"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -104435,7 +104716,7 @@ self: { ]; executableToolDepends = [ git ]; description = "backs up everything github knows about a repository, to the repository"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) git;}; @@ -104490,8 +104771,8 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.3.6"; - sha256 = "07cxai2h6alyka0bsfch7vfjsvp3s9d48jw4n6z74kmxq3zdrgxh"; + version = "1.3.7"; + sha256 = "14dz9ap43m2ws6l4wfrn6wn3g5p2k0fgv639q7nyp4zdd4kn9czh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104542,7 +104823,7 @@ self: { http-client-tls monad-parallel tabular tagsoup text time vector ]; description = "Various Github helper utilities"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105116,7 +105397,7 @@ self: { libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ libglade ]; description = "Binding to the glade library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs.gnome2) libglade;}; @@ -105171,7 +105452,7 @@ self: { base containers GLFW-b lens mtl OpenGL ]; description = "An OpenGL micro framework"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105348,7 +105629,7 @@ self: { ]; libraryPkgconfigDepends = [ glib ]; description = "Binding to the GLIB library for Gtk2Hs"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; "glicko" = callPackage @@ -105364,7 +105645,7 @@ self: { ]; testHaskellDepends = [ base data-default hspec ]; description = "Glicko-2 implementation in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "glider-nlp" = callPackage @@ -105603,7 +105884,7 @@ self: { editedCabalFile = "0nia67zywmxyvcnlk0a906dijh9h7m6w48330n9gs2mjkhkyqb13"; libraryHaskellDepends = [ base gloss reactive-banana ]; description = "An Interface for gloss in terms of a reactive-banana Behavior"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105751,7 +106032,7 @@ self: { sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za"; libraryHaskellDepends = [ base gloss sodium ]; description = "A Sodium interface to the Gloss drawing package"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -105984,7 +106265,7 @@ self: { priority-queue qd reflection Vec ]; description = "Mandelbrot Set explorer using GTK"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -106031,7 +106312,7 @@ self: { libraryPkgconfigDepends = [ libgnome-keyring ]; libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs.gnome3) gnome-keyring; inherit (pkgs) libgnome-keyring;}; @@ -106102,7 +106383,7 @@ self: { testPkgconfigDepends = [ libidn ]; testToolDepends = [ c2hs ]; description = "Bindings for GNU IDN"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libidn;}; @@ -106139,7 +106420,7 @@ self: { librarySystemDepends = [ gnutls ]; libraryPkgconfigDepends = [ gnutls ]; description = "Bindings for GNU libgnutls"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) gnutls;}; "goa" = callPackage @@ -106272,7 +106553,7 @@ self: { ]; testHaskellDepends = [ base containers HUnit mtl parsec ]; description = "A monadic take on a 2,500-year-old board game - library"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -106294,7 +106575,7 @@ self: { executableHaskellDepends = [ base gtk ]; testHaskellDepends = [ base HUnit ]; description = "A monadic take on a 2,500-year-old board game - GTK+ UI"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -108625,6 +108906,8 @@ self: { pname = "goldplate"; version = "0.1.3"; sha256 = "109qhyq0n4w1jdz7y2hd8cjf44pikavv6mfnmf65vyfjangjq610"; + revision = "1"; + editedCabalFile = "1chrg7mfs4w4hbc0i1pdsj1350c4h3dhcv7xswn2ygq78337xxqk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108844,8 +109127,8 @@ self: { }: mkDerivation { pname = "google-oauth2-jwt"; - version = "0.3.2"; - sha256 = "1njb9j6pb656drchi8qc94pniwph2bplnb667ga719yxmzm4256s"; + version = "0.3.3"; + sha256 = "13iy695qpb9yyr1wi3fslj0xd90izgj4wmvs04k5mhf6k53pk9dk"; libraryHaskellDepends = [ base base64-bytestring bytestring HsOpenSSL RSA text unix-time ]; @@ -108988,7 +109271,7 @@ self: { mime-types network optparse-applicative text wai warp ]; description = "proxy gopher over http"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; @@ -109746,7 +110029,7 @@ self: { sha256 = "0dzkv13w06hkxg2vkbblpskvsq02c2ay06rw2j4vyjpw13hms5bv"; libraryHaskellDepends = [ base containers fgl ]; description = "An implementation of algorithms for matchings in graphs"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -110223,6 +110506,8 @@ self: { pname = "graphql-client"; version = "1.1.0"; sha256 = "0yk6nfyyynydrgwc1cdy5235121gw5q4iaapbvixpckz2diidxx7"; + revision = "2"; + editedCabalFile = "120c5cd9gj407lf3lcvfq0gqlvdpf3ciws9207nh0qqqdrpws9mj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111358,7 +111643,7 @@ self: { old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec ]; description = "fractal explorer GUI using the ruff library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111378,7 +111663,7 @@ self: { random ruff Vec ]; description = "Mandelbrot Set examples using ruff and gruff"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111397,7 +111682,7 @@ self: { ]; libraryPkgconfigDepends = [ gsasl ]; description = "Bindings for GNU libgsasl"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) gsasl;}; "gsc-weighting" = callPackage @@ -111425,7 +111710,7 @@ self: { base feed http-conduit scalpel-core text uri xml-types ]; description = "scrapes google scholar, provides RSS feed"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -111539,7 +111824,7 @@ self: { libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GStreamer open source multimedia framework"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {gst-plugins-base = null; gstreamer = null;}; @@ -111611,7 +111896,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk2 ]; description = "Binding to the Gtk+ graphical user interface library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk2;}; "gtk-helpers" = callPackage @@ -111637,7 +111922,7 @@ self: { sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0"; libraryHaskellDepends = [ base gtk json transformers ]; description = "A simple custom form widget for gtk which allows inputing of JSON values"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "gtk-largeTreeStore" = callPackage @@ -111653,7 +111938,7 @@ self: { ]; testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "gtk-mac-integration" = callPackage @@ -111669,8 +111954,8 @@ self: { libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; description = "Bindings for the Gtk/OS X integration library"; - license = lib.licenses.lgpl21; - platforms = [ "armv7l-linux" "x86_64-darwin" ]; + license = lib.licenses.lgpl21Only; + platforms = [ "x86_64-darwin" ]; }) {inherit (pkgs) gtk-mac-integration-gtk2;}; "gtk-serialized-event" = callPackage @@ -111687,7 +111972,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk2 ]; description = "GTK+ Serialized event"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk2;}; @@ -111700,7 +111985,7 @@ self: { sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws"; libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "gtk-sni-tray" = callPackage @@ -111752,7 +112037,7 @@ self: { sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706"; libraryHaskellDepends = [ base gtk ]; description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "gtk-toy" = callPackage @@ -111777,7 +112062,7 @@ self: { libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ xlibsWrapper ]; description = "A wrapper around the eggtraymanager library for Linux system trays"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) xlibsWrapper;}; "gtk2hs-buildtools" = callPackage @@ -111798,7 +112083,7 @@ self: { libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "gtk2hs-cast-glade" = callPackage @@ -111951,7 +112236,7 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; description = "Binding to the Gtk+ 3 graphical user interface library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gtk3;}; "gtk3-helpers" = callPackage @@ -111982,7 +112267,7 @@ self: { libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; description = "Bindings for the Gtk/OS X integration library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {gtk-mac-integration-gtk3 = null;}; @@ -112002,7 +112287,7 @@ self: { libraryPkgconfigDepends = [ gtkglext ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GTK+ OpenGL Extension"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; @@ -112025,7 +112310,7 @@ self: { libraryPkgconfigDepends = [ gtkimageview ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkImageView library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtkimageview;}; @@ -112066,7 +112351,7 @@ self: { libraryPkgconfigDepends = [ gtksourceview ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtksourceview;}; @@ -112087,7 +112372,7 @@ self: { libraryPkgconfigDepends = [ gtksourceview3 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the GtkSourceView library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtksourceview3;}; @@ -112152,7 +112437,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; description = "graphical untyped lambda calculus interactive interpreter"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112165,7 +112450,7 @@ self: { sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2"; libraryHaskellDepends = [ base ]; description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "gw" = callPackage @@ -112241,7 +112526,7 @@ self: { stm template-haskell transformers utf8-string vinyl ]; description = "Haskell library for retrieving data from various booru image sites"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112534,7 +112819,7 @@ self: { libraryHaskellDepends = [ base hOff-parser OpenGL ]; executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ]; description = "The tool to transform the OFF to other image format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -112547,7 +112832,7 @@ self: { sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci"; libraryHaskellDepends = [ base parsec ]; description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hOpenPGP" = callPackage @@ -114071,7 +114356,7 @@ self: { ShellCheck split text ]; description = "Dockerfile Linter JavaScript API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hadoop-formats" = callPackage @@ -114173,7 +114458,7 @@ self: { ]; testHaskellDepends = [ base doctest filemanip process ]; description = "Confirm delegation of NS and MX records"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "hafar" = callPackage @@ -114267,7 +114552,7 @@ self: { ]; executableHaskellDepends = [ base time ]; description = "Analytic Hierarchy Process"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -114424,7 +114709,9 @@ self: { iterio-server mongoDB mtl ]; description = "Dynamic launcher of Hails applications"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hairy" = callPackage @@ -114556,18 +114843,16 @@ self: { , containers, cryptonite, data-default, deepseq, directory , file-embed, filepath, fsnotify, http-conduit, http-types , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc - , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa - , resourcet, scientific, tagsoup, tasty, tasty-hunit + , parsec, process, QuickCheck, random, regex-tdfa, resourcet + , scientific, tagsoup, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, text, time , time-locale-compat, unordered-containers, utillinux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { pname = "hakyll"; - version = "4.13.4.1"; - sha256 = "1z9k3029bjyxy2aqmqr6gzsva50154y4bfxqkmsjgl38lx3s6kk9"; - revision = "1"; - editedCabalFile = "1hv80gqq50zz791620lgdvkspspii0z59ngj7la69cdw2739cc5g"; + version = "4.14.0.0"; + sha256 = "088df9vs5f2p5iiv7rbrisz4z4s38mkr9z41gy3hqdapg4m7mi1c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -114575,15 +114860,15 @@ self: { base binary blaze-html blaze-markup bytestring containers cryptonite data-default deepseq directory file-embed filepath fsnotify http-conduit http-types lrucache memory mtl network-uri - optparse-applicative pandoc pandoc-citeproc parsec process random - regex-tdfa resourcet scientific tagsoup template-haskell text time + optparse-applicative pandoc parsec process random regex-tdfa + resourcet scientific tagsoup template-haskell text time time-locale-compat unordered-containers vector wai wai-app-static warp yaml ]; executableHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ - base bytestring containers filepath QuickCheck tasty tasty-hunit - tasty-quickcheck text unordered-containers yaml + base bytestring containers filepath QuickCheck tasty tasty-golden + tasty-hunit tasty-quickcheck text unordered-containers yaml ]; testToolDepends = [ utillinux ]; description = "A static website compiler library"; @@ -114849,6 +115134,8 @@ self: { ]; description = "Hakyll wrapper for the Elm compiler"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hakyll-favicon" = callPackage @@ -114999,7 +115286,7 @@ self: { regex-posix split tasty tasty-hunit tasty-quickcheck ]; description = "A shortcode extension module for Hakyll"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115277,7 +115564,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base hint process ]; description = "looks for functions given a set of example input/outputs"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "halves" = callPackage @@ -115430,7 +115717,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Interpreter for SQL-structure definitions in YAML (YamSql)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115686,7 +115973,7 @@ self: { wai-middleware-static yaml ]; description = "Simple Continuous Integration/Deployment System"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -115840,7 +116127,7 @@ self: { libraryPkgconfigDepends = [ libappindicator-gtk2 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the appindicator library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libappindicator-gtk2;}; @@ -115856,7 +116143,7 @@ self: { libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ libappindicator-gtk3 ]; description = "Binding to the appindicator library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libappindicator-gtk3;}; @@ -116597,7 +116884,7 @@ self: { array base clock language-dot transformers xml ]; description = "Parser for dot made with happy"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "happy-hour" = callPackage @@ -116621,6 +116908,8 @@ self: { pname = "happy-meta"; version = "0.2.0.11"; sha256 = "1vgv5fx1fya7wfh3zwdgy0hm0lyzp171gnpp6ymfd6kqmqkl3293"; + revision = "1"; + editedCabalFile = "1dspifamwsn6lcj2mxjyrbdsfjqfb4p6m0s1c9dkiv08cfkk02p6"; libraryHaskellDepends = [ array base containers fail haskell-src-meta mtl template-haskell ]; @@ -116855,7 +117144,7 @@ self: { base containers derive hlint hslogger hspec HUnit QuickCheck ]; description = "A web service specification compiler that generates implementation and tests"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -116873,7 +117162,7 @@ self: { ]; libraryPkgconfigDepends = [ groonga ]; description = "Low level bindings for Groonga"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) groonga;}; @@ -116893,7 +117182,7 @@ self: { scotty text time transformers wai-extra ]; description = "Yet another Groonga http server"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117066,7 +117355,7 @@ self: { base bytestring conduit cryptohash hex path ]; description = "Decompress SAPCAR archives"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "hascard" = callPackage @@ -117511,7 +117800,7 @@ self: { base bytestring cryptohash directory filepath ]; description = "Rename every file in a directory with his SHA1 hash"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hashring" = callPackage @@ -117722,7 +118011,7 @@ self: { base cmdargs containers cpphs directory her-lexer split ]; description = "A dialect of haskell with order of execution based on dependency resolution"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -117813,15 +118102,15 @@ self: { broken = true; }) {}; - "haskeline_0_8_1_1" = callPackage + "haskeline_0_8_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.1.1"; - sha256 = "1cg51rbhpa7ism0rg39dw7njz4r3q5h5pnysnbc37dh6gcdiyg2p"; + version = "0.8.1.2"; + sha256 = "0axr258a8wrsq37jwx4g343969lycydx9symijnp64a7ki67jrnp"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -117871,7 +118160,7 @@ self: { editedCabalFile = "0h900mw5kzd9fvywpbhfd9acnfwp3qk7nfi9yr9ibamjb8s87cm1"; libraryHaskellDepends = [ base containers mtl protolude text ]; description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118052,29 +118341,33 @@ self: { }) {}; "haskell-ci" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base-compat - , bytestring, Cabal, cabal-install-parsers, containers, deepseq + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base-compat, base16-bytestring, binary, bytestring, Cabal + , cabal-install-parsers, containers, cryptohash-sha256, deepseq , Diff, directory, exceptions, filepath, generic-lens-lite, HsYAML - , lattices, mtl, network-uri, optparse-applicative, parsec, pretty - , process, ShellCheck, tasty, tasty-golden, temporary, text - , transformers, unordered-containers + , indexed-traversable, indexed-traversable-instances, ini, lattices + , mtl, network-uri, optparse-applicative, parsec, pretty, process + , ShellCheck, tasty, tasty-golden, temporary, text, transformers + , unordered-containers, zinza }: mkDerivation { pname = "haskell-ci"; - version = "0.10.3"; - sha256 = "18qynghm1aj0qr18v6m3md75p2l3kyhki03798jwhi4kc5qdk2vv"; + version = "0.12"; + sha256 = "17ccxpsi483fkiyp98m09nzqds9n78y53naii5x18nvdxv9fssam"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - aeson base base-compat bytestring Cabal cabal-install-parsers - containers deepseq directory exceptions filepath generic-lens-lite - HsYAML lattices mtl network-uri optparse-applicative parsec pretty - process ShellCheck temporary text transformers unordered-containers + aeson attoparsec base base-compat base16-bytestring binary + bytestring Cabal cabal-install-parsers containers cryptohash-sha256 + deepseq directory exceptions filepath generic-lens-lite HsYAML + indexed-traversable indexed-traversable-instances ini lattices mtl + network-uri optparse-applicative parsec pretty process ShellCheck + temporary text transformers unordered-containers zinza ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-terminal base base-compat bytestring Diff directory filepath - tasty tasty-golden transformers + ansi-terminal base base-compat bytestring Cabal Diff directory + filepath tasty tasty-golden transformers ]; doHaddock = false; description = "Cabal package script generator for Travis-CI"; @@ -118113,7 +118406,7 @@ self: { sha256 = "1iz94kyq1xn3v89aay282qglv2sh41b04p8vaygwm22v1g4b4kk7"; libraryHaskellDepends = [ base process ]; description = "Simple CoffeeScript API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118134,7 +118427,7 @@ self: { base bimap boolean-list bytestring containers ]; description = "compress files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118413,7 +118706,7 @@ self: { libraryPkgconfigDepends = [ glib gobject-introspection ]; testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -118425,7 +118718,7 @@ self: { libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; "haskell-gi-overloading" = callPackage @@ -118736,7 +119029,7 @@ self: { base directory haskell-lsp lens process text unix ]; description = "A haskell package to build your own Language Server client"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -118802,7 +119095,7 @@ self: { sha256 = "18s8g82v3h4b7maz6di43vfym6d3w16j4rbh5sjh4ps26yjnnfy4"; libraryHaskellDepends = [ base containers ]; description = "A simple menu system for Haskell programs"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "haskell-ml" = callPackage @@ -119003,7 +119296,7 @@ self: { old-locale poppler template-haskell time zlib ]; description = "Tool for presenting PDF-based presentations"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119094,7 +119387,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {libpostal = null;}; + }) {inherit (pkgs) libpostal;}; "haskell-postgis" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, bytestring-lexing @@ -119189,7 +119482,7 @@ self: { sha256 = "03d8c1gnxd923f3fqqw06w3ibnd20llfgd7s5jgkscc872i5ghz6"; libraryHaskellDepends = [ base syb ]; description = "A DSL for expressing natural deduction rules in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -119225,7 +119518,7 @@ self: { base containers lens linear mtl random sdl2 sdl2-ttf text vector ]; description = "Snake game implemetation in Haskell using SDL2"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "haskell-spacegoo" = callPackage @@ -119258,8 +119551,6 @@ self: { libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "haskell-src-exts" = callPackage @@ -119926,7 +120217,7 @@ self: { sha256 = "0fv533nac6dlawgffr1kvn4xpv63hdcb4wgyqbbg2s6dg9a2hw38"; libraryHaskellDepends = [ base process ]; description = "Simple TypeScript API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120465,7 +120756,7 @@ self: { test-framework-quickcheck2 ]; description = "A scrabble library capturing the core game logic of scrabble"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -120519,6 +120810,8 @@ self: { ]; description = "Elm to Haskell translation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskelzinc" = callPackage @@ -120913,12 +121206,13 @@ self: { , http-types, lens, monad-control, monad-logger, mtl, network, nqe , optparse-applicative, QuickCheck, random, rocksdb-haskell-jprupp , rocksdb-query, scotty, stm, string-conversions, text, time - , transformers, unliftio, unordered-containers, wai, warp, wreq + , transformers, unliftio, unordered-containers, vault, wai + , wai-extra, warp, wreq }: mkDerivation { pname = "haskoin-store"; - version = "0.49.0"; - sha256 = "126krbi29jxi978my3wg8cl2gqpr0xn0fmbz6fxqcbbcwi75fa30"; + version = "0.51.0"; + sha256 = "0wgf4j28f3g8anm6xpi0qn1as8lw7b6gwsp92xpc0f2yvv38gm4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120927,7 +121221,8 @@ self: { haskoin-core haskoin-node haskoin-store-data hedis http-types lens monad-control monad-logger mtl network nqe random rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions - text time transformers unliftio unordered-containers wai warp wreq + text time transformers unliftio unordered-containers vault wai + wai-extra warp wreq ]; executableHaskellDepends = [ aeson aeson-pretty base base16 bytes bytestring cereal conduit @@ -120936,7 +121231,7 @@ self: { http-types lens monad-control monad-logger mtl network nqe optparse-applicative random rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions text time transformers unliftio - unordered-containers wai warp wreq + unordered-containers vault wai wai-extra warp wreq ]; testHaskellDepends = [ aeson aeson-pretty base base16 base64 bytes bytestring cereal @@ -120945,7 +121240,7 @@ self: { http-types lens monad-control monad-logger mtl network nqe QuickCheck random rocksdb-haskell-jprupp rocksdb-query scotty stm string-conversions text time transformers unliftio - unordered-containers wai warp wreq + unordered-containers vault wai wai-extra warp wreq ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -120963,8 +121258,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.49.0"; - sha256 = "1v9zb3m1pvhbqm6pxzy2w8ipyxnv80gw8xlsr25fj0g2ylifkjb2"; + version = "0.51.0"; + sha256 = "12p8caxi77hqy420bix3h3a427m5hq4vwwwgf1g4cmava7c0p7wq"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -122428,7 +122723,7 @@ self: { sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8"; libraryHaskellDepends = [ base haste-compiler transformers ]; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -122569,7 +122864,7 @@ self: { base cmdargs process split tasty tasty-hunit tasty-quickcheck ]; description = "Hath manipulates network blocks in CIDR notation"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "hats" = callPackage @@ -122998,7 +123293,7 @@ self: { base directory ghc ghc-mod ghc-paths libhbb ]; description = "Haskell Busy Bee, a backend for text editors"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123086,7 +123381,7 @@ self: { optparse-applicative parsec primitive text transformers vector ]; description = "An optimizing Brainfuck compiler and evaluator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123339,7 +123634,7 @@ self: { array attoparsec base containers hlint hspec QuickCheck text ]; description = "Chess library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -123514,8 +123809,10 @@ self: { libraryHaskellDepends = [ base unix ]; librarySystemDepends = [ bluetooth cwiid ]; description = "Library to interface with the wiimote"; - license = lib.licenses.gpl2; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + license = lib.licenses.gpl2Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage @@ -123881,7 +124178,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base directory process unix vty ]; description = "a small display manager"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124002,7 +124299,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq primitive ]; description = "Haskell implementation of High Dynamic Range (HDR) Histograms"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124051,8 +124348,8 @@ self: { }: mkDerivation { pname = "headroom"; - version = "0.4.0.0"; - sha256 = "1xjm84k6wpi7b5w9pjf1siwy4c59rfsgmrg5cbjhznrv8mzvpygw"; + version = "0.4.1.0"; + sha256 = "1f98x1qm567wsa58nyavj7lfi2fmm6zrmjc0cwg0dyhvi63n9qp0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124235,7 +124532,7 @@ self: { vector ]; description = "Find and annotate ITDs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124260,7 +124557,7 @@ self: { pipes pipes-text safe text turtle vector ]; description = "Find and annotate ITDs with assembly or read pair joining"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -124424,30 +124721,6 @@ self: { }) {}; "hedgehog" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring - , concurrent-output, containers, deepseq, directory, erf - , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show - , primitive, random, resourcet, stm, template-haskell, text, time - , transformers, transformers-base, wl-pprint-annotated - }: - mkDerivation { - pname = "hedgehog"; - version = "1.0.4"; - sha256 = "16j60k0xg74861b5a5n9brx1pgwa2yg76v8q8drmhlx46ga5fwdz"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring concurrent-output containers - deepseq directory erf exceptions lifted-async mmorph monad-control - mtl pretty-show primitive random resourcet stm template-haskell - text time transformers transformers-base wl-pprint-annotated - ]; - testHaskellDepends = [ - base containers mmorph mtl pretty-show text transformers - ]; - description = "Release with confidence"; - license = lib.licenses.bsd3; - }) {}; - - "hedgehog_1_0_5" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring , concurrent-output, containers, deepseq, directory, erf , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show @@ -124469,7 +124742,6 @@ self: { ]; description = "Release with confidence"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hedgehog-checkers" = callPackage @@ -124509,8 +124781,8 @@ self: { }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.5.1"; - sha256 = "0gyq9dr25sz14yw5x8jlb73l2hzv92r1c6cfan7lygq7z0yaiw6b"; + version = "0.2.5.2"; + sha256 = "0h9givw1l83l8z59w6y1rjcnply297b2iag3qhy1rmcjyq3d6m0m"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -125208,7 +125480,7 @@ self: { base containers Lucu mtl network regex-posix ]; description = "Simple, distributed, anonymous data sharing network"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -125766,7 +126038,7 @@ self: { mtl optparse-applicative semigroups split vty ]; description = "A command-line manager for delicious kitchen recipes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -126324,17 +126596,18 @@ self: { }) {}; "hexpat-streamparser" = callPackage - ({ mkDerivation, base, bytestring, hexpat, List, mtl + ({ mkDerivation, base, bytestring, hexpat, hspec, List, mtl , parser-combinators, text, transformers }: mkDerivation { pname = "hexpat-streamparser"; - version = "0.0.2"; - sha256 = "11g78dkr9dp4kgz8zmckgq66587qahdhxyhcn03ajr0b07ab27z3"; + version = "0.1.1"; + sha256 = "13wn89aw2fqhirrdshmdh1xqhihx4h5pgmp4x9lspy2jfrpga9f5"; libraryHaskellDepends = [ base bytestring hexpat List mtl parser-combinators text transformers ]; + testHaskellDepends = [ base hexpat hspec ]; license = lib.licenses.bsd3; }) {}; @@ -127175,7 +127448,7 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base directory hspec ]; description = "Unofficial bindings for GRIB API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {grib_api = null;}; @@ -127430,8 +127703,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.7.4"; - sha256 = "05ad47ll6vxi7say4f7zf13npcjpqbwb42pqs2bmxslif6rl9sdh"; + version = "0.7.5"; + sha256 = "0k8g1qkxqqa0ld15s82mvkgsm4icm65dkabsv8sd2mkrhck0lfw8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127618,7 +127891,7 @@ self: { filepath hmatrix lens optparse-generic safe text text-show vector ]; description = "Hierarchical spectral clustering of a graph"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -127984,7 +128257,7 @@ self: { base bytestring directory gtk HTTP http-conduit network temporary ]; description = "Simple gtk2hs image viewer. Point it at an image and fire away."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -128288,8 +128561,8 @@ self: { }: mkDerivation { pname = "hint"; - version = "0.9.0.3"; - sha256 = "0kp2hngmk2sf4ariv02rgrrd190zzb7nlk0pj8fq7rsckcxc87ra"; + version = "0.9.0.4"; + sha256 = "0hdhnkldscq3hp5xn5ns79f6cd6bw6ih6k550d5c38sdqypx73ns"; libraryHaskellDepends = [ base directory exceptions filepath ghc ghc-boot ghc-paths random temporary transformers unix @@ -128969,7 +129242,7 @@ self: { tasty-quickcheck text transformers unordered-containers ]; description = "Majority Judgment"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hjugement-cli" = callPackage @@ -128998,7 +129271,7 @@ self: { time transformers unix unordered-containers ]; description = "Majority Judgment and Helios-C command line tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129027,7 +129300,7 @@ self: { transformers ]; description = "A cryptographic protocol for the Majority Judgment"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hkd" = callPackage @@ -129110,7 +129383,7 @@ self: { simple-cmd-args typed-process xdg-basedir ]; description = "Simple Hackage release workflow for package maintainers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hkt" = callPackage @@ -129254,7 +129527,7 @@ self: { utility-ht wizards ]; description = "Command-line interface for the hledger accounting system"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -129279,7 +129552,7 @@ self: { wai-extra warp ]; description = "Web API server for the hledger accounting tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -129314,7 +129587,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; description = "Compares the transactions in two ledger files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hledger-flow" = callPackage @@ -129339,7 +129612,7 @@ self: { base containers foldl HUnit path path-io stm text turtle ]; description = "An hledger workflow focusing on automated statement import and classification"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hledger-iadd" = callPackage @@ -129351,8 +129624,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.13"; - sha256 = "19i5cr11zm4d27x2gddxy4993jgmf4ghgpvx8fw4acadwbvlnjvg"; + version = "1.3.14"; + sha256 = "0kcw8yp9g6cj6amc4rh8iwzd4zh5v68ns8sf5rv4hfa4xj928iy5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129445,7 +129718,7 @@ self: { unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hledger-makeitso" = callPackage @@ -129466,7 +129739,7 @@ self: { base containers foldl HUnit stm text turtle ]; description = "An hledger workflow focusing on automated statement import and classification"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hledger-stockquotes" = callPackage @@ -129512,7 +129785,7 @@ self: { split text text-zipper time transformers unix vector vty ]; description = "Curses-style terminal interface for the hledger accounting system"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -129567,7 +129840,7 @@ self: { base hledger hledger-lib hspec text yesod yesod-test ]; description = "Web-based user interface for the hledger accounting system"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -129582,7 +129855,7 @@ self: { libraryPkgconfigDepends = [ libbladeRF ]; testHaskellDepends = [ base hlint ]; description = "Haskell binding to libBladeRF SDR library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) libbladeRF;}; @@ -129684,6 +129957,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "hlint_3_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs + , containers, cpphs, data-default, directory, extra, file-embed + , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex + , hscolour, process, refact, text, transformers, uniplate + , unordered-containers, utf8-string, vector, yaml + }: + mkDerivation { + pname = "hlint"; + version = "3.3"; + sha256 = "1cbmaw3ikni2fqkzyngc6qwg8k6ighy48979msfs97qg0kxjmbbd"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring cmdargs containers cpphs + data-default directory extra file-embed filepath filepattern + ghc-lib-parser ghc-lib-parser-ex hscolour process refact text + transformers uniplate unordered-containers utf8-string vector yaml + ]; + executableHaskellDepends = [ base ]; + description = "Source code suggestions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hlint-test" = callPackage ({ mkDerivation, base, hlint }: mkDerivation { @@ -129881,6 +130180,8 @@ self: { pname = "hls-explicit-imports-plugin"; version = "1.0.0.0"; sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; + revision = "1"; + editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-plugin-api lsp lsp-types shake text unordered-containers @@ -129963,6 +130264,25 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-retrie-plugin_1_0_0_1" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, directory, extra + , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie + , safe-exceptions, shake, text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-retrie-plugin"; + version = "1.0.0.1"; + sha256 = "0vshnnh8x2n0kn7hh04z00mkdmw3130b3mmfrm3z4ygia852hzmq"; + libraryHaskellDepends = [ + aeson base containers deepseq directory extra ghc ghcide hashable + hls-plugin-api lsp lsp-types retrie safe-exceptions shake text + transformers unordered-containers + ]; + description = "Retrie integration plugin for Haskell Language Server"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, extra, foldl, ghc , ghc-exactprint, ghcide, hls-plugin-api, lens, lsp, retrie, shake @@ -130163,7 +130483,7 @@ self: { libraryHaskellDepends = [ base containers hmatrix ]; librarySystemDepends = [ glpk ]; description = "Linear Programming based on GLPK"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -130178,7 +130498,7 @@ self: { ]; libraryPkgconfigDepends = [ gsl ]; description = "Numerical computation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage @@ -130240,7 +130560,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base hmatrix ]; description = "NIPALS method for Principal Components Analysis on large data-sets"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130303,7 +130623,7 @@ self: { sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz"; libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; description = "Interface to GSL special functions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hmatrix-static" = callPackage @@ -130381,7 +130701,7 @@ self: { base haskell-src-exts haskell-src-meta hmatrix template-haskell ]; description = "MATLAB-like syntax for hmatrix vectors and matrices"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -130589,6 +130909,8 @@ self: { pname = "hmm-lapack"; version = "0.4"; sha256 = "0f0xf1fjsqqfimxx7skdwddw8zbdmas3l31y6921mxzy1syys30w"; + revision = "1"; + editedCabalFile = "10dg0s6nrvb93ksyzgappmr28av4k204kmc8lb3vc2ribqhpb177"; libraryHaskellDepends = [ base comfort-array containers deepseq explicit-exception fixed-length lapack lazy-csv netlib-ffi non-empty prelude-compat @@ -130813,13 +131135,14 @@ self: { , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 , cryptohash-sha512, directory, filepath, hashable, lifted-base , monad-control, mtl, nix-derivation, process, saltine, tasty - , tasty-golden, tasty-hspec, tasty-hunit, tasty-quickcheck - , temporary, text, time, unix, unordered-containers, vector + , tasty-discover, tasty-golden, tasty-hspec, tasty-hunit + , tasty-quickcheck, temporary, text, time, unix + , unordered-containers, vector }: mkDerivation { pname = "hnix-store-core"; - version = "0.4.1.0"; - sha256 = "05yblps7x9r4hwszinx2s4rcfr8q1d1y6r29mn6jzydjwvdyhgj0"; + version = "0.4.2.0"; + sha256 = "02i7vxhpaqwyjvd6w2raxjz7r0xxs37x5b6pq9rw6l1l0k18nx5i"; libraryHaskellDepends = [ algebraic-graphs attoparsec base base16-bytestring base64-bytestring bytestring cereal containers cryptohash-md5 @@ -130832,6 +131155,7 @@ self: { bytestring containers directory filepath process tasty tasty-golden tasty-hspec tasty-hunit tasty-quickcheck temporary text unix ]; + testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = lib.licenses.asl20; }) {}; @@ -130843,8 +131167,8 @@ self: { }: mkDerivation { pname = "hnix-store-remote"; - version = "0.4.1.0"; - sha256 = "1w6x756hh7429ci2kdsl9psxbsq8k829x802dblv652d33wl0fkc"; + version = "0.4.2.0"; + sha256 = "17v785dql4rl2yn1qdagvnyx8y9r3bd02npg51mfqhl49knd92fr"; libraryHaskellDepends = [ attoparsec base binary bytestring containers hnix-store-core mtl network nix-derivation text time unordered-containers @@ -131022,7 +131346,7 @@ self: { base containers gtk3 gtksourceview3 hspec mtl text ]; description = "A source code editor aiming for the convenience of use"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131496,7 +131820,7 @@ self: { ]; description = "DirectSound extension (Windows) for the Hommage sound library"; license = "GPL"; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "homoiconic" = callPackage @@ -131519,8 +131843,8 @@ self: { }: mkDerivation { pname = "homotuple"; - version = "0.1.2.1"; - sha256 = "1jhw6mby17wz0jiqxjj59qfvcy9dgd8gm5z0ak3qzr1xrd652fa8"; + version = "0.2.0.0"; + sha256 = "17vr2g8jv71k2bwv5x973xjjxacr5br4xlngxjpzbq6xk9n37laf"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base OneTuple Only single-tuple ]; description = "Homotuple, all whose elements are the same type"; @@ -131672,7 +131996,7 @@ self: { array astar base containers hfov monad-loops mtl ncurses random ]; description = "A small, toy roguelike"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131694,7 +132018,7 @@ self: { ]; executableHaskellDepends = [ base cmdargs hoodle-core ]; description = "Executable for hoodle"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -131773,7 +132097,7 @@ self: { unordered-containers xournal-parser ]; description = "extra hoodle tools"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132182,9 +132506,7 @@ self: { base haskell-src hoppy-generator hoppy-runtime ]; description = "C++ FFI generator - Documentation"; - license = lib.licenses.agpl3; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licenses.agpl3Only; }) {}; "hoppy-generator" = callPackage @@ -132200,9 +132522,7 @@ self: { process temporary text ]; description = "C++ FFI generator - Code generator"; - license = lib.licenses.agpl3; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licenses.agpl3Only; }) {}; "hoppy-runtime" = callPackage @@ -132218,8 +132538,6 @@ self: { ]; description = "C++ FFI generator - Runtime support"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hoppy-std" = callPackage @@ -132234,8 +132552,6 @@ self: { ]; description = "C++ FFI generator - Standard library bindings"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hops" = callPackage @@ -132288,7 +132604,7 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "A language based on homotopy type theory with an interval type"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -132357,7 +132673,7 @@ self: { time transformers ]; description = "Haskell Open Sound Control"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hosc-json" = callPackage @@ -132456,7 +132772,7 @@ self: { attoparsec base bytestring data-default dns iproute network ]; description = "An dns server which is extremely easy to config"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133448,7 +133764,7 @@ self: { sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc"; libraryHaskellDepends = [ base vector ]; description = "A nice implementation of the k-Means algorithm"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -133976,7 +134292,7 @@ self: { base containers directory filepath megaparsec ]; description = "Conllu validating parser and utils"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -134577,6 +134893,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-tags" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc + , mtl, process, strict + }: + mkDerivation { + pname = "hs-tags"; + version = "0.1.5"; + sha256 = "0gy894sr2557a6pmvi99dkn03990r43ycxknryxym62z54bz1q8f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal containers directory filepath ghc mtl process strict + ]; + description = "Create tag files (ctags and etags) for Haskell code"; + license = lib.licenses.mit; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -134631,8 +134964,8 @@ self: { }: mkDerivation { pname = "hs-watchman"; - version = "0.0.0.3"; - sha256 = "1cqhl4gydk8i003p49cy7dcvhw0rgrc4j2l54271y4cqgkd8pkfi"; + version = "0.0.1.0"; + sha256 = "1550rfmvqgm1ak9n9kj1mv1vn7rfdangk8g9a40qwry5s4b0aihi"; libraryHaskellDepends = [ async base binary bytestring containers filepath network process temporary @@ -134801,7 +135134,7 @@ self: { libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base HUnit lens ]; description = "PID control loop"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "hsSqlite3" = callPackage @@ -134950,7 +135283,7 @@ self: { enableSeparateDataOutput = true; executableHaskellDepends = [ base Hclip HTTP process unix ]; description = "(ab)Use Google Translate as a speech synthesiser"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135113,7 +135446,7 @@ self: { transformers vector ]; description = "Haskell SuperCollider"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -135562,7 +135895,7 @@ self: { natural-transformation profunctors text unordered-containers vector ]; description = "Describe schemas for your Haskell data types"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "hschema-aeson" = callPackage @@ -135591,7 +135924,7 @@ self: { scientific text time unordered-containers vector ]; description = "Describe schemas for your Haskell data types"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "hschema-prettyprinter" = callPackage @@ -135609,7 +135942,7 @@ self: { vector ]; description = "Describe schemas for your Haskell data types"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "hschema-quickcheck" = callPackage @@ -135626,7 +135959,7 @@ self: { quickcheck-instances text unordered-containers vector ]; description = "Describe schemas for your Haskell data types"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "hsclock" = callPackage @@ -135837,7 +136170,7 @@ self: { libraryHaskellDepends = [ base containers network ]; librarySystemDepends = [ adns ]; description = "Asynchronous DNS Resolver"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -136004,7 +136337,7 @@ self: { sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q"; libraryHaskellDepends = [ base containers language-puppet text ]; description = "A small and ugly library that emulates the output of the puppet facter program"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136449,28 +136782,6 @@ self: { }) {}; "hslua" = callPackage - ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 - , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "hslua"; - version = "1.2.0"; - sha256 = "0a295zqpbrv8a2hw7msz5p7brlswag16sg08dyz399ij6b7q5x0h"; - configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; - libraryHaskellDepends = [ - base bytestring containers exceptions mtl text - ]; - librarySystemDepends = [ lua5_3 ]; - testHaskellDepends = [ - base bytestring containers exceptions mtl QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck text - ]; - description = "Bindings to Lua, an embeddable scripting language"; - license = lib.licenses.mit; - }) {inherit (pkgs) lua5_3;}; - - "hslua_1_3_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, lua5_3 , mtl, QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text @@ -136490,7 +136801,6 @@ self: { ]; description = "Bindings to Lua, an embeddable scripting language"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) lua5_3;}; "hslua-aeson" = callPackage @@ -136611,7 +136921,7 @@ self: { libraryHaskellDepends = [ base colour ]; testHaskellDepends = [ aeson base bytestring colour containers ]; description = "HSLuv conversion utility"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -136640,9 +136950,10 @@ self: { hydraPlatforms = lib.platforms.none; broken = true; }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; - jasper = null; inherit (pkgs) lcms; inherit (pkgs) libjpeg; - inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; - wmflite = null; inherit (pkgs) zlib;}; + inherit (pkgs) jasper; inherit (pkgs) lcms; + inherit (pkgs) libjpeg; inherit (pkgs) libpng; + inherit (pkgs) libxml2; tiff = null; wmflite = null; + inherit (pkgs) zlib;}; "hsmisc" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec @@ -136702,7 +137013,7 @@ self: { librarySystemDepends = [ libsndfile ]; libraryToolDepends = [ c2hs ]; description = "Haskell bindings for libsndfile"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) libsndfile;}; "hsndfile-storablevector" = callPackage @@ -136713,7 +137024,7 @@ self: { sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z"; libraryHaskellDepends = [ base hsndfile storablevector ]; description = "Haskell bindings for libsndfile (Data.StorableVector interface)"; - license = lib.licenses.lgpl2; + license = lib.licenses.lgpl2Only; }) {}; "hsndfile-vector" = callPackage @@ -136724,7 +137035,7 @@ self: { sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig"; libraryHaskellDepends = [ base hsndfile vector ]; description = "Haskell bindings for libsndfile (Data.Vector interface)"; - license = lib.licenses.lgpl2; + license = lib.licenses.lgpl2Only; }) {}; "hsnock" = callPackage @@ -137252,6 +137563,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-golden-aeson_0_9_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, hspec-core, HUnit, QuickCheck + , quickcheck-arbitrary-adt, random, silently, transformers + }: + mkDerivation { + pname = "hspec-golden-aeson"; + version = "0.9.0.0"; + sha256 = "1mj516xn6an2pkygfzm2418hbvaf8yvgwgvmpgpwrxqss87m3c84"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec HUnit + QuickCheck quickcheck-arbitrary-adt random transformers + ]; + testHaskellDepends = [ + aeson base directory hspec hspec-core QuickCheck + quickcheck-arbitrary-adt silently transformers + ]; + description = "Use tests to monitor changes in Aeson serialization"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-hashable" = callPackage ({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck , silently @@ -137658,8 +137991,8 @@ self: { }: mkDerivation { pname = "hspec-wai"; - version = "0.10.1"; - sha256 = "05jv0cz8r8bf63ma5byjb2gkj9vwgnls4n9mks99qc525n055ckz"; + version = "0.11.0"; + sha256 = "0fk23vrs5apjy11z47mply2kay3n193gnyrbb9fkpwvmxyhxlp0x"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive hspec-core hspec-expectations http-types QuickCheck text transformers wai @@ -137699,23 +138032,6 @@ self: { }) {}; "hspec-wai-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring - , case-insensitive, hspec, hspec-wai, template-haskell - }: - mkDerivation { - pname = "hspec-wai-json"; - version = "0.10.1"; - sha256 = "04mpqij446ki5l6xwi3bjmlf3ggjia2nzv8j62mdy6ick96dqwk6"; - libraryHaskellDepends = [ - aeson aeson-qq base bytestring case-insensitive hspec-wai - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-wai ]; - description = "Testing JSON APIs with hspec-wai"; - license = lib.licenses.mit; - }) {}; - - "hspec-wai-json_0_11_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell }: @@ -137730,7 +138046,6 @@ self: { testHaskellDepends = [ base hspec hspec-wai ]; description = "Testing JSON APIs with hspec-wai"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-webdriver" = callPackage @@ -137775,7 +138090,7 @@ self: { sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il"; libraryHaskellDepends = [ base hspec QuickCheckVariant ]; description = "Spec for testing properties for variant types"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -137866,7 +138181,7 @@ self: { test-framework-hunit ]; description = "The Haskell Stream Processor command line utility"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138162,18 +138477,6 @@ self: { }) {}; "hsshellscript" = callPackage - ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: - mkDerivation { - pname = "hsshellscript"; - version = "3.4.5"; - sha256 = "0d66gsm7s2j4f60cjca6fsddg4i1m3l6rcyq29ywskifhfaxbgvx"; - libraryHaskellDepends = [ base directory parsec random unix ]; - libraryToolDepends = [ c2hs ]; - description = "Haskell for Unix shell scripting tasks"; - license = "LGPL"; - }) {}; - - "hsshellscript_3_5_0" = callPackage ({ mkDerivation, base, c2hs, directory, parsec, random, unix }: mkDerivation { pname = "hsshellscript"; @@ -138183,7 +138486,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell for Unix shell scripting tasks"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; }) {}; "hssourceinfo" = callPackage @@ -138368,7 +138670,7 @@ self: { test-framework-quickcheck2 ]; description = "Distributed instant messaging over Tor"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -138396,7 +138698,7 @@ self: { executableHaskellDepends = [ base process ]; testHaskellDepends = [ async base ]; description = "A Tox protocol implementation in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -138843,7 +139145,7 @@ self: { base containers QuickCheck tasty tasty-quickcheck text transformers ]; description = "Equiprobable draw from publicly verifiable random data"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "htlset" = callPackage @@ -138891,7 +139193,7 @@ self: { base bytestring doctest doctest-discover hlint QuickCheck ]; description = "Determine character encoding of HTML documents/fragments"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139262,7 +139564,7 @@ self: { htsn-common hxt MissingH network process tasty tasty-hunit unix ]; description = "Parse XML files from The Sports Network feed"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139277,7 +139579,7 @@ self: { ansi-terminal base hslogger transformers ]; description = "Display/logging facilities used by both htsn and htsn-import"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "htsn-import" = callPackage @@ -139306,7 +139608,7 @@ self: { split tasty tasty-hunit time transformers tuple ]; description = "Import XML files from The Sports Network into an RDBMS"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -139340,18 +139642,16 @@ self: { ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat , bytestring, containers, cookie, hashable, hspec, hspec-discover , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged - , text, time-compat, unordered-containers, uuid-types + , text, time-compat, transformers, unordered-containers, uuid-types }: mkDerivation { pname = "http-api-data"; - version = "0.4.1.1"; - sha256 = "1s93m2vh4c1p073xasvknnj3czbf8xsyg48kyznr4jwfhzi17anh"; - revision = "1"; - editedCabalFile = "1dshqb1140nj4h8d750s97gmzb2rk0ppr1rakvqxy1r79mg3m2wr"; + version = "0.4.2"; + sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat - unordered-containers uuid-types + transformers unordered-containers uuid-types ]; testHaskellDepends = [ base base-compat bytestring cookie hspec HUnit nats QuickCheck @@ -140010,30 +140310,6 @@ self: { }) {}; "http-link-header" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-conversion, criterion, directory, errors, hspec - , hspec-attoparsec, http-api-data, network-uri, QuickCheck, text - , transformers - }: - mkDerivation { - pname = "http-link-header"; - version = "1.0.3.1"; - sha256 = "0b9a3kax6zvn8aaflys63lanqan65hsv0dr8vwhbpbhyvxrxn9ns"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion errors - http-api-data network-uri text - ]; - testHaskellDepends = [ - base hspec hspec-attoparsec QuickCheck text - ]; - benchmarkHaskellDepends = [ - base criterion directory network-uri text transformers - ]; - description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; - license = lib.licenses.publicDomain; - }) {}; - - "http-link-header_1_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, directory , errors, hspec, hspec-attoparsec, http-api-data, network-uri , QuickCheck, text, transformers @@ -140055,7 +140331,6 @@ self: { ]; description = "A parser and writer for the HTTP Link header per RFC 5988"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "http-listen" = callPackage @@ -140476,39 +140751,6 @@ self: { }) {}; "http2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base - , base16-bytestring, bytestring, case-insensitive, containers - , directory, doctest, filepath, gauge, Glob, heaps, hspec - , http-types, mwc-random, network, network-byte-order, psqueues - , stm, text, time-manager, unordered-containers, vector - }: - mkDerivation { - pname = "http2"; - version = "2.0.5"; - sha256 = "1rg6dnkx2yxcdp87r1vdpyxacqv7jgxiq3bb1hjz45v5jk1xj676"; - revision = "1"; - editedCabalFile = "0xxi7gcldh3fvnh98khw9f2vm5w85sakbb6165s779nkvq7p8ak2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring case-insensitive containers http-types - network network-byte-order psqueues stm time-manager - ]; - testHaskellDepends = [ - aeson aeson-pretty array base base16-bytestring bytestring - case-insensitive containers directory doctest filepath Glob hspec - http-types network network-byte-order psqueues stm text - time-manager unordered-containers vector - ]; - benchmarkHaskellDepends = [ - array base bytestring case-insensitive containers gauge heaps - mwc-random network-byte-order psqueues stm - ]; - description = "HTTP/2 library"; - license = lib.licenses.bsd3; - }) {}; - - "http2_2_0_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base , base16-bytestring, bytestring, case-insensitive, containers , directory, doctest, filepath, gauge, Glob, heaps, hspec @@ -140537,7 +140779,6 @@ self: { ]; description = "HTTP/2 library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http2-client" = callPackage @@ -140632,6 +140873,8 @@ self: { ]; description = "Encoders based on `proto3-wire` for gRPC over HTTP2"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "http2-grpc-types" = callPackage @@ -140697,7 +140940,7 @@ self: { base directory filepath functor-infix text ]; description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets."; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -140760,7 +141003,7 @@ self: { ]; testSystemDepends = [ tvm_runtime ]; description = "Bindings for TVM machine learning framework"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {tvm_runtime = null;}; @@ -141324,7 +141567,7 @@ self: { ]; executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -141500,7 +141743,7 @@ self: { sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv"; libraryHaskellDepends = [ base hvega text ]; description = "Theme for hvega"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "hw-aeson" = callPackage @@ -141511,8 +141754,8 @@ self: { pname = "hw-aeson"; version = "0.1.1.0"; sha256 = "0d50yghgnxhynbm6w5kgkhgr8xgnghr8g1xn7zf0p9ax8dxkdy00"; - revision = "1"; - editedCabalFile = "0akwsfw024i8i8w8y1h2wdp9vqd7ws5jfyb5v5d9yckjk3sa2wn1"; + revision = "2"; + editedCabalFile = "062g7zwbp9csgcbpbbyg6ckb8zhkx1kqk5dsms36fmx95dq4zl5j"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base doctest doctest-discover hedgehog hspec @@ -141580,6 +141823,8 @@ self: { pname = "hw-balancedparens"; version = "0.4.1.1"; sha256 = "16v36fj5aawnx6glarzljl3yb93zkn06ij5cg40zba5rp8jhpg7z"; + revision = "1"; + editedCabalFile = "0jh79y6wl0ml4fc59icbg35nvcz7zi0fqbbg0p6y7nkxnhv4yc0j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141614,8 +141859,8 @@ self: { pname = "hw-bits"; version = "0.7.2.1"; sha256 = "18l9r0yhddkzgbc2vvk0qr9brb5ih25zjfga3bddb5j8gpaaq65q"; - revision = "1"; - editedCabalFile = "14y67p3rsj97rzlh2cw7iy04gb6cfa977bjbr35vgkav0skbigbn"; + revision = "2"; + editedCabalFile = "1almm4nl56gf99wys1kzalqcz0dkaih0pgxsyqv4q1j1w3ggfmfq"; libraryHaskellDepends = [ base bitvec bytestring deepseq hw-int hw-prim hw-string-parse vector @@ -141663,6 +141908,8 @@ self: { pname = "hw-conduit"; version = "0.2.1.0"; sha256 = "1xnkkpqcgyii7f16jjh2k2qh4ydpsff5q2xnggyg4jf7m69yrih2"; + revision = "1"; + editedCabalFile = "1rmdwb4a7ax9yadj4xv63n582vsmk84h03qkr6npj9b9gw4qw6i3"; libraryHaskellDepends = [ array base bytestring conduit conduit-combinators time transformers unliftio-core word8 @@ -141701,6 +141948,8 @@ self: { pname = "hw-diagnostics"; version = "0.0.1.0"; sha256 = "111g54c5bhgjii6vbyb116bg3dxywa9l693r8xjjrxpamzvi0avj"; + revision = "1"; + editedCabalFile = "04qpkr54wkb99hdfzk6gxhi6ak5lc564jzab1cc7675s7lsj1nji"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest doctest-discover ]; testToolDepends = [ doctest-discover ]; @@ -141720,8 +141969,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; - revision = "2"; - editedCabalFile = "1l7aww6nci05ns7hnk46r20as3xy1j0s5fxsrb5w0x9y2kwvqj61"; + revision = "3"; + editedCabalFile = "066vlpy361f6r5k74b3myi6lc2g8lxm7cz23i5hhyi319yjp1jxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141761,8 +142010,8 @@ self: { pname = "hw-dump"; version = "0.1.1.0"; sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; - revision = "2"; - editedCabalFile = "0p6cbijds7vc8bx9rb8s8bwr9dp4qc91idmd64llgz06d9kmvkcs"; + revision = "3"; + editedCabalFile = "16wpfpmxp3r1nrzfmcihzfcfhaiwrlq7x7z9kf68aib5zqmdxzwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141796,8 +142045,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.0"; sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; - revision = "2"; - editedCabalFile = "0l7h7pr6gpq0xnp4w003q3dxw7pmv2d6kpx2iqfc3nzzpa562ivv"; + revision = "3"; + editedCabalFile = "1g6w3j4azxvikiycjnb4rjsaw8pyica3m17yhsrxq24pms4n35pl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141833,6 +142082,8 @@ self: { pname = "hw-excess"; version = "0.2.3.0"; sha256 = "0xiyf3xyg6f4kgkils9ycx6q0qcsbd6rw4m9lizw9295mnp05s3g"; + revision = "1"; + editedCabalFile = "0qq8svkn9365vdbb0y3y4m2pdklsrf6z3a1m0kyfmbr0vphza369"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -141856,6 +142107,8 @@ self: { pname = "hw-fingertree"; version = "0.1.2.0"; sha256 = "0b1aff5aa9ifapyf2qvqggxfm36x5w7l7c37bfy9qdll264pdh0i"; + revision = "1"; + editedCabalFile = "0hg9hnga0d15a5md67q7xl53kgp34hwvl4aw9s8xkjm4fs7a54z9"; libraryHaskellDepends = [ base deepseq hw-prim ]; testHaskellDepends = [ base deepseq doctest doctest-discover hedgehog hspec @@ -141875,6 +142128,8 @@ self: { pname = "hw-fingertree-strict"; version = "0.1.2.0"; sha256 = "1zhh694m8hbin7059ys8c6sqjvyfsazcsp0jxqg59w5ypqjznzca"; + revision = "1"; + editedCabalFile = "0vr8xqvwihg3j83bqfhcqlnlpdq7k2v6kkx1xly7fdjw2hcwgkhl"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base doctest doctest-discover hedgehog hspec HUnit @@ -141893,6 +142148,8 @@ self: { pname = "hw-hedgehog"; version = "0.1.1.0"; sha256 = "0a2pic2h983kdkai68wabclzwjbk5i9vz229jlwvs0hyw6b0mzz9"; + revision = "1"; + editedCabalFile = "1fwgxwbfz6yfj6xfl9471q7fpsckm2wvpb8wxwb32c3x5122ly5v"; libraryHaskellDepends = [ base hedgehog vector ]; testHaskellDepends = [ base doctest doctest-discover ]; testToolDepends = [ doctest-discover ]; @@ -141908,6 +142165,8 @@ self: { pname = "hw-hspec-hedgehog"; version = "0.1.1.0"; sha256 = "04r30hb4664yciwfl3kyx0xn6sqc6abwhavb4wxiaas8b4px9kyn"; + revision = "2"; + editedCabalFile = "16v3dcpm51m8g2va85jfnbxqyc6dds2nazyd31080fa4804a90wz"; libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit transformers ]; @@ -141927,6 +142186,8 @@ self: { pname = "hw-int"; version = "0.0.2.0"; sha256 = "13ifa28b12hiibhmwas5hn3dmmiz2rihlc837hhii0z1ng03s360"; + revision = "1"; + editedCabalFile = "13vc1hvyil8qql2d6ryi2m4a6snhm2v8vghh8s9hr4qx6dzh4irv"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest doctest-discover hedgehog hspec hw-hedgehog @@ -141947,8 +142208,8 @@ self: { pname = "hw-ip"; version = "2.4.2.0"; sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx"; - revision = "1"; - editedCabalFile = "19jbgqsmc71apmr6z0n0a2hgfhv9r0bsqa2x55r8grpyr91blpmw"; + revision = "2"; + editedCabalFile = "19x9s7hdch768annsss3paz7sqxqr3flz01wky1vijf18abakk3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -141982,6 +142243,8 @@ self: { pname = "hw-json"; version = "1.3.2.2"; sha256 = "03h5zv94ndsz4vh0jql8rg8pl95rbf8xkyzvr3r55i3kpmb85sbg"; + revision = "1"; + editedCabalFile = "1ivm89r5kqflpsayl941xq0q3izjklakfqzr2f6nl78wpa3ykkiq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142025,8 +142288,8 @@ self: { pname = "hw-json-lens"; version = "0.2.1.0"; sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6"; - revision = "1"; - editedCabalFile = "1gxqds8889dzkfncnlncjb7avw4zm7dzj3063mq4rsb05gyrplhz"; + revision = "2"; + editedCabalFile = "0n6cxjr2r7w2i735c1dz2cflgvbgcdspzzzg8w3knhl1kgiyi2ih"; libraryHaskellDepends = [ aeson base bytestring containers hw-json lens scientific text word8 ]; @@ -142053,8 +142316,8 @@ self: { pname = "hw-json-simd"; version = "0.1.1.0"; sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n"; - revision = "1"; - editedCabalFile = "047s5clxvi3l9x80lnf7nrv7myxnvqmh8y7syb2ryv3m549lyv2q"; + revision = "2"; + editedCabalFile = "1amvva0pqidwcjdd4snywm8m614ygc2zn6036fh4v1ps20pyq2l9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; @@ -142084,8 +142347,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.0"; sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; - revision = "3"; - editedCabalFile = "0zmq1gb9znb84d9igppww6295glnhg5b6xlgadr435cddp5zmhpx"; + revision = "4"; + editedCabalFile = "0mpjnc99yi474h9qvgg48kjcl3hxxhl58gar72bzcf5rx12pyn9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142124,8 +142387,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.3.1"; sha256 = "1mpsspp6ba2zqv38a0rcv93mbwb1rb8snmxklf32g02djj8b4vir"; - revision = "1"; - editedCabalFile = "0gdvwhj2jmd8dm1yi3kzs0lyw5r4bk7c50s21z1600v36bmzpdm1"; + revision = "2"; + editedCabalFile = "1qc0nxcahlc0zn4ycfxhhj1qplxc0r8qh20zmq4m2n7wyghlb3hc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142239,6 +142502,8 @@ self: { pname = "hw-mquery"; version = "0.2.1.0"; sha256 = "1qhd8jcwffr57mjraw0g3xj9kb0jd75ybqaj1sbxw31lc2hr9w9j"; + revision = "1"; + editedCabalFile = "15jji7wzx2ws58nqd965r6bycdgl09qlp4rrcd81y57mq24h27mb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base dlist lens ]; @@ -142262,8 +142527,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.0"; sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; - revision = "2"; - editedCabalFile = "0hlmi9w5z7j9ycqjf5avx3b09yglcbx8krypv274j2qrm5fzypr4"; + revision = "3"; + editedCabalFile = "1zn1aqkyzsa0mk9b7igvnmxas0907h9if96c9km1gjrndnjvxkyd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142294,6 +142559,8 @@ self: { pname = "hw-parser"; version = "0.1.1.0"; sha256 = "1zsbw725mw3fn4814qricqanbvx1kgbnqvgwijqgfv8jz7yf5gxa"; + revision = "1"; + editedCabalFile = "0yh06ypgvag83h32czz8dpsrc9a4w0pqy3m4jvds8sbgnj45havs"; libraryHaskellDepends = [ attoparsec base bytestring hw-prim text ]; @@ -142330,6 +142597,8 @@ self: { pname = "hw-prim"; version = "0.6.3.0"; sha256 = "0gqn7s0ki9x951n5whyh0pkcbbqz4kpcn80xxpsv1c0v34946xv7"; + revision = "1"; + editedCabalFile = "1z3fcff42xq0j430q72ncjv6zc0zvzzq94ifh06m342z0x8imv83"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap transformers unliftio-core vector @@ -142381,8 +142650,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.0"; sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; - revision = "2"; - editedCabalFile = "03lc8cgijr4ysz0i9c4pjhas4cd5ifxs400cr0nbasjvmz27hr3c"; + revision = "3"; + editedCabalFile = "14awklhpnw53jalxfq0446aidndmanpnwjxp1136imjv7p270pvn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142418,8 +142687,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.4.1"; sha256 = "1s0lqwq0rjmjca6lshfnxqi0c7bzlyflhm45xw1xa9pvqci8439h"; - revision = "1"; - editedCabalFile = "0flhrgqgwgxwk6ik3k7322dn8ybyjzh6g1csg2d9bafldj7akcwv"; + revision = "2"; + editedCabalFile = "174a3qhkdam5m5rqwb9qzapg2xkd8vb0lirkz2d0xb4xxc0vzcy7"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -142447,6 +142716,8 @@ self: { pname = "hw-simd"; version = "0.1.2.0"; sha256 = "1r202xzqprb1v8ajd9n6ixckjfdy17mn8jibx4j2xgknx595v24f"; + revision = "1"; + editedCabalFile = "0vl82knb53njkp7n6jrwp4fpipfkc7s4lsi2cqd6w2xkgmlc0rxv"; libraryHaskellDepends = [ base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect hw-rankselect-base transformers vector @@ -142470,6 +142741,36 @@ self: { broken = true; }) {}; + "hw-simd-cli" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, containers, deepseq + , directory, doctest, doctest-discover, generic-lens, hw-bits + , hw-prim, hw-rankselect-base, hw-simd, lens, mmap, mtl + , optparse-applicative, resourcet, vector + }: + mkDerivation { + pname = "hw-simd-cli"; + version = "0.0.0.1"; + sha256 = "0fqkrhjrflkiacq1qfnfiy4rk6pg47j72d0ni0jwfdn6ajx22y90"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bits-extra bytestring containers deepseq directory + generic-lens hw-bits hw-prim hw-rankselect-base hw-simd lens mmap + mtl optparse-applicative resourcet vector + ]; + executableHaskellDepends = [ + base bits-extra bytestring containers deepseq directory + generic-lens hw-bits hw-prim hw-rankselect-base hw-simd lens mmap + mtl optparse-applicative resourcet vector + ]; + testHaskellDepends = [ base bits-extra doctest doctest-discover ]; + testToolDepends = [ doctest-discover ]; + description = "SIMD library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hw-streams" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, doctest , doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -142480,6 +142781,8 @@ self: { pname = "hw-streams"; version = "0.0.1.0"; sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5"; + revision = "1"; + editedCabalFile = "0fib78604y6cjchah7zhjsfli820ks51qq7yjv81wwbckjjkpw5v"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive transformers vector @@ -142612,8 +142915,8 @@ self: { pname = "hw-xml"; version = "0.5.1.0"; sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; - revision = "3"; - editedCabalFile = "0b1lkhc6qf5vqafn69bid01k1hi043k7yrpl7pbxfrn154w8afpm"; + revision = "4"; + editedCabalFile = "1hnbcr376pncgzzrbilffxwz5sk67c4d9hzjix3xa94cja09w1ny"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -142703,7 +143006,7 @@ self: { executableToolDepends = [ alex happy ]; testHaskellDepends = [ array base Cabal containers mtl ]; description = "An implementation of Neil D. Jones' While language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -142796,7 +143099,7 @@ self: { containers hedgehog hspec magic-wormhole protolude saltine text ]; description = "magic-wormhole client"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143339,7 +143642,7 @@ self: { ]; testHaskellDepends = [ base Cabal containers mtl QuickCheck ]; description = "An alternate Prelude"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -143961,7 +144264,7 @@ self: { scotty stm stm-conduit text transformers ]; description = "A haskell wrapper for the Zulip API"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144089,7 +144392,7 @@ self: { attoparsec base bytestring network unix ]; description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144122,7 +144425,7 @@ self: { sha256 = "0yrdh4y0ssldg0lmrbr6yk0zg2sihirp3mnh20dvg3m887kdhrj1"; libraryHaskellDepends = [ base dbus directory unix xdg-basedir ]; description = "A simple uncomplete ibus api"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "ical" = callPackage @@ -144154,8 +144457,8 @@ self: { }: mkDerivation { pname = "ice40-prim"; - version = "0.2.0.0"; - sha256 = "02dm3zqq24phhxis471gp91figkazpwpz0ndhazp14jajxvka0cd"; + version = "0.3.0.0"; + sha256 = "0qrpaqmgas3czhw2ppc1f1m4m7y2hc93za2g0rvfw80ncbrkl83s"; libraryHaskellDepends = [ base Cabal clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise interpolate @@ -144813,7 +145116,7 @@ self: { transformers wl-pprint-text ]; description = "An keyboard-driven interactive graph editor"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -144833,7 +145136,7 @@ self: { libraryPkgconfigDepends = [ ige-mac-integration ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Bindings for the Gtk/OS X integration library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {ige-mac-integration = null;}; @@ -145679,7 +145982,7 @@ self: { parsec richreports split staticanalysis text uxadt ]; description = "Multi-platform parser analyzer and generator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -145770,7 +146073,7 @@ self: { testHaskellDepends = [ base hspec parsec ]; benchmarkHaskellDepends = [ base criterion parsec ]; description = "A math-inspired programmatic 2D & 3D CAD system"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "implicit-hie" = callPackage @@ -145829,7 +146132,7 @@ self: { editedCabalFile = "02x6cmbxyw26y5azhjrx8461vngsj27l0a255xvhg2pl25zwfbfs"; libraryHaskellDepends = [ base mtl time transformers ]; description = "A logging framework built around implicit parameters"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146204,7 +146507,7 @@ self: { base bytestring criterion deepseq monoid-subclasses text ]; description = "Generic parser library capable of providing partial results from partial input"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "incremental-sat-solver" = callPackage @@ -146614,7 +146917,7 @@ self: { libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; description = "Non-contiguous interval data types with potentially infinite ranges"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146695,7 +146998,7 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative parsec ]; description = "Type inference and checker for JavaScript (experimental)"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146775,33 +147078,6 @@ self: { }) {}; "influxdb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, raw-strings-qq - , scientific, tagged, tasty, tasty-hunit, template-haskell, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.9.1"; - sha256 = "1g8lj56xi61g0vfindiz4lmnypjh2bzp2nm92dmh2d4mlfhrh78y"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ - base containers doctest lens raw-strings-qq tasty tasty-hunit - template-haskell time vector - ]; - description = "InfluxDB client library for Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "influxdb_1_9_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, raw-strings-qq @@ -146826,7 +147102,6 @@ self: { ]; description = "InfluxDB client library for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "informative" = callPackage @@ -146854,7 +147129,7 @@ self: { time-locale-compat yesod yesod-auth yesod-core yesod-form ]; description = "A yesod subsite serving a wiki"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -146973,7 +147248,7 @@ self: { sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl"; libraryHaskellDepends = [ base ]; description = "Monadic functions with injected parameters"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147175,7 +147450,7 @@ self: { isExecutable = true; executableHaskellDepends = [ aether base text ]; description = "Console client for encyclopedias"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {aether = null;}; @@ -147285,8 +147560,8 @@ self: { }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.6.0.0"; - sha256 = "0b27fvvq1xxici2w33m823xnj7fwq1irjhwrcaav1khz3h93qv85"; + version = "0.6.2.0"; + sha256 = "1yvxsz1b9qrhyw6zamqs5254mpba3vijhach1n424mqa6aq1935s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147449,7 +147724,7 @@ self: { http-types network scotty text wai wai-extra ]; description = "Basic HTTP gateway to save articles to Instapaper"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147475,7 +147750,7 @@ self: { sha256 = "1fc3vgxxzk6rw0y6d40jiyrc66fd1ig7nk4bdmfn1q595q5iwnz3"; libraryHaskellDepends = [ array base containers music-diatonic ]; description = "Render Instrument Chords"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "int-cast" = callPackage @@ -147640,7 +147915,7 @@ self: { vector ]; description = "Integrate different assays"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -147915,7 +148190,7 @@ self: { test-framework-hunit ]; description = "GHC preprocessor and library to enable variable interpolation in strings"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148101,7 +148376,7 @@ self: { libraryHaskellDepends = [ base deepseq fingertree ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Intervals with adherences"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148173,7 +148448,7 @@ self: { ]; executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) ncurses;}; "intrinsic-superclasses" = callPackage @@ -148592,8 +148867,8 @@ self: { pname = "io-streams"; version = "1.5.2.0"; sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; - revision = "1"; - editedCabalFile = "1dcadj5gv1m2yy97zsbq5x67vsblp8gy58a0kl5di9vkbgrcw46n"; + revision = "2"; + editedCabalFile = "1mr0y8m6xdkgvvk76n7pn1airqzgdp8kd8x6jd9w97iy5wjp14q7"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -148862,7 +149137,7 @@ self: { unix ]; description = "interactive patch editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -148902,23 +149177,23 @@ self: { "ipfs" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, directory-tree - , doctest, envy, flow, Glob, http-media, ip, lens, lens-aeson - , monad-logger, QuickCheck, regex-compat, rio, servant + , doctest, envy, flow, Glob, http-media, lens, lens-aeson + , monad-logger, network-ip, QuickCheck, regex-compat, rio, servant , servant-client, servant-multipart, servant-server, swagger2, text , vector, yaml }: mkDerivation { pname = "ipfs"; - version = "1.3.0.0"; - sha256 = "1ag3rx7p4gp39rhgwap083ny5x00z5p8aks1lwvrsmdlvn83ym6l"; + version = "1.3.0.3"; + sha256 = "08g1lvh7w46qsg80h5nm3r333zbhl2q4shnrm5jann4p3g5ii08x"; libraryHaskellDepends = [ - aeson base bytestring envy flow Glob http-media ip lens - monad-logger regex-compat rio servant servant-client + aeson base bytestring envy flow Glob http-media lens monad-logger + network-ip regex-compat rio servant servant-client servant-multipart servant-server swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow - Glob http-media ip lens lens-aeson monad-logger QuickCheck + Glob http-media lens lens-aeson monad-logger network-ip QuickCheck regex-compat rio servant servant-client servant-multipart servant-server swagger2 text vector yaml ]; @@ -149443,7 +149718,7 @@ self: { sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr"; libraryHaskellDepends = [ aeson base http-client lens text wreq ]; description = "Iron.IO message queueing client library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -149756,7 +150031,7 @@ self: { base containers hspec megaparsec QuickCheck ]; description = "Isotopic masses and relative abundances"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150540,7 +150815,7 @@ self: { haskell98 hoauth mtl old-locale parsec time utf8-string xml ]; description = "CLI (command line interface) to YQL"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150637,7 +150912,7 @@ self: { sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd"; libraryHaskellDepends = [ base hosc ]; description = "control JackMiniMix"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -150768,7 +151043,7 @@ self: { ]; executableHaskellDepends = [ base boxes directory filepath ]; description = "Export sheet music and audio from Windows/Mac app Jammit"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "japanese-calendar" = callPackage @@ -151115,7 +151390,7 @@ self: { ]; executableHaskellDepends = [ base mtl network ]; description = "Implementation of Java Debug Interface"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -151227,8 +151502,8 @@ self: { ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.3.3"; - sha256 = "0sgm9x2bdwazhj598aix2xyshjy6cvai4sgq5zz8gxv2l6prfbr7"; + version = "1.3.4"; + sha256 = "0rrqaibgafbynrlcsp7f7hkzgkp2gix7ji2hkpgpby6fvp6965fh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -151572,8 +151847,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.9.0"; - sha256 = "1dnkyzs7kk2lxz2kj3x6v8w1lypsr0rppyn78s7w5sr89y924752"; + version = "0.9.1"; + sha256 = "0dy076k7zrg9mn4ll73k5p68r1dwzj9wqm4zn7w22py6wx06xg9p"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite memory mtl text time transformers transformers-compat @@ -152907,7 +153182,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "JSON-RPC 2.0 server over a Conduit."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -153077,22 +153352,21 @@ self: { "juandelacosa" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring - , data-default-class, docopt, entropy, fast-logger, http-types - , interpolatedstring-perl6, mtl, mysql, mysql-simple, network - , resource-pool, scotty, text, unix, wai, wai-extra - , wai-middleware-static, warp + , data-default-class, entropy, fast-logger, http-types, mtl, mysql + , mysql-simple, network, optparse-applicative, resource-pool + , scotty, text, unix, wai, wai-extra, wai-middleware-static, warp }: mkDerivation { pname = "juandelacosa"; - version = "0.1.1"; - sha256 = "060zq739i3xhr7w448p460r7x3jyyzf7pn61abp7f9g8vjn6vqw7"; + version = "0.1.2"; + sha256 = "0lrqklpff24cklsdrlfym7ryvszyripjkwsb0m8dn7vab9yqswn2"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base base64-bytestring bytestring data-default-class docopt entropy - fast-logger http-types interpolatedstring-perl6 mtl mysql - mysql-simple network resource-pool scotty text unix wai wai-extra + base base64-bytestring bytestring data-default-class entropy + fast-logger http-types mtl mysql mysql-simple network + optparse-applicative resource-pool scotty text unix wai wai-extra wai-middleware-static warp ]; description = "Manage users in MariaDB >= 10.1.1"; @@ -153124,7 +153398,7 @@ self: { optparse-applicative text unordered-containers yaml ]; description = "Tableau-based theorem prover for justification logic"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154336,7 +154610,7 @@ self: { process ]; description = "Build profiles for kdesrc-build"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -154356,7 +154630,7 @@ self: { process ]; description = "Build profiles for kdesrc-build"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "kdt" = callPackage @@ -154834,8 +155108,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.1.1.3"; - sha256 = "0p0zm3dxjcmckwif966cnsn8qb667mxd8yh7wx56nl7jsxz90cw1"; + version = "0.2.0.0"; + sha256 = "1wgbjk1iyb4njcr957lipxnypk3c08c98v9czk3xld9dqzq9xxf1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -155122,7 +155396,7 @@ self: { unix unix-compat utf8-string wai warp zxcvbn-c ]; description = "back up a secret key securely to the cloud"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155217,7 +155491,7 @@ self: { parsec text transformers unix unordered-containers yaml ]; description = "Command-line file tagging and organization tool"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -155365,6 +155639,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "kind-generics-th_0_2_2_2" = callPackage + ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "kind-generics-th"; + version = "0.2.2.2"; + sha256 = "1lgz7wvz5jvq65r7zmymcfx3hwskw2b45a3vfwj0pgnddpjmh9n4"; + libraryHaskellDepends = [ + base ghc-prim kind-generics template-haskell th-abstraction + ]; + testHaskellDepends = [ base kind-generics template-haskell ]; + description = "Template Haskell support for generating `GenericK` instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "kinds" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -156525,7 +156816,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec ]; description = "Untyped Lambda calculus to JavaScript compiler"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157125,7 +157416,7 @@ self: { base clash-prelude Lambdaya template-haskell ]; description = "Fpga bus core and serialization for RedPitaya"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157202,7 +157493,7 @@ self: { sha256 = "1nmyirpf07q7lrgfdqxwaspa173a2g3077gy9k7rpviw8pg2az0w"; libraryHaskellDepends = [ base bytestring http-streams Mapping ]; description = "A Lisp"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -157629,7 +157920,7 @@ self: { megaparsec prettyprinter QuickCheck split text time ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "language-dockerfile" = callPackage @@ -157657,7 +157948,7 @@ self: { transformers unordered-containers yaml ]; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158155,7 +158446,7 @@ self: { grammatical-parsers prettyprinter tasty tasty-hunit text ]; description = "Parser, pretty-printer, and more for the Oberon programming language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -158673,8 +158964,8 @@ self: { ({ mkDerivation, base, liblapack, netlib-ffi }: mkDerivation { pname = "lapack-ffi"; - version = "0.0.2"; - sha256 = "11759avf0kzkqy4s24kn556j93l10x28njpg6h14y915pdl35dyl"; + version = "0.0.3"; + sha256 = "1qj7l2maka7z0gnkb59kl9qnyql12g5akmmqwsjvcnhbywgiv1yr"; libraryHaskellDepends = [ base netlib-ffi ]; libraryPkgconfigDepends = [ liblapack ]; description = "Auto-generated interface to Fortran LAPACK"; @@ -158770,7 +159061,7 @@ self: { HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time ]; description = "Tool to track security alerts on LWN"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159266,7 +159557,7 @@ self: { template-haskell vector-space ]; description = "Identifiers for not-yet-computed values"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159288,7 +159579,7 @@ self: { temporary ]; description = "Storing computed values for re-use when the same program runs again"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159332,7 +159623,7 @@ self: { testHaskellDepends = [ base doctest lens ]; testToolDepends = [ markdown-unlit ]; description = "Lazy-Spined Monadic Priority Queues"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -159580,7 +159871,7 @@ self: { base blaze-html directory filepath pandoc split ]; description = "A simple portfolio generator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160658,7 +160949,7 @@ self: { semigroups terminal-progress-bar text ]; description = "frugal issue tracker"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -160878,7 +161169,7 @@ self: { libraryHaskellDepends = [ base containers doctest lattices ]; testHaskellDepends = [ base doctest QuickCheck ]; description = "L-Fuzzy Set Theory implementation in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161217,8 +161508,8 @@ self: { pname = "libfuse3"; version = "0.1.2.0"; sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb"; - revision = "1"; - editedCabalFile = "0gnq6aav00xx7dc8am87q2n6xw7cf7jm29g5bq5n1b72gqs91rzf"; + revision = "2"; + editedCabalFile = "0fbf1zrw5i3jag6yrzxsxcx82dag7a3mw5rmz6ab6v3gm9w8m9b2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161283,7 +161574,7 @@ self: { base bytestring ghc ghc-paths hspec mtl syb ]; description = "Backend for text editors to provide better Haskell editing support"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161430,7 +161721,7 @@ self: { test-framework-th text time transformers ]; description = "Prelude based on protolude for GHC 8 and beyond"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161508,7 +161799,7 @@ self: { test-framework-th text time transformers ]; description = "Prelude based on protolude for GHC 8 and beyond"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161551,7 +161842,7 @@ self: { base directory errors protolude tasty tasty-hunit text ]; description = "Bindings to the nix package manager"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -161605,7 +161896,7 @@ self: { executableHaskellDepends = [ base bytestring time ]; testHaskellDepends = [ base ]; description = "Bindings to liboath"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {liboath = null; oath = null;}; @@ -161637,7 +161928,7 @@ self: { librarySystemDepends = [ pafe ]; testHaskellDepends = [ base bytestring iconv transformers ]; description = "Wrapper for libpafe"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {pafe = null;}; @@ -161895,7 +162186,7 @@ self: { base HUnit network test-framework test-framework-hunit ]; description = "Haskell bindings for libsystemd-daemon"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {libsystemd-daemon = null; systemd-daemon = null;}; @@ -161930,7 +162221,7 @@ self: { librarySystemDepends = [ taglib ]; libraryPkgconfigDepends = [ taglib ]; description = "Binding to TagLib C library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) taglib;}; @@ -162667,7 +162958,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Convert newlines in text"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "line-drawing" = callPackage @@ -162694,7 +162985,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Display the number of bytes of each line"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "line2pdf" = callPackage @@ -162850,7 +163141,7 @@ self: { tasty-smallcheck ]; description = "A simple library for linear codes (coding theory, error correction)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -162909,7 +163200,7 @@ self: { libraryHaskellDepends = [ base bytestring network ]; testHaskellDepends = [ base hspec network tasty-hspec ]; description = "Typed sockets"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "linear-tests" = callPackage @@ -162967,7 +163258,7 @@ self: { semigroups tagged transformers vector vector-space ]; description = "Native, complete, matrix-free linear algebra"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163323,7 +163614,7 @@ self: { ]; libraryPkgconfigDepends = [ blkid ]; description = "Linux libblkid"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {blkid = null;}; @@ -163555,7 +163846,9 @@ self: { ]; description = "Labeled File System interface for LIO"; license = "GPL"; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "lio-simple" = callPackage @@ -163579,7 +163872,7 @@ self: { simple-templates text ]; description = "LIO support for the Simple web framework"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -163994,7 +164287,7 @@ self: { ansi-terminal base data-default hspec stm terminal-size vty ]; description = "A simple list prompt UI for the terminal"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -164022,7 +164315,7 @@ self: { MissingH tasty tasty-hunit tasty-quickcheck ]; description = "List all remote forwards for mail accounts stored in a SQL database"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -165236,7 +165529,7 @@ self: { sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd"; libraryHaskellDepends = [ base containers text transformers ]; description = "Library for localization (l10n)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "localize" = callPackage @@ -166124,7 +166417,7 @@ self: { ]; testHaskellDepends = [ base test-framework ]; description = "A library for lattice cryptography"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166146,7 +166439,7 @@ self: { test-framework time ]; description = "Lattice-based cryptographic applications using ."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166164,7 +166457,7 @@ self: { MonadRandom split statistics ]; description = "A library for benchmarking ."; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166187,7 +166480,7 @@ self: { text-format transformers ]; description = "Calculus for LOL (λω language)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166208,7 +166501,7 @@ self: { testHaskellDepends = [ base lol lol-apps test-framework ]; benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ]; description = "A fast C++ backend for ."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166229,7 +166522,7 @@ self: { testHaskellDepends = [ base lol-tests ]; benchmarkHaskellDepends = [ base DRBG lol lol-benches ]; description = "A repa backend for ."; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166250,7 +166543,7 @@ self: { ]; testHaskellDepends = [ base lol test-framework ]; description = "A library for testing ."; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166276,7 +166569,7 @@ self: { monad-classes tasty tasty-hunit text text-format transformers ]; description = "Type inferencer for LOL (λω language)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -166584,7 +166877,7 @@ self: { librarySystemDepends = [ loris ]; libraryToolDepends = [ c2hs ]; description = "interface to Loris API"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {loris = null;}; @@ -166703,7 +166996,7 @@ self: { vector ]; description = "An EDSL for diagrams based based on linear constraints"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "lp-diagrams-svg" = callPackage @@ -167051,7 +167344,7 @@ self: { aeson base bytestring file-embed hspec QuickCheck text th-utilities ]; description = "Core functionality for LTI 1.3."; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167169,7 +167462,7 @@ self: { text ]; description = "Library functions for reading and writing Lua chunks"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167595,7 +167888,7 @@ self: { base exceptions hspec hspec-core random text turtle uuid ]; description = "LXD client written in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -167617,7 +167910,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text yaml ]; description = "Read the configuration file of the standard LXD client"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "lye" = callPackage @@ -167755,7 +168048,7 @@ self: { sha256 = "0ccwckq0gkrnahf224s59gsdd9baay1dfc8fh1kz2r87rbygzsk7"; libraryHaskellDepends = [ base bytestring ]; description = "Lzip compression / Lzlib bindings"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168076,7 +168369,7 @@ self: { monad-control mtl resourcet stm stm-containers time transformers ]; description = "Machine transducers for Amazonka calls"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168089,8 +168382,8 @@ self: { pname = "machines-attoparsec"; version = "0"; sha256 = "0mxm1gy7kr7czhmfwskl56wnawb2l3axfig22935bliq75mpvbs4"; - revision = "1"; - editedCabalFile = "1n57r25q0aajakkl7r82yw6rs9dqlhmr0qmhs7vb7ycs5i1chyis"; + revision = "2"; + editedCabalFile = "16gb0nd9njzz0nb97ii6i8vq0c309m6wl0cdgy08rdbf4cpzfx91"; libraryHaskellDepends = [ attoparsec base bytestring machines text ]; @@ -168621,7 +168914,7 @@ self: { aeson base bytestring mtl text time xml zip-archive zlib ]; description = "A parser library for DMARC and SMTP TLS reports"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168647,7 +168940,7 @@ self: { tasty-hunit ]; description = "Count mailboxes in a SQL database"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "mailchimp" = callPackage @@ -168933,7 +169226,7 @@ self: { template-haskell text unix utf8-string ]; description = "The Haskell/Gtk+ Integrated Live Environment"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -168960,7 +169253,7 @@ self: { ]; doHaddock = false; description = "Virtual package to install all Manatee packages"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -168981,7 +169274,7 @@ self: { split stm text unix utf8-string ]; description = "Multithread interactive input/search framework for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169002,7 +169295,7 @@ self: { mtl stm text utf8-string webkit ]; description = "Browser extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -169026,7 +169319,7 @@ self: { template-haskell text time unix utf8-string ]; description = "The core of Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169050,7 +169343,7 @@ self: { old-time regex-tdfa stm template-haskell text utf8-string ]; description = "Download Manager extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169072,7 +169365,7 @@ self: { filepath gtk gtksourceview2 manatee-core regex-tdfa stm text ]; description = "Editor extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169094,7 +169387,7 @@ self: { manatee-core mtl old-locale old-time stm text utf8-string ]; description = "File manager extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169116,7 +169409,7 @@ self: { gtkimageview manatee-core regex-tdfa stm text utf8-string ]; description = "Image viewer extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169142,7 +169435,7 @@ self: { regex-posix split stm template-haskell text unix utf8-string ]; description = "IRC client extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169165,7 +169458,7 @@ self: { text time unix utf8-string ]; description = "Mplayer client extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169187,7 +169480,7 @@ self: { manatee-core mtl poppler stm text utf8-string ]; description = "PDF viewer extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169208,7 +169501,7 @@ self: { proc stm text ]; description = "Process manager extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169230,7 +169523,7 @@ self: { filepath gtk manatee-core stm text utf8-string webkit ]; description = "Feed reader extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -169250,7 +169543,7 @@ self: { filepath gtk gtksourceview2 manatee-core regex-tdfa stm text ]; description = "Template code to create Manatee application"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169271,7 +169564,7 @@ self: { stm text unix vte ]; description = "Terminal Emulator extension for Manatee"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169292,7 +169585,7 @@ self: { filepath gtk manatee-core regex-tdfa stm text ]; description = "Welcome module to help user play Manatee quickly"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169307,7 +169600,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base ]; description = "Simple mancala game"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "mandrill" = callPackage @@ -169351,7 +169644,7 @@ self: { array base bytestring containers directory filepath GLUT hslua time ]; description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169409,7 +169702,7 @@ self: { semigroups vector-space ]; description = "Sampling random points on general manifolds"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169440,7 +169733,7 @@ self: { tasty-hunit tasty-quickcheck vector-space ]; description = "Coordinate-free hypersurfaces"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -169453,7 +169746,7 @@ self: { sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "map-classes" = callPackage @@ -169863,7 +170156,7 @@ self: { pandoc temporary text transformers webkit ]; description = "A simple markup document preview (markdown, textile, reStructuredText)"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -169944,7 +170237,7 @@ self: { array base bytestring colour gloss MonadRandom mtl random ]; description = "Generates mountainous terrain using a random walk algorithm"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170038,7 +170331,7 @@ self: { base configurator dlist parsek pretty ]; description = "Markup language preprocessor for Haskell"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "masakazu-bot" = callPackage @@ -170060,7 +170353,7 @@ self: { twitter-types ]; description = "@minamiyama1994_bot on haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -170483,7 +170776,7 @@ self: { sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3"; libraryHaskellDepends = [ base data-default-class ]; description = "Parse and evaluate math expressions with variables and functions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "mathflow" = callPackage @@ -170523,7 +170816,7 @@ self: { graphviz HTTP process safe tagsoup text ]; description = "Discover your (academic) ancestors!"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "mathista" = callPackage @@ -171134,7 +171427,7 @@ self: { tagsoup text time xdg-basedir ]; description = "download bugs mailboxes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171183,7 +171476,7 @@ self: { MissingH polyparse process text unix ]; description = "Machine Configuration Manager"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171256,7 +171549,7 @@ self: { sha256 = "14z1x9dqnjj391nrlngs9s887yqh3arc7kfgk0m3d89vrkc185vq"; libraryHaskellDepends = [ base MonadRandom ]; description = "MCMC applied to probabilistic program synthesis"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -171486,7 +171779,7 @@ self: { base bytestring storable-endian transformers utility-ht ]; description = "Parse song module files from Amiga MED and OctaMED"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "medea" = callPackage @@ -171688,7 +171981,7 @@ self: { servant-client servant-server text time ]; description = "Haskell SDK for communicating with the Medium API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -172299,8 +172592,8 @@ self: { pname = "mercury-api"; version = "0.1.0.2"; sha256 = "0ybpc1kai85rflgdr80jd8cvwxaxmbphv82nz2p17502jrmdfkhg"; - revision = "5"; - editedCabalFile = "15xgb00cv8srnhfgh7v01b2qijcwapwsbx92jbdss525n3j74d48"; + revision = "6"; + editedCabalFile = "03d71mfq8nvqjr7hcpkh1q25fi1avqj35mfrrf7rkm13fr49bi7i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173059,7 +173352,7 @@ self: { tasty tasty-quickcheck text unordered-containers vector ]; description = "A tiny JSON library with light dependency footprint"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "microbase" = callPackage @@ -173171,17 +173464,6 @@ self: { }) {}; "microlens" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "microlens"; - version = "0.4.11.2"; - sha256 = "1z6zdprpr193a56r5s67q75554rrqyp2kk6srxn1gif7fd54sj2f"; - libraryHaskellDepends = [ base ]; - description = "A tiny lens library with no dependencies"; - license = lib.licenses.bsd3; - }) {}; - - "microlens_0_4_12_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; @@ -173190,7 +173472,6 @@ self: { libraryHaskellDepends = [ base ]; description = "A tiny lens library with no dependencies"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-aeson" = callPackage @@ -173239,21 +173520,6 @@ self: { }) {}; "microlens-ghc" = callPackage - ({ mkDerivation, array, base, bytestring, containers, microlens - , transformers - }: - mkDerivation { - pname = "microlens-ghc"; - version = "0.4.12"; - sha256 = "07qh66alv00jz4l3w80km8grym6sk36c5kx5jfaya20irq91ni1b"; - libraryHaskellDepends = [ - array base bytestring containers microlens transformers - ]; - description = "microlens + array, bytestring, containers, transformers"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-ghc_0_4_13" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers }: @@ -173266,7 +173532,6 @@ self: { ]; description = "microlens + array, bytestring, containers, transformers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-mtl" = callPackage @@ -173285,22 +173550,6 @@ self: { }) {}; "microlens-platform" = callPackage - ({ mkDerivation, base, hashable, microlens, microlens-ghc - , microlens-mtl, microlens-th, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-platform"; - version = "0.4.1"; - sha256 = "0zlijw6ib9zf15n750qz6jlvj9l6sdf0d29w8nkflr2bspbvxn03"; - libraryHaskellDepends = [ - base hashable microlens microlens-ghc microlens-mtl microlens-th - text unordered-containers vector - ]; - description = "microlens + all batteries included (best for apps)"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-platform_0_4_2" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: @@ -173314,7 +173563,6 @@ self: { ]; description = "microlens + all batteries included (best for apps)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "microlens-process" = callPackage @@ -173461,7 +173709,7 @@ self: { tf-random transformers ]; description = "Language for algorithmic generation of MIDI files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173474,7 +173722,7 @@ self: { sha256 = "1dkja5arps41wanhv1jnkf99xrc8f5aiimp27myd595lqqdr87s2"; libraryHaskellDepends = [ base containers safe stm ]; description = "Hot-swappable FRP"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "midi" = callPackage @@ -173510,7 +173758,9 @@ self: { ]; description = "Convert between datatypes of the midi and the alsa packages"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {}; "midi-music-box" = callPackage @@ -173552,7 +173802,7 @@ self: { ]; benchmarkHaskellDepends = [ base bytestring criterion ]; description = "A simple and fast library for working with MIDI messages"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "midi-util" = callPackage @@ -173582,7 +173832,7 @@ self: { base bytestring directory event-list midi parsec process ]; description = "Utilities for working with MIDI data"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -173817,7 +174067,7 @@ self: { tasty-quickcheck ]; description = "Lambda calculus interpreter"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174084,7 +174334,7 @@ self: { sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172"; libraryHaskellDepends = [ base vector ]; description = "Bindings to Miniball, a smallest enclosing ball library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "miniforth" = callPackage @@ -174122,7 +174372,7 @@ self: { array base bytestring containers mtl semigroups text transformers ]; description = "A minimalistic lens library, providing only the simplest, most basic lens functionality"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174456,7 +174706,7 @@ self: { libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; description = "Read and write IDX data that is used in e.g. the MINST database."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174492,7 +174742,7 @@ self: { base bytestring ghc-prim hspec primitive vector ]; description = "A Minisat-based CDCL SAT solver in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174512,7 +174762,7 @@ self: { transformers twitter-conduit ]; description = "Tweet mirror"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -174782,7 +175032,7 @@ self: { anydbm base Cabal directory HUnit MissingH ]; description = "Haskell interface to Python"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175019,6 +175269,37 @@ self: { }) {}; "mmark" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec + , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens + , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck + , text, text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.7.2"; + sha256 = "1wwszzba6fvg0r4q5z2dzashim0nkaxzx4rmjl216kdi08jkp7mm"; + revision = "3"; + editedCabalFile = "1ffa76pz544pa3s764lnc38rdmfccyn8z6zn1w76pqb01p0f9k9p"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers deepseq dlist email-validate + foldl hashable html-entity-map lucid megaparsec microlens + microlens-th modern-uri mtl parser-combinators text text-metrics + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "mmark_0_0_7_3" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens @@ -175029,6 +175310,8 @@ self: { pname = "mmark"; version = "0.0.7.3"; sha256 = "1gfl9jhqm1jaqxi0yxd8r4z3ai5c3f1wv53vjs0ln84qjpcqp30s"; + revision = "1"; + editedCabalFile = "19yg41grkliim428x9cqwcynmjvkh83mqfyxiv2dc6fvid6fmcrk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -175377,7 +175660,7 @@ self: { libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; description = "Read and write IDX data that is used in e.g. the MNIST database."; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "moan" = callPackage @@ -175595,7 +175878,7 @@ self: { semigroups split text transformers ]; description = "Modify fasta (and CLIP) files in several optional ways"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175689,7 +175972,7 @@ self: { base hmatrix sparse-linear-algebra spectral-clustering vector ]; description = "Find the modularity of a network"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175760,7 +176043,7 @@ self: { nats pandoc-types parsec prettify process semigroups text ]; description = "Modular C code generator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -175808,22 +176091,23 @@ self: { "mohws" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor - , directory, explicit-exception, filepath, html, HTTP, network - , network-uri, old-locale, old-time, parsec, process, transformers - , unix, utility-ht + , directory, explicit-exception, fail, filepath, html, HTTP + , network, network-uri, old-locale, old-time, parsec, process + , transformers, unix, utility-ht }: mkDerivation { pname = "mohws"; - version = "0.2.1.6"; - sha256 = "0rnb6nq99bav0z5dxzc4xkb2ai6ifm5v2ijd76sgzbs2032v6wqs"; + version = "0.2.1.8"; + sha256 = "039abcwkqijsw8qp2iid6ilnyg79lvc1m6zik0jc4gadl5g704wh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-accessor directory - explicit-exception filepath html HTTP network network-uri + explicit-exception fail filepath html HTTP network network-uri old-locale old-time parsec process transformers unix utility-ht ]; + executableHaskellDepends = [ base bytestring ]; description = "Modular Haskell Web Server"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -176013,7 +176297,7 @@ self: { base contravariant invariant MonadRandom mtl primitive transformers ]; description = "Monad, monad transformer, and typeclass representing choices"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "monad-chronicle" = callPackage @@ -177634,7 +177918,7 @@ self: { base containers directory mtl optparse-applicative process unix ]; description = "A system state collecting library and application"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178259,7 +178543,7 @@ self: { tasty-quickcheck template-haskell text unordered-containers yaml ]; description = "A multi-lingual, typed, workflow language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -178848,7 +179132,7 @@ self: { simple-ui template-haskell text unix utf8-string vty ]; description = "Music player for linux"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179049,7 +179333,7 @@ self: { sha256 = "11c62m19ngap44fv4gnv0ln8iff1b08dg2vclj16jx1fj8pqps9y"; libraryHaskellDepends = [ base containers dbus mtl ]; description = "Interface for MPRIS"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179135,7 +179419,7 @@ self: { base directory filepath gtk mtl process template-haskell unix ]; description = "A minimalist mpv GUI written in I/O heavy Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -179183,7 +179467,7 @@ self: { stm text transformers ]; description = "A MQTT client library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -180177,7 +180461,7 @@ self: { ]; testToolDepends = [ alex happy ]; description = "An intermediate language designed to perform advanced code analysis"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181258,7 +181542,7 @@ self: { executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ gtk3 ]; description = "Supply your tunes info without leaving your music player"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gtk3;}; @@ -181293,7 +181577,7 @@ self: { test-framework-smallcheck text time transformers xmlhtml ]; description = "Send an email to all MusicBrainz editors"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181305,8 +181589,8 @@ self: { }: mkDerivation { pname = "musicw"; - version = "0.3.7"; - sha256 = "0b5wn084ka4xnvimzxd47y4m0ldmfqr7sa30a5bm08g62333h3yr"; + version = "0.3.8"; + sha256 = "00hw1ayzcyh9dxrha3kmyi9r69d5bb942ggl020jm3r5jayzs28h"; libraryHaskellDepends = [ array base bytestring containers data-default file-embed ghcjs-base ghcjs-dom ghcjs-prim json monad-loops mtl safe text time @@ -181518,7 +181802,7 @@ self: { process ]; description = "Watches your screensaver and (un)mutes music when you (un)lock the screen"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181896,7 +182180,7 @@ self: { http-client-tls network-uri text yaml ]; description = "Export from MyAnimeList"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -181979,21 +182263,6 @@ self: { }) {}; "mysql" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql - }: - mkDerivation { - pname = "mysql"; - version = "0.1.7.3"; - sha256 = "1yf9ni64q19ci6ripcjh0pvpklxyi0fzigb33ss05wswlal385rc"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring containers ]; - librarySystemDepends = [ mysql ]; - testHaskellDepends = [ base bytestring hspec ]; - description = "A low-level MySQL client library"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) mysql;}; - - "mysql_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql }: mkDerivation { @@ -182006,7 +182275,6 @@ self: { testHaskellDepends = [ base bytestring hspec ]; description = "A low-level MySQL client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) mysql;}; "mysql-effect" = callPackage @@ -182355,7 +182623,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; description = "EDSL to specify Nagios configuration files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "nagios-perfdata" = callPackage @@ -182452,7 +182720,7 @@ self: { libraryHaskellDepends = [ aeson attoparsec base lens text wreq ]; executableHaskellDepends = [ base text ]; description = "Tool to keep namecoin names updated and well"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "named" = callPackage @@ -182839,7 +183107,7 @@ self: { kanji microlens microlens-aeson optparse-applicative text ]; description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183156,7 +183424,7 @@ self: { aeson base iso639 lens lens-aeson network-uri random text wreq ]; description = "Interface to Naver Translate"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183214,7 +183482,7 @@ self: { librarySystemDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; description = "Modernised bindings to GNU ncurses"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) ncurses;}; "ndjson-conduit" = callPackage @@ -183295,7 +183563,7 @@ self: { random transformers ]; description = "A NEAT library for Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -183617,7 +183885,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "Nested set model implementation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "nestedmap" = callPackage @@ -183854,7 +184122,7 @@ self: { editedCabalFile = "00wqr9nnjn8hm0r8xa5qrgqva5r0pcf32hlksrqhkzy12yl2kv08"; libraryHaskellDepends = [ base bytestring hosc network ]; description = "Netclock protocol"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184071,7 +184339,7 @@ self: { base bytestring tasty tasty-golden tasty-quickcheck ]; description = "Parser for .netrc files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "netrium" = callPackage @@ -184123,7 +184391,7 @@ self: { base bytestring enumerator transformers ]; description = "Enumerator-based netstring parsing"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184739,7 +185007,7 @@ self: { sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7"; libraryHaskellDepends = [ array base containers mtl ]; description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -184955,6 +185223,28 @@ self: { broken = true; }) {}; + "network-packet-linux" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-discover, HUnit + , network, QuickCheck, vendored-network, vendored-network-test + }: + mkDerivation { + pname = "network-packet-linux"; + version = "0.1.0.0"; + sha256 = "17096sa20jijq37nr0bn4bcnpilh5yx4pdwqb4c2vk4i0lkwg58m"; + revision = "2"; + editedCabalFile = "0w3ca2z3ppj7b8ifafh4y42zv6wpkdd0mmfsvmvcdmfprlsh244b"; + libraryHaskellDepends = [ base network vendored-network ]; + testHaskellDepends = [ + base bytestring hspec HUnit network QuickCheck + vendored-network-test + ]; + testToolDepends = [ hspec-discover ]; + description = "Types for working with Linux packet sockets"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {vendored-network = null; vendored-network-test = null;}; + "network-pgi" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, enumerator, tnet @@ -184984,7 +185274,7 @@ self: { text transformers xml-types ]; description = "Client library for the XMPP protocol"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185163,7 +185453,7 @@ self: { transformers ]; description = "ByteString and Text streams for networking"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -185734,7 +186024,7 @@ self: { libraryHaskellDepends = [ base containers fixedprec random ]; executableHaskellDepends = [ base random time ]; description = "Exact and approximate synthesis of quantum circuits"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "newt" = callPackage @@ -186114,7 +186404,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186187,7 +186477,7 @@ self: { unordered-containers ]; description = "IDL compiler and RPC/distributed object framework for microservices"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -186922,7 +187212,7 @@ self: { sha256 = "1wd2vd0qn8ln3a5r29gikdcr4c2c2rf43p6kq3wmqm8ww30djgca"; libraryHaskellDepends = [ base containers ]; description = "Binders and alpha-equivalence made easy"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "nomyx-api" = callPackage @@ -187063,16 +187353,19 @@ self: { }) {nomyx-auth = null;}; "non-empty" = callPackage - ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht + ({ mkDerivation, base, containers, deepseq, doctest-exitcode-stdio + , QuickCheck, utility-ht }: mkDerivation { pname = "non-empty"; - version = "0.3.2"; - sha256 = "0j47d1xaxi2ynsa3wckapjbcvzr66cwca74xpzi554ba70agq40v"; + version = "0.3.3"; + sha256 = "01vhkj9xgggml51zmrj3hngxxnzrcd4zs0a7yjg69i6z518mh0pg"; libraryHaskellDepends = [ base containers deepseq QuickCheck utility-ht ]; - testHaskellDepends = [ base containers QuickCheck utility-ht ]; + testHaskellDepends = [ + base containers doctest-exitcode-stdio QuickCheck utility-ht + ]; description = "List-like structures with static restrictions on the number of elements"; license = lib.licenses.bsd3; }) {}; @@ -187234,8 +187527,8 @@ self: { ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: mkDerivation { pname = "nonempty-zipper"; - version = "1.0.0.0"; - sha256 = "0qqdrp1rr1qmgxxzwn21gy1gc9mwdhliyp72d74bndqr3yki46fm"; + version = "1.0.0.1"; + sha256 = "17h070rciwbdk36n68dbin1yv2ybrb2vak9azimfv51z6b6a7b4w"; libraryHaskellDepends = [ base comonad deepseq safe ]; testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; description = "A non-empty comonadic list zipper"; @@ -187291,7 +187584,7 @@ self: { ad base nonlinear-optimization primitive reflection vector ]; description = "Wrapper of nonlinear-optimization package for using with AD package"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "nonlinear-optimization-backprop" = callPackage @@ -187309,7 +187602,7 @@ self: { reflection vector ]; description = "Wrapper of nonlinear-optimization package for using with backprop package"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "noodle" = callPackage @@ -187345,10 +187638,8 @@ self: { }: mkDerivation { pname = "normalization-insensitive"; - version = "2.0.1"; - sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; - revision = "4"; - editedCabalFile = "1p0vxvp44nzjn7big9m3wj8gvffaxz05c46jalm73fwm8cj54iqf"; + version = "2.0.2"; + sha256 = "1rr12rrij64hi6jkd42h4x2m86k1ra10ykzpzc38n6rfdhyiswpn"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -187381,7 +187672,7 @@ self: { base bytestring cassava containers optparse-generic text vector ]; description = "Normalize data using a variety of methods"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "normalize-imports" = callPackage @@ -187522,7 +187813,7 @@ self: { librarySystemDepends = [ notmuch talloc ]; libraryToolDepends = [ c2hs ]; description = "Haskell binding to Notmuch, the mail indexer"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) notmuch; inherit (pkgs) talloc;}; "notmuch-haskell" = callPackage @@ -188021,7 +188312,7 @@ self: { editedCabalFile = "1lsxi6704g6svw0834haggp6j97kb6r51583lr2a3kn1ni2zh60c"; libraryHaskellDepends = [ base microlens microlens-th ]; description = "Flexible and accurate (for a given precision) numerical->string conversion"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "numbered-semigroups" = callPackage @@ -188034,7 +188325,7 @@ self: { editedCabalFile = "04wkhb2r275nax8wh00w6c4pxfaky190g2bsviw39jyi7wr2f33c"; libraryHaskellDepends = [ base call-stack semigroups ]; description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -188176,20 +188467,24 @@ self: { }) {}; "numeric-prelude" = callPackage - ({ mkDerivation, array, base, containers, deepseq, non-negative - , parsec, QuickCheck, random, semigroups, storable-record - , utility-ht + ({ mkDerivation, array, base, containers, deepseq + , doctest-exitcode-stdio, doctest-lib, non-negative, parsec + , QuickCheck, random, semigroups, storable-record, utility-ht }: mkDerivation { pname = "numeric-prelude"; - version = "0.4.3.2"; - sha256 = "1vd777ax2yvxknfxp9isgjk7cabjv3q86dgf3hybv78hc4ji5gmq"; + version = "0.4.3.3"; + sha256 = "0kqz3xzg0j3cqaidmdzmg47h564ivp4iz5ys8zs5g41k2wd06ild"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers deepseq non-negative parsec QuickCheck random semigroups storable-record utility-ht ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib QuickCheck random + utility-ht + ]; description = "An experimental alternative hierarchy of numeric type classes"; license = lib.licenses.bsd3; }) {}; @@ -188817,7 +189112,7 @@ self: { ]; testHaskellDepends = [ base bytestring ]; description = "Fully Automatic Luxury OAuth 1.0a headers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "oauth2-jwt-bearer" = callPackage @@ -188895,7 +189190,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Communicate to OBD interfaces over ELM327"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189201,7 +189496,7 @@ self: { array base bytestring containers hexpr mtl parsec symbol text ]; description = "Lisp with more dynamism, more power, more simplicity"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -189822,7 +190117,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "memoization for IO actions and functions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "one-line-aeson-text" = callPackage @@ -190016,7 +190311,7 @@ self: { sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly"; libraryHaskellDepends = [ base ]; description = "Support for OO-like prototypes"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "op" = callPackage @@ -190194,7 +190489,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base basic-prelude text turtle ]; description = "Open haddock HTML documentation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -190673,7 +190968,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {EGL = null; GLESv2 = null;}; @@ -191807,7 +192102,7 @@ self: { broken = true; }) {}; - "optparse-applicative" = callPackage + "optparse-applicative_0_15_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, process , QuickCheck, transformers, transformers-compat }: @@ -191823,9 +192118,10 @@ self: { testHaskellDepends = [ base bytestring QuickCheck ]; description = "Utilities and combinators for parsing command line options"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "optparse-applicative_0_16_1_0" = callPackage + "optparse-applicative" = callPackage ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck , transformers, transformers-compat }: @@ -191839,7 +192135,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Utilities and combinators for parsing command line options"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "optparse-applicative-simple" = callPackage @@ -191888,22 +192183,6 @@ self: { }) {}; "optparse-generic" = callPackage - ({ mkDerivation, base, bytestring, Only, optparse-applicative - , semigroups, system-filepath, text, time, transformers, void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.3.1"; - sha256 = "0c2fhy54mn8h7z5qj3mq1qcdb1ab6bxbpiaaqwrmh7iys41zg6q0"; - libraryHaskellDepends = [ - base bytestring Only optparse-applicative semigroups - system-filepath text time transformers void - ]; - description = "Auto-generate a command-line parser for your datatype"; - license = lib.licenses.bsd3; - }) {}; - - "optparse-generic_1_4_4" = callPackage ({ mkDerivation, base, bytestring, Only, optparse-applicative , system-filepath, text, time, transformers, void }: @@ -191919,7 +192198,6 @@ self: { ]; description = "Auto-generate a command-line parser for your datatype"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "optparse-helper" = callPackage @@ -192293,7 +192571,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base parsec regex-compat ]; description = "Basic org to anki exporter"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "organize-imports" = callPackage @@ -192306,7 +192584,7 @@ self: { isExecutable = true; executableHaskellDepends = [ attoparsec base text ]; description = "Organize scala imports"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192385,7 +192663,7 @@ self: { transformers universum ]; description = "Statistics visualizer for org-mode"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192529,6 +192807,32 @@ self: { license = lib.licenses.mit; }) {}; + "ory-kratos" = callPackage + ({ mkDerivation, aeson, base, containers, exceptions, http-api-data + , http-client, http-client-tls, http-types, mtl, network-uri + , servant, servant-client, servant-client-core, servant-server + , swagger2, text, time, transformers, uuid, wai, warp + }: + mkDerivation { + pname = "ory-kratos"; + version = "0.0.5.9"; + sha256 = "1c4vn8zyv9lakchiip6w80cfxkz7zsgfiwd5mq5dnc6fcsri3c6h"; + libraryHaskellDepends = [ + aeson base containers exceptions http-api-data http-client + http-client-tls http-types mtl network-uri servant servant-client + servant-client-core servant-server swagger2 text time transformers + uuid wai warp + ]; + testHaskellDepends = [ + aeson base containers exceptions http-api-data http-client + http-client-tls http-types mtl network-uri servant servant-client + servant-client-core servant-server swagger2 text time transformers + uuid wai warp + ]; + description = "API bindings for Ory Kratos"; + license = lib.licenses.asl20; + }) {}; + "os-release" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , hspec-megaparsec, megaparsec, pretty-simple, safe-exceptions @@ -192574,7 +192878,7 @@ self: { sha256 = "1452a2y085xbj5q83g6y8f9vrxmlq804i8kyx6rfwyzfvzq5s3ic"; libraryHaskellDepends = [ base colour gloss random ]; description = "Implements an osculatory packing (kissing circles) algorithm and display"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -192675,7 +192979,7 @@ self: { process temporary ]; description = "Better conversion of Oxford Scholarship Online material to PDF"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193050,7 +193354,7 @@ self: { ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "Efficient “spreadsheet table” like maps with multiple marginals"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193320,7 +193624,7 @@ self: { optparse-applicative simple-cmd-args text ]; description = "Pagure client"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "pagure-hook-receiver" = callPackage @@ -193426,7 +193730,9 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {pam = null;}; @@ -193473,63 +193779,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, connection, containers, criterion - , data-default, deepseq, Diff, directory, doclayout, doctemplates - , emojis, exceptions, executable-path, file-embed, filepath, Glob - , haddock-library, hslua, hslua-module-system, hslua-module-text - , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb - , jira-wiki-markup, JuicyPixels, mtl, network, network-uri - , pandoc-types, parsec, process, QuickCheck, random, safe - , scientific, SHA, skylighting, skylighting-core, split, syb - , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, temporary, texmath, text, text-conversions - , time, unicode-transforms, unix, unordered-containers, weigh, xml - , zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "2.11.4"; - sha256 = "1x8s6gidcij81vcxhj3pday484dyxn3d5s9sz0rh3nfml80cgkyk"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive citeproc - commonmark commonmark-extensions commonmark-pandoc connection - containers data-default deepseq directory doclayout doctemplates - emojis exceptions file-embed filepath Glob haddock-library hslua - hslua-module-system hslua-module-text HsYAML HTTP http-client - http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl - network network-uri pandoc-types parsec process random safe - scientific SHA skylighting skylighting-core split syb tagsoup - temporary texmath text text-conversions time unicode-transforms - unix unordered-containers xml zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base64-bytestring bytestring containers Diff directory - doctemplates exceptions executable-path filepath Glob hslua mtl - pandoc-types process QuickCheck tasty tasty-golden tasty-hunit - tasty-lua tasty-quickcheck temporary text time xml zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion mtl text time weigh - ]; - postInstall = '' - mkdir -p $out/share/man/man1 - mv "man/"*.1 $out/share/man/man1/ - ''; - description = "Conversion between markup formats"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_12" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -193584,7 +193833,6 @@ self: { ''; description = "Conversion between markup formats"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -193637,7 +193885,7 @@ self: { base directory filepath pandoc-types process text-conversions ]; description = "Insert a preamble before pandoc-citeproc's bibliography"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "pandoc-crossref" = callPackage @@ -193673,15 +193921,15 @@ self: { utility-ht ]; description = "Pandoc filter for cross-references"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "pandoc-csv2table" = callPackage ({ mkDerivation, base, csv, pandoc, pandoc-types, text }: mkDerivation { pname = "pandoc-csv2table"; - version = "1.0.8"; - sha256 = "0sf0af2cx5fi3a2iixkjjdpzp0153hxsjzs5wwqssby39g7s24gb"; + version = "1.0.9"; + sha256 = "14ln4i75cpqpjyzhqx0wvsrggvm6ak8rif514r5qwnckjl97v79l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193860,7 +194108,7 @@ self: { pandoc-types shelly system-fileio system-filepath text ]; description = "Japanese-specific markup filters for pandoc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -193976,8 +194224,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.1.0"; - sha256 = "1dk9s37z3hah1kiha3q9d1yzl0vfgivdazhdcraivaspzi78iry8"; + version = "1.1.1"; + sha256 = "10wwci7p3kphmjxlnpymbnx3cw2l3yfydm29l6k2vakz1pd7zdh0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194027,7 +194275,7 @@ self: { mtl pandoc-types tasty tasty-hspec tasty-hunit temporary text ]; description = "A Pandoc filter to include figures generated from Python code blocks"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194177,7 +194425,7 @@ self: { transformers Yampa ]; description = "A super-pang clone"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -194198,7 +194446,7 @@ self: { ]; libraryPkgconfigDepends = [ pango ]; description = "Binding to the Pango text rendering engine"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {inherit (pkgs) pango;}; "pangraph" = callPackage @@ -194781,7 +195029,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base bytestring containers ]; description = "A passphrase generator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -195564,7 +195812,7 @@ self: { sha256 = "090yhbbh2i5lwfwrfml0n54ziy8mz3mgmwnykr4ab06w1ylc2zh4"; libraryHaskellDepends = [ base ]; description = "Parallel Parsing Processes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "parsely" = callPackage @@ -196017,7 +196265,7 @@ self: { random ]; description = "a simple password manager"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -196039,7 +196287,7 @@ self: { passman-core resourcet text X11 yaml ]; description = "Deterministic password generator command line interface"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -196065,34 +196313,11 @@ self: { ]; doHaddock = false; description = "Deterministic password generator core"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; "password" = callPackage - ({ mkDerivation, base, base-compat, base64, bytestring, Cabal - , cabal-doctest, cryptonite, doctest, memory, QuickCheck - , quickcheck-instances, scrypt, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text - }: - mkDerivation { - pname = "password"; - version = "2.1.1.0"; - sha256 = "1x3nv3bn0rp0f6rayrzp7yvw7x1ly7vjygcl6wdq86y0k1ca2wby"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base base64 bytestring cryptonite memory template-haskell text - ]; - testHaskellDepends = [ - base base-compat bytestring cryptonite doctest memory QuickCheck - quickcheck-instances scrypt tasty tasty-hunit tasty-quickcheck - template-haskell text - ]; - description = "Hashing and checking of passwords"; - license = lib.licenses.bsd3; - }) {}; - - "password_3_0_0_0" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, cryptonite, doctest, memory, password-types , QuickCheck, quickcheck-instances, scrypt, tasty, tasty-hunit @@ -196114,33 +196339,9 @@ self: { ]; description = "Hashing and checking of passwords"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "password-instances" = callPackage - ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest - , doctest, http-api-data, password, persistent, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text - }: - mkDerivation { - pname = "password-instances"; - version = "2.0.0.2"; - sha256 = "03dl3b530m02y7mv2lvssamhakswa3d9bj2r2ndvg78wi0vm5xp1"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base http-api-data password persistent text - ]; - testHaskellDepends = [ - aeson base base-compat doctest http-api-data password persistent - QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck - template-haskell text - ]; - description = "typeclass instances for password package"; - license = lib.licenses.bsd3; - }) {}; - - "password-instances_3_0_0_0" = callPackage ({ mkDerivation, aeson, base, base-compat, Cabal, cabal-doctest , doctest, http-api-data, password, password-types, persistent , QuickCheck, quickcheck-instances, tasty, tasty-hunit @@ -196161,7 +196362,6 @@ self: { ]; description = "typeclass instances for password package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "password-types" = callPackage @@ -196248,26 +196448,27 @@ self: { , filepath, mtl, network, network-uri, optparse-applicative, pandoc , pandoc-types, process, QuickCheck, skylighting, tasty , tasty-hunit, tasty-quickcheck, terminal-size, text, time - , unordered-containers, yaml + , unordered-containers, wcwidth, yaml }: mkDerivation { pname = "patat"; - version = "0.8.6.1"; - sha256 = "1n9qw4wmh7aqmnkqdc6v12rs80vipnszr4744nlkasq6jlzijw0c"; + version = "0.8.7.0"; + sha256 = "05bg36lbhqlh80w952hrpy88n99qddv86hiqqbc6p3bc89rlzg1w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint async base base64-bytestring bytestring colour containers directory filepath mtl network network-uri optparse-applicative pandoc pandoc-types process - skylighting terminal-size text time unordered-containers yaml + skylighting terminal-size text time unordered-containers wcwidth + yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory QuickCheck tasty tasty-hunit tasty-quickcheck text ]; description = "Terminal-based presentations using Pandoc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197411,7 +197612,7 @@ self: { base directory filepath ghc ghc-paths old-time process ]; description = "pdynload is polymorphic dynamic linking library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -197549,7 +197750,7 @@ self: { base containers filepath haskeline logict mtl parsec ]; description = "a lazy non-deterministic concatenative programming language"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198313,7 +198514,7 @@ self: { base optparse-applicative persistent text ]; description = "Transforms persist's quasi-quoted syntax into ER format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -198386,6 +198587,35 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "persistent_2_11_0_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, fast-logger, hspec + , http-api-data, monad-logger, mtl, path-pieces, resource-pool + , resourcet, scientific, shakespeare, silently, text, time + , transformers, unliftio, unliftio-core, unordered-containers + , vector + }: + mkDerivation { + pname = "persistent"; + version = "2.11.0.4"; + sha256 = "1n5wkhfvyqq6p57nkf9yx73kap6spyzam5w12ni8pmd1m6pk77xn"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data monad-logger mtl + path-pieces resource-pool resourcet scientific silently text time + transformers unliftio unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + containers hspec http-api-data path-pieces scientific shakespeare + text time transformers unordered-containers vector + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -198638,6 +198868,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-mtl_0_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, containers + , monad-logger, mtl, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, resource-pool, resourcet + , tasty, tasty-golden, tasty-hunit, text, transformers, unliftio + , unliftio-core, unliftio-pool + }: + mkDerivation { + pname = "persistent-mtl"; + version = "0.2.1.0"; + sha256 = "1lwzkxb55bb4ldcwxkkfjfly39bnjjdg01yihl6znx8y3c461yrx"; + libraryHaskellDepends = [ + base conduit containers mtl persistent resource-pool resourcet text + transformers unliftio unliftio-core unliftio-pool + ]; + testHaskellDepends = [ + base bytestring conduit containers monad-logger persistent + persistent-postgresql persistent-sqlite persistent-template + resource-pool resourcet tasty tasty-golden tasty-hunit text + unliftio + ]; + description = "Monad transformer for the persistent API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-mysql" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, fast-logger, hspec, HUnit, monad-logger, mysql @@ -199113,7 +199369,7 @@ self: { unordered-containers ]; description = "Persona (BrowserID) library"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199136,7 +199392,7 @@ self: { pem persona scotty shakespeare text time transformers unix wai x509 ]; description = "Persona (BrowserID) Identity Provider"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199256,7 +199512,7 @@ self: { async base ini postgresql-simple random scotty text transformers ]; description = "REST service and library for creating/consuming temporary PostgreSQL databases"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199288,7 +199544,7 @@ self: { warp ]; description = "REST service for creating temporary PostgreSQL databases"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -199404,7 +199660,7 @@ self: { libraryHaskellDepends = [ base containers pretty ]; librarySystemDepends = [ gu pgf ]; description = "Bindings to the C version of the PGF runtime"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {gu = null; inherit (pkgs) pgf;}; @@ -199543,7 +199799,7 @@ self: { ]; testSystemDepends = [ pHash ]; description = "Haskell bindings to pHash, the open source perceptual hash library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {pHash = null;}; "phizzle" = callPackage @@ -199559,7 +199815,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Library for checking if a given link is in a phishtank json file"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "phoityne" = callPackage @@ -200114,7 +200370,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl SDL transformers ]; description = "A fractal viewer"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200181,7 +200437,7 @@ self: { io-streams mtl network parsec RSA transformers ]; description = "Applied pi-calculus interpreter"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200233,7 +200489,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Lightweight access control solution for the pijul vcs"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200276,7 +200532,7 @@ self: { xdg-basedir ]; description = "Set up port forwarding with the Private Internet Access VPN service"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200316,7 +200572,7 @@ self: { libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; executableHaskellDepends = [ base cli hmatrix ]; description = "simple image manipulation functions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200414,7 +200670,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base matrix transformers xml ]; description = "Converts a svg image to tikz code"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -200579,7 +200835,7 @@ self: { transformers ]; description = "Back up the notes you've saved to Pinboard"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "pinch" = callPackage @@ -202065,7 +202321,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "A program for turning pixel art into 3D prints"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202244,7 +202500,7 @@ self: { http-directory simple-cmd simple-cmd-args text ]; description = "Package tree diff tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202311,7 +202567,7 @@ self: { sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i"; libraryHaskellDepends = [ base bytestring mtl time unix ]; description = "plaimi's prelude"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202702,7 +202958,7 @@ self: { base cairo colour fixed-vector gtk hmatrix plot text vector ]; description = "A quick way to use Mathematica like Manipulation abilities"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -202735,7 +202991,7 @@ self: { base colour gtk hmatrix plot text vector ]; description = "A plotting tool with Mathematica like Manipulation abilities"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -203574,7 +203830,7 @@ self: { sha256 = "1csi81i0j3hk2gsc3c0rx939i67b0mj2pi064giw20yspqqjrp27"; libraryHaskellDepends = [ base requirements ]; description = "Polykinded extensible records"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "polyToMonoid" = callPackage @@ -204237,7 +204493,7 @@ self: { process time unix wx wxcore ]; description = "pomodoro timer"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -204523,7 +204779,7 @@ self: { libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler_gi ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Poppler"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; @@ -205396,17 +205652,15 @@ self: { }) {}; "postgresql-placeholder-converter" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec + ({ mkDerivation, attoparsec, base, bytestring, either-result, hspec , hspec-discover, mtl, utf8-string }: mkDerivation { pname = "postgresql-placeholder-converter"; - version = "0.1.0.0"; - sha256 = "1dprqv0r00nrx6m0byqfzpb91h5kz3nxd0w0m21150l68sj2d8ys"; - revision = "1"; - editedCabalFile = "0mla1cibyc13bz7gvv5b31il8nyp0vjfi8xqgpynbjfq7d4fjnnc"; + version = "0.2.0.0"; + sha256 = "0jpsa6c2m0m8d9abki585krf9pvj5p4rsayg1qs963r4vg1m8p23"; libraryHaskellDepends = [ - attoparsec base bytestring mtl utf8-string + attoparsec base bytestring either-result mtl utf8-string ]; testHaskellDepends = [ base hspec ]; testToolDepends = [ hspec-discover ]; @@ -206082,7 +206336,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base binary bytestring split ]; description = "Command line Dreamcast VMU filesystem toolset"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206222,7 +206476,7 @@ self: { JuicyPixels vector ]; description = "Trace bitmap images to paths using potrace"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "potrace-diagrams" = callPackage @@ -206235,7 +206489,7 @@ self: { editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga"; libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ]; description = "Potrace bindings for the diagrams library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -206487,7 +206741,7 @@ self: { base tasty tasty-hunit tasty-quickcheck vector-space ]; description = "Alternative Show class that gives shorter view if possible"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "prairie" = callPackage @@ -207710,7 +207964,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "prime number tools"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "primes" = callPackage @@ -208336,7 +208590,7 @@ self: { xformat ]; description = "Parse process information for Linux"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -208961,7 +209215,7 @@ self: { editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -209178,8 +209432,8 @@ self: { }: mkDerivation { pname = "prolens"; - version = "0.0.0.0"; - sha256 = "1p4cl83knkvfa11ijw9qb2akz9n8lv9ixawgxwynypygg7vdg9j2"; + version = "0.0.0.1"; + sha256 = "0sf9s363gdyhs4qs6z2zqf1ha49qhfx9b1rldj28cgljrxy8jkws"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog inspection-testing @@ -209986,29 +210240,6 @@ self: { }) {}; "proto3-wire" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , doctest, hashable, QuickCheck, safe, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers - }: - mkDerivation { - pname = "proto3-wire"; - version = "1.1.0"; - sha256 = "1f8vllbysz6d7njkqd6f52k4nixjj4wf2k4nh4gb4b7dihdzhnmg"; - revision = "1"; - editedCabalFile = "1ws072947d8lmchknyhrzpg9mh6dacya872a4b9dw0cdgkn13zm8"; - libraryHaskellDepends = [ - base bytestring cereal containers deepseq hashable QuickCheck safe - text unordered-containers - ]; - testHaskellDepends = [ - base bytestring cereal doctest QuickCheck tasty tasty-hunit - tasty-quickcheck text - ]; - description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; - license = lib.licenses.asl20; - }) {}; - - "proto3-wire_1_2_0" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers @@ -210032,6 +210263,7 @@ self: { description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "protobuf" = callPackage @@ -210344,7 +210576,7 @@ self: { time ]; description = "Computations that automatically track data dependencies"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -210948,7 +211180,7 @@ self: { libraryHaskellDepends = [ base containers stm unix ]; librarySystemDepends = [ libpulseaudio ]; description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage @@ -211002,7 +211234,7 @@ self: { mtl text ]; description = "A program that displays the puppet resources associated to a node given .pp files."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -211157,8 +211389,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.4.2"; - sha256 = "18cjifncnxi4c3xxkgvvvay56h2a0zs83505xf1a9fkz5n8iwqby"; + version = "0.4.3"; + sha256 = "00jl1n200nfn8iaqqdpa9h77b14r0fd6amsh46h16ad4ky3p2nkj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211172,7 +211404,7 @@ self: { tasty-hedgehog tasty-hunit tasty-quickcheck text time ]; description = "types and parser for email messages (including MIME)"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Plus; }) {}; "purescheme-wai-routing-core" = callPackage @@ -211829,7 +212061,7 @@ self: { test-framework-hunit ]; description = "Command line interface for the pwstore library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "pwstore-fast" = callPackage @@ -212309,9 +212541,7 @@ self: { libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; description = "Qt bindings for Haskell - C++ library"; - license = lib.licenses.lgpl3; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licenses.lgpl3Only; }) {inherit (pkgs.qt5) qtbase;}; "qtah-examples" = callPackage @@ -212328,9 +212558,7 @@ self: { base binary bytestring containers filepath hoppy-runtime qtah-qt5 ]; description = "Example programs for Qtah Qt bindings"; - license = lib.licenses.lgpl3; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licenses.lgpl3Only; }) {}; "qtah-generator" = callPackage @@ -212350,9 +212578,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Generator for Qtah Qt bindings"; - license = lib.licenses.lgpl3; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licenses.lgpl3Only; }) {}; "qtah-qt5" = callPackage @@ -212373,9 +212599,7 @@ self: { libraryToolDepends = [ qtbase ]; testHaskellDepends = [ base hoppy-runtime HUnit ]; description = "Qt bindings for Haskell"; - license = lib.licenses.lgpl3; - hydraPlatforms = lib.platforms.none; - broken = true; + license = lib.licenses.lgpl3Only; }) {inherit (pkgs.qt5) qtbase;}; "quack" = callPackage @@ -212562,7 +212786,7 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Quite Useless DB"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212586,7 +212810,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Quenya verb conjugator"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -212870,7 +213094,7 @@ self: { libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ]; testHaskellDepends = [ base hspec ieee754 QuickCheck ]; description = "HUnit like assertions for QuickCheck"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "quickcheck-classes" = callPackage @@ -213321,7 +213545,7 @@ self: { test-framework-quickcheck2 ]; description = "QuickLZ compression for ByteStrings"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "quickpull" = callPackage @@ -213414,7 +213638,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "An interface for describing and executing terminal applications"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "quicktest" = callPackage @@ -213449,7 +213673,7 @@ self: { servant-server text warp ]; description = "A quick webapp generator for any file processing tool"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214568,7 +214792,7 @@ self: { base containers microspec tf-random vector ]; description = "Easy-to-use randomness for livecoding"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -214911,7 +215135,7 @@ self: { transformers tree-fun ]; description = "Create random trees"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "random-variates" = callPackage @@ -215085,7 +215309,7 @@ self: { base bytestring cassava containers lens optparse-generic vector ]; description = "Find the rank product of a data set"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "rank1dynamic" = callPackage @@ -215180,7 +215404,7 @@ self: { base eve hspec lens QuickCheck quickcheck-instances text yi-rope ]; description = "A modular text editor"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215201,7 +215425,7 @@ self: { rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope ]; description = "Example user config for Rasa"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215233,7 +215457,7 @@ self: { base containers data-default lens rasa text ]; description = "Rasa Ext for running commands"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215250,7 +215474,7 @@ self: { base data-default lens mtl rasa text text-lens yi-rope ]; description = "Rasa Ext adding cursor(s)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215268,7 +215492,7 @@ self: { yi-rope ]; description = "Rasa Ext for filesystem actions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215281,7 +215505,7 @@ self: { sha256 = "1wv3bkfq92h7b91x88mzqcijbpb2kh7zkgg4ljxdx59qi4lb7hry"; libraryHaskellDepends = [ base lens mtl rasa ]; description = "Rasa Ext for logging state/actions"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215299,7 +215523,7 @@ self: { text vty yi-rope ]; description = "Rasa extension for rendering to terminal with vty"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215312,7 +215536,7 @@ self: { sha256 = "0grfj3qxlmk63x5cxrbibkhrrgij077f7sr0kj6vcl0np7a5dl98"; libraryHaskellDepends = [ base data-default lens rasa yi-rope ]; description = "Rasa Ext for populating status-bar"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215325,7 +215549,7 @@ self: { sha256 = "198phwvsndsk149rj744znjzw8w2n0238pbv07d7rfs2c1987s04"; libraryHaskellDepends = [ base data-default lens rasa ]; description = "Rasa Ext managing rendering styles"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215343,7 +215567,7 @@ self: { yi-rope ]; description = "Rasa Ext managing rendering views"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215363,7 +215587,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "Rasa Ext for vim bindings"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -215443,8 +215667,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.13"; - sha256 = "0ydg5xlf10g1wp18bwpr3mg9x29fyc1c5g22rn4szy0cs6hvqx6m"; + version = "1.0.14"; + sha256 = "0yjr8hj5c5i2l4p9zinwvzf33vhn6s9lipndqwx0km4ry0rylwwx"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -215460,8 +215684,8 @@ self: { }: mkDerivation { pname = "ratel-wai"; - version = "1.1.4"; - sha256 = "1b2d5agip0zw10nmkr45gwhzpaga9nsdqv62xil11gadhaqji2f7"; + version = "1.1.5"; + sha256 = "0afrsnj1sjcr99sw7cpv2l4pn2is9y6qck4lq1vc33h8kk4hr25y"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-client ratel wai ]; @@ -215593,19 +215817,19 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, binary - , bytestring, caerbannog, containers, filepath, http-client - , http-client-tls, HUnit, text, transformers + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , containers, filepath, http-client, http-client-tls, HUnit, text + , transformers }: mkDerivation { pname = "rattletrap"; - version = "10.0.7"; - sha256 = "1wpxysd23gz2lga6bzg3cx21yxjvcprqgk9xqlg3b5gmj22h2mdg"; + version = "11.0.0"; + sha256 = "10xr9fv0xdiz173i5apz29sh66bvya3ris2c7ig2qs8dfbqi165s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty array base binary bytestring caerbannog - containers filepath http-client http-client-tls text transformers + aeson aeson-pretty array base bytestring containers filepath + http-client http-client-tls text transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring filepath HUnit ]; @@ -216069,7 +216293,7 @@ self: { aeson aeson-pretty base bytestring scotty time transformers ]; description = "react-tutorial web server"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216181,7 +216405,7 @@ self: { ]; testHaskellDepends = [ base doctest ]; description = "home (etc) automation using reactive-banana"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216234,7 +216458,7 @@ self: { SDL-ttf ]; description = "Reactive Banana bindings for SDL"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -216421,7 +216645,7 @@ self: { ]; description = "An alternate implementation of push-pull FRP"; license = "GPL"; - platforms = [ "armv7l-linux" ]; + platforms = lib.platforms.none; }) {}; "reactor" = callPackage @@ -217103,18 +217327,20 @@ self: { "recover-rtti" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, ghc-heap , ghc-prim, mtl, QuickCheck, sop-core, stm, tasty, tasty-quickcheck - , text, vector + , text, unordered-containers, vector }: mkDerivation { pname = "recover-rtti"; - version = "0.1.0.0"; - sha256 = "19bf4279nfq8sv20v56sah30mv2g10zy2yxcylhc33w85d9jkisl"; + version = "0.3.0.0"; + sha256 = "0zk08jzsww8sv3q9h1mnc6a8ckqlf3lvc5cxwfbni7rb9giz6zia"; libraryHaskellDepends = [ aeson base bytestring containers ghc-heap mtl sop-core stm text + unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers ghc-heap ghc-prim mtl QuickCheck - sop-core stm tasty tasty-quickcheck text vector + sop-core stm tasty tasty-quickcheck text unordered-containers + vector ]; description = "Recover run-time type information from the GHC heap"; license = lib.licenses.bsd3; @@ -217545,7 +217771,7 @@ self: { version = "0.1.0.0"; sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9"; libraryHaskellDepends = [ base crypto-api ]; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "ref" = callPackage @@ -218579,7 +218805,7 @@ self: { sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am"; libraryHaskellDepends = [ base parsec ]; description = "The parser and render to parsec and render the string"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -218988,21 +219214,6 @@ self: { }) {inherit (pkgs) pcre;}; "regex-pcre-builtin" = callPackage - ({ mkDerivation, array, base, bytestring, containers, regex-base - , text - }: - mkDerivation { - pname = "regex-pcre-builtin"; - version = "0.95.1.3.8.43"; - sha256 = "0n1sbsjch0n5cgv2lhw2yfaxb611mckyg0jpz2kcbyj5hcrvzv3c"; - libraryHaskellDepends = [ - array base bytestring containers regex-base text - ]; - description = "PCRE Backend for \"Text.Regex\" (regex-base)"; - license = lib.licenses.bsd3; - }) {}; - - "regex-pcre-builtin_0_95_2_3_8_43" = callPackage ({ mkDerivation, array, base, bytestring, containers, regex-base , text }: @@ -219015,7 +219226,6 @@ self: { ]; description = "PCRE Backend for \"Text.Regex\" (regex-base)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "regex-pcre-text" = callPackage @@ -219077,7 +219287,7 @@ self: { sha256 = "1y4vmiq1xksxxd84yvyark6axsz51ywb6slswbddlxbdpcpfday7"; doHaddock = false; description = "\"Regex for Windows\" C library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {}; "regex-posix-unittest" = callPackage @@ -219768,6 +219978,8 @@ self: { pname = "relation"; version = "0.5.2.0"; sha256 = "1sinb0rw2jq1xjy80rsxnjf5va33n2i67km55hxfls9w15wsg2yw"; + revision = "1"; + editedCabalFile = "18nh56qp1cjpg28sagwiy4h44v5dvm5rhm3wqyyz4mw3k78x71kh"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest doctest-discover hedgehog hspec @@ -220059,6 +220271,28 @@ self: { license = lib.licenses.mit; }) {}; + "relude_1_0_0_1" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , doctest, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "1.0.0.1"; + sha256 = "0cw9a1gfvias4hr36ywdizhysnzbzxy20fb3jwmqmgjy40lzxp2g"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers doctest Glob hedgehog text + ]; + benchmarkHaskellDepends = [ base criterion unordered-containers ]; + description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -221082,7 +221316,7 @@ self: { sha256 = "1s0s3p0dy07222ks83w3spfw9df33q5lggqv3dw4m9hd5x16a6zi"; libraryHaskellDepends = [ base ]; description = "Abstraction to manage user defined Type Errors"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "rere" = callPackage @@ -221168,8 +221402,8 @@ self: { }: mkDerivation { pname = "rescue"; - version = "0.4.0"; - sha256 = "0hv2q8mkd94ksxgvijn83bkxf9lgnqn92g6k4ryl05z21sc8wl8d"; + version = "0.4.2.1"; + sha256 = "096wlxiz8bjvjpnp68qzmkplddm3nh5417b3amn9x6kj7wvbf1ky"; libraryHaskellDepends = [ base exceptions ghc mtl text transformers transformers-base world-peace @@ -221272,7 +221506,7 @@ self: { base bytestring directory filepath tasty tasty-hunit ]; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -221330,7 +221564,7 @@ self: { optparse-applicative process unix ]; description = "Remove trivial conflict markers in a git repository"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -221746,7 +221980,7 @@ self: { base bytestring containers tasty tasty-hunit temporary text ]; description = "Easy Git repository serialization"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "restricted-workers" = callPackage @@ -222041,7 +222275,7 @@ self: { isExecutable = true; executableHaskellDepends = [ array base process ]; description = "Text-only reversi (aka othelo) game"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -222393,7 +222627,7 @@ self: { ]; testHaskellDepends = [ base simple-cmd ]; description = "Bugzilla query tool"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223256,7 +223490,7 @@ self: { ]; executableHaskellDepends = [ ansi-terminal base options time ]; description = "Ring-LWE/LWR challenges using Lol"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223365,7 +223599,7 @@ self: { monad-control mtl process resourcet text time unix ]; description = "A build daemon for Haskell development"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -223825,7 +224059,7 @@ self: { base optparse-applicative random regex-applicative ]; description = "Playing with applicatives and dice!"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224005,7 +224239,7 @@ self: { wreq ]; description = "Query the namecoin blockchain"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "rose" = callPackage @@ -224064,7 +224298,7 @@ self: { base containers deepseq minilens mtl transformers ]; description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224825,7 +225059,9 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to librtlsdr"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) rtl-sdr;}; "rtnetlink" = callPackage @@ -224887,7 +225123,7 @@ self: { QuickCheck temporary utf8-string ]; description = "Parsing and manipulation of rtorrent state file contents"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "rts-loader" = callPackage @@ -224906,7 +225142,7 @@ self: { ]; executableHaskellDepends = [ base Cabal process ]; description = "Dynamically load Haskell libraries"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -224925,8 +225161,10 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base ]; description = "Binding to the C++ audio stretching library Rubber Band"; - license = lib.licenses.gpl3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + license = lib.licenses.gpl3Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -225093,7 +225331,7 @@ self: { base cmdargs directory filepath old-time process ]; description = "runghc replacement for fast repeated runs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "runhs" = callPackage @@ -226682,7 +226920,7 @@ self: { ]; testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; description = "SwiftNav's SBP Library"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "sbp2udp" = callPackage @@ -226987,7 +227225,7 @@ self: { base hspec scalpel scalpel-core tagsoup text uri ]; description = "scalpel scrapers for search engines"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227229,7 +227467,7 @@ self: { options text text-icu transformers wai warp ]; description = "Find the ideal lesson layout"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227278,7 +227516,7 @@ self: { base groom hspec msgpack-binary QuickCheck ]; description = "Encoding-independent schemas for Haskell data types"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -227858,7 +228096,7 @@ self: { base ditto ditto-lucid lucid scotty text ]; description = "Html form validation using `ditto`"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228167,7 +228405,7 @@ self: { test-framework-quickcheck2 text validation ]; description = "Scrape websites for changes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228241,7 +228479,7 @@ self: { vector ]; description = "scroll(6), a roguelike game"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "scrypt" = callPackage @@ -228464,7 +228702,7 @@ self: { base Cabal hspec hspec-core lrucache QuickCheck stm ]; description = "image compositing with sdl2 - declarative style"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -228548,7 +228786,9 @@ self: { libraryPkgconfigDepends = [ SDL2_mixer ]; description = "Bindings to SDL2_mixer"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-sprite" = callPackage @@ -228588,7 +228828,9 @@ self: { libraryPkgconfigDepends = [ SDL2 SDL2_ttf ]; description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -229069,7 +229311,7 @@ self: { base containers diagrams-cairo diagrams-lib haskell-qrencode random ]; description = "Secret Santa game assigner using QR-Codes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -229091,7 +229333,7 @@ self: { test-framework test-framework-quickcheck2 vector ]; description = "Information-theoretic secure secret sharing"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {}; "secrm" = callPackage @@ -229165,7 +229407,7 @@ self: { ]; librarySystemDepends = [ sedna ]; description = "Sedna C API XML Binding"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {sedna = null;}; @@ -229286,8 +229528,8 @@ self: { }: mkDerivation { pname = "selective"; - version = "0.4.1.1"; - sha256 = "1ix9080g4qcs3w89bmilr6f84kg6vw9hyx5cs5hiw9xnp7dh4sdc"; + version = "0.4.2"; + sha256 = "1mg5hnr3f4zjh3ajy16jkxj630rnfa9iqnnmpjqd9gkjdxpssd5l"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers mtl QuickCheck tasty tasty-expected-failure @@ -229456,7 +229698,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Evaluate code snippets in Literate Haskell"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230023,7 +230265,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; description = "SmartyPants for Korean language"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -230198,7 +230440,7 @@ self: { tasty-hunit transformers vector ]; description = "A package with basic parsing utilities for several Bioinformatic data formats"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "sequenceTools" = callPackage @@ -230226,7 +230468,7 @@ self: { base bytestring hspec pipes sequence-formats vector ]; description = "A package with tools for processing DNA sequencing data"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "sequent-core" = callPackage @@ -232073,7 +232315,7 @@ self: { ]; testHaskellDepends = [ base hspec QuickCheck servant-server text ]; description = "Type-safe pagination for Servant APIs"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -232316,8 +232558,8 @@ self: { ({ mkDerivation, base, servant-client-core, servant-rawm }: mkDerivation { pname = "servant-rawm-client"; - version = "1.0.0.1"; - sha256 = "0ldjhmmfdh0jpfaz4sg1b9n5l23wza3w0m8bvvf80gvl7p6fk0fj"; + version = "1.0.0.2"; + sha256 = "08b52fzg1q2p8r58cwbjfc2ixrsxhv1hpzh99wb276s6bka4m9lr"; libraryHaskellDepends = [ base servant-client-core servant-rawm ]; description = "The client implementation of servant-rawm"; license = lib.licenses.bsd3; @@ -233500,7 +233742,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base directory exceptions hspec ]; description = "Session types library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233524,7 +233766,7 @@ self: { base distributed-process hspec network-transport-tcp sessiontypes ]; description = "Session types distributed"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -233807,7 +234049,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "S-Expression parsing/printing made fun and easy"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -234270,8 +234512,7 @@ self: { ]; description = "Build rules for historical benchmarking"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "shake-bindist" = callPackage @@ -234528,7 +234769,7 @@ self: { ]; executableHaskellDepends = [ base shake ]; description = "Shake build system on-disk caching"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235799,7 +236040,7 @@ self: { hmatrix JuicyPixels random random-shuffle split vector ]; description = "Machine Learning algorithms"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -235812,7 +236053,7 @@ self: { sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m"; libraryHaskellDepends = [ base ]; description = "Sieve is an implementation of the Sieve abstract data type"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "sifflet" = callPackage @@ -235936,8 +236177,8 @@ self: { }: mkDerivation { pname = "signable"; - version = "0.3"; - sha256 = "1bh4i93333s3yldn4nnl4xv4gb92ggdwap6im9f259cfg1v22d2q"; + version = "0.4"; + sha256 = "0fzf3zijr61ifqbxkmkzii8vbl5h04ydpzc24z5ixvcq94yfzlgx"; libraryHaskellDepends = [ asn1-encoding asn1-types base binary bytestring casing cryptonite memory microlens pem proto-lens proto-lens-runtime @@ -236144,7 +236385,7 @@ self: { unordered-containers vector wai wai-extra ]; description = "A minimalist web framework for the WAI server interface"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "simple-actors" = callPackage @@ -236398,7 +236639,7 @@ self: { libraryHaskellDepends = [ base parsec text transformers ]; executableHaskellDepends = [ base text ]; description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -236699,7 +236940,7 @@ self: { resource-pool simple transformers ]; description = "Connector package for integrating postgresql-orm with the Simple web framework"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "simple-reflect" = callPackage @@ -236775,7 +237016,7 @@ self: { cookie cryptohash http-types simple transformers wai wai-extra ]; description = "Cookie-based session management for the Simple web framework"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "simple-sessions" = callPackage @@ -236893,7 +237134,7 @@ self: { aeson attoparsec base hspec HUnit scientific vector ]; description = "A basic template language for the Simple web framework"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "simple-text-format" = callPackage @@ -236926,7 +237167,7 @@ self: { transformers vector vty ]; description = "UI library for terminal"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237163,7 +237404,7 @@ self: { base directory filepath mtl process random regex-compat split time ]; description = "A simple markup language that translates to LaTeX"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "simplex-basic" = callPackage @@ -237226,7 +237467,7 @@ self: { sha256 = "0a8414006gdya8b4dw38251kim3x2i5g7m03ga479ialghralrc8"; libraryHaskellDepends = [ base containers ]; description = "Load data organized in a tree"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "since" = callPackage @@ -237329,6 +237570,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "singleton-nats_0_4_6" = callPackage + ({ mkDerivation, base, singletons, singletons-base }: + mkDerivation { + pname = "singleton-nats"; + version = "0.4.6"; + sha256 = "1drjwwkpszgifhnd7p4qqz92z85nh7w81w1hpdqv9a6vc5hfbv7r"; + libraryHaskellDepends = [ base singletons singletons-base ]; + description = "Unary natural numbers relying on the singletons infrastructure"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "singleton-typelits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -237367,23 +237620,74 @@ self: { license = lib.licenses.bsd3; }) {}; + "singletons_3_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singletons"; + version = "3.0"; + sha256 = "1zrnmdv00i9lyrqvbvljx24lvi49p11m5gbvh1xc2ygnhgb6xmx5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Basic singleton types and definitions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "singletons-base" = callPackage + ({ mkDerivation, base, bytestring, Cabal, deepseq, directory + , filepath, pretty, process, singletons, singletons-th, tasty + , tasty-golden, template-haskell, text, th-desugar, turtle + }: + mkDerivation { + pname = "singletons-base"; + version = "3.0"; + sha256 = "0syrh4f9rs4g643c90md1vqrpr6p8h8g8sh4x3j2dld12yvrw4wn"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base pretty singletons singletons-th template-haskell text + th-desugar + ]; + testHaskellDepends = [ + base bytestring deepseq filepath process tasty tasty-golden text + turtle + ]; + description = "A promoted and singled version of the base library"; + license = lib.licenses.bsd3; + }) {}; + "singletons-presburger" = callPackage - ({ mkDerivation, base, ghc, ghc-typelits-presburger, mtl - , reflection, singletons + ({ mkDerivation, base, ghc-typelits-presburger, mtl, reflection + , singletons }: mkDerivation { pname = "singletons-presburger"; - version = "0.5.0.0"; - sha256 = "0pc95rg9vbcgzw6bzsj41vbz3h85p4lhf1ry8ik6l8c2nz3ga6bb"; + version = "0.6.0.0"; + sha256 = "1yg1l770c2817yhm569ij5rb8l15c69p5f68i0vrdd8kwpv1ka63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base ghc ghc-typelits-presburger mtl reflection singletons + base ghc-typelits-presburger mtl reflection singletons ]; description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package"; license = lib.licenses.bsd3; }) {}; + "singletons-th" = callPackage + ({ mkDerivation, base, containers, ghc-boot-th, mtl, singletons + , syb, template-haskell, th-desugar, th-orphans, transformers + }: + mkDerivation { + pname = "singletons-th"; + version = "3.0"; + sha256 = "1c0w7sg0lbpizrzns4g55wxsk5jm8wlqw0w9rz4jzqwy15byb572"; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl singletons syb template-haskell + th-desugar th-orphans transformers + ]; + description = "A framework for generating singleton types"; + license = lib.licenses.bsd3; + }) {}; + "singnal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -237392,7 +237696,7 @@ self: { sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj"; libraryHaskellDepends = [ base ]; description = "Singnal"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -237972,38 +238276,59 @@ self: { "skylighting" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , directory, filepath, pretty-show, skylighting-core, text + , pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.10.4"; - sha256 = "057nrlm714r78rfdrqyy4zjl50npvz5qaprrb9nfwdiyb50nyz2j"; + version = "0.10.4.1"; + sha256 = "1a1s0fvfbq9q4fy72192mh9sdxz81cpl2z6ghsbh7prfl2kbqsiv"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers skylighting-core + base binary containers skylighting-core ]; executableHaskellDepends = [ - base blaze-html bytestring containers directory filepath - pretty-show text + base blaze-html bytestring containers pretty-show text ]; description = "syntax highlighting library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; + }) {}; + + "skylighting_0_10_5" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , pretty-show, skylighting-core, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.10.5"; + sha256 = "09f21wkw8n5bjdn5bbrqphq4f44gipd1cb9b0ikjn9zrggglfnx9"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers skylighting-core + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers pretty-show text + ]; + description = "syntax highlighting library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, HUnit, mtl, pretty-show, QuickCheck, random, safe - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text - , transformers, utf8-string, xml-conduit + , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string + , xml-conduit }: mkDerivation { pname = "skylighting-core"; - version = "0.10.4"; - sha256 = "0b5cbwsr5mnl4wppxw8rwy4a14pk6s804c4qwf1cd2vzz9j64dag"; + version = "0.10.4.1"; + sha256 = "07pnwixyi4v24412j6fs2j5kip2j2rx5fakpdiczffwma4jagv73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238012,9 +238337,9 @@ self: { filepath mtl safe text transformers utf8-string xml-conduit ]; testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck text utf8-string + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text ]; benchmarkHaskellDepends = [ base containers criterion directory filepath text @@ -238023,6 +238348,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-core_0_10_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string + , xml-conduit + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.10.5"; + sha256 = "1iaisswfg8ab6rd11002390jfxr309qyvlm85h57mi8svwxk09x2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath mtl safe text transformers utf8-string xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -238297,7 +238654,7 @@ self: { libraryHaskellDepends = [ base time ]; executableHaskellDepends = [ base time ]; description = "zZzzZz"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "slice-cpp-gen" = callPackage @@ -238431,6 +238788,23 @@ self: { license = lib.licenses.mpl20; }) {}; + "slist_0_2_0_0" = callPackage + ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec + , hspec-hedgehog + }: + mkDerivation { + pname = "slist"; + version = "0.2.0.0"; + sha256 = "1aiswwh33rxp49adhjygyjrhivsflafz5z0kyv3wfnb0wk15jv96"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec hspec-hedgehog + ]; + description = "Sized list"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "sloane" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , bloomfilter, bytestring, conduit, conduit-extra, containers @@ -238469,7 +238843,7 @@ self: { base Chart Chart-cairo colour data-default-class lens ]; description = "Visualize mathematical function's slope fields"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "slot-lambda" = callPackage @@ -238969,7 +239343,7 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion time ]; description = "Symbolic Model Checking for Dynamic Epistemic Logic"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239179,7 +239553,7 @@ self: { template-haskell ]; description = "A type-safe interface to communicate with an SMT solver"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239197,7 +239571,7 @@ self: { mtl smtlib2 smtlib2-pipe text ]; description = "Dump the communication with an SMT solver for debugging purposes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239220,7 +239594,7 @@ self: { base Cabal cabal-test-quickcheck smtlib2 smtlib2-quickcheck ]; description = "A type-safe interface to communicate with an SMT solver"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239237,7 +239611,7 @@ self: { base containers dependent-map dependent-sum mtl QuickCheck smtlib2 ]; description = "Helper functions to create SMTLib expressions in QuickCheck"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239250,7 +239624,7 @@ self: { sha256 = "12828gfip43pwjwnhd0smvkz1ar71gbp4lkv3njli6yp5dbcwfi5"; libraryHaskellDepends = [ base dependent-sum mtl smtlib2 time ]; description = "Get timing informations for SMT queries"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -239590,6 +239964,8 @@ self: { ]; description = "Serve Elm files through the Snap web framework"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snap-error-collector" = callPackage @@ -239967,7 +240343,7 @@ self: { snap snap-core ]; description = "CoffeeScript for Snap, auto-compilation and pre-compilation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240203,6 +240579,8 @@ self: { testHaskellDepends = [ base hspec-snap hspec2 lens snap text ]; description = "Lexical Style Sheets - Snap Web Framework adaptor"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "snaplet-mandrill" = callPackage @@ -240544,7 +240922,7 @@ self: { sednaDBXML snap ]; description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240806,7 +241184,7 @@ self: { base classy-prelude containers lens linear mtl ncurses transformers ]; description = "Tiny, declarative wrapper around ncurses"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240867,7 +241245,7 @@ self: { base containers directory filepath HsSyck parsec safe spoonutil ]; description = "The Simple Nice-Looking Manual Generator"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -240911,7 +241289,7 @@ self: { optparse-applicative parsec random ]; description = "Strategic board game of medium complexity"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241013,7 +241391,7 @@ self: { base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random ]; description = "randomized fractal snowflakes demo"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "snowtify" = callPackage @@ -241388,7 +241766,7 @@ self: { enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo gtk old-time stm ]; description = "GUI functions as used in the book \"The Haskell School of Expression\""; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -241632,7 +242010,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; description = "Generate string for sort key"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "sorting" = callPackage @@ -241906,26 +242284,33 @@ self: { }) {}; "spacecookie" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , directory, fast-logger, filepath, hxt-unicode, mtl, socket - , systemd, transformers, unix + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, directory, download-curl, fast-logger + , filepath-bytestring, hxt-unicode, mtl, process, socket, systemd + , tasty, tasty-expected-failure, tasty-hunit, text, transformers + , unix }: mkDerivation { pname = "spacecookie"; - version = "0.2.1.2"; - sha256 = "0cb51kji78vfg17mcnz3a5jlfbnyavh880x09b18y9syqwx4in7l"; + version = "1.0.0.0"; + sha256 = "0v61n5afcrfmj7dd51h4wi7d5hzl4r86wvaymhsi3h4jday58ln0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers directory fast-logger - filepath hxt-unicode mtl socket transformers unix + async attoparsec base bytestring containers directory + filepath-bytestring hxt-unicode mtl socket text transformers unix ]; executableHaskellDepends = [ - aeson attoparsec base bytestring containers directory filepath mtl - socket systemd transformers unix + aeson attoparsec base bytestring containers directory fast-logger + filepath-bytestring mtl socket systemd text transformers unix ]; - description = "Gopher Library and Server Daemon"; - license = lib.licenses.gpl3; + testHaskellDepends = [ + attoparsec base bytestring containers directory download-curl + filepath-bytestring process tasty tasty-expected-failure + tasty-hunit + ]; + description = "Gopher server library and daemon"; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; @@ -242060,7 +242445,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "An SPARQL 1.1 Protocol client library."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "sparrow" = callPackage @@ -242173,7 +242558,7 @@ self: { mwc-random primitive QuickCheck scientific ]; description = "Numerical computing in native Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "sparse-tensor" = callPackage @@ -242293,7 +242678,7 @@ self: { tasty-quickcheck vector-space ]; description = "Rotate about any suitable axis"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "spawn" = callPackage @@ -242461,7 +242846,7 @@ self: { sparse-linear-algebra statistics vector ]; description = "Library for spectral clustering"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -242815,7 +243200,7 @@ self: { tasty tasty-hunit tasty-quickcheck vector ]; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243019,7 +243404,7 @@ self: { base directory extensible-exceptions filepath parsec ]; description = "Spoon's utilities. Simple testing and nice looking error reporting."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -243686,7 +244071,7 @@ self: { temporary text time vty ]; description = "text UI for scanning with SANE"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245443,7 +245828,7 @@ self: { sha256 = "0b6y8yi0cfisi58pxxx1gnd1vab2i8f5wb3gzv1dfsxx5hl6jlwf"; libraryHaskellDepends = [ base MissingH ]; description = "Reusable static analysis interfaces and modules"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "statistics" = callPackage @@ -245569,7 +245954,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base statistics text vector ]; description = "command line statistics"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245586,7 +245971,7 @@ self: { base bytestring monad-control mtl network random ]; description = "StatsD API"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -245843,7 +246228,7 @@ self: { aeson base base64-bytestring binary bytestring split text ]; description = "Parse Structured Test Data Format (STDF)"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246322,7 +246707,7 @@ self: { libraryHaskellDepends = [ base mtl process stm unix ]; testHaskellDepends = [ base QuickCheck stm ]; description = "Simple STM Promises for IO computations and external processes"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246442,7 +246827,7 @@ self: { base Chart Chart-cairo containers mtl random ]; description = "Monadic composition of probabilistic functions and sampling"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -246694,8 +247079,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.9"; - sha256 = "189ygrm1ycyyklh77a9vhdvw86gbhjba0kl8kj7z1b79sw8q4v4g"; + version = "0.7.10"; + sha256 = "0026bjff7nsw23i1l5427qnvw69ncbii5s2q1nshkrs1nrspb0i2"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -246840,7 +247225,7 @@ self: { unordered-containers vector ]; description = "Client for Stratum protocol"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -247569,6 +247954,8 @@ self: { pname = "streamly"; version = "0.7.3"; sha256 = "11bjyyqc745igw7122284fjph0922l56jddnhfy5h7w84nj35ck3"; + revision = "1"; + editedCabalFile = "1fbhk59p5hjkxf4dnghs8wb70pyv0kx6br5sf4csf4vk1rkqyljw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248686,8 +249073,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "5.0.13"; - sha256 = "137kqb3lvqyzvarcgvc8ifphj2927z01pcl752sna9vcvj7q7wp6"; + version = "5.0.14"; + sha256 = "0a9hnrl7ww92ki1z4qa8m2smxlc0gq2a856w706ayzzfkma5dxil"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -248776,7 +249163,7 @@ self: { testing-feat ]; description = "Instantiate structural induction schemas for algebraic data types"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -248815,26 +249202,6 @@ self: { }) {}; "structured-cli" = callPackage - ({ mkDerivation, base, data-default, exceptions, haskeline, mtl - , split, transformers - }: - mkDerivation { - pname = "structured-cli"; - version = "2.6.0.0"; - sha256 = "1g0yq5kxidmh4x0izvspafhhir64krw986s0a5rkbvkjk7ahvm7y"; - revision = "1"; - editedCabalFile = "0gmviyrihzpm27s91ygs5fzdawk33aqw74dyasn354kfczq5vza7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base data-default exceptions haskeline mtl split transformers - ]; - executableHaskellDepends = [ base data-default mtl split ]; - description = "Application library for building interactive console CLIs"; - license = lib.licenses.bsd3; - }) {}; - - "structured-cli_2_7_0_1" = callPackage ({ mkDerivation, base, data-default, exceptions, haskeline, mtl , split, transformers }: @@ -248850,7 +249217,6 @@ self: { executableHaskellDepends = [ base data-default mtl split ]; description = "Application library for building interactive console CLIs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "structured-haskell-mode" = callPackage @@ -249208,8 +249574,8 @@ self: { }: mkDerivation { pname = "subcategories"; - version = "0.1.0.0"; - sha256 = "0rrvlwfyjmv4wpvm9dbr4vxbmlr24pzdfwvz3hkshgxnrc58gslw"; + version = "0.1.1.0"; + sha256 = "09ri226jxcig4f3jxcjh63skvv48myis58ffj7zrmr12sfzkb279"; libraryHaskellDepends = [ base containers data-default foldl hashable mono-traversable pointed primitive reflection semialign template-haskell text these @@ -249273,7 +249639,7 @@ self: { base containers lens mtl parsec pretty template-haskell ]; description = "Toolchain of subleq computer"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249307,7 +249673,7 @@ self: { base cmark hlint hspec template-haskell text ]; description = "Extract a part from CommonMark/Markdown docs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249338,7 +249704,7 @@ self: { base bytestring cassava containers optparse-generic text vector ]; description = "Subsample data"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -249410,7 +249776,7 @@ self: { libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec ]; description = "Helps when going \"seed values\" -> alternatives and optional -> answers"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "success" = callPackage @@ -249474,7 +249840,7 @@ self: { libraryHaskellDepends = [ base vector ]; executableHaskellDepends = [ base HUnit ]; description = "n log n implementation of suffix array"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250288,7 +250654,7 @@ self: { sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz"; libraryHaskellDepends = [ array base ]; description = "A support vector machine written in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "svm-light-utils" = callPackage @@ -250490,7 +250856,7 @@ self: { random-shuffle readline system-fileio system-filepath text ]; description = "Clojure without alphanumerics"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250571,7 +250937,7 @@ self: { test-framework test-framework-hunit text time ]; description = "A semantic web toolkit"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; }) {}; "swiss-ephemeris" = callPackage @@ -250579,13 +250945,13 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.2.1.0"; - sha256 = "0mbq3mzplxnnpr1zqbgg6k1ggh0fw4xlzvyg74rid863dxcldjpm"; + version = "1.2.1.1"; + sha256 = "1k584gv36xgj87qbrvcl5w9v8z2k7y4csmz737d5r2a8mvf8sf33"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250929,7 +251295,7 @@ self: { text transformers ]; description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250952,7 +251318,7 @@ self: { tasty tasty-golden text time transformers treeseq ]; description = "Library for reading and writing Atom"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250965,7 +251331,7 @@ self: { sha256 = "1yvlvsr38b1ydplpz1jldy816sngmic273iajcmhr73rlyzk5y3d"; libraryHaskellDepends = [ base ]; description = "Basic symantics for writing Embedded Domain-Specific Languages (EDSL)"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "symantic-cli" = callPackage @@ -250981,7 +251347,7 @@ self: { transformers ]; description = "Symantics for parsing and documenting a CLI"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -250999,7 +251365,7 @@ self: { base containers tasty tasty-hunit text transformers ]; description = "Document symantics"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "symantic-grammar" = callPackage @@ -251015,7 +251381,7 @@ self: { base megaparsec tasty tasty-hunit text transformers ]; description = "Library for symantic grammars"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "symantic-http" = callPackage @@ -251031,7 +251397,7 @@ self: { text transformers ]; description = "Symantic combinators for deriving clients or a server from an HTTP API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251051,7 +251417,7 @@ self: { symantic-http text time transformers word8 ]; description = "symantic-http applied to the derivation of HTTP clients"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251079,7 +251445,7 @@ self: { time transformers wai wai-extra warp ]; description = "Demo for symantic-http and its companion libraries"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251102,7 +251468,7 @@ self: { symantic-http text time transformers word8 ]; description = "Streaming support through pipes for symantic-http"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251122,7 +251488,7 @@ self: { text time transformers wai warp word8 ]; description = "symantic-http applied to the derivation of HTTP servers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251151,7 +251517,7 @@ self: { transformers wai wai-extra warp ]; description = "Test symantic-http and its companion libraries"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251175,7 +251541,7 @@ self: { tasty-hunit text transformers ]; description = "Symantics for common types"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251225,7 +251591,7 @@ self: { symantic-base tasty tasty-golden text transformers treeseq ]; description = "Library for reading, validating and writing XML"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -251381,7 +251747,7 @@ self: { ansi-terminal base monad-loops random ]; description = "Minimal implementation(s) of the classic electronic memory game"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "sync" = callPackage @@ -253658,23 +254024,6 @@ self: { }) {}; "tasty" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl - , optparse-applicative, stm, tagged, unbounded-delays, unix - , wcwidth - }: - mkDerivation { - pname = "tasty"; - version = "1.2.3"; - sha256 = "0qpn0avpw4w1qq5r2gwh2piipj0llqq6ylagr3xnqiraq6mhg8cc"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers mtl optparse-applicative - stm tagged unbounded-delays unix wcwidth - ]; - description = "Modern and extensible testing framework"; - license = lib.licenses.mit; - }) {}; - - "tasty_1_4_1" = callPackage ({ mkDerivation, ansi-terminal, base, clock, containers, mtl , optparse-applicative, stm, tagged, unbounded-delays, unix , wcwidth @@ -253689,27 +254038,9 @@ self: { ]; description = "Modern and extensible testing framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-ant-xml" = callPackage - ({ mkDerivation, base, containers, directory, filepath - , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers - , xml - }: - mkDerivation { - pname = "tasty-ant-xml"; - version = "1.1.7"; - sha256 = "01br1jqmin3kislw59rdsgl4pggdf8miwddifj654dllfgg148vg"; - libraryHaskellDepends = [ - base containers directory filepath generic-deriving ghc-prim mtl - stm tagged tasty transformers xml - ]; - description = "Render tasty output to XML for Jenkins"; - license = lib.licenses.bsd3; - }) {}; - - "tasty-ant-xml_1_1_8" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml @@ -253724,7 +254055,6 @@ self: { ]; description = "Render tasty output to XML for Jenkins"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-auto" = callPackage @@ -253787,6 +254117,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_2_3" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.2.3"; + sha256 = "16273rxlvjh960mdlhkpggx8rbza1n18fxl9m9yi8dhkli4g0w6a"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -253875,28 +254217,6 @@ self: { }) {}; "tasty-golden" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, mtl, optparse-applicative, process, tagged - , tasty, tasty-hunit, temporary, text - }: - mkDerivation { - pname = "tasty-golden"; - version = "2.3.3.2"; - sha256 = "19dif84p71hks8czmaff6nlylsz34bqy0nki7mclr4ysawz1hdm9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring containers deepseq directory filepath mtl - optparse-applicative process tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - ]; - description = "Golden tests support for tasty"; - license = lib.licenses.mit; - }) {}; - - "tasty-golden_2_3_4" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged , tasty, tasty-hunit, temporary, text, unix-compat @@ -253917,7 +254237,25 @@ self: { ]; description = "Golden tests support for tasty"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; + }) {}; + + "tasty-grading-system" = callPackage + ({ mkDerivation, aeson, base, containers, directory, filepath + , generic-deriving, mtl, stm, tagged, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "tasty-grading-system"; + version = "0.1.0.0"; + sha256 = "1r72gbylmv466naxkqsf56wlkp5kzhvyq0w3k7g47hs1rlslllmp"; + revision = "2"; + editedCabalFile = "1kr1113k6a0d8yd51lvl1689wdbq2lb2fp44rl6jzdaizxvj360f"; + libraryHaskellDepends = [ + aeson base containers directory filepath generic-deriving mtl stm + tagged tasty text + ]; + testHaskellDepends = [ aeson base tasty tasty-hunit ]; + description = "Grade your tasty-testsuite"; + license = lib.licenses.bsd3; }) {}; "tasty-groundhog-converters" = callPackage @@ -253948,6 +254286,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.1.0"; sha256 = "0vkmhqfydyxbvjjbwvwn0q1f1a2dl9wmhz0s7020frpzwqcjwm5b"; + revision = "1"; + editedCabalFile = "1yhj5jpgsr1mflsadf1fgaj8hh7y3dnfsg95m6bni7xprdnw6nf9"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -253988,6 +254328,8 @@ self: { pname = "tasty-hspec"; version = "1.1.6"; sha256 = "02s82ijs2ringqxsqbm7m3vcy5brmwxa617azxv0v2phi3rdkjvl"; + revision = "1"; + editedCabalFile = "0za15rg0szacxq9yfxxjzddr77ai7ng5827a20pj9dr5anjlnajj"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -254291,33 +254633,6 @@ self: { }) {}; "tasty-silver" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , deepseq, directory, filepath, mtl, optparse-applicative, process - , process-extras, regex-tdfa, semigroups, stm, tagged, tasty - , tasty-hunit, temporary, text, transformers - }: - mkDerivation { - pname = "tasty-silver"; - version = "3.1.15"; - sha256 = "07iiaw5q5jb6bxm5ys1s6bliw0qxsqp100awzxwkwfia03i1iz8z"; - revision = "1"; - editedCabalFile = "1pxwixy274w0z99zsx0aywcxcajnpgan3qri81mr1wb6afxrq8d6"; - libraryHaskellDepends = [ - ansi-terminal async base bytestring containers deepseq directory - filepath mtl optparse-applicative process process-extras regex-tdfa - semigroups stm tagged tasty temporary text - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - transformers - ]; - description = "A fancy test runner, including support for golden tests"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "tasty-silver_3_2_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit @@ -254474,7 +254789,7 @@ self: { typed-process ]; description = "Terminal user acceptance testing (UAT) via tmux"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "tasty-travis" = callPackage @@ -254547,7 +254862,7 @@ self: { base dollaridoos profunctors semigroups ]; description = "Types and combinators for taxes"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "tbox" = callPackage @@ -255029,7 +255344,7 @@ self: { aeson base bytestring data-default http-conduit url utf8-string ]; description = "Telegram API client"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255249,7 +255564,7 @@ self: { regex-pcre split tagsoup text time transformers ]; description = "IRC tellbot"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255401,7 +255716,7 @@ self: { unordered-containers uri-encode ]; description = "Template Toolkit implementation for Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "template-yj" = callPackage @@ -255427,7 +255742,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base mtl tagsoup uniplate ]; description = "Make template from website"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255661,7 +255976,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Programmers' time tracker"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "tensor" = callPackage @@ -255673,7 +255988,7 @@ self: { libraryHaskellDepends = [ base ghc-prim random vector ]; testHaskellDepends = [ base QuickCheck random ]; description = "A completely type-safe library for linear algebra"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -256022,7 +256337,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base cli ]; description = "Composable terminal colors"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "terminal" = callPackage @@ -256278,7 +256593,7 @@ self: { base containers mtl process syb transformers ]; description = "A semantic parser for lojban"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257008,7 +257323,7 @@ self: { base optparse-generic system-filepath text ]; description = "Compile separate tex files with the same bibliography"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "tex2txt" = callPackage @@ -257022,7 +257337,7 @@ self: { libraryHaskellDepends = [ base containers deepseq parsec ]; executableHaskellDepends = [ base containers deepseq parsec ]; description = "LaTeX to plain-text conversion"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257044,7 +257359,7 @@ self: { temporary unix ]; description = "View your latex output while editing"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257056,8 +257371,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.12.1.1"; - sha256 = "04clgbbzva9yxzkn9nf176mqj1lrv64h13awk86l4lrcfbb7kgh1"; + version = "0.12.2"; + sha256 = "0lqib59cnvxvgj6k8wk74g5xbamf63q3z7wnwc8r2d56z05djvxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257068,7 +257383,7 @@ self: { utf8-string xml ]; description = "Conversion between formats used to represent mathematics"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "texrunner" = callPackage @@ -257230,7 +257545,7 @@ self: { tasty-quickcheck text text-short vector ]; description = "Memory-efficient string-indexed container types"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257383,7 +257698,7 @@ self: { test-framework-quickcheck2 test-framework-th text text-icu ]; description = "Dealing with Strict Text in NFC normalization"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -257513,20 +257828,6 @@ self: { }) {}; "text-manipulate" = callPackage - ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }: - mkDerivation { - pname = "text-manipulate"; - version = "0.2.0.1"; - sha256 = "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base tasty tasty-hunit text ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Case conversion, word boundary manipulation, and textual subjugation"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; - }) {}; - - "text-manipulate_0_3_0_0" = callPackage ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }: mkDerivation { pname = "text-manipulate"; @@ -257537,7 +257838,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Case conversion, word boundary manipulation, and textual subjugation"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "text-markup" = callPackage @@ -257826,8 +258126,8 @@ self: { pname = "text-show-instances"; version = "3.8.4"; sha256 = "1vsrf4vjq4z759srnzvyk3hn90ck4k91vy8cn625m8hy1zddqj2q"; - revision = "1"; - editedCabalFile = "1z7kgnxm9r9dgnqn4fyrfv3k8k2dac7g2hsf649jaxhh898z6dm6"; + revision = "2"; + editedCabalFile = "1k5q21j0276jafyy4icgncz45r5gab2mj8964xayhh548rzj5cm6"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -258134,8 +258434,8 @@ self: { ({ mkDerivation, base, QuickCheck, utility-ht }: mkDerivation { pname = "tfp"; - version = "1.0.1.1"; - sha256 = "1qkcm4l09qpxy9996lnfn79c1wn1ca45s3i2iz2x3kvp0f999d3i"; + version = "1.0.2"; + sha256 = "02rm06cscj470ab6pla3050l1iygak69yfhsy0wc6cvavz181plf"; libraryHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ base QuickCheck ]; description = "Type-level integers, booleans, lists using type families"; @@ -258266,23 +258566,6 @@ self: { }) {}; "th-compat" = callPackage - ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl - , template-haskell - }: - mkDerivation { - pname = "th-compat"; - version = "0.1.1"; - sha256 = "1y83yq5ac067a631bd4kg0d14yp8hc23a0dsqsgbqdn279c21ylm"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ - base base-compat hspec mtl template-haskell - ]; - testToolDepends = [ hspec-discover ]; - description = "Backward- (and forward-)compatible Quote and Code types"; - license = lib.licenses.bsd3; - }) {}; - - "th-compat_0_1_2" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover, mtl , template-haskell }: @@ -258297,7 +258580,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Backward- (and forward-)compatible Quote and Code types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-constraint-compat" = callPackage @@ -258369,6 +258651,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-desugar_1_12" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, HUnit, mtl + , ordered-containers, syb, template-haskell, th-abstraction + , th-lift, th-orphans, transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.12"; + sha256 = "1bp47jpif299kbm27zhjaw1nhl12daa09vsc8f0jracq0jhxi3iv"; + libraryHaskellDepends = [ + base containers ghc-prim mtl ordered-containers syb + template-haskell th-abstraction th-lift th-orphans + transformers-compat + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-abstraction + th-lift th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-dict-discovery" = callPackage ({ mkDerivation, base, constraints, template-haskell }: mkDerivation { @@ -258396,32 +258701,21 @@ self: { }) {}; "th-expand-syns" = callPackage - ({ mkDerivation, base, containers, syb, template-haskell }: + ({ mkDerivation, base, containers, syb, template-haskell + , th-abstraction + }: mkDerivation { pname = "th-expand-syns"; - version = "0.4.6.0"; - sha256 = "1dz8bl4yb6sis74knmvqxa21y9yws9l8gafzsi0chaqx15b5asxj"; - libraryHaskellDepends = [ base containers syb template-haskell ]; - testHaskellDepends = [ base template-haskell ]; + version = "0.4.8.0"; + sha256 = "1mw0yxfbmicv0irfrcz4s6pn39za7yjd7zz09ialwym1b46624si"; + libraryHaskellDepends = [ + base containers syb template-haskell th-abstraction + ]; + testHaskellDepends = [ base template-haskell th-abstraction ]; description = "Expands type synonyms in Template Haskell ASTs"; license = lib.licenses.bsd3; }) {}; - "th-expand-syns_0_4_7_0" = callPackage - ({ mkDerivation, base, containers, syb, template-haskell }: - mkDerivation { - pname = "th-expand-syns"; - version = "0.4.7.0"; - sha256 = "1gmb89pgy3i0jpd760xmzx254xpg8pczfa8glgw9z1wak09kwv54"; - revision = "1"; - editedCabalFile = "0zh77kg86qmr285sn0xhhi2hbn8b9dx2pgmf2fipij8zj32k9ny4"; - libraryHaskellDepends = [ base containers syb template-haskell ]; - testHaskellDepends = [ base template-haskell ]; - description = "Expands type synonyms in Template Haskell ASTs"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -259732,7 +260026,7 @@ self: { sha256 = "0xpfcabhlpnp883jb23sjcilan1cwwykvvlqvc6qzhda63fcyqp1"; libraryHaskellDepends = [ base tuples-homogenous-h98 vector ]; description = "3D Tic-Tac-Toe game"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259756,7 +260050,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "tidal-midi" = callPackage @@ -259773,7 +260067,7 @@ self: { base containers PortMidi tidal time transformers ]; description = "MIDI support for tidal"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259788,7 +260082,7 @@ self: { base bytestring containers serialport tidal ]; description = "Serial support for tidal"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -259810,7 +260104,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "Visual rendering for Tidal patterns and osc messages"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260085,7 +260379,7 @@ self: { sha256 = "0n05lw6zpcfr3lwy2qn7v0j3ym1la9x0mak8szaxc2nbkyc8drrb"; libraryHaskellDepends = [ base base-io-access time ]; description = "IO Access for time"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260226,7 +260520,7 @@ self: { base doctest doctest-discover template-haskell time ]; description = "Quasi-quoters for dates and times"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260245,7 +260539,7 @@ self: { test-framework-hunit time ]; description = "Generate recurring dates"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260261,7 +260555,7 @@ self: { libraryHaskellDepends = [ array base containers mtl ]; executableHaskellDepends = [ base ]; description = "Time series analysis"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -260370,7 +260664,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base process time ]; description = "time each line of terminal output"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "timeit" = callPackage @@ -260737,28 +261031,28 @@ self: { executableHaskellDepends = [ base brick microlens time vty ]; testHaskellDepends = [ base hspec microlens time ]; description = "Time utilities"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; "timezone-detect" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-discover, time - , timezone-olson, timezone-series + ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck + , time, timezone-olson, timezone-series }: mkDerivation { pname = "timezone-detect"; - version = "0.3.0.0"; - sha256 = "10pv88wmz8zqr1h3zh66skbkma2zz3gvwjaalnpfz5ii2dgl27yy"; + version = "0.3.0.1"; + sha256 = "1n4jmx0196zzq092b66kcrwpk00xsm7sj4s29ij5cl05sdaqalqx"; libraryHaskellDepends = [ base time timezone-olson timezone-series ]; testHaskellDepends = [ - base directory hspec time timezone-olson timezone-series + base directory hspec QuickCheck time timezone-olson timezone-series ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the zone-detect C library; plus tz-aware utils"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261071,7 +261365,7 @@ self: { keera-hails-reactivevalues mtl network network-bsd template-haskell ]; description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261090,7 +261384,7 @@ self: { base IfElse network network-bsd stm transformers Yampa ]; description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261103,7 +261397,7 @@ self: { sha256 = "0h7d4152nd8mx4slyjss4kf7n1xn99vc5hnk072apqfv301vpbx3"; libraryHaskellDepends = [ base Yampa ]; description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261497,7 +261791,7 @@ self: { base bytestring directory template text ]; description = "simple executable for templating"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "tn" = callPackage @@ -261709,7 +262003,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "token-limiter" = callPackage @@ -261799,7 +262093,7 @@ self: { sha256 = "0n8w923m8c803zcphims51q2xm6a0374zzh00d62mg92zbdsh9vn"; libraryHaskellDepends = [ base bytestring text ]; description = "An efficient and easy-to-use tokenizer monad"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "tokenizer-streaming" = callPackage @@ -261815,7 +262109,7 @@ self: { streaming-commons text tokenizer-monad ]; description = "A variant of tokenizer-monad that supports streaming"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261841,7 +262135,7 @@ self: { ]; testHaskellDepends = [ base hspec ]; description = "TokTok C code style checker"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -261893,7 +262187,9 @@ self: { librarySystemDepends = [ tokyocabinet tokyotyrant ]; description = "FFI bindings to libtokyotyrant"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; @@ -261919,8 +262215,8 @@ self: { pname = "toml"; version = "0.1.3"; sha256 = "0wby1jas854niwyac95n39liqc874xcd1ahqpw6ksi2nhv2ld6f2"; - revision = "1"; - editedCabalFile = "086a2dsv3nn04ak78c0q0by9kqdw92idfl1iyzp1qihfdi8mxb2f"; + revision = "2"; + editedCabalFile = "1qzlsicdd7qdys69iy838y2v4dkaq4d4ar664l338y5y7fg3axxv"; libraryHaskellDepends = [ attoparsec base bytestring containers old-locale time ]; @@ -261974,6 +262270,37 @@ self: { license = lib.licenses.mpl20; }) {}; + "tomland_1_3_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , hashable, hedgehog, hspec, hspec-hedgehog, hspec-megaparsec + , markdown-unlit, megaparsec, mtl, parser-combinators, text, time + , transformers, unordered-containers, validation-selective + }: + mkDerivation { + pname = "tomland"; + version = "1.3.3.0"; + sha256 = "1masnbr5x75727k2rmgcmxqm91139v9wy434ml5a4c3dsry7xyhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable megaparsec mtl + parser-combinators text time transformers unordered-containers + validation-selective + ]; + executableHaskellDepends = [ + base bytestring containers hashable text time unordered-containers + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ + base bytestring containers directory hashable hedgehog hspec + hspec-hedgehog hspec-megaparsec megaparsec text time + unordered-containers + ]; + description = "Bidirectional TOML serialization"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "tomlcheck" = callPackage ({ mkDerivation, base, htoml-megaparsec, megaparsec , optparse-applicative, text @@ -262174,7 +262501,7 @@ self: { ]; executableHaskellDepends = [ base optparse-generic ]; description = "Cluster single cells and analyze cell clade relationships"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262456,7 +262783,7 @@ self: { saltine text ]; description = "A Tox protocol implementation in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -262483,7 +262810,7 @@ self: { data-default-class hspec QuickCheck saltine ]; description = "Haskell bindings to the C reference implementation of Tox"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {toxcore = null;}; @@ -262626,7 +262953,7 @@ self: { wai warp websockets wuss ]; description = "Applications for interacting with the Pushbullet API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263104,7 +263431,7 @@ self: { base containers criterion mtl multirec parsec QuickCheck ]; description = "Generic representation of tree transformations"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -263729,27 +264056,27 @@ self: { "tree-diff" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , base-compat, bytestring, bytestring-builder, containers, hashable - , parsec, parsers, pretty, QuickCheck, scientific, tagged, tasty - , tasty-golden, tasty-quickcheck, text, time, trifecta - , unordered-containers, uuid-types, vector + , base-compat, bytestring, bytestring-builder, containers + , criterion, deepseq, Diff, hashable, parsec, parsers, pretty + , primitive, QuickCheck, scientific, semialign, strict, tagged + , tasty, tasty-golden, tasty-quickcheck, text, these, time + , trifecta, unordered-containers, uuid-types, vector }: mkDerivation { pname = "tree-diff"; - version = "0.1"; - sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; - revision = "6"; - editedCabalFile = "1wqfac660m9ggv6r85a7y29mk947hki9iydy124vdwcqzichja0d"; + version = "0.2"; + sha256 = "1ny7mi0n8cyb65q9ihbnm2gxiyya888dw2c4y0hjy8k882wdhf0x"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring - bytestring-builder containers hashable parsec parsers pretty - QuickCheck scientific tagged text time unordered-containers - uuid-types vector + bytestring-builder containers deepseq hashable parsec parsers + pretty primitive QuickCheck scientific semialign strict tagged text + these time unordered-containers uuid-types vector ]; testHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck - tagged tasty tasty-golden tasty-quickcheck trifecta + ansi-terminal ansi-wl-pprint base base-compat parsec primitive + QuickCheck tagged tasty tasty-golden tasty-quickcheck trifecta ]; + benchmarkHaskellDepends = [ base criterion deepseq Diff ]; description = "Diffing of (expression) trees"; license = lib.licenses.gpl2Plus; }) {}; @@ -263762,7 +264089,7 @@ self: { sha256 = "07vgsps4kjld75ndnjjaigsk5vvg11vjp740pznhsw79k3qjbs9a"; libraryHaskellDepends = [ base containers mtl ]; description = "Library for functions pertaining to tree exploration and manipulation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "tree-monad" = callPackage @@ -263996,7 +264323,7 @@ self: { tasty-hunit text transformers ]; description = "A tree of Data.Map."; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264059,7 +264386,7 @@ self: { sha256 = "105gj9s8gp4xc4i7ank8m6pjc80kywl7vn53qdxfrndaljv4kark"; libraryHaskellDepends = [ base containers ]; description = "Library for a multi-way tree (rose tree), using Seq (finger tree) for forests"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "treeviz" = callPackage @@ -264169,7 +264496,7 @@ self: { attoparsec base bytestring containers deepseq mtl network ]; description = "Library for polling Tremulous servers"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264427,7 +264754,7 @@ self: { sha256 = "0y0iyll7ml5qz271cqa0dc3w2j3w1d8jjaxwaf2flcidigws69z5"; libraryHaskellDepends = [ base ]; description = "Constraints that any type, resp. no type fulfills"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264466,7 +264793,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion ]; description = "A Tropical Geometry package for Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -264945,7 +265272,7 @@ self: { transformers ]; description = "Write stream processing computations with side effects in a series of tubes"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265091,7 +265418,7 @@ self: { libraryHaskellDepends = [ base generics-sop ]; testHaskellDepends = [ base generics-sop ]; description = "functions on n-ary tuples using generics-sop"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "tuple-th" = callPackage @@ -265198,7 +265525,7 @@ self: { base containers hspec hspecVariant QuickCheck QuickCheckVariant ]; description = "An implementation of Turing Machine and Automaton"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -265243,29 +265570,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, foldl - , hostname, managed, optional-args, optparse-applicative, process - , stm, streaming-commons, system-fileio, system-filepath, temporary - , text, time, transformers, unix, unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.5.20"; - sha256 = "1dk8ddp1p77l7gbg81ryqrkaxhrj3an24mx572b5wmhmjmbjfk9l"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process stm streaming-commons system-fileio - system-filepath temporary text time transformers unix unix-compat - ]; - testHaskellDepends = [ base doctest system-filepath temporary ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = lib.licenses.bsd3; - }) {}; - - "turtle_1_5_21" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, foldl , hostname, managed, optional-args, optparse-applicative, process @@ -265286,7 +265590,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -266213,8 +266516,8 @@ self: { pname = "type-errors"; version = "0.2.0.0"; sha256 = "1d1fi4ij18q39rpibc056mgvly75zqixkba4l8bn307c62f50k8p"; - revision = "1"; - editedCabalFile = "157fjnr98fn5943siqwk1rd2wwnzd7nlbkbkzvdqv7d723cmh126"; + revision = "2"; + editedCabalFile = "1rlhswrkyvhaqhgk2yr9xk49yp196p5fy37hmyni9g7rx1d07qyj"; libraryHaskellDepends = [ base first-class-families syb template-haskell th-abstraction ]; @@ -267040,7 +267343,7 @@ self: { base ghc-typelits-knownnat mtl pretty-compact ]; description = "Typed frontend to TensorFlow and higher-order deep learning"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -267154,13 +267457,14 @@ self: { }) {}; "typenums" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, hspec, hspec-discover, QuickCheck }: mkDerivation { pname = "typenums"; - version = "0.1.2.1"; - sha256 = "06wrsvbddv2ga7k39954697jnclb5r6g4m95pr0fmv34ws1y1d66"; + version = "0.1.3"; + sha256 = "0ampchndx0z8bhdqgp14smv270pizjvlr54ns3x79hwjpg9m01rc"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; description = "Type level numbers using existing Nat functionality"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -267341,7 +267645,7 @@ self: { base containers parallel polynomials-bernstein vector ]; description = "Drawings for printed text documents"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "typson-beam" = callPackage @@ -267776,7 +268080,9 @@ self: { libraryPkgconfigDepends = [ systemd ]; description = "libudev bindings"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) systemd;}; "udp-conduit" = callPackage @@ -267908,7 +268214,7 @@ self: { optparse-applicative ]; description = "Minimal HTTP client library optimized for benchmarking"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "ui-command" = callPackage @@ -268277,7 +268583,7 @@ self: { ]; executableHaskellDepends = [ base bytestring cmdargs ]; description = "Secure and resilient remote file storage utility"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -268330,8 +268636,8 @@ self: { pname = "unescaping-print"; version = "0.1"; sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5"; - revision = "2"; - editedCabalFile = "113p28z74lvsc7c6v93ilvbyp2fn5h1qsymksn3mi2ndxwq3vz3f"; + revision = "3"; + editedCabalFile = "0r2ggyy2qla75jxdhd3izqqkqb3ar6538jczfwlbbxrj4w1xkd47"; libraryHaskellDepends = [ base ]; description = "Tiny package providing unescaping versions of show and print"; license = lib.licenses.bsd3; @@ -269186,7 +269492,7 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "An extendable library for type-safe computations including units"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -269670,6 +269976,20 @@ self: { license = "GPL"; }) {}; + "unlift-stm" = callPackage + ({ mkDerivation, base, stm, transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "unlift-stm"; + version = "0.1.0.0"; + sha256 = "1580vrv09f0w7ipzv89pq8xsz5labf3vprxxicy29q0nwnnc6y3l"; + libraryHaskellDepends = [ + base stm transformers unliftio unliftio-core + ]; + description = "(un)lifted classes and functions for the STM monad"; + license = lib.licenses.bsd2; + }) {}; + "unlifted-list" = callPackage ({ mkDerivation, base, ghc-prim, semigroups }: mkDerivation { @@ -269838,7 +270158,7 @@ self: { isExecutable = true; executableHaskellDepends = [ base storable-endian utility-ht ]; description = "Extract useful information from Amiga MED files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "unordered-containers" = callPackage @@ -271370,13 +271690,17 @@ self: { }) {}; "utility-ht" = callPackage - ({ mkDerivation, base, QuickCheck }: + ({ mkDerivation, base, doctest-exitcode-stdio, doctest-lib + , QuickCheck + }: mkDerivation { pname = "utility-ht"; - version = "0.0.15"; - sha256 = "148gdz6pbl1i5qjvjrq5576pg58anmh18xha37n9fncjy36pjp44"; + version = "0.0.16"; + sha256 = "10dvmfhhhj5w4wz5drhvs6i0yv35kbbcbzhy6ci34r3ppcik5rdw"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base doctest-exitcode-stdio doctest-lib QuickCheck + ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = lib.licenses.bsd3; }) {}; @@ -271781,7 +272105,7 @@ self: { sha256 = "0qmp5k4wg5ja2382cwarf8fwjval2a5wdwvz32f965hvwgc9cd43"; libraryHaskellDepends = [ base json MissingH mtl ]; description = "Cross-language extensible representation for algebraic data type instances"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271794,7 +272118,7 @@ self: { sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la"; libraryHaskellDepends = [ base process ]; description = "Utility function for reading a source of loaded uzbl pages"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "v4l2" = callPackage @@ -271848,7 +272172,7 @@ self: { ]; testHaskellDepends = [ base process ]; description = "the cabal companion"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271880,7 +272204,7 @@ self: { sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1"; libraryHaskellDepends = [ array base containers ghc-prim ]; description = "Graph representation of the GHC heap"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -271911,7 +272235,7 @@ self: { sha256 = "093ba6n30a6gyifnk3bd50rkx8qldjqq9vsk92pnq152ibs36b2m"; libraryHaskellDepends = [ base filepath graphviz vacuum ]; description = "A library for transforming vacuum graphs into GraphViz output"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272082,10 +272406,8 @@ self: { }: mkDerivation { pname = "validation-selective"; - version = "0.1.0.0"; - sha256 = "0ia3g2c1137pa0ns97yf8vbfvwmjhqnqhzn9lzgxvxwzchvwpnf7"; - revision = "1"; - editedCabalFile = "19pcv1i7xcrgg248dbgyl83zx3gn9zilrxqs3arlmkwdi0jdj4nv"; + version = "0.1.0.1"; + sha256 = "005j45rm0bqjlyh3w67zi62hjv3fp0np7szz80s9nm203i8p6wzb"; libraryHaskellDepends = [ base deepseq selective ]; testHaskellDepends = [ base doctest hedgehog hspec hspec-hedgehog selective text @@ -272348,7 +272670,7 @@ self: { optparse-applicative process uniplate ]; description = "Analyze and visualize expression trees"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -272996,7 +273318,7 @@ self: { test-framework-hunit test-framework-quickcheck2 ]; description = "Vector clocks for versioning message flows"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -273595,7 +273917,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion lens ]; description = "Random verilog generation and simulator testing"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274227,7 +274549,7 @@ self: { xmms2-client xmms2-client-glib ]; description = "An XMMS2 client"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274640,7 +274962,7 @@ self: { libraryPkgconfigDepends = [ vte ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) vte;}; @@ -274659,7 +274981,7 @@ self: { libraryPkgconfigDepends = [ vte ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the VTE library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) vte;}; @@ -274733,7 +275055,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base vty ]; description = "A lib for displaying a menu and getting a selection using VTY"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -274784,7 +275106,7 @@ self: { libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -275510,7 +275832,7 @@ self: { base bytestring conduit http-types text transformers wai wai-extra ]; description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -275627,15 +275949,15 @@ self: { , blaze-builder, blaze-html, bytestring, case-insensitive, cereal , clientsession, cookie, exceptions, hedgehog, hoauth2, http-client , http-client-tls, http-conduit, http-reverse-proxy, http-types - , jose, microlens, mtl, optparse-simple, regex-posix - , safe-exceptions, shakespeare, tasty, tasty-hedgehog, tasty-hunit - , text, time, unix-compat, unordered-containers, uri-bytestring - , vault, wai, wai-app-static, wai-extra, warp, yaml + , jose, microlens, mtl, optparse-applicative, optparse-simple + , regex-posix, safe-exceptions, shakespeare, tasty, tasty-hedgehog + , tasty-hunit, text, time, unix-compat, unordered-containers + , uri-bytestring, vault, wai, wai-app-static, wai-extra, warp, yaml }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.2.3.1"; - sha256 = "0i5zg6pyrr3f9g39jpk557h5rqzrm36279dav3v8n6lrj919x01m"; + version = "0.2.4.1"; + sha256 = "1q8vj3ri5fvdhlwls7az4zcwk7iyc3fi4yf968086pkg92hpzcdl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275647,7 +275969,8 @@ self: { uri-bytestring vault wai wai-app-static wai-extra yaml ]; executableHaskellDepends = [ - base bytestring cereal clientsession optparse-simple wai-extra warp + base bytestring cereal clientsession optparse-applicative + optparse-simple wai-extra warp ]; testHaskellDepends = [ aeson base binary bytestring clientsession cookie hedgehog hoauth2 @@ -276076,7 +276399,7 @@ self: { base Cabal directory mtl split text wai wai-middleware-static warp ]; description = "WAI middleware for preprocessing static files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -276267,6 +276590,29 @@ self: { broken = true; }) {}; + "wai-middleware-validation" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , filepath, here, hspec, http-types, insert-ordered-containers + , lens, openapi3, text, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-validation"; + version = "0.1.0.0"; + sha256 = "0cbp32j31xkmniml56gnh278g94zhhfc8xlp842n8lll5hh13bf4"; + libraryHaskellDepends = [ + aeson base bytestring containers filepath http-types + insert-ordered-containers lens openapi3 text wai + ]; + testHaskellDepends = [ + base bytestring doctest here hspec http-types openapi3 wai + wai-extra + ]; + description = "WAI Middleware to validate the request and response bodies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-middleware-verbs" = callPackage ({ mkDerivation, base, bytestring, exceptions, hashable, http-types , mmorph, monad-control, monad-control-aligned, monad-logger, mtl @@ -276647,7 +276993,7 @@ self: { vector-algorithms wai ]; description = "A simple cache for serving static files in a WAI middleware"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278039,7 +278385,7 @@ self: { transformers unordered-containers vector wreq ]; description = "Bindings to the WebDriver API"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -278228,7 +278574,7 @@ self: { libraryPkgconfigDepends = [ webkit ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {webkit = null;}; @@ -278277,7 +278623,7 @@ self: { libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk24x-gtk3;}; @@ -278334,7 +278680,7 @@ self: { base bytestring JuicyPixels tasty tasty-hunit ]; description = "JuicyPixels support for WebP format"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {inherit (pkgs) libwebp;}; "webpage" = callPackage @@ -279178,7 +279524,7 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ]; librarySystemDepends = [ dnsapi ]; description = "Domain Name Service (DNS) lookup via the /dnsapi.dll standard library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {dnsapi = null;}; @@ -279424,7 +279770,7 @@ self: { ]; testHaskellDepends = [ base conduit hspec HUnit mtl ]; description = "Run computations that depend on one or more elements in a stream"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "witherable" = callPackage @@ -279451,22 +279797,6 @@ self: { }) {}; "witherable-class" = callPackage - ({ mkDerivation, base, base-orphans, containers, hashable - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "witherable-class"; - version = "0"; - sha256 = "0jb8yq9i0rlbmcd5rbg95m2w26zbmi7iwph5v7wghiari751r2bp"; - libraryHaskellDepends = [ - base base-orphans containers hashable transformers - unordered-containers vector - ]; - description = "Witherable = Traversable + Filterable"; - license = lib.licenses.bsd3; - }) {}; - - "witherable-class_0_0_1" = callPackage ({ mkDerivation, base, witherable }: mkDerivation { pname = "witherable-class"; @@ -279475,7 +279805,6 @@ self: { libraryHaskellDepends = [ base witherable ]; description = "Witherable = Traversable + Filterable"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "within" = callPackage @@ -279877,7 +280206,7 @@ self: { libraryHaskellDepends = [ base binary containers ]; testHaskellDepends = [ base binary containers hspec QuickCheck ]; description = "Implementation of a finite trie over words"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "word-vector" = callPackage @@ -280245,7 +280574,7 @@ self: { ]; executableHaskellDepends = [ base ]; description = "a \"Desktop Workflow\" monad with Objective-C bindings"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280383,8 +280712,8 @@ self: { }: mkDerivation { pname = "wraxml"; - version = "0.4.4.1"; - sha256 = "04snqwr6plf1y179dzfjjmg9kjf4lbdgj22xqlhw6wllvd8953c2"; + version = "0.4.4.2"; + sha256 = "1cfbbr1fbp7wrm2w7rldvf3gvp8fzvnpa6c2mkxscarhmn5wl92z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280393,7 +280722,7 @@ self: { xml-basic ]; description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure"; - license = "GPL"; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280848,7 +281177,7 @@ self: { base bytestring file-embed hspec network-uri ]; description = "WSDL parsing in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -280867,7 +281196,7 @@ self: { base bencode bytestring containers directory safe utf8-string ]; description = "A small tool to list, add and remove webseeds from a torrent file"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281319,7 +281648,7 @@ self: { type-level ]; description = "A embedded DSL for manipulating DSP languages in Haskell"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281482,7 +281811,9 @@ self: { ]; description = "Haskell extended file attributes interface"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -281552,7 +281883,7 @@ self: { base directory filepath process unix ]; description = "XChat"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281569,7 +281900,7 @@ self: { base bytestring containers mtl network transformers ]; description = "Partial implementation of the XCP protocol with ethernet as transport layer"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -281718,7 +282049,7 @@ self: { libraryPkgconfigDepends = [ libxfconf ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "FFI bindings to xfconf"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {libxfconf = null;}; @@ -282917,7 +283248,7 @@ self: { ]; libraryToolDepends = [ c2hs ]; description = "An XMMS2 client library"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282931,7 +283262,7 @@ self: { libraryHaskellDepends = [ base haskell98 xmms2-client ]; libraryToolDepends = [ c2hs ]; description = "An XMMS2 client library — GLib integration"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -282978,7 +283309,9 @@ self: { benchmarkHaskellDepends = [ base gauge mtl time ]; description = "A Minimalistic Text Based Status Bar"; license = lib.licenses.bsd3; - platforms = [ "armv7l-linux" "i686-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; @@ -283079,7 +283412,7 @@ self: { sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9"; libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ]; description = "Third party extensions for xmonad"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283240,7 +283573,7 @@ self: { editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28"; libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; }) {}; "xmonad-windownames" = callPackage @@ -283461,43 +283794,45 @@ self: { }) {}; "xrefcheck" = callPackage - ({ mkDerivation, aeson, aeson-options, async, base, bytestring + ({ mkDerivation, aeson, aeson-casing, async, base, bytestring , cmark-gfm, containers, data-default, deepseq, directory - , directory-tree, filepath, fmt, Glob, hspec, hspec-discover - , http-client, http-types, lens, modern-uri, mtl, o-clock - , optparse-applicative, pretty-terminal, QuickCheck, req - , roman-numerals, template-haskell, text, text-metrics - , th-lift-instances, th-utilities, universum, with-utf8, yaml + , directory-tree, file-embed, filepath, fmt, Glob, hspec + , hspec-discover, http-client, http-types, HUnit, lens, modern-uri + , mtl, o-clock, optparse-applicative, pretty-terminal, QuickCheck + , regex-tdfa, req, roman-numerals, template-haskell, text + , text-metrics, th-lift-instances, th-utilities, transformers + , universum, with-utf8, yaml }: mkDerivation { pname = "xrefcheck"; - version = "0.1.2"; - sha256 = "0m3cya6rfx7ypq4sp172z9fnnl6n11v98f6bj003phrapl6s0vnn"; + version = "0.1.3"; + sha256 = "0v7ylf21kky36shq1l33mlcsg2iihqwqx7bxyjlmhndp9hi0dr8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-options async base bytestring cmark-gfm containers - data-default deepseq directory directory-tree filepath fmt Glob - http-client http-types lens modern-uri mtl o-clock - optparse-applicative pretty-terminal req roman-numerals + aeson aeson-casing async base bytestring cmark-gfm containers + data-default deepseq directory directory-tree file-embed filepath + fmt Glob http-client http-types HUnit lens modern-uri mtl o-clock + optparse-applicative pretty-terminal regex-tdfa req roman-numerals template-haskell text text-metrics th-lift-instances th-utilities - universum with-utf8 yaml + transformers universum with-utf8 yaml ]; executableHaskellDepends = [ - aeson aeson-options async base bytestring cmark-gfm containers - data-default deepseq directory directory-tree filepath fmt Glob - http-client http-types lens modern-uri mtl o-clock - optparse-applicative pretty-terminal req roman-numerals + aeson aeson-casing async base bytestring cmark-gfm containers + data-default deepseq directory directory-tree file-embed filepath + fmt Glob http-client http-types HUnit lens modern-uri mtl o-clock + optparse-applicative pretty-terminal regex-tdfa req roman-numerals template-haskell text text-metrics th-lift-instances th-utilities - universum with-utf8 yaml + transformers universum with-utf8 yaml ]; testHaskellDepends = [ - aeson aeson-options async base bytestring cmark-gfm containers - data-default deepseq directory directory-tree filepath fmt Glob - hspec http-client http-types lens modern-uri mtl o-clock - optparse-applicative pretty-terminal QuickCheck req roman-numerals - template-haskell text text-metrics th-lift-instances th-utilities - universum with-utf8 yaml + aeson aeson-casing async base bytestring cmark-gfm containers + data-default deepseq directory directory-tree file-embed filepath + fmt Glob hspec http-client http-types HUnit lens modern-uri mtl + o-clock optparse-applicative pretty-terminal QuickCheck regex-tdfa + req roman-numerals template-haskell text text-metrics + th-lift-instances th-utilities transformers universum with-utf8 + yaml ]; testToolDepends = [ hspec-discover ]; license = lib.licenses.mpl20; @@ -283680,7 +284015,7 @@ self: { split text time ]; description = "#plaimi's all-encompassing bot"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -283827,7 +284162,7 @@ self: { librarySystemDepends = [ yajl ]; libraryToolDepends = [ c2hs ]; description = "Bindings for YAJL, an event-based JSON implementation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {inherit (pkgs) yajl;}; @@ -283844,7 +284179,7 @@ self: { base bytestring enumerator json-types text transformers yajl ]; description = "Enumerator-based interface to YAJL, an event-based JSON implementation"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284433,7 +284768,7 @@ self: { base GLFW-b newtype OpenGL vector-space Yampa ]; description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284467,7 +284802,7 @@ self: { base GLUT newtype OpenGL vector-space Yampa-core ]; description = "Connects Yampa and GLUT"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284691,8 +285026,8 @@ self: { }: mkDerivation { pname = "yasi"; - version = "0.1.1.1"; - sha256 = "0b3ajgxf8bk2pjfwqmf748x1yzyq9knjsya2xzkdrjs5vffg1j9k"; + version = "0.1.2.1"; + sha256 = "0647z79wva7apkp0swj7gax780vqmhr5czxrvg88gl3bi03wcapl"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit text @@ -284759,7 +285094,7 @@ self: { th-abstraction transformers ]; description = "Total recursion schemes"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "yaya-hedgehog" = callPackage @@ -284770,7 +285105,7 @@ self: { sha256 = "0aw932d2yr3w84ia44y46w4w96bc8gdag63h66rhx3v7gwmkwdwg"; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "yaya-test" = callPackage @@ -284787,7 +285122,7 @@ self: { base deriving-compat hedgehog yaya yaya-hedgehog ]; description = "Test suites for `yaya`"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284804,7 +285139,7 @@ self: { base bifunctors comonad either free lens yaya ]; description = "Non-total extensions to the Yaya recursion scheme library"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; }) {}; "yaya-unsafe-test" = callPackage @@ -284820,7 +285155,7 @@ self: { base hedgehog yaya yaya-hedgehog yaya-unsafe ]; description = "Test suites for `yaya-unsafe`"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -284873,7 +285208,7 @@ self: { aeson base numbered-semigroups tasty tasty-hunit tasty-quickcheck ]; description = "Yesod-based server for interactive presentation slides"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -285428,7 +285763,7 @@ self: { yesod-auth yesod-core ]; description = "A yesod-auth plugin for LTI 1.3"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -286268,7 +286603,7 @@ self: { ]; testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287148,7 +287483,7 @@ self: { ]; testHaskellDepends = [ base cryptonite hspec QuickCheck ]; description = "Executable specifications of composable cryptographic protocols"; - license = lib.licenses.agpl3; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287205,7 +287540,7 @@ self: { yi-mode-haskell yi-mode-javascript yi-rope ]; description = "Yi editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287225,7 +287560,7 @@ self: { yi-rope ]; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287257,7 +287592,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; description = "Yi editor core library"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287275,7 +287610,7 @@ self: { transformers-base yi-core yi-rope ]; description = "Dynamic configuration support for Yi"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287288,7 +287623,7 @@ self: { sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv"; libraryHaskellDepends = [ base containers split yi-language ]; description = "Simple mapping from colour names used in emacs to Color"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287309,7 +287644,7 @@ self: { yi-language yi-rope ]; description = "Pango frontend for Yi editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287328,7 +287663,7 @@ self: { stm text vty yi-core yi-language yi-rope ]; description = "Vty frontend for Yi editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287348,7 +287683,7 @@ self: { yi-rope ]; description = "Fuzzy open plugin for yi"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287377,7 +287712,7 @@ self: { text yi-core yi-language yi-rope ]; description = "Yi editor incremental reader"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287394,7 +287729,7 @@ self: { base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; description = "Cua keymap for Yi editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287413,7 +287748,7 @@ self: { text transformers-base yi-core yi-language yi-misc-modes yi-rope ]; description = "Emacs keymap for Yi editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287441,7 +287776,7 @@ self: { unordered-containers yi-core yi-language yi-rope ]; description = "Vim keymap for Yi editor"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287470,7 +287805,7 @@ self: { unordered-containers ]; description = "Collection of language-related Yi libraries"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287489,7 +287824,7 @@ self: { ]; libraryToolDepends = [ alex ]; description = "Yi editor miscellaneous modes"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287508,7 +287843,7 @@ self: { ]; libraryToolDepends = [ alex ]; description = "Yi editor haskell mode"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287528,7 +287863,7 @@ self: { ]; libraryToolDepends = [ alex ]; description = "Yi editor javascript mode"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287562,7 +287897,7 @@ self: { ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A rope data structure used by Yi"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }) {}; "yi-snippet" = callPackage @@ -287582,7 +287917,7 @@ self: { base containers tasty-hunit tasty-th yi-rope ]; description = "Snippet support for yi"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287931,7 +288266,7 @@ self: { libraryHaskellDepends = [ base cryptonite memory yu-utils ]; testHaskellDepends = [ base MonadRandom random yu-utils ]; description = "Auth module for Yu"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287945,7 +288280,7 @@ self: { libraryHaskellDepends = [ base yu-auth yu-utils ]; testHaskellDepends = [ base blaze-markup hspec yu-utils ]; description = "The core of Yu"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287962,7 +288297,7 @@ self: { base cmdargs yaml yu-auth yu-core yu-utils ]; description = "The launcher for Yu"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -287981,7 +288316,7 @@ self: { base cmdargs directory echo filepath process yu-auth yu-utils ]; description = "Tool for Yu"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -288006,7 +288341,7 @@ self: { warp xml-hamlet yesod-core ]; description = "Utils for Yu"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -288097,7 +288432,7 @@ self: { time transformers vector xml-conduit ]; description = "Utilities for reading and writing Alteryx .yxdb files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -288365,19 +288700,20 @@ self: { "zeolite-lang" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable - , megaparsec, mtl, parser-combinators, regex-tdfa, time - , transformers, unix + , megaparsec, microlens, microlens-th, mtl, parser-combinators + , regex-tdfa, time, transformers, unix }: mkDerivation { pname = "zeolite-lang"; - version = "0.12.0.0"; - sha256 = "056brd93d1559wdz7s4wcvjglqg5p1bafhhgbqcqnd0q8msnilrv"; + version = "0.13.0.0"; + sha256 = "0baljnskj5vrw9vwkwddrqchqvk7i5dxr4d5aj7qvl73brchjx7c"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers directory filepath hashable megaparsec mtl - parser-combinators regex-tdfa time transformers unix + base containers directory filepath hashable megaparsec microlens + microlens-th mtl parser-combinators regex-tdfa time transformers + unix ]; executableHaskellDepends = [ base containers directory filepath unix @@ -288489,7 +288825,7 @@ self: { transformers zeromq3-haskell ]; description = "Conduit bindings for zeromq3-haskell"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -288561,7 +288897,7 @@ self: { ]; testHaskellDepends = [ base ]; description = "Conduit wrapper around zeromq4-haskell"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -288839,7 +289175,7 @@ self: { conduit-extra hspec lzma ]; description = "Read and parse ZIM files"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; "zinza" = callPackage @@ -289261,7 +289597,7 @@ self: { directory filepath mtl parallel-io text zmidi-core ]; description = "Representing MIDI a simple score"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -289384,7 +289720,7 @@ self: { mtl ui-command vector zoom-cache zoom-cache-pcm ]; description = "Tools for generating zoom-cache-pcm files"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -289708,7 +290044,7 @@ self: { base bytestring containers fixed-vector storable-record ]; description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }) {}; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix index baf83c6477..1809f9fd2d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { description = "A lightweight IDE for Clojure"; homepage = "https://github.com/arthuredelstein/clooj"; license = lib.licenses.bsd3; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index e0c72d628a..01b3e995f5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -171,11 +171,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "1.3.5"; # Jan 24, 2021 + crossVersion = "e53999d0c340769792ba18d749751b0df3d1d177"; # Mar 21, 2021 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1sa2f8s1hc604g5y98w6m6y5q43s9jiyrpnp4b34zkfx1qs3w6l4"; + sha256 = "14vcpwjhq667yh0cs7ism70df8l7068vn4a0ww59hdjyj7yc84i6"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -211,7 +211,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.6"; - sha256 = "1fx6b2q7wzd0xwy7qkmkvd5bdm09d3zfnynrb6afl9ghd8ww56fv"; + version = "5.33.8"; + sha256 = "1zr6sdsfcmk86n3f8j65x07xkv29v0pi8bwc986ahmjx7x92xzgl"; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 42e82cd3a5..61008f242b 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-wccVMEUAfTWs/8hnrT7nrxfYPHyNl+lXt+KUDkyplto="; + sha256 = "sha256-LLUAwqky/q9KvFltrcff5U2BSLvOk/BbDSj07QlePSg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix deleted file mode 100644 index d75e5e8b28..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/60.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages -, which, readline, zlib, icu }: - -with lib; - -let - version = "60.9.0"; -in stdenv.mkDerivation { - pname = "spidermonkey"; - inherit version; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0gy5x2rnnbkqmjd9sq93s3q5na9nkba68xwpizild7k6qn63qicz"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; # Configure script only understands --includedir - - buildInputs = [ readline zlib icu ]; - nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ]; - - patches = [ - # Fixed in 62.0 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1415202 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mozjs60/raw/a1b605c73f382db25977cb2d4d70a3ba2ff85b92/f/Always-use-the-equivalent-year-to-determine-the-time-zone.patch"; - sha256 = "12i225qbzlyfj2disms50zrr5jy8zgn2cc4rgsg58sfgf1bn7150"; - }) - ]; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python2.interpreter}" - - # We can't build in js/src/, so create a build dir - mkdir obj - cd obj/ - configureScript=../js/src/configure - ''; - - configureFlags = [ - "--with-system-zlib" - "--with-system-icu" - "--with-intl-api" - "--enable-readline" - "--enable-shared-js" - "--enable-posix-nspr-emulation" - "--disable-jemalloc" - # Fedora and Arch disable optimize, but it doesn't seme to be necessary - # It turns on -O3 which some gcc version had a problem with: - # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e - "--enable-optimize" - "--enable-release" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Spidermonkey seems to use different host/build terminology for cross - # compilation here. - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - configurePlatforms = []; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - # Remove unnecessary static lib - preFixup = '' - moveToOutput bin/js60-config "$dev" - rm $out/lib/libjs_static.ajs - ln -s $out/bin/js60 $out/bin/js - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.abbradar ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix new file mode 100644 index 0000000000..165251c8c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/trealla/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, readline, openssl, withThread ? true, withSSL ? true, xxd }: + +stdenv.mkDerivation rec { + pname = "trealla"; + version = "1.7.65"; + + src = fetchFromGitHub { + owner = "infradig"; + repo = "trealla"; + rev = "v${version}"; + sha256 = "sha256-uCDACBwdiCeAwF6IZHz7s5pD83JXTP7jAQDjGld8tt0="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-I/usr/local/include' "" \ + --replace '-L/usr/local/lib' "" \ + --replace 'GIT_VERSION :=' 'GIT_VERSION ?=' + ''; + + makeFlags = [ + "GIT_VERSION=\"v${version}\"" + (lib.optionalString withThread "THREADS=1") + (lib.optionalString (!withSSL) "NOSSL=1") + (lib.optionalString stdenv.isDarwin "NOLDLIBS=1") + ]; + + nativeBuildInputs = [ xxd ]; + buildInputs = [ readline openssl ]; + + installPhase = '' + install -Dm755 -t $out/bin tpl + ''; + + doCheck = true; + preCheck = '' + # Disable test 81 due to floating point error + rm tests/issues/test081.expected tests/issues/test081.pl + ''; + + meta = with lib; { + description = "A compact, efficient Prolog interpreter written in ANSI C"; + homepage = "https://github.com/infradig/trealla"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix new file mode 100644 index 0000000000..414171082e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +, libSM +, libX11 +, libXt +, libffi +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "yabasic"; + version = "2.89.1"; + + src = fetchurl { + url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; + hash = "sha256-k8QmQCpszLyotEiWDrG878RM2wqSq7I4W9j6Z2Ub3Yg="; + }; + + buildInputs = [ + libSM + libX11 + libXt + libffi + ncurses + ]; + + meta = with lib; { + homepage = "http://www.yabasic.de/"; + description = "Yet another BASIC"; + longDescription = '' + Yabasic is a traditional basic-interpreter. It comes with goto and various + loops and allows to define subroutines and libraries. It does simple + graphics and printing. Yabasic can call out to libraries written in C and + allows to create standalone programs. Yabasic runs under Unix and Windows + and has a comprehensive documentation; it is small, simple, open-source + and free. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix index 976387d49e..136ffb7980 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.0"; + version = "5.16.1"; src = fetchurl { - sha256 = "0x68l4n0v2jqmbawdgpghmhnchpg1jsvxzskj6s4hjll6hdgb6fk"; + sha256 = "sha256-Q9PzqJC/+uhcbxAC6c+VD8wf0X8/XlXcO4XTnQni4yM="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix index 540e152655..ccfafd36a8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/rtmidi/default.nix @@ -37,14 +37,16 @@ stdenv.mkDerivation rec { url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; }) + (fetchpatch { + name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch"; + url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch"; + sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj"; + }) ]; postPatch = '' substituteInPlace rtmidi.pc.in \ --replace 'Requires:' 'Requires.private:' - substituteInPlace CMakeLists.txt \ - --replace 'PUBLIC_HEADER RtMidi.h' 'PUBLIC_HEADER "RtMidi.h;rtmidi_c.h"' \ - --replace 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}' 'PUBLIC_HEADER DESTINATION $''\{CMAKE_INSTALL_INCLUDEDIR}/rtmidi' ''; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix index 88e81d733b..3b3c005a01 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-resampler"; - version = "1.6.2"; + version = "1.8.0"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1my5k2dh2dkvjp6xjnf9qy6i7s28z13kw1n9pwa4a2cpwbzawfr3"; + sha256 = "sha256-5XRPI8VN0Vs/eDpoe9h57uKmkKRUWhW0nEzwN6pGSqI="; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix index 18dddee6bd..b6468a8dae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1hbri4dv924ph3cxkmwkl4kdca4dvhc9qda60rdzs6355l76k23n"; + sha256 = "sha256-8Du9Ib3MhPcgetBIi0k1NboaXxZh7iPNhDe7197JnHc="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 700fe4f468..dc585217ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "4.4.24"; + version = "4.4.34"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-RfjD+E8FLFNBkwpOohNAKDINHAhSNEkeVArqtjfn2i0="; + sha256 = "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25"; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix new file mode 100644 index 0000000000..de9c182df1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchurl }: + +let + version = "0.6"; + sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; + +in +stdenv.mkDerivation { + pname = "bearssl"; + inherit version; + + src = fetchurl { + url = "https://www.bearssl.org/bearssl-${version}.tar.gz"; + inherit sha256; + }; + + outputs = [ "bin" "lib" "dev" "out" ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + install -D build/brssl $bin/brssl + install -D build/testcrypto $bin/testcrypto + install -Dm644 build/libbearssl.so $lib/lib/libbearssl.so + install -Dm644 build/libbearssl.a $lib/lib/libbearssl.a + install -Dm644 -t $dev/include inc/*.h + touch $out + runHook postInstall + ''; + + meta = { + homepage = "https://www.bearssl.org/"; + description = "An implementation of the SSL/TLS protocol written in C"; + longDescription = '' + BearSSL is an implementation of the SSL/TLS protocol (RFC 5246) + written in C. It aims at offering the following features: + + * Be correct and secure. In particular, insecure protocol versions and + choices of algorithms are not supported, by design; cryptographic + algorithm implementations are constant-time by default. + + * Be small, both in RAM and code footprint. For instance, a minimal + server implementation may fit in about 20 kilobytes of compiled code + and 25 kilobytes of RAM. + + * Be highly portable. BearSSL targets not only “big” operating systems + like Linux and Windows, but also small embedded systems and even + special contexts like bootstrap code. + + * Be feature-rich and extensible. SSL/TLS has many defined cipher + suites and extensions; BearSSL should implement most of them, and + allow extra algorithm implementations to be added afterwards, + possibly from third parties. + ''; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.Profpatsch ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix index 03f6e96e18..5ce7ad477b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.4.24"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FTHtd93LOnRek9fqvI+KBkk/+53Bwy9GKCEo0NDtops="; + sha256 = "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m"; }; buildInputs = [ bctoolbox belr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 833d200ffa..8f0a116f1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -2,15 +2,16 @@ , bctoolbox , cmake , fetchFromGitLab +, lib , libantlr3c , mbedtls -, lib, stdenv +, stdenv , zlib }: stdenv.mkDerivation rec { pname = "belle-sip"; - version = "4.4.26"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-30w5X/S5VY4zSHs2G4KXOP8mEvC78xakwrcd/Bm1ds4="; + sha256 = "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z"; }; nativeBuildInputs = [ antlr3_4 cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix index b38757525a..acd2393f75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.3.2"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "1lda0f89vas38xgmc4yvnrigmrbril3dyqxgb5jh1zfx1xczfh1q"; + sha256 = "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h"; }; buildInputs = [ bctoolbox ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix index a23acdbdc8..0f848e3024 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "0x6pqd5cdag0l283lkq01qaqwyf1skxbncdwig8b2s742nbzjlz8"; + sha256 = "sha256-SP/rVt/8VoeUprwJIIMSIBvoC1Zein3F7MR2tqc2vd0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index 0adcb327cc..f29295bb13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "4.4.9"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix index 9410b07150..3b9f4f942a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crcpp/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "crcpp"; - version = "1.0.1.0"; + version = "1.1.0.0"; src = fetchFromGitHub { owner = "d-bahr"; repo = "CRCpp"; rev = "release-${version}"; - sha256 = "138w97kfxnv8rcnvggba6fcxgbgq8amikkmy3jhqfn6xzy6zaimh"; + sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix index 256e0d7024..f74cfdec93 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/inchi/default.nix @@ -1,69 +1,74 @@ -{ pkgs -, fetchurl +{ fetchurl , lib , stdenv , unzip , fixDarwinDylibNames }: -stdenv.mkDerivation { - pname = "inchi"; - version = "1.05"; - src = fetchurl { - url = "http://www.inchi-trust.org/download/105/INCHI-1-SRC.zip"; - sha1 = "e3872a46d58cb321a98f4fd4b93a989fb6920b9c"; - }; +let + versionMajor = "1"; + versionMinor = "0.6"; + version = versionMajor + "." + versionMinor; + removeDots = lib.replaceStrings [ "." ] [ "" ]; + src-doc = fetchurl { + url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-DOC.zip"; + sha256 = "1kyda09i9p89xfq90ninwi7w13k1w3ljpl4gqdhpfhi5g8fgxx7f"; + }; +in + stdenv.mkDerivation rec { + pname = "inchi"; + inherit version; - nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - outputs = [ "out" "doc" ]; + src = fetchurl { + url = "http://www.inchi-trust.org/download/${removeDots version}/INCHI-1-SRC.zip"; + sha256 = "1zbygqn0443p0gxwr4kx3m1bkqaj8x9hrpch3s41py7jq08f6x28"; + }; - enableParallelBuilding = true; + nativeBuildInputs = [ unzip ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + outputs = [ "out" "doc" ]; - preConfigure = '' - cd ./INCHI_API/libinchi/gcc - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace makefile \ - --replace ",--version-script=libinchi.map" "" \ - --replace "LINUX_Z_RELRO = ,-z,relro" "" \ - --replace "-soname" "-install_name" \ - --replace "gcc" $CC - ''; - installPhase = '' - runHook preInstall + enableParallelBuilding = true; - cd ../../.. - mkdir -p $out/lib - mkdir -p $out/include/inchi - mkdir -p $doc/share/ + preConfigure = '' + cd ./INCHI_API/libinchi/gcc + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace makefile \ + --replace ",--version-script=libinchi.map" "" \ + --replace "LINUX_Z_RELRO = ,-z,relro" "" \ + --replace "-soname" "-install_name" \ + --replace "gcc" $CC + ''; + installPhase = let + versionOneDot = versionMajor + "." + removeDots versionMinor; + in '' + runHook preInstall - install -m 755 INCHI_API/bin/Linux/libinchi.so.1.05.00 $out/lib - ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so.1 - ln -s $out/lib/libinchi.so.1.05.00 $out/lib/libinchi.so - install -m 644 INCHI_BASE/src/*.h $out/include/inchi + cd ../../.. + mkdir -p $out/lib + mkdir -p $out/include/inchi + mkdir -p $doc/share/ - runHook postInstall - ''; + install -m 755 INCHI_API/bin/Linux/libinchi.so.${versionOneDot}.00 $out/lib + ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so.1 + ln -s $out/lib/libinchi.so.${versionOneDot}.00 $out/lib/libinchi.so + install -m 644 INCHI_BASE/src/*.h $out/include/inchi - preFixup = lib.optionalString stdenv.isDarwin '' - fixDarwinDylibNames $(find "$out" -name "*.so.*") - ''; + runHook postInstall + ''; - postInstall = - let - src-doc = fetchurl { - url = "http://www.inchi-trust.org/download/105/INCHI-1-DOC.zip"; - sha1 = "2f54y0san34v01c215kk0cigzsn76js5"; - }; - in - '' + preFixup = lib.optionalString stdenv.isDarwin '' + fixDarwinDylibNames $(find "$out" -name "*.so.*") + ''; + + postInstall = '' unzip '${src-doc}' install -m 644 INCHI-1-DOC/*.pdf $doc/share ''; - meta = with lib; { - homepage = "https://www.inchi-trust.org/"; - description = "IUPAC International Chemical Identifier library"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ rmcgibbo ]; - }; -} + meta = with lib; { + homepage = "https://www.inchi-trust.org/"; + description = "IUPAC International Chemical Identifier library"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ rmcgibbo ]; + }; + } diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index fec910bd59..b75b1b833d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -1,26 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, libuuid, libossp_uuid, gtest }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, automaticcomponenttoolkit +, pkg-config, libzip, gtest, openssl, libuuid, libossp_uuid }: stdenv.mkDerivation rec { pname = "lib3mf"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; rev = "v${version}"; - sha256 = "0w4d9zvl95g1x3r5nyd6cr27g6fwhhwaivh8a5r1xs5l6if21x19"; + sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]; + outputs = [ "out" "dev" ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "out"}/include/lib3mf" + "-DUSE_INCLUDED_ZLIB=OFF" + "-DUSE_INCLUDED_LIBZIP=OFF" + "-DUSE_INCLUDED_GTEST=OFF" + "-DUSE_INCLUDED_SSL=OFF" + ]; + + buildInputs = [ + libzip gtest openssl + ] ++ (if stdenv.isDarwin then [ libossp_uuid ] else [ libuuid ]); postPatch = '' - rmdir Tests/googletest - ln -s ${gtest.src} Tests/googletest - # fix libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ - sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3MF.pc.in + sed -i 's,=''${\(exec_\)\?prefix}/,=,' lib3mf.pc.in + + # replace bundled binaries + for i in AutomaticComponentToolkit/bin/act.*; do + ln -sf ${automaticcomponenttoolkit}/bin/act $i + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix index d51eac7bdb..6cbf1d2043 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libantlr3c/default.nix @@ -15,5 +15,12 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; + # The package failed to build with error: + # gcc: error: unrecognized command line option '-m64' + # + # See: + # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d + # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd + broken = stdenv.hostPlatform.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix index 81b84e0f18..99692f63d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-ZDPDJXvSAqCkhxUSzlcWBAMrCI6mjA8rXxX65Cw5nYI="; + sha256 = "sha256-HBZ/VMuTLAYpqcIPzQ4JbsMSXsI/sKc14ZFpbVhQF/g="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 647fb6825a..2822b45f87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.4.21"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-vs65lBRTYYhx2F90n32qnf0CvcPJUIXc16hmggTF/JI="; + sha256 = "1sysr8wnf1kvq87h2ymr5qk9qcjapayvlmcmzcx3zxk8vhqp83d8"; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix new file mode 100644 index 0000000000..41283ed7cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "libplctag"; + version = "2.3.6"; + + src = fetchFromGitHub { + owner = "libplctag"; + repo = "libplctag"; + rev = "v${version}"; + sha256 = "sha256-mrNEUNYxnRyKhUCz+exp6Upf2g/L6WnYJ8alcIx5wMc="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/libplctag/libplctag"; + description = "Library that uses EtherNet/IP or Modbus TCP to read and write tags in PLCs"; + license = with licenses; [ lgpl2Plus mpl20 ]; + maintainers = with maintainers; [ petterstorvik ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 24cd29dcb1..5405391a1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-TAfo4BkNHE8r32FPT2iDjddq2lk1yC9DrRGZurSO48c="; + sha256 = "sha256-QSpkcQEDTMsFbQBa7dTuL/5HraVChUHqUuJdNMty/4s="; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix index d108bf4e6d..6eb1bb93f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.12.1"; + version = "0.12.2"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv"; + sha256 = "sha256-Tu/BHk9sIS/H2E2HHhzBOdoGaaRv8/2lV6b91NdMpns="; }; checkInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix index e6996a53c8..b9ca940561 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -2,14 +2,15 @@ , belle-sip , cmake , fetchFromGitLab +, lib , soci , sqlite -, lib, stdenv +, stdenv }: stdenv.mkDerivation rec { pname = "lime"; - version = "4.4.21"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-3whr2KSAULRe3McgOtJlA3NEPF8NO6YHp+4vqeMPT5I="; + sha256 = "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z"; }; buildInputs = [ bctoolbox soci belle-sip sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix index e98903e3a8..c71bf17a3c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -1,20 +1,44 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config -, qtbase, curl, libuv, glfw3 }: +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config +, qtbase, curl, libuv, glfw3, rapidjson }: mkDerivation rec { pname = "mapbox-gl-native"; - version = "2020.06.07"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mapbox"; repo = "mapbox-gl-native"; - rev = "e18467d755f470b26f61f6893eddd76ecf0816e6"; - sha256 = "1x271gg9h81jpi70pv63i6lsa1zg6bzja9mbz7bsa4s02fpqy7wh"; + rev = "maps-v${version}"; + sha256 = "027rw23yvd5a6nl9b5hsanddc44nyb17l2whdcq9fxb9n6vcda4c"; fetchSubmodules = true; }; + patches = [ + # https://github.com/mapbox/mapbox-gl-native/pull/16591 + (fetchpatch { + name = "add-support-for-qmapboxgl-installation.patch"; + url = "https://github.com/mapbox/mapbox-gl-native/commit/e18467d755f470b26f61f6893eddd76ecf0816e6.patch"; + sha256 = "0gs7wmkvyhf2db4cwbsq31sprsh1avi70ggvi32bk0wn3cw4d79b"; + }) + (fetchpatch { + name = "add-support-for-using-qmapboxgl-as-a-proper-cmake-dependency.patch"; + url = "https://github.com/mapbox/mapbox-gl-native/commit/ab27b9b8207754ef731b588d187c470ffb084455.patch"; + sha256 = "1lr5p1g4qaizs57vjqry9aq8k1ki59ks0y975chlnrm2sffp140r"; + }) + (fetchpatch { + name = "skip-license-check.patch"; + url = "https://git.alpinelinux.org/aports/plain/testing/mapbox-gl-native/0002-skip-license-check.patch?id=6751a93dca26b0b3ceec9eb151272253a2fe497e"; + sha256 = "1yybwzxbvn0lqb1br1fyg7763p2h117s6mkmywkl4l7qg9daa7ba"; + }) + ]; + + postPatch = '' + # don't use vendored rapidjson + rm -r vendor/mapbox-base/extras/rapidjson + ''; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ curl libuv glfw3 qtbase ]; + buildInputs = [ curl libuv glfw3 qtbase rapidjson ]; cmakeFlags = [ "-DMBGL_WITH_QT=ON" @@ -27,7 +51,7 @@ mkDerivation rec { description = "Interactive, thoroughly customizable maps in native Android, iOS, macOS, Node.js, and Qt applications, powered by vector tiles and OpenGL"; homepage = "https://mapbox.com/mobile"; license = licenses.bsd2; - maintainers = [ maintainers.Thra11 ]; + maintainers = with maintainers; [ Thra11 dotlambda ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix index 1740b9ae58..87e7657662 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -1,22 +1,31 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtlocation, mapbox-gl-native }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, curl +, qtbase +, qtlocation +, mapbox-gl-native +}: mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - sha256 = "1izwkfqn8jl83vihcxl2b159sqmkn1amxf92zw0h6psls2g9xhwx"; + sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw="; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtlocation mapbox-gl-native ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ curl qtlocation mapbox-gl-native ]; postPatch = '' - substituteInPlace mapbox-gl-qml.pro \ - --replace '$$[QT_INSTALL_QML]' $out'/${qtbase.qtQmlPrefix}' + substituteInPlace src/CMakeLists.txt \ + --replace ' ''${QT_INSTALL_QML}' " $out/${qtbase.qtQmlPrefix}" ''; # Package expects qt5 subdirectory of mapbox-gl-native to be in the include path @@ -26,7 +35,7 @@ mkDerivation rec { description = "Unofficial Mapbox GL Native bindings for Qt QML"; homepage = "https://github.com/rinigus/mapbox-gl-qml"; license = licenses.lgpl3Only; - maintainers = [ maintainers.Thra11 ]; + maintainers = with maintainers; [ Thra11 dotlambda ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index 6321e35f7f..ad770046d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.32"; + version = "4.4.35"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps="; + sha256 = "18qmg678m087k7qsaxwfcv2p875z2kpy91pqryiv955km40drl0g"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix index 2ac2087054..36abc9f327 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.6.7"; + version = "2.0.0"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "1ymffs3ixc4vkhpr09ph6xhyknm2cx8ij8j5l70cq6119mwilnwa"; + sha256 = "sha256-BMDCreY41CxJaPo9BdSRZlqh/YjtPC9aI/Zxt501e+0="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix index e8053ce270..958be905f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.7"; + version = "4.9.8"; pname = "nco"; - nativeBuildInputs = [ flex which ]; - buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ]; + nativeBuildInputs = [ flex which antlr ]; + buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4="; + sha256 = "sha256-fOdmM0I/UGhxacofEBfw9UmOOrMDUXs59ca8uvkQKqw="; }; prePatch = '' @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { --replace "/bin/mv" "${coreutils}/bin/mv" ''; + parallelBuild = true; + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; homepage = "http://nco.sourceforge.net/"; - license = lib.licenses.gpl3; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix index 09169019a1..9b5043a1e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/notcurses/default.nix @@ -3,7 +3,7 @@ multimediaSupport ? true }: let - version = "2.1.5"; + version = "2.2.3"; in stdenv.mkDerivation { pname = "notcurses"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "02x9a0z7mbgry2wsfai1l3jwb2zpcg4gq6a2w5d920ap2fixzy8b"; + sha256 = "sha256-O6bu/tEotsxHAx6rCi0xRaklmF0l6neYwwscF2w0HJg="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix index 2b99f29f4c..e760868524 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.32"; + version = "4.4.34"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q="; + sha256 = "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m"; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch index ce1085f37f..a4fb8b41e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -1,19 +1,19 @@ diff --git a/meson_options.txt b/meson_options.txt -index a6c8af72..8e5c3d73 100644 +index e2a1e028..310029f2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,6 +10,9 @@ option('media-session', description: 'Build and install pipewire-media-session', - type: 'boolean', - value: true) + type: 'feature', + value: 'auto') +option('media-session-prefix', + description: 'Install directory for pipewire-media-session and its support files', + type: 'string') option('man', description: 'Build manpages', - type: 'boolean', + type: 'feature', diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index 4a70b0b0..84c9a19e 100644 +index 5c4d1af0..7296220f 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build @@ -10,7 +10,7 @@ install_data( diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 2a92711626..cb695fa398 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,29 +1,29 @@ diff --git a/meson.build b/meson.build -index ffee41b4..bab6f019 100644 +index 97d4d939..b17358e5 100644 --- a/meson.build +++ b/meson.build -@@ -318,8 +318,8 @@ alsa_dep = (get_option('pipewire-alsa') - ? dependency('alsa', version : '>=1.1.7') - : dependency('', required: false)) - +@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' + + alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) + -installed_tests_metadir = join_paths(pipewire_datadir, 'installed-tests', pipewire_name) -installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pipewire_name) +installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', pipewire_name) +installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', pipewire_name) - installed_tests_enabled = get_option('installed_tests') + installed_tests_enabled = not get_option('installed_tests').disabled() installed_tests_template = files('template.test.in') - + diff --git a/meson_options.txt b/meson_options.txt -index f03033c3..32df6c53 100644 +index fba0d647..8c6106cd 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -18,6 +18,9 @@ option('installed_tests', +@@ -26,6 +26,9 @@ option('installed_tests', description: 'Install manual and automated test executables', - type: 'boolean', - value: false) + type: 'feature', + value: 'disabled') +option('installed_test_prefix', + description: 'Prefix for installed tests', + type: 'string') option('gstreamer', description: 'Build GStreamer plugins', - type: 'boolean', + type: 'feature', diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 5c5578abc8..955a4d9da6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -39,11 +39,11 @@ let fontDirectories = []; }; - mesonBool = b: if b then "true" else "false"; + mesonEnable = b: if b then "enabled" else "disabled"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.23"; + version = "0.3.24"; outputs = [ "out" @@ -61,7 +61,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - hash = "sha256:1HMUrE1NBmrdBRMKX3LRlXaCEH3wqP2jGtW8Rp9oyQA="; + hash = "sha256:PcY20FTtUtJYAwCscEs+HfkdwDksYPFZIVTVORP1ooI="; }; patches = [ @@ -103,22 +103,23 @@ let ++ lib.optionals bluezSupport [ bluez libopenaptx ldacbt sbc fdk_aac ]; mesonFlags = [ - "-Ddocs=true" - "-Dman=false" # we don't have xmltoman - "-Dexamples=${mesonBool withMediaSession}" # only needed for `pipewire-media-session` + "-Ddocs=enabled" + "-Dman=disabled" # we don't have xmltoman + "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session` "-Dudevrulesdir=lib/udev/rules.d" - "-Dinstalled_tests=true" + "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dgstreamer=${mesonBool gstreamerSupport}" - "-Dffmpeg=${mesonBool ffmpegSupport}" - "-Dbluez5=${mesonBool bluezSupport}" - "-Dbluez5-backend-hsp-native=${mesonBool nativeHspSupport}" - "-Dbluez5-backend-hfp-native=${mesonBool nativeHfpSupport}" - "-Dbluez5-backend-ofono=${mesonBool ofonoSupport}" - "-Dbluez5-backend-hsphfpd=${mesonBool hsphfpdSupport}" + "-Dlibcamera=disabled" + "-Dgstreamer=${mesonEnable gstreamerSupport}" + "-Dffmpeg=${mesonEnable ffmpegSupport}" + "-Dbluez5=${mesonEnable bluezSupport}" + "-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}" + "-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}" + "-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}" + "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dpipewire_config_dir=/etc/pipewire" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix index 1500056463..1c06020653 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -1,20 +1,33 @@ -{ fetchFromGitHub, lib, stdenv, autoreconfHook, pkg-config }: +{ fetchFromGitHub +, lib +, stdenv +, cmake +}: stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.0"; + version = "1.14.1"; + + outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1wp9sz2ld4g6ak9v59i3s5mbsraxsphi9k91vw9xgrbzfmg8w0a6"; + sha256 = "sha256-QWwgtfgO+7zGW1M5qdfrIilVw6D/A/Er3l2bZ8V35kE="; }; - outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + cmake + ]; - hardeningDisable = [ "fortify" ]; + postPatch = '' + # Wrong paths in pkg-config file generated by CMake + # https://github.com/pupnp/pupnp/pull/205/files#r588946478 + substituteInPlace CMakeLists.txt \ + --replace '\''${exec_prefix}/' "" \ + --replace '\''${prefix}/' "" + ''; meta = { description = "An open source UPnP development kit for Linux"; @@ -26,9 +39,9 @@ stdenv.mkDerivation rec { UPnP Device Architecture Specification. ''; - license = "BSD-style"; + license = lib.licenses.bsd3; - homepage = "http://pupnp.sourceforge.net/"; + homepage = "https://pupnp.github.io/pupnp/"; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 9613eed287..617b2c1d9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -90,11 +90,7 @@ qtModule { '' else '' substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \ --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]" - '') - + '' - substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \ - --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' - ''); + '')); NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit @@ -190,6 +186,7 @@ qtModule { buildInputs = optionals stdenv.isDarwin (with darwin; [ cups + apple_sdk.libs.sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` # to get some information about the host platform. @@ -205,15 +202,8 @@ qtModule { shift done '') - - # For sandbox.h include - (runCommand "MacOS_SDK_sandbox.h" {} '' - install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h - '') ]); - __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib"; - dontUseNinjaBuild = true; dontUseNinjaInstall = true; dontUseXcbuild = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix index 4587bf4616..85468bd4f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/default.nix @@ -1,7 +1,8 @@ -{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, gtk2 }: +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake, pkg-config, gtk2 }: mkDerivation { - name = "qtstyleplugins-2017-03-11"; + pname = "qtstyleplugins"; + version = "unstable-2017-03-11"; src = fetchFromGitHub { owner = "qt"; @@ -10,7 +11,18 @@ mkDerivation { sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy"; }; - patches = [ ./fix-build-against-Qt-5.15.patch ]; + patches = [ + (fetchpatch rec { + name = "0001-fix-build-against-Qt-5.15.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins"; + sha256 = "j0CgfutqFawy11IqFnlrkfMsMD01NjX/MkfVEVxj1QM="; + }) + (fetchpatch rec { + name = "0002-fix-gtk2-background.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=qt5-styleplugins"; + sha256 = "qUOkNckrSUEzXY1PUZKfbiCjhNyB5ZBw2IN/j32GKM4="; + }) + ]; nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ gtk2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch deleted file mode 100644 index 7eb7441582..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Thu, 28 May 2020 12:35:42 +0200 -Subject: [PATCH] fix build against Qt 5.15 - -With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application -palette handling between QGuiApplication and QApplication") -QApplicationPrivate::setSystemPalette is no longer used and necessary. ---- - src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ - src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp -index 36169c9..2544593 100644 ---- a/src/plugins/styles/gtk2/qgtkstyle.cpp -+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp -@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app) - // not supported as these should be entirely determined by - // current Gtk settings - if (app->desktopSettingsAware() && d->isThemeAvailable()) { -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QApplicationPrivate::setSystemPalette(standardPalette()); -+#endif - QApplicationPrivate::setSystemFont(d->getThemeFont()); - d->applyCustomPaletteHash(); - if (!d->isKDE4Session()) -diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp -index e57b3d8..e71beb0 100644 ---- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp -+++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp -@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme() - if (oldTheme != QGtkStylePrivate::getThemeName()) { - oldTheme = QGtkStylePrivate::getThemeName(); - QPalette newPalette = qApp->style()->standardPalette(); -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QApplicationPrivate::setSystemPalette(newPalette); -+#endif - QApplication::setPalette(newPalette); - if (!QGtkStylePrivate::instances.isEmpty()) { - QGtkStylePrivate::instances.last()->initGtkWidgets(); --- -2.26.2 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix b/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix index e5fad490f6..1f2518fc73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qwt/6.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { - name = "qwt-6.1.5"; + name = "qwt-6.1.6"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"; + sha256 = "sha256-mUYNMcEV7kEXsBddiF9HwsWQ14QgbwmBXcBY++Xt4fY="; }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix b/third_party/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix index 5b73bc4147..69ec017474 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.6"; + name = "resolv_wrapper-1.1.7"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; + sha256 = "sha256-Rgrn/V5TSFvn3ZmlXFki8csWNrnoghmB1JrRZQfIoHQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index e4ee3c4730..6ab2fe9f6c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.5"; + version = "6.17.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; + sha256 = "sha256-mfONfYMxZ3CT7Bk3OYSwg0UChmk4mQ1+cHN94gEDZcM="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 37ea3b6572..f0b68845ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-azRuLB03NvW+brw7A/kbgkjoDUlk1p7Ch4zZD55QiMQ="; + sha256 = "sha256-e9Y5QEs9xqfJpaWxnA6iFwHE6TTGyVM7hfFuMEmpW78="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix index 2f1006404b..e67cb1736b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.4"; + version = "2020.3.6"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "1laa8dllpvf2z0cjxx22ravdf1d7a18bm708gd2ny35fhjfibm0h"; + sha256 = "sha256-7D7KRNIffgUr6vwbni1XwW+8GtXwM6vJZ7V6/QLDVmk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix index f561864a75..2c87d421ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix @@ -6,17 +6,17 @@ stdenv.mkDerivation rec { pname = "soci"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "SOCI"; repo = pname; rev = version; - sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"; + sha256 = "sha256-d4GtxDaB+yGfyCnbvnLRUYcrPSMkUF7Opu6+SZd8opM="; }; # Do not build static libraries - cmakeFlags = [ "-DSOCI_STATIC=OFF" ]; + cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index 1395f3e60c..593bd87a98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "01xj30hhm1ji76igkqkn63rw42vvzq3azkr9qz6fy83iwqaybgyn"; + sha256 = "sha256-qMgZpLo/BHGJbJ0DDN8COHAhU3ujWgVK9oZOnnMwKas="; }; buildInputs = [ glib openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix b/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix index 3a3f5c7976..01ec3a4fba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "129iv9maabmb42ylfdv0l0g94mcbf3y4q3np175008rcqdr8z6h1"; + sha256 = "sha256-aoitTT9fwTIs3ovfqQjKGgrU+kT5mj+vDHt5lg49JHU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix index 451f17a2cd..feb3825b3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "tclap-1.2.2"; + name = "tclap-1.2.3"; src = fetchurl { url = "mirror://sourceforge/tclap/${name}.tar.gz"; - sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; + sha256 = "sha256-GefbUoFUDxVDSHcLw6dIRXX09Umu+OAKq8yUs5X3c8k="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix index 800b356401..062c441063 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "39"; + version = "40"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "1053iw4isi7qsy94fqmh570wki999sg9n70jhqy8kfy1bniczh0l"; + sha256 = "sha256-q0iMM3Hb5Y21RUhhxFEd/q4OCJFJ12gozZd5jCDscro="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix index 7b6907a016..3bcc40b5da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, curl, libxml2 }: stdenv.mkDerivation rec { - name = "xmlrpc-c-1.51.06"; + name = "xmlrpc-c-1.51.07"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${name}.tgz"; - sha256 = "1l4zz22q10081vr06b8sii0l3krr64xyiywz6rcladw8kiyxip06"; + sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk="; }; buildInputs = [ curl libxml2 ]; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 3b9a5ee494..d6ee818d43 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -12,6 +12,7 @@ , "@webassemblyjs/wast-refmt" , "alloy" , "asar" +, "balanceofsatoshis" , "bash-language-server" , "bower" , "bower2nix" 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 cc2c471bd6..4090028c97 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,40 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1102.4" = { + "@alexbosworth/html2unicode-1.1.5" = { + name = "_at_alexbosworth_slash_html2unicode"; + packageName = "@alexbosworth/html2unicode"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@alexbosworth/html2unicode/-/html2unicode-1.1.5.tgz"; + sha512 = "CXMFAyovJHtLzKlraBpGlM/8TX9bvVz081IDZkQF3IMGHePgHCAs1vQdnKM38VMGekywNCbo7kt3fHooSMgA2w=="; + }; + }; + "@alexbosworth/request-2.88.3" = { + name = "_at_alexbosworth_slash_request"; + packageName = "@alexbosworth/request"; + version = "2.88.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@alexbosworth/request/-/request-2.88.3.tgz"; + sha512 = "51/Y5x0SncVGQc274YckWMo9CooUGp7XppgV9K8v5eBwcXnw9sM/j0LpAvUFE7gjJcmZVYXDmLxtOYtgC0f2dg=="; + }; + }; + "@alexbosworth/saxophone-0.6.2" = { + name = "_at_alexbosworth_slash_saxophone"; + packageName = "@alexbosworth/saxophone"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@alexbosworth/saxophone/-/saxophone-0.6.2.tgz"; + sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; + }; + }; + "@angular-devkit/architect-0.1102.5" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.4"; + version = "0.1102.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.4.tgz"; - sha512 = "A/nc/s9S9+H6xFOxcXqyfiCg9lXzCpO2ZVeaNamZB8f8tHoGfFMQ3JkCGhFiYsbze4fXhcwszNq1o36lGIW7FA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.5.tgz"; + sha512 = "lVc6NmEAZZPzvc18GzMFLoxqKKvPlNOg4vEtFsFldZmrydLJJGFi4KAs2WaJd8qVR1XuY4el841cjDQAJSq6sQ=="; }; }; "@angular-devkit/core-11.2.0" = { @@ -49,13 +76,13 @@ let sha512 = "2JEGXzFqjTqVls2uIZEE0sk4VY9a/alxBAq8BFYIVbvzKsL9gAY71Ztf21zrhQrZop9qeuLJtOAbp00QyYUaQA=="; }; }; - "@angular-devkit/core-11.2.4" = { + "@angular-devkit/core-11.2.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "11.2.4"; + version = "11.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.4.tgz"; - sha512 = "98mGDV4XtKWiQ/2D6yzvOHrnJovXchaAN9AjscAHd2an8Fkiq72d9m2wREpk+2J40NWTDB6J5iesTh3qbi8+CA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.5.tgz"; + sha512 = "DRFvEHRKoC+hTwcOAJqLe6UQa+bpXc/1IGCMHWEbuply0KIFIGQOlmaYwFZKixz3HdFZlmoCMcAVkAXvyaWVsQ=="; }; }; "@angular-devkit/schematics-11.2.0" = { @@ -76,13 +103,13 @@ let sha512 = "x/IKgZDn6z/MzQ28WF2GTP2N+n78iySQhLu6n6bpmdrFp9noi9QASzN+mAFiqSNO8XpO9oyIB5y2ERl8KBrU1g=="; }; }; - "@angular-devkit/schematics-11.2.4" = { + "@angular-devkit/schematics-11.2.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "11.2.4"; + version = "11.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.4.tgz"; - sha512 = "M9Ike1TYawOIHzenlZS1ufQbsS+Z11/doj5w/UrU0q2OEKc6U375t5qVGgKo3PLHHS8osb9aW9xYwBfVlKrryQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.5.tgz"; + sha512 = "7RoWgpMvhljPhW9CMz1EtqkwNnGpnsPyy0N29ClHPUq+o8wLR0hvbLBDz1fKSF7j1AwRccaQSNTj8KWsjzQJLQ=="; }; }; "@angular-devkit/schematics-cli-0.1102.0" = { @@ -211,15 +238,6 @@ let sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg=="; }; }; - "@apollo/federation-0.20.7" = { - name = "_at_apollo_slash_federation"; - packageName = "@apollo/federation"; - version = "0.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.20.7.tgz"; - sha512 = "URIayksqBaJ+xlcJmyGCf+OqHP60lX2CYGv9fDWQ1KM48sEN1ABHGXkEa0vwgWMH0XUVo94lYDVY11BAJUsuCw=="; - }; - }; "@apollo/protobufjs-1.0.5" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; @@ -238,42 +256,6 @@ let sha512 = "M50pk8oo3CGTu4waGOklIX3YtTZoPfWG9K/G9WB8NpyQGA1OwYTiBFv94XqUtKElTDoFwoMXpMQd3Wy5dINvxA=="; }; }; - "@apollographql/graphql-language-service-interface-2.0.2" = { - name = "_at_apollographql_slash_graphql-language-service-interface"; - packageName = "@apollographql/graphql-language-service-interface"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-language-service-interface/-/graphql-language-service-interface-2.0.2.tgz"; - sha512 = "28wePK0hlIVjgmvMXMAUq8qRSjz9O+6lqFp4PzOTHtfJfSsjVe9EfjF98zTpHsTgT3HcOxmbqDZZy8jlXtOqEA=="; - }; - }; - "@apollographql/graphql-language-service-parser-2.0.2" = { - name = "_at_apollographql_slash_graphql-language-service-parser"; - packageName = "@apollographql/graphql-language-service-parser"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-language-service-parser/-/graphql-language-service-parser-2.0.2.tgz"; - sha512 = "rpTPrEJu1PMaRQxz5P8BZWsixNNhYloS0H0dwTxNBuE3qctbARvR7o8UCKLsmKgTbo+cz3T3a6IAsWlkHgMWGg=="; - }; - }; - "@apollographql/graphql-language-service-types-2.0.2" = { - name = "_at_apollographql_slash_graphql-language-service-types"; - packageName = "@apollographql/graphql-language-service-types"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-language-service-types/-/graphql-language-service-types-2.0.2.tgz"; - sha512 = "vE+Dz8pG+Xa1Z2nMl82LoO66lQ6JqBUjaXqLDvS3eMjvA3N4hf+YUDOWfPdNZ0zjhHhHXzUIIZCkax6bXfFbzQ=="; - }; - }; - "@apollographql/graphql-language-service-utils-2.0.2" = { - name = "_at_apollographql_slash_graphql-language-service-utils"; - packageName = "@apollographql/graphql-language-service-utils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-language-service-utils/-/graphql-language-service-utils-2.0.2.tgz"; - sha512 = "fDj5rWlTi/czvUS5t7V7I45Ai6bOO3Z7JARYj21Y2xxfbRGtJi6h8FvLX0N/EbzQgo/fiZc/HAhtfwn+OCjD7A=="; - }; - }; "@apollographql/graphql-playground-html-1.6.27" = { name = "_at_apollographql_slash_graphql-playground-html"; packageName = "@apollographql/graphql-playground-html"; @@ -373,15 +355,6 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.12.11" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.12.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz"; - sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; - }; - }; "@babel/generator-7.13.9" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1408,15 +1381,6 @@ let sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ=="; }; }; - "@babel/types-7.10.4" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz"; - sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; - }; - }; "@babel/types-7.13.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -1435,22 +1399,22 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@bugsnag/browser-7.7.0" = { + "@bugsnag/browser-7.9.0" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.7.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.7.0.tgz"; - sha512 = "o3Y/8ZINTCyCiDid01xF4RwAfRCtt4Ak65sbEUjuen90Lf62LcqNIrguRotum5/5GrXl/ktm8gk6Tp8XBiS79A=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.9.0.tgz"; + sha512 = "+W/oxEJJMgNRVrgcCGXYQKAf6Nu28JklU3v+w7zgPEaxnzxxUwsCj7s4534XQvj/jprP60281WsAlTDqFRprAQ=="; }; }; - "@bugsnag/core-7.7.0" = { + "@bugsnag/core-7.9.0" = { name = "_at_bugsnag_slash_core"; packageName = "@bugsnag/core"; - version = "7.7.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.7.0.tgz"; - sha512 = "y6xY/ZjHRSD3h1ADdkgH4sUJeJ9TUjNjkui+pjdmQkG4asjA8lBNmjnqirGeAxgL00lg5xvbfLSq9iHdqFW9oQ=="; + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.9.0.tgz"; + sha512 = "LjARVBusQ1ewNrHRPBrwY4ISsXf/aPjQHAixFe6fRMiLzAS0awxFweVlbdfm+Oj/ZE04J6O9n4re9TC6pVBpEA=="; }; }; "@bugsnag/cuid-3.0.0" = { @@ -1462,22 +1426,22 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.8.0" = { + "@bugsnag/js-7.9.0" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.8.0.tgz"; - sha512 = "knSEXI4Znch4KzKooG3IgrYcZhKHYyTt/hGEmFhKCNmEiNGhGVisl0mbFCyjTBT+wYmWqqbv6kx4YOyGLCH0Yw=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.9.0.tgz"; + sha512 = "owMjgCdMMD/3zvojNUZRfnWcjbudmAZ0f+5oNqxUwB4oEUgDd70QfNz11/QgrfydIgQd1iAj2qLyNZ2aAdQgzg=="; }; }; - "@bugsnag/node-7.8.0" = { + "@bugsnag/node-7.9.0" = { name = "_at_bugsnag_slash_node"; packageName = "@bugsnag/node"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.8.0.tgz"; - sha512 = "2ZkXP5gmTE4LcPu2TB350BUmClbwsPZ1ZjYMiHqHDb2Xjoico0PNt6F9tBLjDRy9jS/pFGbjt/iOpyfr4GFm8A=="; + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.9.0.tgz"; + sha512 = "ctTJLfeNgbWZAnKbqg4w1PMsabSnmkgAY199oZLonDuu/60UWlNOcDEicDEhULD9gt2vYTZy78QsYov4LDAojQ=="; }; }; "@bugsnag/safe-json-stringify-6.0.0" = { @@ -1534,6 +1498,15 @@ let sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw=="; }; }; + "@cto.af/textdecoder-0.0.0" = { + name = "_at_cto.af_slash_textdecoder"; + packageName = "@cto.af/textdecoder"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cto.af/textdecoder/-/textdecoder-0.0.0.tgz"; + sha512 = "sJpx3F5xcVV/9jNYJQtvimo4Vfld/nD3ph+ZWtQzZ03Zo8rJC7QKQTRcIGS13Rcz80DwFNthCWMrd58vpY4ZAQ=="; + }; + }; "@cycle/dom-18.3.0" = { name = "_at_cycle_slash_dom"; packageName = "@cycle/dom"; @@ -1885,15 +1858,6 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = { - name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; - packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.2.tgz"; - sha512 = "ZHkXKq2XFFmAUdmSZrmqUSIrRM4O9gtkdpxMmV+LQl7kScUnbo6pMnXu6+FTDgZ12aW6SDoZoOJfS56WD+Eu6A=="; - }; - }; "@eslint/eslintrc-0.4.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -1930,22 +1894,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.31" = { + "@expo/config-3.3.33" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.31"; + version = "3.3.33"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.31.tgz"; - sha512 = "LRNWctdc9TI7C2BIrqShS97LT+Oe2TuazWh5uFdvxT1gMe7N4TslyLwaYHPiOgetukRtTAOP5+ekXXyc656VdA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.33.tgz"; + sha512 = "8AJaBUlPOrIUfyy61N+/EfGegyddNyFnu2fifQGAhi8/bK61LpfbuRz7jBi4vnEDsOO0Hvwjm+mM6rK5RTjNOA=="; }; }; - "@expo/config-plugins-1.0.21" = { + "@expo/config-plugins-1.0.23" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.21"; + version = "1.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.21.tgz"; - sha512 = "sMTF0/lx52ovJPz9iH5l0aKRpPFFtYoAQ+38AYhXI890Sswr1UU4Pq3IA5RMdvtOTkTzNREr21WvEHd7X8D1dA=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.23.tgz"; + sha512 = "LjglO6CHC69qYjOynRsDBKuVbL2W3UPJs6nghgJR5aNhQCZtQsc74p4NWbQEkbPEasNtGCb355PlsV2fQskFaQ=="; }; }; "@expo/config-types-40.0.0-beta.2" = { @@ -1966,22 +1930,22 @@ let sha512 = "HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw=="; }; }; - "@expo/dev-server-0.1.57" = { + "@expo/dev-server-0.1.59" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.57"; + version = "0.1.59"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.57.tgz"; - sha512 = "0N5RArNt1qnkGbUqW2MWC4+FlxbyVuzn2e/QeICBq6mdSC+LT+J0jatbpSGD7Mk76tZtDGduHQBR0MA9Vdqgew=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.59.tgz"; + sha512 = "mDFUiJVQ1LWx7WQCGCdqiQTm/j+UooVuYZKE9OpJIjBBLPB+a/0rlu7OxU+0PyjA+xc0t5fGVgRCuij2mqzS+A=="; }; }; - "@expo/dev-tools-0.13.85" = { + "@expo/dev-tools-0.13.87" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.85"; + version = "0.13.87"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.85.tgz"; - sha512 = "brTPqUyk+J+jYrwupCcTDEXXpmQ2cDVYd9tDvpKLZGj8VnuUj2u2miAeJc4rSiKE+N6YYeRwJRF7gghd2NBVkw=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.87.tgz"; + sha512 = "tQF9NvKd1HsGVm2iNrLYa1hndJNSkilYTLSvJnCSNbgGQJzMCMMfcdZXpIn8Sc6iF0kQ1KIfIzeO8UL72qTNIA=="; }; }; "@expo/devcert-1.0.0" = { @@ -1993,13 +1957,13 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.10" = { + "@expo/image-utils-0.3.11" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.10"; + version = "0.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.10.tgz"; - sha512 = "EebukeUnzyk4ts1E1vMQSb0p8otYqWKsZNDZEoqHtERhxMSO7WhQLqa7/z2kB/YMHRJjrhaa3Aa2X5zjYot1kA=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.11.tgz"; + sha512 = "JH5/FExvEsz9H9QsgoOEN3QYqH9V50dKjpkwTkytXLutD5Z587xSRka57pbX+d4nkHqiQBT0W8buUkbma78NYg=="; }; }; "@expo/json-file-8.2.28-alpha.0" = { @@ -2011,13 +1975,13 @@ let sha512 = "cCQdw/Nfw8doXjN3onvUnWkuJjtVxx2iUjSOLMydvgI87YpW3x05uUXOVs4P+77YFVoFS6xbki+fmKK2JSCf8w=="; }; }; - "@expo/metro-config-0.1.57" = { + "@expo/metro-config-0.1.59" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.57"; + version = "0.1.59"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.57.tgz"; - sha512 = "SyUDmjIpSy5DE0h32ckdVwB0XbB8jgbbW28MYILUASSLzfC3DmaOqdcNl18jIaewG5hw2eHc2gikd/0TwLN2Vw=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.59.tgz"; + sha512 = "xg9ne3z9D2zjsS6rjdNnnvsljsgcqLdM4e3oc0dmn7Bq8q+rkbCDlm22w2d7NmFIykMMDAvJdpEhTO7Vqyu7Lg=="; }; }; "@expo/osascript-2.0.24" = { @@ -2083,22 +2047,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.61" = { + "@expo/webpack-config-0.12.63" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.61"; + version = "0.12.63"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.61.tgz"; - sha512 = "Ymx+DiBtBIo8+PoJ+dw1QEhgvGfJZvRUAIQ6JLxVPzApHMg6J0UUCrtWYByC8+Ax8QcrdSFjphoCGcFfL45/9w=="; - }; - }; - "@expo/xdl-59.0.25" = { - name = "_at_expo_slash_xdl"; - packageName = "@expo/xdl"; - version = "59.0.25"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.25.tgz"; - sha512 = "can8RKDHBAq8NtGMbg25EmJ2RexJJhefTvvIQec4B6aWrydBYzRa2O//zFBP4VX56DyuwajPOk5gLejWEWeHNw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.63.tgz"; + sha512 = "50hG1KeahBX88X7nhb+ZBL5wHSR6U9EDlHhmYXeGK4tQcNKsfONdieNOKoYKW7LgDr3mSSO+2j7SWfNbAGHEmw=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2146,22 +2101,22 @@ let sha512 = "SMyoMFCPRNoDeHB5MMIi8W3loDxjXsSBeQfQaaKqmph7gVN48DCky6K/xBHHDJDeqJjcmEgwPTRP8qsuuLWnqw=="; }; }; - "@fluentui/react-7.164.1" = { + "@fluentui/react-7.165.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.164.1"; + version = "7.165.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.164.1.tgz"; - sha512 = "TISxdxKjvHtfDTIvRFT7wRTS7eoe1sMXMwURVX2KX0n557aq1olOCbOaRPycnUQ0a4T4D/LIcvA2i47kvaGMYw=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.165.0.tgz"; + sha512 = "fztahwnYIVB6hvb0VV11DKQK4jO4WJiTx2o3IFcxSPcOtZmjYtGDU8X0MXGadWRnzldfNLgkW+5NzqxZrwRD1w=="; }; }; - "@fluentui/react-focus-7.17.5" = { + "@fluentui/react-focus-7.17.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.17.5"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.5.tgz"; - sha512 = "FBgvHMOpFnmMSGVV+QdlKNMQ61kEzqv2wjUObWxdpqxVUeFIk4rSAalCp2R8c2Sg8YxTGmH5ywhySQ6GQEM6sA=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.17.6.tgz"; + sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2326,13 +2281,13 @@ let sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg=="; }; }; - "@graphql-tools/url-loader-6.8.1" = { + "@graphql-tools/url-loader-6.8.2" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.8.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.1.tgz"; - sha512 = "iE/y9IAu0cZYL7o9IIDdGm5WjxacN25nGgVqjZINYlisW/wyuBxng7DMJBAp6yM6gkxkCpMno1ljA/52MXzVPQ=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.2.tgz"; + sha512 = "YzsXSCOwlSj8UqOMhQThPzgEChgS/MonyWV7f0WKmN9gAT/f3fPaUcYhVamsH0vGbvTkfNM4JdoZO/39amRs5Q=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2362,6 +2317,15 @@ let sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; }; }; + "@grpc/grpc-js-1.2.10" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.10.tgz"; + sha512 = "wj6GkNiorWYaPiIZ767xImmw7avMMVUweTvPFg4mJWOxz2180DKwfuxhJJZ7rpc1+7D3mX/v8vJdxTuIo71Ieg=="; + }; + }; "@grpc/grpc-js-1.2.11" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -2398,6 +2362,15 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; + "@handsontable/formulajs-2.0.2" = { + name = "_at_handsontable_slash_formulajs"; + packageName = "@handsontable/formulajs"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@handsontable/formulajs/-/formulajs-2.0.2.tgz"; + sha512 = "maIyMJtYjA5e/R9nyA22Qd7Yw73MBSxClJvle0a8XWAS/5l6shc/OFpQqrmwMy4IXUCmywJ9ER0gOGz/YA720w=="; + }; + }; "@hapi/address-2.1.4" = { name = "_at_hapi_slash_address"; packageName = "@hapi/address"; @@ -3001,13 +2974,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.24.0" = { + "@jsii/spec-1.25.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.24.0.tgz"; - sha512 = "Km0va0ZBlzWPOijsNlo7SwozYT6Ej9h01xXYtBmoHw2CLccofOEQLV2Ig3+ydhU+aTW5yLKJrVPsAjJoaaBAgA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.25.0.tgz"; + sha512 = "Zr56+uqZLoxI8qxIZZEweZdYBo0KqWf+q25m/okgwcKV4njCZuh0APXzeT/ebSkSOHQ3tneEE+g2EP/8IPP2og=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3604,13 +3577,31 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.151" = { + "@microsoft/load-themed-styles-1.10.153" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.151"; + version = "1.10.153"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.151.tgz"; - sha512 = "LCRBzFxmxX94cNNS3ATWu877Y17WJO2/Cg9DQKHrCtrW0tnr7+k6IIGXWAu4L5l9tsa5sQ1YThV6WUS4rWEsFA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.153.tgz"; + sha512 = "Rzc4FAYYyMbZN0TeTRcUN47H/8zXhoZUBcJd2eK/93ZNAitnWGXes0nHXVMFpn+pc9Ca/uq9rCOSURjJsmUrxw=="; + }; + }; + "@mitmaro/errors-1.0.0" = { + name = "_at_mitmaro_slash_errors"; + packageName = "@mitmaro/errors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mitmaro/errors/-/errors-1.0.0.tgz"; + sha512 = "KUU0J4rgHsJiMsAj6Ndj+OTAlsKsX/fe3geQ0UB1jYm1DoaqFoanh1sBshb9rLNJpPjsD7yNQFykGajAsPciyw=="; + }; + }; + "@mitmaro/http-authorization-header-1.0.0" = { + name = "_at_mitmaro_slash_http-authorization-header"; + packageName = "@mitmaro/http-authorization-header"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@mitmaro/http-authorization-header/-/http-authorization-header-1.0.0.tgz"; + sha512 = "cAm7w7S04aswBtsXAReyzHrq9EV7yNalYj8OObsnavCucDoxC10y14gE2Eg82UKnR5v2TWSJAVCLFea4gaiddQ=="; }; }; "@mozilla/readability-0.4.1" = { @@ -3658,13 +3649,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-9.9.5" = { + "@netlify/build-9.11.2" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "9.9.5"; + version = "9.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-9.9.5.tgz"; - sha512 = "1IXONOLuy/Jr0+DwxQ5e3xLab7hBUlwN19EBfmTAvlRvdogrTMz2pjC+49zVZEslidd4a66Evgix+2R8ui/JSg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-9.11.2.tgz"; + sha512 = "hnKDssHUnTSNibvK67lJ2hqZHutsUVSCWvLDV2ExEbSlqws0GdGjTunas39Vx6Vq/YKLEg/bLI+SXSsVyPKWxQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3676,31 +3667,31 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-4.1.3" = { + "@netlify/config-4.2.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "4.1.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-4.1.3.tgz"; - sha512 = "4q2OreQrTUDFWwKJ0EXjiDwHeN7kuuGlqUY0osg7hlK2b8Bd0LCeCOfOWaGcRWe4kSxUWHZxzNGkWKqiDkTpxw=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-4.2.0.tgz"; + sha512 = "z145O9ZOklq6+C02wxS+NZanJAyHHmGS1v9OQ3uTtoE6U0H1W1y7lalxEBNTaVg4/TQTj1X7xOX81KfNuuQ0MA=="; }; }; - "@netlify/framework-info-2.3.0" = { + "@netlify/framework-info-3.2.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "2.3.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-2.3.0.tgz"; - sha512 = "vqy9wbBRP8qWnkzA/OQsThr1+cfqapMrORJ4hWcrjhIPRmXIJtwB6OWuLIUalMeSGCwqZjYpKfudc4BLuxxvjw=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-3.2.0.tgz"; + sha512 = "wvyTzcRMtg4Qlzn8rAjx+k4UD42TLbZdpF7dNqnL4+cBPeS04X0tc7Jhan7aigwnmiKUw6nufhkN40TInpiC6g=="; }; }; - "@netlify/functions-utils-1.3.20" = { + "@netlify/functions-utils-1.3.21" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.20"; + version = "1.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.20.tgz"; - sha512 = "Kssrz9UDx3aLT1CyYSfOe+T6uFgg0a9ycuX8W5qQ+nwbf2NuylDzK/Wsa57kYjc5ewBB5HTgPP0yFwfKQtIn3A=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.21.tgz"; + sha512 = "Pe6DGnmOx6a/RMWCHteODdk7qYZiv4svjLbs1Uit+N2ISRbPJmaKoRFYrsnLICr1Oldcnqp6mA7CoHEpKrMsSw=="; }; }; "@netlify/git-utils-1.0.8" = { @@ -3730,13 +3721,13 @@ let sha512 = "R7oEvYjLOrvO8uSy484c4TrZeD5A1M2TN4dIM7dAdd2iHgpC+i3+RhlM9XFHFOqc8lsim+A+BcKMQYZ19z+j6A=="; }; }; - "@netlify/plugins-list-2.4.1" = { + "@netlify/plugins-list-2.4.3" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.4.1"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.4.1.tgz"; - sha512 = "UtBdYK1LodrnOEuLmDWxBblDPQwlQADFNfKzgkmPaAQ6rGQmKpu5UqAr+u0HAJa2cjm5Pr1Zfs1dBhj0bWnmxw=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.4.3.tgz"; + sha512 = "xJ4o8IRwjjWrsFw/Ii4VSWQgmoBe/GFyWTj1q+ShOpC0BJUTZ22g7+rMwlEZXkisOT+Y/niPkikkrXcU9FCzZg=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -3793,6 +3784,15 @@ let sha512 = "Tt37A8tyQcEw3h4YZ4g5/Cgqya4rf/BnweDjfwPDj0BFZmfjRSH8CIZvTJd2y+R2AvLJ1b89cXVYen9uwb2A9w=="; }; }; + "@netlify/zip-it-and-ship-it-3.0.1" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-3.0.1.tgz"; + sha512 = "Wh3ajSR1uhtYTFCYJoevFGSvykF0hUAJwwOETC8SMfkx4H1xJ1Zt7Bs1OZ1Ee1PayJDy7vQYBwdIeWTJPz8efw=="; + }; + }; "@node-red/editor-api-1.2.9" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; @@ -4009,15 +4009,6 @@ let sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA=="; }; }; - "@oclif/plugin-autocomplete-0.3.0" = { - name = "_at_oclif_slash_plugin-autocomplete"; - packageName = "@oclif/plugin-autocomplete"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.3.0.tgz"; - sha512 = "gCuIUCswvoU1BxDDvHSUGxW8rFagiacle8jHqE49+WnuniXD/N8NmJvnzmlNyc8qLE192CnKK+qYyAF+vaFQBg=="; - }; - }; "@oclif/plugin-help-1.2.11" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; @@ -4063,24 +4054,6 @@ let sha512 = "lfHNiuuCrCUtH9A912T/ztxRA9lS1lCZm+gcmVWksIJG/gwKH/fMn+GdLTbRzU2k6ojtMhBblYk1RWKxUEJuzA=="; }; }; - "@oclif/plugin-plugins-1.9.5" = { - name = "_at_oclif_slash_plugin-plugins"; - packageName = "@oclif/plugin-plugins"; - version = "1.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-plugins/-/plugin-plugins-1.9.5.tgz"; - sha512 = "8U1MKPTaitCBj4HPZpwFo7F5Krw9zEaNqKiX+QkvPz2wfftLqnSqariYvP38S/uo8CDwiR3zHPEYFSxu9CDQQA=="; - }; - }; - "@oclif/plugin-warn-if-update-available-1.7.0" = { - name = "_at_oclif_slash_plugin-warn-if-update-available"; - packageName = "@oclif/plugin-warn-if-update-available"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-warn-if-update-available/-/plugin-warn-if-update-available-1.7.0.tgz"; - sha512 = "Nwyz3BJ8RhsfQ+OmFSsJSPIfn5YJqMrCzPh72Zgo2jqIjKIBWD8N9vTTe4kZlpeUUn77SyXFfwlBQbNCL5OEuQ=="; - }; - }; "@oclif/screen-1.0.4" = { name = "_at_oclif_slash_screen"; packageName = "@oclif/screen"; @@ -4108,13 +4081,13 @@ let sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA=="; }; }; - "@octokit/core-3.3.0" = { + "@octokit/core-3.3.1" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-3.3.0.tgz"; - sha512 = "GGMpjaodCBY7JrtOwfolMocwZw9Pj5NxuQqfaJhGau4tkyonm0JRV9D6juQYLMb1Kl261++4Q980o0FlAtg8jg=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-3.3.1.tgz"; + sha512 = "Dc5NNQOYjgZU5S1goN6A/E500yXOfDUFRGQB8/2Tl16AcfvS3H9PudyOe3ZNE/MaVyHPIfC0htReHMJb1tMrvw=="; }; }; "@octokit/endpoint-6.0.11" = { @@ -4162,13 +4135,13 @@ let sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; }; }; - "@octokit/plugin-paginate-rest-2.13.2" = { + "@octokit/plugin-paginate-rest-2.13.3" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.13.2"; + version = "2.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.2.tgz"; - sha512 = "mjfBcla00UNS4EI/NN7toEbUM45ow3kk4go+LxsXAFLQodsrXcIZbftUhXTqi6ZKd+r6bcqMI+Lv4dshLtFjww=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz"; + sha512 = "46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg=="; }; }; "@octokit/plugin-request-log-1.0.3" = { @@ -4972,13 +4945,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.2.4" = { + "@schematics/angular-11.2.5" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.4"; + version = "11.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.4.tgz"; - sha512 = "HKWpcmfJfx5fryDdVGN1s+AmzOCKViQQGrEZmDTC2PhA6Vg+SOeMKesyFvdOqf4Ld1ZNYw9Kg94wrpz6rycP/Q=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.5.tgz"; + sha512 = "pjaK0gZyqhzgAVxMKElG6cDpAvNZ3adVCTA8dhEixpH+JaQdoczl59hMn7rH75yQW0PApe+8g7HMwVK6bLRmxQ=="; }; }; "@schematics/schematics-0.1102.0" = { @@ -4990,13 +4963,13 @@ let sha512 = "0mN6qGnI31GVNYAKDdZ6ISiJMtN8Z0rekpJ/xNHK/lDNl/QkoJVBHDf68oEcNE8dvWMq86ULpznCdT1IBQ7YFA=="; }; }; - "@schematics/update-0.1102.4" = { + "@schematics/update-0.1102.5" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1102.4"; + version = "0.1102.5"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.4.tgz"; - sha512 = "YgwbnTAok1NcolqFicc4S4tFxASfXttWsbHju4XArym1/KQMUjY8ZOdj4pe56akzrWXuCexZFpjgoYyYyXBuYQ=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.5.tgz"; + sha512 = "iz9pM8mabieqQnPZjrqP5jfRFvPm81/uIg46kY3KjtDtSBi4GAF2dnFyX1dC2mG1rq+e+8zeQLvOvhdLifYlEA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5026,13 +4999,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.7.3" = { + "@serverless/components-3.7.5" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.7.3"; + version = "3.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.3.tgz"; - sha512 = "4LyK956r0hS+0Ew7ErmSG/OuD5k2SkUz2upnpBQlwt1+9hgulYytHNJ5mVtfwRG/VjFtHb+Q94p5Xawo5JuObA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.7.5.tgz"; + sha512 = "fD2Yxaxqt4WmlJquSu5AmWUqJxDTY7d1+u58hFIZyB5mwbFX3cTsHkEVMaLDlZtS6bWveSgGg14pFchLq+AV5A=="; }; }; "@serverless/core-1.1.2" = { @@ -5044,13 +5017,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-4.5.0" = { + "@serverless/enterprise-plugin-4.5.1" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.0.tgz"; - sha512 = "uzWoM5bIXQpdi8bI/NDt353Rr5MF2wBQ0R1ZWrKFSptCIWmYofByqmG2ma6DzJS/u5g0htgucJcIK1ZcrPEd0Q=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-4.5.1.tgz"; + sha512 = "wDZ/Ulu6PZ30gfiwCZ+CxDDt7fZHgH1wbU3pkBOIWtXpksm2edv+eN4irWwVe93OVUqN3uWEtLZJVZH5YQzf1g=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5062,22 +5035,22 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.0" = { + "@serverless/platform-client-4.2.1" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.0.tgz"; - sha512 = "92/Mc09zQbJAw917KhJk0kM76Jpf3njoSevHEu9ASYx7OSjTbZw9B5VdOe4Z2m+4NvUwK0mWBNpSmCvd5uwOhg=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.1.tgz"; + sha512 = "Mb68YdkhKUs4LFsrluabE00ng08fLCslf07Ufy/kwN7LfFZKTpNTnuvc/pR59zk7v3s5XWBTlnGWKbID3IWLlQ=="; }; }; - "@serverless/platform-client-china-2.1.8" = { + "@serverless/platform-client-china-2.1.9" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.8.tgz"; - sha512 = "RmGLLJNDxyVSMyWOh93XMbhVl0b0ErZo1mfUp3mowRDcF8Mss1KQrqlnpFnB7IfOkRqKzmZ72B7eEkOaIQYZPw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.9.tgz"; + sha512 = "PAqhHshlwY1PTeuwCaJeXfGB64w1Vg6C9FtpoFv7dkb7OAlYl86evJbugGUc4YlsdhQsgJvG3QSZpo7sYK1Ipw=="; }; }; "@serverless/template-1.1.4" = { @@ -5107,6 +5080,15 @@ let sha512 = "HhmnTtfGt4gKCNGHg0q9pioltChh+dWbdA7y1aP7vNqjwpZ/pUDAqJf/M3GFozTnhlFpwCY9Ik1tOpDkgP3oiA=="; }; }; + "@serverless/utils-4.0.0" = { + name = "_at_serverless_slash_utils"; + packageName = "@serverless/utils"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@serverless/utils/-/utils-4.0.0.tgz"; + sha512 = "SNLjh3qFnKvqZZAljTHY9IuoS+UZytBqfAki+V5DsVjXEKZrAKzem1kpKF2zeARg8tHFDProM0LGFCxGDkkgxw=="; + }; + }; "@serverless/utils-china-1.0.14" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; @@ -5242,13 +5224,13 @@ let sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ=="; }; }; - "@snyk/dep-graph-1.27.1" = { + "@snyk/dep-graph-1.28.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.27.1"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.27.1.tgz"; - sha512 = "YevGMdKdmiybrpISvkp8qk84elAxr0vmLuHyB3ijHlhSZVhRtCBmDeHmavHc4E9Xv4RWZF+oT5PfcuNvnmph/w=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz"; + sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg=="; }; }; "@snyk/docker-registry-v2-client-1.13.9" = { @@ -5485,139 +5467,139 @@ let sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; }; }; - "@textlint/ast-node-types-4.4.1" = { + "@textlint/ast-node-types-4.4.2" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.1.tgz"; - sha512 = "2QBwlqi2SU83vTHibfdTxGiLdIqR0btNyMGfVl0bwA6FI85HnSYoGFLrdCnq2V0nxpbhuvwzcm2Ja81w0VkMGA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.2.tgz"; + sha512 = "m5brKbI7UY/Q8sbIZ7z1KB8ls04nRILshz5fPQ4EZ04jL19qrrUHJR8A6nK3vJ/GelkDWl4I0VDYSAjLEFQV8g=="; }; }; - "@textlint/ast-tester-2.3.2" = { + "@textlint/ast-tester-2.3.4" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.2.tgz"; - sha512 = "4e1kyqsHks5POcQmuh7ITVrU/dbYyRUfQarQbeVRPP271n2HnlgnoYyZ10yV2Sb/Ksw+lQf7DPSnwNewXdCWww=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-2.3.4.tgz"; + sha512 = "2gIsnJ1Dmr5jjF+u/vusNRqk2bJi0WwwbjP9WV/op51DhDTi7BUNjVSiZtcP9NVxidvs51XNEg+EMTRoKP3Msg=="; }; }; - "@textlint/ast-traverse-2.3.2" = { + "@textlint/ast-traverse-2.3.4" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "2.3.2"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.2.tgz"; - sha512 = "Dt1s/6x0XWhUNFH2rAa9gL6ODtq232BZuBHuHiOg+SrVwzl+VjOfa3fMQ0LoYixGSyDtwqAlksWcC0KyLz0eSw=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-2.3.4.tgz"; + sha512 = "NcjPXCvP8r4D2/azeQhwjPvh2+099I9RRBUrg6IpMfTW4IUUJb4BwZOPgjW+XRIVc71Dhgm82VSIagDL90FYcg=="; }; }; - "@textlint/feature-flag-3.3.2" = { + "@textlint/feature-flag-3.3.4" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.2.tgz"; - sha512 = "7ErQ/UF0IBAd+PkQNBD7yYCDqL2o6leErMDENSWAgUHWLy5TcHr3Orn7qswtBMW5gIyXW9lh+EpllwLJ5qv35w=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-3.3.4.tgz"; + sha512 = "ULAqdD2y1sPAhbkaMjS2fltrZYCNQGsNDv/NQWFsCmDpQ1R8kxoUaTiXpebTM+nVuyvU5GfdkxhHyMarPIjmYw=="; }; }; - "@textlint/fixer-formatter-3.3.2" = { + "@textlint/fixer-formatter-3.3.4" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.2.tgz"; - sha512 = "aTEyH/rHSzxRLrluSjNhDnMSgIYK60J5AAgprKJCkb9h3dDRuNoiJ+BXh5FXVSSm1tGF0d8pu+Ph8OFBgQOchQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-3.3.4.tgz"; + sha512 = "H4i+N+uN7EiI5vRnfRIccFc5yekNHnO8795fiOK2TZPb6SzY3iwLOGZ2rDKvgu7ZKdyGW945w3T0elUF3Fkr5A=="; }; }; - "@textlint/kernel-3.4.2" = { + "@textlint/kernel-3.4.4" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "3.4.2"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.2.tgz"; - sha512 = "PpxAtvLGI9ewn+Dbt4j0KMfmMM39/AY3cikmZffu59nyTdIymXMeVMEVkpVZTEUk5OlL27RAON9FF+2u+0fshg=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-3.4.4.tgz"; + sha512 = "ro9TPnE16C6gtKkY3aOjTs8ZfzAxdXLCV9JD4BuV5P+xBiiu9NdiE2Hwm3LyEGQjMxaKnXjbm/DTCAxA4gz0Dg=="; }; }; - "@textlint/linter-formatter-3.3.2" = { + "@textlint/linter-formatter-3.3.4" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.2.tgz"; - sha512 = "MRa8D1/x6pWycKTwb1QLjtY7GyjgcsYRfV0Gu0Aze5szCa3UDwZSewHycpcAGlIqr8AkqPRfyXi653M47eJ0rA=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-3.3.4.tgz"; + sha512 = "k1lyvR+w7ctwr5dWhMVRTKk19GH99BAO2dLk8ZS0ZcYyKqKAKu6Iyb1cWEg/u3dT3KFbWwoegnAelfz5828SHQ=="; }; }; - "@textlint/markdown-to-ast-6.3.2" = { + "@textlint/markdown-to-ast-6.3.4" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "6.3.2"; + version = "6.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.2.tgz"; - sha512 = "uwndF3PRJ48wTVAEDSy0IAEVJg/scxpdZ1r+QKeGuFfdtaGSrtcgROI6qiVU1g/WNyNfQw+DAA7F8HfM+pmleg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.3.4.tgz"; + sha512 = "LLScbDRXov1l4U4OCLJ5clu9eWNonBG+rhuArwYAHpf0hwIoNoETfAQvrNtXZG/NZ96fdWv4PLtaN6dA4ldRdQ=="; }; }; - "@textlint/module-interop-1.2.2" = { + "@textlint/module-interop-1.2.4" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.2.tgz"; - sha512 = "B8HPS129lOqzEpRcafYl/OJ2TDxfBw1jGfEhebzwt3kGoMd5pQVih+hUIOl+SfAmLWqCDEniaKn0gw1s+hjSXA=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-1.2.4.tgz"; + sha512 = "/wUKvDbBEujrhpcuD7Et4Mcicm3SG2oAe/tyMruLxSJ86umGxd34dEcHRON8fJzou9qyt0gFoczcypd4k3hJow=="; }; }; - "@textlint/source-code-fixer-3.4.2" = { + "@textlint/source-code-fixer-3.4.4" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "3.4.2"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.2.tgz"; - sha512 = "mSGQNO8is21KcHgDh4S8Cx88r7uU+7xpzHLuEuzhgEZfgwz3+tnpk22TrEjNYe1V1+aseU9iCQegVQQr1wroKQ=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-3.4.4.tgz"; + sha512 = "GDHVin2EJ9PGJ33VMGlqtPcvUlY+pkTbaWs4jWv8oBaEK8UUBzS5ZpEc4xi7Xp5vIXnVsCSLKNC6bgvR9X/AoQ=="; }; }; - "@textlint/text-to-ast-3.3.2" = { + "@textlint/text-to-ast-3.3.4" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.2.tgz"; - sha512 = "+DKAP62ho21KID8IcKy1kP6K+kUZk+Z0MwvS9u2l39J0cK+vX523KI+sA6AXxEhOMDA8zhdIsBf3onGvrAtyhA=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-3.3.4.tgz"; + sha512 = "oDwGNQCAo7ROnHqaksPEogf8fxXGU3Z61C6NEv0n9vEWEkUX9oUVX4c9kh5UieZL5nN/xIdzVc3TrXywkkOK3g=="; }; }; - "@textlint/textlint-plugin-markdown-5.3.2" = { + "@textlint/textlint-plugin-markdown-5.3.4" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "5.3.2"; + version = "5.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.2.tgz"; - sha512 = "6Ph7ESKR48tEz5Pnog3PpvF84LU3jkADvr4iBkkVz9vLQt3KbqGnmk8EV94Y0hLEX+UrZKWmH3cJfh6O1Zy/eA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-5.3.4.tgz"; + sha512 = "g8KKuwhzzlRjvKrpq3SbGc+JJMAJoy5Xp0Ibvq7QKgNVxwN/f5WtmrJc8CdgFG7++jgtkDPlofz0c9xG63xKwQ=="; }; }; - "@textlint/textlint-plugin-text-4.3.2" = { + "@textlint/textlint-plugin-text-4.3.4" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "4.3.2"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.2.tgz"; - sha512 = "xnjad0bXaM6ZtgffuFKogHYkzXymUK3VTLP5MGA00kLitADlNUtwXQk82TebkXFcSPRhePU9+2XFipXNQDsg7g=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-4.3.4.tgz"; + sha512 = "ZtctKFR8V9mIZAMibS97xPWlt2lViizIRAy4oDaKCnxAwJ0uAjxm/OlHHdaFwNydGaEDtN60mcmarDqOOAZIiA=="; }; }; - "@textlint/types-1.5.2" = { + "@textlint/types-1.5.4" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.2.tgz"; - sha512 = "IdS0h2MCzdY+wjM0+qvl8IW/IxhmVFAVrGu5TmIBpJkihIV7WMa3ITFXIVb0oqwnePUmyLBRIVsCtC66E3QbfQ=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-1.5.4.tgz"; + sha512 = "bhSrOjW8AFSa/xf6lYZ2akE0j+4O/WEAA2S/R8RrjNMkA5Az2j57mxPNpqMhEeyHDkpzN/coIlqUwgYvcJHv1A=="; }; }; - "@textlint/utils-1.2.2" = { + "@textlint/utils-1.2.4" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.2.tgz"; - sha512 = "7Mqcl9G9YYrPBv5d/tZ2NlWC66hTUpQEQxZEHDMTdF3gPmQUSNRNGjqUR9mhw00Wy8Wo6i3LUWuxwMT6heHNBQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-1.2.4.tgz"; + sha512 = "FREWc8n6bJFsKehtUlHPtbqnXULWhdnlazqWiHMjiBtcxUfD+1kY3P7PNGbChdzeZGmwBkgFQyGkok8bAGnZOw=="; }; }; "@tokenizer/token-0.1.1" = { @@ -5683,13 +5665,13 @@ let sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA=="; }; }; - "@types/babel__core-7.1.12" = { + "@types/babel__core-7.1.14" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.12"; + version = "7.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz"; - sha512 = "wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz"; + sha512 = "zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g=="; }; }; "@types/babel__generator-7.6.2" = { @@ -5971,13 +5953,13 @@ let sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; }; }; - "@types/express-4.17.7" = { + "@types/express-4.17.11" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.7"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.7.tgz"; - sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; + sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; }; }; "@types/express-4.17.8" = { @@ -5998,6 +5980,15 @@ let sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; }; }; + "@types/express-serve-static-core-4.17.19" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; + sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; + }; + }; "@types/fancy-log-1.3.0" = { name = "_at_types_slash_fancy-log"; packageName = "@types/fancy-log"; @@ -6421,13 +6412,13 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/mocha-8.2.1" = { + "@types/mocha-8.2.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.1.tgz"; - sha512 = "NysN+bNqj6E0Hv4CTGWSlPzMW6vTKjDpOteycDkV4IWBsO+PU48JonrPzV9ODjiI2XrjmA05KInLgF5ivZ/YGQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz"; + sha512 = "Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw=="; }; }; "@types/multer-1.4.4" = { @@ -6475,13 +6466,13 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-13.13.46" = { + "@types/node-13.13.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.46"; + version = "13.13.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.46.tgz"; - sha512 = "dqpbzK/KDsOlEt+oyB3rv+u1IxlLFziZu/Z0adfRKoelkr+sTd6QcgiQC+HWq/vkYkHwG5ot2LxgV05aAjnhcg=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.47.tgz"; + sha512 = "R6851wTjN1YJza8ZIeX6puNBSi/ZULHVh4WVleA7q256l+cP2EtXnKbO455fTs2ytQk3dL9qkU+Wh8l/uROdKg=="; }; }; "@types/node-14.11.1" = { @@ -6493,13 +6484,22 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.34" = { + "@types/node-14.14.32" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.34"; + version = "14.14.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.34.tgz"; - sha512 = "dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.32.tgz"; + sha512 = "/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg=="; + }; + }; + "@types/node-14.14.35" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "14.14.35"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-14.14.35.tgz"; + sha512 = "Lt+wj8NVPx0zUmUwumiVXapmaLUcAk3yPuHCFVXras9k5VT9TdhJqKqGVUQCD60OTMCl0qxJ57OiTL0Mic3Iag=="; }; }; "@types/node-6.14.13" = { @@ -6889,13 +6889,13 @@ let sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg=="; }; }; - "@types/websocket-1.0.1" = { + "@types/websocket-1.0.2" = { name = "_at_types_slash_websocket"; packageName = "@types/websocket"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.1.tgz"; - sha512 = "f5WLMpezwVxCLm1xQe/kdPpQIOmL0TXYx2O15VYfYzc7hTIdxiOoOvez+McSIw3b7z/1zGovew9YSL7+h4h7/Q=="; + url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.2.tgz"; + sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; "@types/ws-7.4.0" = { @@ -6952,22 +6952,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@types/zen-observable-0.8.2" = { - name = "_at_types_slash_zen-observable"; - packageName = "@types/zen-observable"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.2.tgz"; - sha512 = "HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg=="; - }; - }; - "@typescript-eslint/eslint-plugin-4.17.0" = { + "@typescript-eslint/eslint-plugin-4.18.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.17.0.tgz"; - sha512 = "/fKFDcoHg8oNan39IKFOb5WmV7oWhQe1K6CDaAVfJaNWEhmfqlA24g+u1lqU5bMH7zuNasfMId4LaYWC5ijRLw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.18.0.tgz"; + sha512 = "Lzkc/2+7EoH7+NjIWLS2lVuKKqbEmJhtXe3rmfA8cyiKnZm3IfLf51irnBcmow8Q/AptVV0XBZmBJKuUJTe6cQ=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -6979,13 +6970,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.17.0" = { + "@typescript-eslint/experimental-utils-4.18.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.17.0.tgz"; - sha512 = "ZR2NIUbnIBj+LGqCFGQ9yk2EBQrpVVFOh9/Kd0Lm6gLpSAcCuLLe5lUCibKGCqyH9HPwYC0GIJce2O1i8VYmWA=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.18.0.tgz"; + sha512 = "92h723Kblt9JcT2RRY3QS2xefFKar4ZQFVs3GityOKWQYgtajxt/tuXIzL7sVCUlM1hgreiV5gkGYyBpdOwO6A=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -6997,22 +6988,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.17.0" = { + "@typescript-eslint/parser-4.18.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.17.0.tgz"; - sha512 = "KYdksiZQ0N1t+6qpnl6JeK9ycCFprS9xBAiIrw4gSphqONt8wydBw4BXJi3C11ywZmyHulvMaLjWsxDjUSDwAw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.18.0.tgz"; + sha512 = "W3z5S0ZbecwX3PhJEAnq4mnjK5JJXvXUDBYIYGoweCyWyuvAKfGHvzmpUzgB5L4cRBb+cTu9U/ro66dx7dIimA=="; }; }; - "@typescript-eslint/scope-manager-4.17.0" = { + "@typescript-eslint/scope-manager-4.18.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.17.0.tgz"; - sha512 = "OJ+CeTliuW+UZ9qgULrnGpPQ1bhrZNFpfT/Bc0pzNeyZwMik7/ykJ0JHnQ7krHanFN9wcnPK89pwn84cRUmYjw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz"; + sha512 = "olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7024,13 +7015,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.17.0" = { + "@typescript-eslint/types-4.18.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.17.0.tgz"; - sha512 = "RN5z8qYpJ+kXwnLlyzZkiJwfW2AY458Bf8WqllkondQIcN2ZxQowAToGSd9BlAUZDB5Ea8I6mqL2quGYCLT+2g=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.18.0.tgz"; + sha512 = "/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A=="; }; }; "@typescript-eslint/typescript-estree-2.34.0" = { @@ -7051,13 +7042,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.17.0" = { + "@typescript-eslint/typescript-estree-4.18.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.17.0.tgz"; - sha512 = "lRhSFIZKUEPPWpWfwuZBH9trYIEJSI0vYsrxbvVvNyIUDoKWaklOAelsSkeh3E2VBSZiNe9BZ4E5tYBZbUczVQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz"; + sha512 = "wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7069,31 +7060,31 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.17.0" = { + "@typescript-eslint/visitor-keys-4.18.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.17.0"; + version = "4.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.17.0.tgz"; - sha512 = "WfuMN8mm5SSqXuAr9NM+fItJ0SVVphobWYkWOwQ1odsfC014Vdxk/92t4JwS1Q6fCA/ABfCKpa3AVtpUKTNKGQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz"; + sha512 = "Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw=="; }; }; - "@uifabric/foundation-7.9.25" = { + "@uifabric/foundation-7.9.26" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.25"; + version = "7.9.26"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.25.tgz"; - sha512 = "E9YMzbbgvNtZEJx1/AZBJX6Ut2chgoA7/ODB9+el6QyUErL/WUeIlXHbl8TZungRL9e1T4Bma48CNvBT8Ul+Fg=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.26.tgz"; + sha512 = "1FLTb+jlH/Tuel2L9wT/zLl5ZW6W4Lbjrs5VUVjv81vWxzznvPnTf8+Ew0qkzaH7xDuMNMl7okswhV0IfJyheg=="; }; }; - "@uifabric/icons-7.5.22" = { + "@uifabric/icons-7.5.23" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.22"; + version = "7.5.23"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.22.tgz"; - sha512 = "xJwgJG2IoEM/sFc4qzG5vXE/eY+vuz6IxPVXH0UoQ+9XY2KRb9p5pjBIx4SM/h0belCBMPF5rGnWYeg6hi14dQ=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.23.tgz"; + sha512 = "eIvUbH0EWgFgdfgFfINgqS2ZVZTyJ/9n5nR4bmcyAe75wsKxm4ser4WIT9IvaBF6+HFVfjUF/v6+VMD7y2LBng=="; }; }; "@uifabric/merge-styles-7.19.2" = { @@ -7105,13 +7096,13 @@ let sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g=="; }; }; - "@uifabric/react-hooks-7.13.12" = { + "@uifabric/react-hooks-7.14.0" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.12"; + version = "7.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.12.tgz"; - sha512 = "TVeBLMI9Cpo0duxt5NkyMAAPyTVsqYQSt+EmjDIZI92abptqBpuiLGXHnLaf+Egw8VgzBv5Vqs8ZRzMg6mhYkA=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.14.0.tgz"; + sha512 = "Ndu/DEKHF4gFXEZa2AGgSkdWaj+njVrsSyXbkWRh2UZReFWnH1LMko9p/ZCwk1i9kAd5CUmyIfURUzIEya9YCg=="; }; }; "@uifabric/set-version-7.0.24" = { @@ -7123,13 +7114,13 @@ let sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg=="; }; }; - "@uifabric/styling-7.18.1" = { + "@uifabric/styling-7.19.0" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.18.1"; + version = "7.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.18.1.tgz"; - sha512 = "yLavWTQ4rAE3uZ3h/odlCKyun3amjlESZu+KAdEfQWnsMMV4VFpJXc1Mhqm/Rzf9rNySaiZMzJ2R4urWcHTJHQ=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.19.0.tgz"; + sha512 = "fXComDtGV7dHF4rP4cLHwI6fC+1f/nvPavpMBz4IQdySwixta9TVMKbzt0OA6i0mJztqZCVAd27F/sl9R/JmcQ=="; }; }; "@uifabric/utilities-7.33.5" = { @@ -7159,13 +7150,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.0.4" = { + "@unicode/unicode-13.0.0-1.0.6" = { name = "_at_unicode_slash_unicode-13.0.0"; packageName = "@unicode/unicode-13.0.0"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.4.tgz"; - sha512 = "0lYwG9JxFapUG1TguDx1PvJ8RhTuojnuRexG2Z2WWDXXAFlzIQgu+6Og7rXwvopU0I3fQK1f7Z+rGm9tD8rYbQ=="; + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.6.tgz"; + sha512 = "ywSlML1wdeBSGH12b6PkblGtjzsQNMZ7+JlJj+eoPj0VuCeg52hcUTeVWfd4GmISU+zOQHWjNC6c0xmsIuVy8Q=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -7177,40 +7168,40 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vue/cli-shared-utils-4.5.11" = { + "@vue/cli-shared-utils-4.5.12" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.11"; + version = "4.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.11.tgz"; - sha512 = "+aaQ+ThQG3+WMexfSWNl0y6f43edqVqRNbguE53F3TIH81I7saS5S750ayqXhZs2r6STJJyqorQnKtAWfHo29A=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.12.tgz"; + sha512 = "qnIQPJ4XckMoqYh9fJ0Y91QKMIb4Hiibrm9+k4E15QHpk5RaokuOpf10SsOr2NLPCXSWsHOLo3hduZSwHPGY/Q=="; }; }; - "@vue/cli-ui-4.5.11" = { + "@vue/cli-ui-4.5.12" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.11"; + version = "4.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.11.tgz"; - sha512 = "hT9cukom8WkV+U3GL0yOFDvWXqG35vy5ddSLideUOK2Ylht0AW7P9DDfUls/cDCpQ172LfPnvKRO/8zADqSElg=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.12.tgz"; + sha512 = "TeP4ujkrUF3/l92R7fAIl6SbTyEw5CbrMpQggctgKrtOtMWorSGhWm17vGtP0C3PoZqzniOzDC7cdO83PL4n+g=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.11" = { + "@vue/cli-ui-addon-webpack-4.5.12" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.11"; + version = "4.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.11.tgz"; - sha512 = "k7Iv8ZfoiFtbHNDlntIUee1fCbS5PkQT9ZuI+tMV7eP7fbQXPSRDefsEOb0lAnrZ953tli+AF+hh2XhP6ihZig=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.12.tgz"; + sha512 = "sPAElJL00koP6BxUSGj5wntH96+IBuhLpu+0YPUYpIMeT/e/Hip/HnsjBzeiv88CvGQKomsjykPQRi26kR/Tjw=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.11" = { + "@vue/cli-ui-addon-widgets-4.5.12" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.11"; + version = "4.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.11.tgz"; - sha512 = "uUZIfWWfvFMAtfyzaJDtwRqN2vNzc2nnALEJliv2ccVRZHS8mwB/aLoaX0hL3h+RBJ8WV2PDiXmRFcESyDfKjA=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.12.tgz"; + sha512 = "GIh+ETKezlmEWmZ/MxKuuJqdfSgYk8DlnIsMnNpbUcdxhHZFbkV2mv/0UoQaH2y0BQhBXBOt9TBJ9j4OeN3DwA=="; }; }; "@vue/compiler-core-3.0.7" = { @@ -7231,51 +7222,6 @@ let sha512 = "VnIH9EbWQm/Tkcp+8dCaNVsVvhm/vxCrIKWRkXY9215hTqOqQOvejT8IMjd2kc++nIsYMsdQk6H9qqBvoLe/Cw=="; }; }; - "@vue/compiler-sfc-3.0.7" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.7.tgz"; - sha512 = "37/QILpGE+J3V+bP9Slg9e6xGqfk+MmS2Yj8ChR4fS0/qWUU/YoYHE0GPIzjmBdH0JVOOmJqunxowIXmqNiHng=="; - }; - }; - "@vue/compiler-ssr-3.0.7" = { - name = "_at_vue_slash_compiler-ssr"; - packageName = "@vue/compiler-ssr"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.7.tgz"; - sha512 = "nHRbHeSpfXwjypettjrA16TjgfDcPEwq3m/zHnGyLC1QqdLtklXmpSM43/CPwwTCRa/qdt0pldJf22MiCEuTSQ=="; - }; - }; - "@vue/reactivity-3.0.7" = { - name = "_at_vue_slash_reactivity"; - packageName = "@vue/reactivity"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.7.tgz"; - sha512 = "FotWcNNaKhqpFZrdgsUOZ1enlJ5lhTt01CNTtLSyK7jYFgZBTuw8vKsEutZKDYZ1XKotOfoeO8N3pZQqmM6Etw=="; - }; - }; - "@vue/runtime-core-3.0.7" = { - name = "_at_vue_slash_runtime-core"; - packageName = "@vue/runtime-core"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.7.tgz"; - sha512 = "DBAZAwVvdmMXuyd6/9qqj/kYr/GaLTmn1L2/QLxLwP+UfhIboiTSBc/tUUb8MRk7Bb98GzNeAWkkT6AfooS3dQ=="; - }; - }; - "@vue/runtime-dom-3.0.7" = { - name = "_at_vue_slash_runtime-dom"; - packageName = "@vue/runtime-dom"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.7.tgz"; - sha512 = "Oij4ruOtnpQpCj+/Q3JPzgpTJ1Q7+N67pA53A8KVITEtxfvKL46NN6dhAZ5NGqwX6RWZpYqWQNewITeF0pHr8g=="; - }; - }; "@vue/shared-3.0.7" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; @@ -7969,15 +7915,6 @@ let sha512 = "k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw=="; }; }; - "@wry/context-0.4.4" = { - name = "_at_wry_slash_context"; - packageName = "@wry/context"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@wry/context/-/context-0.4.4.tgz"; - sha512 = "LrKVLove/zw6h2Md/KZyWxIkFM6AoyKp71OqpH9Hiip1csjPVoD3tPxlbQUNxEnHENks3UGgNpSBCAfq9KWuag=="; - }; - }; "@wry/equality-0.1.11" = { name = "_at_wry_slash_equality"; packageName = "@wry/equality"; @@ -8617,13 +8554,13 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-7.2.1" = { + "ajv-7.2.3" = { name = "ajv"; packageName = "ajv"; - version = "7.2.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.2.1.tgz"; - sha512 = "+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-7.2.3.tgz"; + sha512 = "idv5WZvKVXDqKralOImQgPM9v6WOdLNa0IY3B3doOjw/YxRGT8I+allIJ6kd7Uaj+SF1xZUSU+nPM5aDNBVtnw=="; }; }; "ajv-errors-1.0.1" = { @@ -8707,6 +8644,15 @@ let sha512 = "2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q=="; }; }; + "all-node-versions-8.0.0" = { + name = "all-node-versions"; + packageName = "all-node-versions"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/all-node-versions/-/all-node-versions-8.0.0.tgz"; + sha512 = "cF8ibgj23U7ai4qjSFzpeccwDXUlPFMzKe0Z6qf6gChR+9S0JMyzYz6oYz4n0nHi/FLH9BJIefsONsMH/WDM2w=="; + }; + }; "alphanum-sort-1.0.2" = { name = "alphanum-sort"; packageName = "alphanum-sort"; @@ -9148,24 +9094,6 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.32.5" = { - name = "apollo"; - packageName = "apollo"; - version = "2.32.5"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.32.5.tgz"; - sha512 = "M2EWO9OZYbyziBUqYNSs5eYm9MNarYxLhZyZQp7mbJPdVN8i+w+KMBtD5rOS4e8oZN7lblhz/ooZtlNI2F6nwg=="; - }; - }; - "apollo-cache-1.3.5" = { - name = "apollo-cache"; - packageName = "apollo-cache"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache/-/apollo-cache-1.3.5.tgz"; - sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA=="; - }; - }; "apollo-cache-control-0.11.6" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; @@ -9175,69 +9103,6 @@ let sha512 = "YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw=="; }; }; - "apollo-cache-inmemory-1.6.6" = { - name = "apollo-cache-inmemory"; - packageName = "apollo-cache-inmemory"; - version = "1.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz"; - sha512 = "L8pToTW/+Xru2FFAhkZ1OA9q4V4nuvfoPecBM34DecAugUZEBhI2Hmpgnzq2hTKZ60LAMrlqiASm0aqAY6F8/A=="; - }; - }; - "apollo-client-2.6.10" = { - name = "apollo-client"; - packageName = "apollo-client"; - version = "2.6.10"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-client/-/apollo-client-2.6.10.tgz"; - sha512 = "jiPlMTN6/5CjZpJOkGeUV0mb4zxx33uXWdj/xQCfAMkuNAC3HN7CvYDyMHHEzmcQ5GV12LszWoQ/VlxET24CtA=="; - }; - }; - "apollo-codegen-core-0.39.3" = { - name = "apollo-codegen-core"; - packageName = "apollo-codegen-core"; - version = "0.39.3"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.39.3.tgz"; - sha512 = "2nPwQz2u2NpmbFY5lDEg/vo33RbGAxFLQeZew8H6XfSVLPajWbz2Klest9ZVQhaUnBVZO5q2gQLX+MT2I6uNfA=="; - }; - }; - "apollo-codegen-flow-0.37.3" = { - name = "apollo-codegen-flow"; - packageName = "apollo-codegen-flow"; - version = "0.37.3"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.37.3.tgz"; - sha512 = "gZZHQmGiSzNbJbolnYQPvjwC43/6GzETTo1nTi2JlnLw9jnVZR42kpqrxAeVAJKkquJ+4c2jwQkO4fVIYfdhaw=="; - }; - }; - "apollo-codegen-scala-0.38.3" = { - name = "apollo-codegen-scala"; - packageName = "apollo-codegen-scala"; - version = "0.38.3"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.38.3.tgz"; - sha512 = "Zgg/zd/k8h/ei5UlYSCa27jJAJA4UE+wCb5+LOo2Iz73ZUZh7HRgzoKSfsP1qAiJV4Tqm9WySyU9nOqfajdK1A=="; - }; - }; - "apollo-codegen-swift-0.39.3" = { - name = "apollo-codegen-swift"; - packageName = "apollo-codegen-swift"; - version = "0.39.3"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.39.3.tgz"; - sha512 = "kvIoHOiv5440tHvSdhDHzOUZrpBpdXA6M/QPiuYkpPuI8TAcJ+bTeS696/8t+FO699qYgjsqW7FMdIbi1LWV2g=="; - }; - }; - "apollo-codegen-typescript-0.39.3" = { - name = "apollo-codegen-typescript"; - packageName = "apollo-codegen-typescript"; - version = "0.39.3"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.39.3.tgz"; - sha512 = "Yo/FVaBJbbrndVL75tluH16dNXRZ1M9ELP5AeAPnnw+yGIvYO34LXjfk4G3kqkAJ7puoGc+9muGJLjh6LV6zNA=="; - }; - }; "apollo-datasource-0.7.3" = { name = "apollo-datasource"; packageName = "apollo-datasource"; @@ -9265,15 +9130,6 @@ let sha512 = "ZRXAV+k+hboCVS+FW86FW/QgnDR7gm/xMUwJPGXEbV53OLGuQQdIT0NCYK7AzzVkCfsbb7NJ3mmEclkZY9uuxQ=="; }; }; - "apollo-language-server-1.25.2" = { - name = "apollo-language-server"; - packageName = "apollo-language-server"; - version = "1.25.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.25.2.tgz"; - sha512 = "PGQZ1+nX/RSmf9eawqXloi+ZwJs6dQRdDiEKzSIij1ucd9r9jY5EyamVMi0tYgco1G4XJo1hBRXBm29sTGNfUQ=="; - }; - }; "apollo-link-1.2.1" = { name = "apollo-link"; packageName = "apollo-link"; @@ -9292,69 +9148,6 @@ let sha512 = "p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg=="; }; }; - "apollo-link-context-1.0.20" = { - name = "apollo-link-context"; - packageName = "apollo-link-context"; - version = "1.0.20"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.20.tgz"; - sha512 = "MLLPYvhzNb8AglNsk2NcL9AvhO/Vc9hn2ZZuegbhRHGet3oGr0YH9s30NS9+ieoM0sGT11p7oZ6oAILM/kiRBA=="; - }; - }; - "apollo-link-error-1.1.13" = { - name = "apollo-link-error"; - packageName = "apollo-link-error"; - version = "1.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.1.13.tgz"; - sha512 = "jAZOOahJU6bwSqb2ZyskEK1XdgUY9nkmeclCrW7Gddh1uasHVqmoYc4CKdb0/H0Y1J9lvaXKle2Wsw/Zx1AyUg=="; - }; - }; - "apollo-link-http-1.5.17" = { - name = "apollo-link-http"; - packageName = "apollo-link-http"; - version = "1.5.17"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http/-/apollo-link-http-1.5.17.tgz"; - sha512 = "uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg=="; - }; - }; - "apollo-link-http-common-0.2.16" = { - name = "apollo-link-http-common"; - packageName = "apollo-link-http-common"; - version = "0.2.16"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz"; - sha512 = "2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg=="; - }; - }; - "apollo-link-persisted-queries-0.2.2" = { - name = "apollo-link-persisted-queries"; - packageName = "apollo-link-persisted-queries"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-persisted-queries/-/apollo-link-persisted-queries-0.2.2.tgz"; - sha512 = "YL7XBu/5QsSbbYaWUXgm87T2Hn/2AQZk5Wr8CLXGDr3Wl3E/TRhBhKgQQTly9xhaTi7jgBO+AeIyTH5wCBHA9w=="; - }; - }; - "apollo-link-state-0.4.2" = { - name = "apollo-link-state"; - packageName = "apollo-link-state"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-state/-/apollo-link-state-0.4.2.tgz"; - sha512 = "xMPcAfuiPVYXaLwC6oJFIZrKgV3GmdO31Ag2eufRoXpvT0AfJZjdaPB4450Nu9TslHRePN9A3quxNueILlQxlw=="; - }; - }; - "apollo-link-ws-1.0.20" = { - name = "apollo-link-ws"; - packageName = "apollo-link-ws"; - version = "1.0.20"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.20.tgz"; - sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw=="; - }; - }; "apollo-reporting-protobuf-0.6.2" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; @@ -9373,22 +9166,13 @@ let sha512 = "iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ=="; }; }; - "apollo-server-core-2.21.1" = { + "apollo-server-core-2.21.2" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.21.1"; + version = "2.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.21.1.tgz"; - sha512 = "aI+soLaqKMkWxH6l9xvPP1fCuZgD053SK09D79LQfMbJAHHvs3MI90UpydiY/W61K5l8ELl0YsKdqkQg8262nw=="; - }; - }; - "apollo-server-env-2.4.5" = { - name = "apollo-server-env"; - packageName = "apollo-server-env"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz"; - sha512 = "nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.21.2.tgz"; + sha512 = "jIXMVQPOUzIOl4El/mzSixxJ5IDrqSk3L9uJ1U+ncwiQj0IjtkkyDSuYngcgyEi+KfO2lAzxeOiAy9fIjjkC2A=="; }; }; "apollo-server-env-3.0.0" = { @@ -9409,13 +9193,13 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.21.1" = { + "apollo-server-express-2.21.2" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.21.1"; + version = "2.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.21.1.tgz"; - sha512 = "O8msL01rl1iOfx4qmgpdNDXCh2u+adis8m2pHXZJfHciOoBmAgYaLlH7AOxpW5iHK/vQIwBM0dkPpxu5SaWpag=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.21.2.tgz"; + sha512 = "5aNE1i/My8c9eBJg5uRyZSvE/NThm1X/fewcs4U5WpuEAMdmg/vf0oZnSZ8Nvmj7H8R2E5xiMkTm6Mv+MKOl9A=="; }; }; "apollo-server-plugin-base-0.10.4" = { @@ -9445,15 +9229,6 @@ let sha512 = "SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w=="; }; }; - "apollo-upload-client-11.0.0" = { - name = "apollo-upload-client"; - packageName = "apollo-upload-client"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-upload-client/-/apollo-upload-client-11.0.0.tgz"; - sha512 = "JChTrBi1VSF8u6OPrkWUApJlyUvzwhw98kqRB3fSi7/CU6z0OUD42Mee9s5h8mfjKEfOanK6GNZhF4t2tIPXSw=="; - }; - }; "apollo-utilities-1.3.4" = { name = "apollo-utilities"; packageName = "apollo-utilities"; @@ -9634,15 +9409,6 @@ let sha512 = "XxNTUzKnz1ctK3ZIcI2XUPlD96wbHP2nGqkPKpvk/HNRlPveYrXIVSTk9m3LcqOgDPg3B1nMvdV/K8wZd7PG4w=="; }; }; - "arg-4.1.3" = { - name = "arg"; - packageName = "arg"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; - sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; - }; - }; "argparse-0.1.15" = { name = "argparse"; packageName = "argparse"; @@ -10174,6 +9940,15 @@ let sha1 = "06a6604d6a55d4bf41a9a47d9872d7a78da31e73"; }; }; + "asciichart-1.5.25" = { + name = "asciichart"; + packageName = "asciichart"; + version = "1.5.25"; + src = fetchurl { + url = "https://registry.npmjs.org/asciichart/-/asciichart-1.5.25.tgz"; + sha512 = "PNxzXIPPOtWq8T7bgzBtk9cI2lgS4SJZthUHEiQ1aoIc3lNzGfUvIvo9LiAnq26TACo9t1/4qP6KTGAUbzX9Xg=="; + }; + }; "asciidoctor.js-1.5.9" = { name = "asciidoctor.js"; packageName = "asciidoctor.js"; @@ -10570,6 +10345,15 @@ let sha1 = "1e762817d849ce44bfac07925a42036787061b15"; }; }; + "asyncjs-util-1.2.3" = { + name = "asyncjs-util"; + packageName = "asyncjs-util"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.3.tgz"; + sha512 = "gwrRUMa6oZ1qssVupX4lgSey1PDCEbouUjCqa2/MRgaZ4gZmZfAVBZ/Nzple7r9BN+iVMJPIWrwVu00CRgjHgw=="; + }; + }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -10741,15 +10525,6 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "await-to-js-2.1.1" = { - name = "await-to-js"; - packageName = "await-to-js"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/await-to-js/-/await-to-js-2.1.1.tgz"; - sha512 = "CHBC6gQGCIzjZ09tJ+XmpQoZOn4GdWePB4qUweCaKNJ0D3f115YdhmYVTZ4rMVpiJ3cFzZcTYK1VMYEICV4YXw=="; - }; - }; "aws-sdk-1.18.0" = { name = "aws-sdk"; packageName = "aws-sdk"; @@ -10768,13 +10543,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.863.0" = { + "aws-sdk-2.868.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.863.0"; + version = "2.868.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.863.0.tgz"; - sha512 = "krr0047EOl9qpRdhPoyYxI7+viVUpX+t+Vjbf+alXdOE172DC+hFi8y6egIM1xVV4KkMFm0y0EykBWgA93XNNA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.868.0.tgz"; + sha512 = "ZayPsA/ycaAXqqa2oDyf8iUpl1WOLODZS8ZdvYj77L5owMQm0XC7yqiD+WHj9nToUECF9VAD+AKQMIN6695tVQ=="; }; }; "aws-sign2-0.6.0" = { @@ -10804,6 +10579,15 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; + "aws4-1.9.1" = { + name = "aws4"; + packageName = "aws4"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; + sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; + }; + }; "axios-0.21.1" = { name = "axios"; packageName = "axios"; @@ -11722,6 +11506,15 @@ let sha512 = "s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="; }; }; + "bech32-2.0.0" = { + name = "bech32"; + packageName = "bech32"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bech32/-/bech32-2.0.0.tgz"; + sha512 = "LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg=="; + }; + }; "beeper-1.1.1" = { name = "beeper"; packageName = "beeper"; @@ -11785,6 +11578,15 @@ let sha512 = "yGQTG4NtwTciX0Bkgk1FqQL4p+NiCQKpTSFho2lrxvUkXIlzyJDwraj8aYxAxRZMnnOhRr7QlIBoMRPEnIR34Q=="; }; }; + "bessel-1.0.2" = { + name = "bessel"; + packageName = "bessel"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bessel/-/bessel-1.0.2.tgz"; + sha512 = "Al3nHGQGqDYqqinXhQzmwmcRToe/3WyBv4N8aZc5Pef8xw2neZlR9VPi84Sa23JtgWcucu18HxVZrnI0fn2etw=="; + }; + }; "better-ajv-errors-0.6.7" = { name = "better-ajv-errors"; packageName = "better-ajv-errors"; @@ -12037,6 +11839,15 @@ let sha512 = "HpV5OMLLGTjSVblmrtYRfFFKuQB+GArM0+XP8HGWfJ5vxYBqo+DesvJwOdC2WJ3bCkZShGf0QIfoIpeomVzVdA=="; }; }; + "bip65-1.0.3" = { + name = "bip65"; + packageName = "bip65"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bip65/-/bip65-1.0.3.tgz"; + sha512 = "RQ1nc7xtnLa5XltnCqkoR2zmhuz498RjMJwrLKQzOE049D1HUqnYfon7cVSbwS5UGm0/EQlC2CH+NY3MyITA4Q=="; + }; + }; "bip66-1.1.5" = { name = "bip66"; packageName = "bip66"; @@ -12046,6 +11857,15 @@ let sha1 = "01fa8748785ca70955d5011217d1b3139969ca22"; }; }; + "bip68-1.0.4" = { + name = "bip68"; + packageName = "bip68"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bip68/-/bip68-1.0.4.tgz"; + sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ=="; + }; + }; "bipf-1.4.0" = { name = "bipf"; packageName = "bipf"; @@ -12505,6 +12325,33 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; + "bolt03-1.2.7" = { + name = "bolt03"; + packageName = "bolt03"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bolt03/-/bolt03-1.2.7.tgz"; + sha512 = "gAlWFr+/4ARfCv7GS6+xjeW1hTylKeUvhjIhVwRM0t/hAZ2z+hnnG7ZmVsmCB9bxLTR09PC9j8dnt450uqiHUA=="; + }; + }; + "bolt07-1.7.1" = { + name = "bolt07"; + packageName = "bolt07"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bolt07/-/bolt07-1.7.1.tgz"; + sha512 = "vZCX56PB0274YW8BuCE91xWgqCPkfndBkknYYZFajX6Zr/KByMDXKQ2t1KKSYVkzzTL0rqeLWyQKdL6gJU1zHA=="; + }; + }; + "bolt09-0.1.3" = { + name = "bolt09"; + packageName = "bolt09"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bolt09/-/bolt09-0.1.3.tgz"; + sha512 = "xFfW/ix6qSzBVGGt3jgpG/SX1LgVvGUYxA/0yC6uaPAjgqbdqmbDZzNEqMRps7Z8Vp1H3yfO5JXQuX54n/GzZg=="; + }; + }; "bonjour-3.5.0" = { name = "bonjour"; packageName = "bonjour"; @@ -13900,13 +13747,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001200" = { + "caniuse-lite-1.0.30001203" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001200"; + version = "1.0.30001203"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001200.tgz"; - sha512 = "ic/jXfa6tgiPBAISWk16jRI2q8YfjxHnSG7ddSL1ptrIP8Uy11SayFrjXRAk3NumHpDb21fdTkbTxb/hOrFrnQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001203.tgz"; + sha512 = "/I9tvnzU/PHMH7wBPrfDMSuecDeUKerjCPX7D0xBbaJZPxoT9m+yYxt0zCTkcijCkjTdim3H56Zm0i5Adxch4w=="; }; }; "canvas-2.7.0" = { @@ -13918,13 +13765,13 @@ let sha512 = "pzCxtkHb+5su5MQjTtepMDlIOtaXo277x0C0u3nMOxtkhTyQ+h2yNKhlROAaDllWgRyePAUitC08sXw26Eb6aw=="; }; }; - "capital-case-1.0.4" = { - name = "capital-case"; - packageName = "capital-case"; - version = "1.0.4"; + "caporal-1.4.0" = { + name = "caporal"; + packageName = "caporal"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz"; - sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A=="; + url = "https://registry.npmjs.org/caporal/-/caporal-1.4.0.tgz"; + sha512 = "3pWfIwKVdIbB/gWmpLloO6iGAXTRi9mcTinPOwvHfzH3BYjOhLgq2XRG3hKtp+F6vBcBXxMgCobUzBAx1d8T4A=="; }; }; "capture-exit-2.0.0" = { @@ -14017,6 +13864,15 @@ let sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; + "cbor-7.0.3" = { + name = "cbor"; + packageName = "cbor"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cbor/-/cbor-7.0.3.tgz"; + sha512 = "Io+lJytjYBJKgJqZQUz2bFaMPj+HtlsnT9kHSUiIJFqzWa05lm5/ycQ+NiZWpks3DR2Fz7j7axiTGeT57w/syg=="; + }; + }; "ccount-1.1.0" = { name = "ccount"; packageName = "ccount"; @@ -14053,6 +13909,15 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; + "cert-info-1.5.1" = { + name = "cert-info"; + packageName = "cert-info"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cert-info/-/cert-info-1.5.1.tgz"; + sha512 = "eoQC/yAgW3gKTKxjzyClvi+UzuY97YCjcl+lSqbsGIy7HeGaWxCPOQFivhUYm27hgsBMhsJJFya3kGvK6PMIcQ=="; + }; + }; "chai-4.3.4" = { name = "chai"; packageName = "chai"; @@ -14170,15 +14035,6 @@ let sha512 = "g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A=="; }; }; - "change-case-4.1.2" = { - name = "change-case"; - packageName = "change-case"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz"; - sha512 = "bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A=="; - }; - }; "character-entities-1.2.4" = { name = "character-entities"; packageName = "character-entities"; @@ -14737,13 +14593,13 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; - "clean-css-5.1.1" = { + "clean-css-5.1.2" = { name = "clean-css"; packageName = "clean-css"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.1.tgz"; - sha512 = "GQ6HdEyJN0543mRTA/TkZ7RPoMXGWKq1shs9H86F2kLuixR0RI+xd4JfhJxWUW08FGKQXTKAKpVjKQXu5zkFNA=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.1.2.tgz"; + sha512 = "QcaGg9OuMo+0Ds933yLOY+gHPWbxhxqF0HDexmToPf8pczvmvZGYzd+QqWp9/mkucAOKViI+dSFOqoZIvXbeBw=="; }; }; "clean-deep-3.4.0" = { @@ -14917,22 +14773,22 @@ let sha512 = "1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg=="; }; }; - "cli-spinners-2.5.0" = { + "cli-spinners-2.6.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz"; - sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"; + sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; }; }; - "cli-table-0.3.5" = { + "cli-table-0.3.6" = { name = "cli-table"; packageName = "cli-table"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.5.tgz"; - sha512 = "7uo2+RMNQUZ13M199udxqwk1qxTOS53EUak4gmu/aioUpdH5RvBz0JkJslcWz6ABKedZNqXXzikMZgHh+qF16A=="; + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz"; + sha512 = "ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ=="; }; }; "cli-table3-0.5.1" = { @@ -15475,13 +15331,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.24.0" = { + "codemaker-1.25.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.24.0.tgz"; - sha512 = "oKi5BNSyH0LBtFoxWKRvWnTut8NRdRgOzIF6/YKCaNnVECqq0oMqUpEBKNgcS+sOxfJfI/tkORpSdNGGVE0tmA=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.25.0.tgz"; + sha512 = "54qCHs6X6llXIAztHCo2IyzzvuH9GrEecwxxTU925M3EJV4z+7PMiI1AollZxSeyY2pGO5TjNlAQAyLXETI3NQ=="; }; }; "codepage-1.4.0" = { @@ -16474,24 +16330,6 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; - "consolidate-0.16.0" = { - name = "consolidate"; - packageName = "consolidate"; - version = "0.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/consolidate/-/consolidate-0.16.0.tgz"; - sha512 = "Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ=="; - }; - }; - "constant-case-3.0.4" = { - name = "constant-case"; - packageName = "constant-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz"; - sha512 = "I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ=="; - }; - }; "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; @@ -16519,13 +16357,13 @@ let sha512 = "5AKrTtmiioQWloJ3WRFZb0/uR1lrRboaVE9go++XZltvRnZkN2/kQjaZ0gtFxynU5u5k9mWVtk8mNcgJ9yoRbQ=="; }; }; - "constructs-3.3.65" = { + "constructs-3.3.68" = { name = "constructs"; packageName = "constructs"; - version = "3.3.65"; + version = "3.3.68"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.65.tgz"; - sha512 = "/tjHzxwK4Nz9SAm40kkC2mij3Y3LngVVj/dvk7Xpex25/PMhVRYy1pmJ0/5I5Y6bAMG1HRjcSAyf4k9YZyxJjw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.68.tgz"; + sha512 = "Fq029KuZo16NdYqlSuK1loIDiR1P2WwxsihZjjeK9hM5qoFXjcAAzMI7i5Z1LxZwWl9cUoutBNXSvhF7xHUG7Q=="; }; }; "consume-http-header-1.0.0" = { @@ -16907,13 +16745,13 @@ let sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; }; }; - "copy-props-2.0.4" = { + "copy-props-2.0.5" = { name = "copy-props"; packageName = "copy-props"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz"; - sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A=="; + url = "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz"; + sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw=="; }; }; "copy-template-dir-1.4.0" = { @@ -17150,6 +16988,15 @@ let sha1 = "868fd9092f439d1ef95f4a85e5fa4b9f07efc95c"; }; }; + "cpus-1.0.3" = { + name = "cpus"; + packageName = "cpus"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cpus/-/cpus-1.0.3.tgz"; + sha512 = "PXHBvGLuL69u55IkLa5e5838fLhIMHxmkV4ge42a8alGyn7BtawYgI0hQ849EedvtHIOLNNH3i6eQU1BiE9SUA=="; + }; + }; "cpy-8.1.2" = { name = "cpy"; packageName = "cpy"; @@ -17312,13 +17159,22 @@ let sha512 = "KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ=="; }; }; - "cross-fetch-3.1.0" = { + "cross-fetch-3.1.1" = { name = "cross-fetch"; packageName = "cross-fetch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.0.tgz"; - sha512 = "a+yso9lSpXQI9DH+YjAu/m0dVfP8IVoZDPBLLFcvGpeq3KHNdikkekTOdkHiXEuTq4GBOeO0MfWkE40yzF1w7g=="; + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.1.tgz"; + sha512 = "eIF+IHQpRzoGd/0zPrwQmHwDC90mdvjk+hcbYhKoaRrEk4GEIDqdjs/MljmdPPoHTQudbmWS+f0hZsEpFaEvWw=="; + }; + }; + "cross-fetch-3.1.2" = { + name = "cross-fetch"; + packageName = "cross-fetch"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.2.tgz"; + sha512 = "+JhD65rDNqLbGmB3Gzs3HrEKC0aQnD+XA3SY6RjgkF88jV2q5cTc5+CwxlS3sdmLk98gpPt5CF9XRnPdlxZe6w=="; }; }; "cross-spawn-4.0.2" = { @@ -17420,6 +17276,15 @@ let sha1 = "fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"; }; }; + "crypto-js-4.0.0" = { + name = "crypto-js"; + packageName = "crypto-js"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz"; + sha512 = "bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="; + }; + }; "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -17798,15 +17663,6 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-2.6.16" = { - name = "csstype"; - packageName = "csstype"; - version = "2.6.16"; - src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.16.tgz"; - sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q=="; - }; - }; "csurf-1.11.0" = { name = "csurf"; packageName = "csurf"; @@ -17843,6 +17699,15 @@ let sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; + "csv-parse-4.15.3" = { + name = "csv-parse"; + packageName = "csv-parse"; + version = "4.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.15.3.tgz"; + sha512 = "jlTqDvLdHnYMSr08ynNfk4IAUSJgJjTKy2U5CQBSu4cN9vQOJonLVZP4Qo4gKKrIgIQ5dr07UwOJdi+lRqT12w=="; + }; + }; "csv-parser-1.12.1" = { name = "csv-parser"; packageName = "csv-parser"; @@ -19697,13 +19562,13 @@ let sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; }; - "detect-node-2.0.4" = { + "detect-node-2.0.5" = { name = "detect-node"; packageName = "detect-node"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; - sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz"; + sha512 = "qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw=="; }; }; "detect-port-alt-1.1.6" = { @@ -19733,13 +19598,13 @@ let sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; - "detective-amd-3.0.1" = { + "detective-amd-3.1.0" = { name = "detective-amd"; packageName = "detective-amd"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.1.tgz"; - sha512 = "vJgluSKkPyo+/McW9hzwmZwY1VPA3BS0VS1agdpPAWAhr65HwC1ox4Ig82rVfGYDYCa4GcKQON5JWBk++2Kf1Q=="; + url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.1.0.tgz"; + sha512 = "G7wGWT6f0VErjUkE2utCm7IUshT7nBh7aBBH2VBOiY9Dqy2DMens5iiOvYCuhstoIxRKLrnOvVAz4/EyPIAjnw=="; }; }; "detective-cjs-3.1.1" = { @@ -19814,13 +19679,13 @@ let sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg=="; }; }; - "devtools-protocol-0.0.847576" = { + "devtools-protocol-0.0.854822" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.847576"; + version = "0.0.854822"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.847576.tgz"; - sha512 = "0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz"; + sha512 = "xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg=="; }; }; "dezalgo-1.0.3" = { @@ -20966,13 +20831,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.687" = { + "electron-to-chromium-1.3.693" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.687"; + version = "1.3.693"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.687.tgz"; - sha512 = "IpzksdQNl3wdgkzf7dnA7/v10w0Utf1dF2L+B4+gKrloBrxCut+au+kky3PYvle3RMdSxZP+UiCZtLbcYRxSNQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.693.tgz"; + sha512 = "vUdsE8yyeu30RecppQtI+XTz2++LWLVEIYmzeCaCRLSdtKZ2eXqdJcrs85KwLiPOPVc6PELgWyXBsfqIvzGZag=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -21490,15 +21355,6 @@ let sha512 = "5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg=="; }; }; - "env-ci-5.0.2" = { - name = "env-ci"; - packageName = "env-ci"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/env-ci/-/env-ci-5.0.2.tgz"; - sha512 = "Xc41mKvjouTXD3Oy9AqySz1IeyvJvHZ20Twf5ZLYbNpPPIuCnL/qHCmNlD01LoNy0JTunw9HPYVptD19Ac7Mbw=="; - }; - }; "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; @@ -21841,6 +21697,15 @@ let sha512 = "j02SFrUwFTRUqiY0Kjplwjm1psuzO1d6AjaXKuOR9hrY0HuPsT6sV42B6myW34h1q4CRy+Y3g4RU/cGJeI/nNA=="; }; }; + "esbuild-0.9.6" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.9.6.tgz"; + sha512 = "F6vASxU0wT/Davt9aj2qtDwDNSkQxh9VbyO56M7PDWD+D/Vgq/rmUDGDQo7te76W5auauVojjnQr/wTu3vpaUA=="; + }; + }; "esc-exit-2.0.2" = { name = "esc-exit"; packageName = "esc-exit"; @@ -22129,15 +21994,6 @@ let sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; }; }; - "esm-3.2.25" = { - name = "esm"; - packageName = "esm"; - version = "3.2.25"; - src = fetchurl { - url = "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz"; - sha512 = "U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="; - }; - }; "esmangle-1.0.1" = { name = "esmangle"; packageName = "esmangle"; @@ -22327,6 +22183,15 @@ let sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; }; + "estree-util-is-identifier-name-1.1.0" = { + name = "estree-util-is-identifier-name"; + packageName = "estree-util-is-identifier-name"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz"; + sha512 = "OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ=="; + }; + }; "estree-walker-0.6.1" = { name = "estree-walker"; packageName = "estree-walker"; @@ -22606,13 +22471,13 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "eventsource-1.0.7" = { + "eventsource-1.1.0" = { name = "eventsource"; packageName = "eventsource"; - version = "1.0.7"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; - sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz"; + sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg=="; }; }; "everyauth-0.4.5" = { @@ -22885,13 +22750,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.67" = { + "expo-pwa-0.0.69" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.67"; + version = "0.0.69"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.67.tgz"; - sha512 = "fyp624qENbSSDkW7So9Je5kDmCKf51leHqvO4Oqro2Yfv58XYJqv/j3MGMXd8rnraTJ0ktsfy0rSwA5/tqpmrQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.69.tgz"; + sha512 = "M+pDqlgHNtPmDu0lxxKl9K/gWa0Ul7CBQtbTVe4I3EWI+rtRn+5VfEVH+1iUkavczC/vS14ovQxIlLEdfxF/pg=="; }; }; "express-2.5.11" = { @@ -23173,15 +23038,6 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; - "extract-files-5.0.1" = { - name = "extract-files"; - packageName = "extract-files"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-files/-/extract-files-5.0.1.tgz"; - sha512 = "qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w=="; - }; - }; "extract-files-9.0.0" = { name = "extract-files"; packageName = "extract-files"; @@ -23650,6 +23506,15 @@ let sha1 = "b2497f47a57d9026b3907c09756acf5f4bd34e8b"; }; }; + "fetch-node-website-5.0.3" = { + name = "fetch-node-website"; + packageName = "fetch-node-website"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-node-website/-/fetch-node-website-5.0.3.tgz"; + sha512 = "O86T46FUWSOq4AWON39oaT8H90QFKAbmjfOVBhgaS87AFfeW00txz73KTv7QopPWtHBbGdI1S8cIT1VK1OQYLg=="; + }; + }; "fields-0.1.24" = { name = "fields"; packageName = "fields"; @@ -24361,13 +24226,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.146.0" = { + "flow-parser-0.147.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.146.0"; + version = "0.147.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.146.0.tgz"; - sha512 = "lMaDIdcEsdtKL0B+VFp8et/AjnB+cU1HJ6KDrp4Lw3Gsq0Ck0cmWRDgWfUQxxDvY99ntQyA/IdyFxFK4izKo4g=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.147.0.tgz"; + sha512 = "z+b/pgp2QLvsWJkzhKXU8yC5TmaNyXGRmHac3x0Swmn9uQESRXhNIJq9TPHKPPeWgFym33OLO+5BlIdy/tXRCQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -24703,6 +24568,15 @@ let sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; }; }; + "form-data-3.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz"; + sha512 = "CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg=="; + }; + }; "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; @@ -25405,15 +25279,6 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; - "generic-names-2.0.1" = { - name = "generic-names"; - packageName = "generic-names"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz"; - sha512 = "kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ=="; - }; - }; "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; @@ -25684,13 +25549,13 @@ let sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; }; }; - "getenv-0.7.0" = { + "getenv-1.0.0" = { name = "getenv"; packageName = "getenv"; - version = "0.7.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/getenv/-/getenv-0.7.0.tgz"; - sha1 = "39b91838707e2086fd1cf6ef8777d1c93e14649e"; + url = "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz"; + sha512 = "7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg=="; }; }; "getmac-5.17.0" = { @@ -25792,15 +25657,6 @@ let sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6"; }; }; - "git-parse-1.0.4" = { - name = "git-parse"; - packageName = "git-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.4.tgz"; - sha512 = "NSC71SqG6jN0XYPbib8t/mgguVLddw+xvkkLv2EsCFvHfsZjO+ZqMcGoGHHMqfhZllCDDAkOwZESkZEmICj9ZA=="; - }; - }; "git-raw-commits-2.0.10" = { name = "git-raw-commits"; packageName = "git-raw-commits"; @@ -25837,15 +25693,6 @@ let sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; }; }; - "git-rev-sync-2.1.0" = { - name = "git-rev-sync"; - packageName = "git-rev-sync"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-2.1.0.tgz"; - sha512 = "qZWv4D3GBm9sHEq5Jvc2rGuwQbz52mJoNAhe/zZS+rlwft7n8BGAG0QCgXt6m+jxn82IwlpOT3UXY81LkFJufA=="; - }; - }; "git-semver-tags-4.1.1" = { name = "git-semver-tags"; packageName = "git-semver-tags"; @@ -25891,15 +25738,6 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.4.3" = { - name = "git-url-parse"; - packageName = "git-url-parse"; - version = "11.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz"; - sha512 = "LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ=="; - }; - }; "git-url-parse-11.4.4" = { name = "git-url-parse"; packageName = "git-url-parse"; @@ -26026,15 +25864,6 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; - "glob-7.1.5" = { - name = "glob"; - packageName = "glob"; - version = "7.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz"; - sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ=="; - }; - }; "glob-7.1.6" = { name = "glob"; packageName = "glob"; @@ -26161,6 +25990,15 @@ let sha512 = "wYGh6O3Xkx1LsMXQpObr/uu3PsFpbWhpbslgn9Xq52rbDZ6YOwJcQtU5R4lSEQgCDtXLItV9EH5X1F/VnBTAlw=="; }; }; + "global-cache-dir-2.0.0" = { + name = "global-cache-dir"; + packageName = "global-cache-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global-cache-dir/-/global-cache-dir-2.0.0.tgz"; + sha512 = "30pvU3e8muclEhc9tt+jRMaywOS3QfNdURflJ5Zv0bohjhcVQpBe5bwRHghGSJORLOKW81/n+3iJvHRHs+/S1Q=="; + }; + }; "global-dirs-0.1.1" = { name = "global-dirs"; packageName = "global-dirs"; @@ -26288,13 +26126,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-13.6.0" = { + "globals-13.7.0" = { name = "globals"; packageName = "globals"; - version = "13.6.0"; + version = "13.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.6.0.tgz"; - sha512 = "YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ=="; + url = "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz"; + sha512 = "Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA=="; }; }; "globals-9.18.0" = { @@ -26441,6 +26279,15 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; + "goldengate-10.0.2" = { + name = "goldengate"; + packageName = "goldengate"; + version = "10.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.2.tgz"; + sha512 = "lPzyIIgEIMC9mDfUQ/F3+5Y+UlJKxvmWOSEjomb9oNyQ25D3oaMmqv2TIPjJe9nS2hP9XzTRHImh4WQKWE3Wmw=="; + }; + }; "gonzales-pe-4.3.0" = { name = "gonzales-pe"; packageName = "gonzales-pe"; @@ -26639,15 +26486,6 @@ let sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg=="; }; }; - "graceful-fs-4.1.15" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz"; - sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; - }; - }; "graceful-fs-4.2.6" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -26729,15 +26567,6 @@ let sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; - "graphql-anywhere-4.2.7" = { - name = "graphql-anywhere"; - packageName = "graphql-anywhere"; - version = "4.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-anywhere/-/graphql-anywhere-4.2.7.tgz"; - sha512 = "fJHvVywWVWjiHuPIMs16Nfjf4zdQUwSO1LKycwBJCWIPeoeQ8LqXK2BgYoZAHkhKEFktZZeYyzS4o/uIUG0z5A=="; - }; - }; "graphql-config-3.0.3" = { name = "graphql-config"; packageName = "graphql-config"; @@ -26765,22 +26594,13 @@ let sha512 = "95yD/tKi24q8xYa7Q9rhQN16AYj5wPbrb8tmHGM3WRc9EBmWrG/0kkMl+tQG8wcEuE9ibR4zyOM31p5Sdr2v4g=="; }; }; - "graphql-tag-2.11.0" = { + "graphql-tag-2.12.3" = { name = "graphql-tag"; packageName = "graphql-tag"; - version = "2.11.0"; + version = "2.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.11.0.tgz"; - sha512 = "VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA=="; - }; - }; - "graphql-tag-2.12.1" = { - name = "graphql-tag"; - packageName = "graphql-tag"; - version = "2.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.1.tgz"; - sha512 = "LPewEE1vzGkHnCO8zdOGogKsHHBdtpGyihow1UuMwp6RnZa0lAS7NcbvltLOuo4pi5diQCPASAXZkQq44ffixA=="; + url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.3.tgz"; + sha512 = "5wJMjSvj30yzdciEuk9dPuUBUR56AqDi3xncoYQl1i42pGdSqOJrJsdb/rz5BDoy+qoGvQwABcBeF0xXY3TrKw=="; }; }; "graphql-tools-3.0.0" = { @@ -26819,13 +26639,13 @@ let sha512 = "zsrDtu5gCbQFDWsNa5bMB4nf1LpKX9KDgh+f8oL1288ijV4RxeckhVozAjqjXAfRpxOHD1xOESsh6zq8SjdgjA=="; }; }; - "graphql-ws-4.1.5" = { + "graphql-ws-4.2.2" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "4.1.5"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.1.5.tgz"; - sha512 = "yUQ1AjegD1Y9jDS699kyw7Mw+9H+rILm2HoS8N5a5B5YTH93xy3yifFhAJpKGc2wb/8yGdlVy8gTcud0TPqi6Q=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.2.2.tgz"; + sha512 = "b6TLtWLAmKunD72muL9EeItRGpio9+V3Cx4zJsBkRA+3wxzTWXDvQr9/3qSwJ3D/2abz0ys2KHTM6lB1uH7KIQ=="; }; }; "gray-matter-2.1.1" = { @@ -27089,6 +26909,15 @@ let sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; + "har-validator-5.1.3" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; + sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + }; + }; "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; @@ -27602,15 +27431,6 @@ let sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; }; }; - "header-case-2.0.4" = { - name = "header-case"; - packageName = "header-case"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz"; - sha512 = "H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q=="; - }; - }; "headless-0.1.7" = { name = "headless"; packageName = "headless"; @@ -27692,13 +27512,13 @@ let sha1 = "b86ce808598e8a9d1892c571f3cedd86fc9f0653"; }; }; - "highlight.js-10.6.0" = { + "highlight.js-10.7.1" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.6.0"; + version = "10.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.6.0.tgz"; - sha512 = "8mlRcn5vk/r4+QcqerapwBYTe+iPL5ih6xrNylxrnBdHQiijDETfXX7VIxC3UiCRiINBJfANBAsPzAvRQj8RpQ=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.1.tgz"; + sha512 = "S6G97tHGqJ/U8DsXcEdnACbirtbx58Bx9CzIVeYli8OuswCfYI/LsXH2EiGcoGio1KAC3x4mmUwulOllJ2ZyRA=="; }; }; "highlight.js-8.2.0" = { @@ -27845,13 +27665,22 @@ let sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw=="; }; }; - "hosted-git-info-4.0.0" = { + "hosted-git-info-4.0.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.1.tgz"; + sha512 = "eT7NrxAsppPRQEBSwKSosReE+v8OzABwEScQYk5d4uxaEPlzxTIku7LINXtBGalthkLhJnq5lBI89PfK43zAKg=="; + }; + }; + "hot-formula-parser-4.0.0" = { + name = "hot-formula-parser"; + packageName = "hot-formula-parser"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.0.tgz"; - sha512 = "fqhGdjk4av7mT9fU/B01dUtZ+WZSc/XEXMoLXDVZukiQRXxeHSSz3AqbeWRJHtF8EQYHlAgB1NSAHU0Cm7aqZA=="; + url = "https://registry.npmjs.org/hot-formula-parser/-/hot-formula-parser-4.0.0.tgz"; + sha512 = "diG1UvuQ3HxtfezVUIpvndk/bVkqZJ9Rfv10MdVF7pJEj8P2Jd4iCZSMJCN3lDhnLegaVlfSYSA6+szYNFQUKg=="; }; }; "hot-shots-6.8.7" = { @@ -28296,6 +28125,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "http-signature-1.3.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.1.tgz"; + sha512 = "Y29YKEc8MQsjch/VzkUVJ+2MXd9WcR42fK5u36CZf4G8bXw2DXMTWuESiB0R6m59JAWxlPPw5/Fri/t/AyyueA=="; + }; + }; "http-signature-1.3.5" = { name = "http-signature"; packageName = "http-signature"; @@ -28584,15 +28422,6 @@ let sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; - "icss-utils-5.1.0" = { - name = "icss-utils"; - packageName = "icss-utils"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; - sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; - }; - }; "idb-kv-store-4.5.0" = { name = "idb-kv-store"; packageName = "idb-kv-store"; @@ -28953,15 +28782,6 @@ let sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; }; }; - "inflected-2.1.0" = { - name = "inflected"; - packageName = "inflected"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inflected/-/inflected-2.1.0.tgz"; - sha512 = "hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w=="; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -29205,6 +29025,15 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; + "inquirer-8.0.0" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.0.0.tgz"; + sha512 = "ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA=="; + }; + }; "inquirer-autocomplete-prompt-1.3.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -29457,6 +29286,15 @@ let sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="; }; }; + "invoices-1.1.6" = { + name = "invoices"; + packageName = "invoices"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-1.1.6.tgz"; + sha512 = "/rNd9R/qcq+4QakROCQGnOJbiQ9BKwtOVF+OWu+3pYVYgPydnAMA++VCcKxZYFCGDC70Ee+9oUvIlXI8UQoiqQ=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -30807,6 +30645,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; "is-url-1.2.4" = { name = "is-url"; packageName = "is-url"; @@ -31059,6 +30906,15 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; + "isnumber-1.0.0" = { + name = "isnumber"; + packageName = "isnumber"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz"; + sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; + }; + }; "isobject-2.1.0" = { name = "isobject"; packageName = "isobject"; @@ -31266,15 +31122,6 @@ let sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; }; }; - "java-properties-1.0.2" = { - name = "java-properties"; - packageName = "java-properties"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/java-properties/-/java-properties-1.0.2.tgz"; - sha512 = "qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ=="; - }; - }; "javascript-stringify-1.6.0" = { name = "javascript-stringify"; packageName = "javascript-stringify"; @@ -31302,6 +31149,15 @@ let sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="; }; }; + "jest-get-type-25.2.6" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "25.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; + }; + }; "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; @@ -31347,6 +31203,15 @@ let sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ=="; }; }; + "jest-validate-25.5.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "25.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz"; + sha512 = "okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ=="; + }; + }; "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; @@ -31680,13 +31545,13 @@ let sha512 = "xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ=="; }; }; - "jscodeshift-0.10.0" = { + "jscodeshift-0.11.0" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.10.0.tgz"; - sha512 = "xpH2FVSEepXoNr6+cPlPHzPzBY1W9bPulufhCHOShzk8+CTCzAOQKytuOXT0b/9PvmO4biRi0g/ZIylVew815w=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.11.0.tgz"; + sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; "jsdom-11.12.0" = { @@ -31770,49 +31635,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.24.0" = { + "jsii-1.25.0" = { name = "jsii"; packageName = "jsii"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.24.0.tgz"; - sha512 = "ROCFFFdbs2o8OgQEWvpMY/UMXshndkGr8TunG0NQx8kQfONYeCjgNFqMcbcyXuhlR+DI1MUGVVOzw6zc9geyGA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.25.0.tgz"; + sha512 = "5dchUvG+RTc48v8euUUNvxKxAlPMIaE9rG8BFp4RiXQiB3EFDTJeeM89cXK4w/vAhjgDlAxMDx3EJr7k6e461A=="; }; }; - "jsii-pacmak-1.24.0" = { + "jsii-pacmak-1.25.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.24.0.tgz"; - sha512 = "8L5AOOy2LU3Y8tLy+KBTdmtxfu+Kn6g54htj+d1g3dVCxApC/G83C1DudhkYCxM3gDavsLPHhG6+fyopdTVV5A=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.25.0.tgz"; + sha512 = "GEVdCYvnwYVnVNdcLDrvStaHqWIXBiZCpM9i4LS2rpA+qSsyXJUF8FV4cj2YFjdHsolUdY1EKY7njSs8XQ+1gg=="; }; }; - "jsii-reflect-1.24.0" = { + "jsii-reflect-1.25.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.24.0.tgz"; - sha512 = "LWWReRtLhmyUMRD5NOFDV+HJHP/ChHRa6alccSPU9vTL5tm9HtMW0oO2XaVj4a2YPujvQ+sH7APzndj60Qgzqw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.25.0.tgz"; + sha512 = "ufBgOeGe6WVmx0CO7ABraEYOzhzxvmx6gJuUvOz/8XMe1dIIU2USLW3O1ArkEtIWchN4F2gITdd7I7jhdzzN1A=="; }; }; - "jsii-rosetta-1.24.0" = { + "jsii-rosetta-1.25.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.24.0.tgz"; - sha512 = "BMYxIjYG62wctUZFjYc5xKPNTgzTRRw2Fp8R9p4o0VeFE224ntyHgy9y7oKuCu+K1ev917NRoCLj7f2tyGTMAg=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.25.0.tgz"; + sha512 = "2g+O5mkXrcsJPrHs71WPvLhcV4JERYUUzfG4rArZQ+YsGYSlpP2K6FdYlAk8haeCeEgyaedNgsbcW9NbxV8p3A=="; }; }; - "jsii-srcmak-0.1.252" = { + "jsii-srcmak-0.1.255" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.252"; + version = "0.1.255"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.252.tgz"; - sha512 = "nRQ2JdGUgAi5YXkxQwJ4lM3K4oTeGzVTIT+4nQ6FBLC0/eHQrJYbqNbX27xb/JzqidVzv7y7C0ykZGiBDByKSQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.255.tgz"; + sha512 = "vWIcR+z9HmqHX4lwJI9TFkGhBsZK2tPlgnvANJ09+SwrrLdBFOBFOJB298U5vMyQ/2mf0VFGlFFoJO9mA/6B4A=="; }; }; "json-bigint-0.2.3" = { @@ -32094,6 +31959,15 @@ let sha512 = "W9Lq347r8tA1DfMvAGn9QNcgYm4Wm7Yc+k8e6vezpMnRT+NHbtlxgNBXRVjXe9YM6eTn6+p/MKOlV/aABJcSnQ=="; }; }; + "json2csv-5.0.6" = { + name = "json2csv"; + packageName = "json2csv"; + version = "5.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/json2csv/-/json2csv-5.0.6.tgz"; + sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; + }; + }; "json2jsii-0.1.188" = { name = "json2jsii"; packageName = "json2jsii"; @@ -32346,6 +32220,15 @@ let sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; }; }; + "jstat-1.9.4" = { + name = "jstat"; + packageName = "jstat"; + version = "1.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jstat/-/jstat-1.9.4.tgz"; + sha512 = "IiTPlI7pcrsq41EpDzrghlA1fhiC9GXxNqO4k5ogsjsM1XAWQ8zESH/bZsExLVgQsYpXE+7c11kEbbuxTLUpJQ=="; + }; + }; "jstransform-10.1.0" = { name = "jstransform"; packageName = "jstransform"; @@ -33400,6 +33283,15 @@ let sha512 = "wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw=="; }; }; + "lightning-3.2.20" = { + name = "lightning"; + packageName = "lightning"; + version = "3.2.20"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.2.20.tgz"; + sha512 = "VbuYUKrESdUd2mWzFannAn/Bd0DZ0fkO73LeemJ7JS2JaIItXHoEZTAHWg+Ekf+r2rk4+v7NLurrfCmGpNdD8A=="; + }; + }; "limit-spawn-0.0.3" = { name = "limit-spawn"; packageName = "limit-spawn"; @@ -33526,6 +33418,42 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; + "ln-accounting-4.2.6" = { + name = "ln-accounting"; + packageName = "ln-accounting"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.2.6.tgz"; + sha512 = "q8Z9hAkl0Dmkj5kJuQDUWkEFT2Ja5YDQrpvBEpS5Pe4NNrI1PSHM6jYb3t9cDqhq/qkKyCNHZBY7QDLWtXJABg=="; + }; + }; + "ln-service-51.3.1" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.3.1.tgz"; + sha512 = "V5Q1rZbN4GY1PfxosQ1pWyyhZF/qPWivf5whL0lDWBrJ4xgsemYRkg5ce4YaUNLYv/BXfMrQVyw09w+tyq+QnQ=="; + }; + }; + "ln-sync-0.4.4" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.4.tgz"; + sha512 = "E9Smgc7vzhUn1wSQ8CzUXBfPqD2PNdXOM84nfVv/kbRSdJ87JvCbE0ksxv76X3CjgwbnC++B1946bR96ymK+Ig=="; + }; + }; + "ln-telegram-3.2.1" = { + name = "ln-telegram"; + packageName = "ln-telegram"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.1.tgz"; + sha512 = "LpnCfPrafA95mjyYnmoJI03bgGOX3X/2uG8BVZRNOSGrqVKjGVUL6cx849L7lRoHLtbWM6Rge3uZ901Fkx5Bfg=="; + }; + }; "load-bmfont-1.4.1" = { name = "load-bmfont"; packageName = "load-bmfont"; @@ -34444,15 +34372,6 @@ let sha1 = "6694cffa65fef931f7c31ce86c74597cf560f4f1"; }; }; - "lodash.identity-3.0.0" = { - name = "lodash.identity"; - packageName = "lodash.identity"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz"; - sha1 = "ad7bc6a4e647d79c972e1b80feef7af156267876"; - }; - }; "lodash.includes-4.3.0" = { name = "lodash.includes"; packageName = "lodash.includes"; @@ -34804,15 +34723,6 @@ let sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; }; }; - "lodash.pickby-4.6.0" = { - name = "lodash.pickby"; - packageName = "lodash.pickby"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz"; - sha1 = "7dea21d8c18d7703a27c704c15d3b84a67e33aff"; - }; - }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -35047,15 +34957,6 @@ let sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; }; }; - "lodash.xorby-4.7.0" = { - name = "lodash.xorby"; - packageName = "lodash.xorby"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.xorby/-/lodash.xorby-4.7.0.tgz"; - sha1 = "9c19a6f9f063a6eb53dd03c1b6871799801463d7"; - }; - }; "lodash.zip-4.2.0" = { name = "lodash.zip"; packageName = "lodash.zip"; @@ -35128,6 +35029,15 @@ let sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; }; }; + "log-symbols-4.1.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; + }; + }; "log-update-1.0.2" = { name = "log-update"; packageName = "log-update"; @@ -35542,6 +35452,15 @@ let sha512 = "O6oWF0xe1AFvOCjU8uOZBZ/lhjaMNwHfVNaqVMqmoQXlRwBcFWpCAToiZOdXcKVMdo/5s/D0a2QgA5laMErxHQ=="; }; }; + "macaroon-3.0.4" = { + name = "macaroon"; + packageName = "macaroon"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/macaroon/-/macaroon-3.0.4.tgz"; + sha512 = "Tja2jvupseKxltPZbu5RPSz2Pgh6peYA3O46YCTcYL8PI1VqtGwDqRhGfP8pows26xx9wTiygk+en62Bq+Y8JA=="; + }; + }; "machine-10.4.0" = { name = "machine"; packageName = "machine"; @@ -35686,15 +35605,6 @@ let sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; - "make-error-1.3.6" = { - name = "make-error"; - packageName = "make-error"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; - }; - }; "make-fetch-happen-8.0.14" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -36055,15 +35965,6 @@ let sha512 = "1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q=="; }; }; - "markdown-table-2.0.0" = { - name = "markdown-table"; - packageName = "markdown-table"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz"; - sha512 = "Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A=="; - }; - }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -36334,15 +36235,6 @@ let sha512 = "3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg=="; }; }; - "mdast-util-compact-2.0.1" = { - name = "mdast-util-compact"; - packageName = "mdast-util-compact"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz"; - sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; - }; - }; "mdast-util-from-markdown-0.8.5" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; @@ -36352,6 +36244,42 @@ let sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; + "mdast-util-mdx-0.1.1" = { + name = "mdast-util-mdx"; + packageName = "mdast-util-mdx"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdx/-/mdast-util-mdx-0.1.1.tgz"; + sha512 = "9nncdnHNYSb4HNxY3AwE6gU632jhbXsDGXe9PkkJoEawYWJ8tTwmEOHGlGa2TCRidtkd6FF5I8ogDU9pTDlQyA=="; + }; + }; + "mdast-util-mdx-expression-0.1.1" = { + name = "mdast-util-mdx-expression"; + packageName = "mdast-util-mdx-expression"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-0.1.1.tgz"; + sha512 = "SoO8y1B9NjMOYlNdwXMchuTVvqSTlUmXm1P5QvZNPv7OH7aa8qJV+3aA+vl1DHK9Vk1uZAlgwokjvDQhS6bINA=="; + }; + }; + "mdast-util-mdx-jsx-0.1.3" = { + name = "mdast-util-mdx-jsx"; + packageName = "mdast-util-mdx-jsx"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-0.1.3.tgz"; + sha512 = "MIAop4fMALAAVMpXIZqSq2T9/3d/hiiSTdPTJ9AOIZL1td2JBbUOBSnBSMfEk4GOyiQSsla+NFziJbNBwBH1sw=="; + }; + }; + "mdast-util-mdxjs-esm-0.1.1" = { + name = "mdast-util-mdxjs-esm"; + packageName = "mdast-util-mdxjs-esm"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-0.1.1.tgz"; + sha512 = "kBiYeashz+nuhfv+712nc4THQhzXIH2gBFUDbuLxuDCqU/fZeg+9FAcdRBx9E13dkpk1p2Xwufzs3wsGJ+mISQ=="; + }; + }; "mdast-util-to-markdown-0.6.5" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; @@ -36505,13 +36433,13 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; - "mem-8.0.0" = { + "mem-8.1.0" = { name = "mem"; packageName = "mem"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-8.0.0.tgz"; - sha512 = "qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA=="; + url = "https://registry.npmjs.org/mem/-/mem-8.1.0.tgz"; + sha512 = "FIkgXo0kTi3XpvaznV5Muk6Y6w8SkdmRXcY7ZLonQesuYezp59UooLxAVBcGuN6PH2tXN84mR3vyzSc6oSMUfA=="; }; }; "mem-fs-1.2.0" = { @@ -36649,13 +36577,13 @@ let sha512 = "51j4kUedbqkWGby44hAhf5f/hj8GOvHoLX00/YHURBNxOMf5k8JbPuGfmeNpZEXhc3vrmfnFben4+rOOx3HjEQ=="; }; }; - "memorystore-1.6.5" = { + "memorystore-1.6.6" = { name = "memorystore"; packageName = "memorystore"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.5.tgz"; - sha512 = "2RD1kTZhF0nywVtps2NoQgbMiPO6o1+dIRUAi2cRQDxMyCKwOZdBrC/Lk9/ttlF6lHn3T6uCPwSbgWxEef9djQ=="; + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.6.tgz"; + sha512 = "EbLl1xg9+DlnjXkZK/eMUoWyhZ1IxcWMpSuFyqyA/Z4BNuH7BR+E0yC40WbLZZ6G8LxHiUZ2DPhqV8DR8+9UQQ=="; }; }; "memorystream-0.3.1" = { @@ -36757,6 +36685,15 @@ let sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; }; }; + "merge-options-3.0.4" = { + name = "merge-options"; + packageName = "merge-options"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz"; + sha512 = "2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ=="; + }; + }; "merge-source-map-1.0.4" = { name = "merge-source-map"; packageName = "merge-source-map"; @@ -36766,15 +36703,6 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; - "merge-source-map-1.1.0" = { - name = "merge-source-map"; - packageName = "merge-source-map"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; - sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; - }; - }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -37000,6 +36928,60 @@ let sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA=="; }; }; + "micromark-extension-mdx-0.2.1" = { + name = "micromark-extension-mdx"; + packageName = "micromark-extension-mdx"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-mdx/-/micromark-extension-mdx-0.2.1.tgz"; + sha512 = "J+nZegf1ExPz1Ft6shxu8M9WfRom1gwRIx6gpJK1SEEqKzY5LjOR1d/WHRtjwV4KoMXrL53+PoN7T1Rw1euJew=="; + }; + }; + "micromark-extension-mdx-expression-0.3.2" = { + name = "micromark-extension-mdx-expression"; + packageName = "micromark-extension-mdx-expression"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-0.3.2.tgz"; + sha512 = "Sh8YHLSAlbm/7TZkVKEC4wDcJE8XhVpZ9hUXBue1TcAicrrzs/oXu7PHH3NcyMemjGyMkiVS34Y0AHC5KG3y4A=="; + }; + }; + "micromark-extension-mdx-jsx-0.3.3" = { + name = "micromark-extension-mdx-jsx"; + packageName = "micromark-extension-mdx-jsx"; + version = "0.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-0.3.3.tgz"; + sha512 = "kG3VwaJlzAPdtIVDznfDfBfNGMTIzsHqKpTmMlew/iPnUCDRNkX+48ElpaOzXAtK5axtpFKE3Hu3VBriZDnRTQ=="; + }; + }; + "micromark-extension-mdx-md-0.1.1" = { + name = "micromark-extension-mdx-md"; + packageName = "micromark-extension-mdx-md"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-mdx-md/-/micromark-extension-mdx-md-0.1.1.tgz"; + sha512 = "emlFQEyfx/2aPhwyEqeNDfKE6jPH1cvLTb5ANRo4qZBjaUObnzjLRdzK8RJ4Xc8+/dOmKN8TTRxFnOYF5/EAwQ=="; + }; + }; + "micromark-extension-mdxjs-0.3.0" = { + name = "micromark-extension-mdxjs"; + packageName = "micromark-extension-mdxjs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-mdxjs/-/micromark-extension-mdxjs-0.3.0.tgz"; + sha512 = "NQuiYA0lw+eFDtSG4+c7ao3RG9dM4P0Kx/sn8OLyPhxtIc6k+9n14k5VfLxRKfAxYRTo8c5PLZPaRNmslGWxJw=="; + }; + }; + "micromark-extension-mdxjs-esm-0.3.0" = { + name = "micromark-extension-mdxjs-esm"; + packageName = "micromark-extension-mdxjs-esm"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark-extension-mdxjs-esm/-/micromark-extension-mdxjs-esm-0.3.0.tgz"; + sha512 = "ZkI/cneSGQFdmB3iOT34n9Zq0Gc6vknAd1o2G7SaiCUY5D9a5ZCvGP/vCjHmlB7f2Y4b4+O1YMLywxYmQeUFwQ=="; + }; + }; "micromatch-2.3.11" = { name = "micromatch"; packageName = "micromatch"; @@ -37027,6 +37009,15 @@ let sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; }; }; + "micromist-1.1.0" = { + name = "micromist"; + packageName = "micromist"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micromist/-/micromist-1.1.0.tgz"; + sha512 = "+CQ76pabE9egniSEdmDuH+j2cYyIBKP97kujG8ZLZyLCRq5ExwtIy4DPHPFrq4jVbhMRBnyjuH50KU9Ohs8QCg=="; + }; + }; "middleware-handler-0.2.0" = { name = "middleware-handler"; packageName = "middleware-handler"; @@ -37126,6 +37117,15 @@ let sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; + "mime-db-1.43.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.43.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; + sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; + }; + }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -37153,6 +37153,15 @@ let sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; + "mime-types-2.1.26" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.26"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; + sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; + }; + }; "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; @@ -37747,13 +37756,13 @@ let sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; }; }; - "moize-6.0.0" = { + "moize-6.0.1" = { name = "moize"; packageName = "moize"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/moize/-/moize-6.0.0.tgz"; - sha512 = "/GXPWgxfgQAeM2S7IPh29MDbhK9ZF1YjzP6QRcJ1QcYrqehe6eFpAQZ88Xk/s4dy/wYhMY5axT1vaaWC+lllZA=="; + url = "https://registry.npmjs.org/moize/-/moize-6.0.1.tgz"; + sha512 = "Bl91P98A6Xba35mn9XoAW9DuGoQb3HyoY888TxrvQbMr9+1v3dzBzi9n4Guh5Lne8ENdqbXjQ0a8mf7UUvZ9wg=="; }; }; "mold-source-map-0.4.0" = { @@ -38485,13 +38494,13 @@ let sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; - "nanoid-3.1.21" = { + "nanoid-3.1.22" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.21"; + version = "3.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.21.tgz"; - sha512 = "A6oZraK4DJkAOICstsGH98dvycPr/4GGDH7ZWKmMdd3vGcOurZ6JmWFUt0DA5bzrrn2FrUjmv6mFNWvv8jpppA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz"; + sha512 = "/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ=="; }; }; "nanolru-1.0.0" = { @@ -39116,6 +39125,15 @@ let sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; }; }; + "node-addon-api-2.0.2" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz"; + sha512 = "Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA=="; + }; + }; "node-addon-api-3.1.0" = { name = "node-addon-api"; packageName = "node-addon-api"; @@ -39576,6 +39594,15 @@ let sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; + "node-version-alias-1.0.1" = { + name = "node-version-alias"; + packageName = "node-version-alias"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-version-alias/-/node-version-alias-1.0.1.tgz"; + sha512 = "E9EhoJkpIIZyYplB298W8ZfhcojQrnKnUPcaOgJqVqICUZwPZkuj10nTzEscwdziOOj545v4tGPvNBG3ieUbSw=="; + }; + }; "node-wsfederation-0.1.1" = { name = "node-wsfederation"; packageName = "node-wsfederation"; @@ -39621,6 +39648,15 @@ let sha512 = "VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ=="; }; }; + "nofilter-2.0.3" = { + name = "nofilter"; + packageName = "nofilter"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nofilter/-/nofilter-2.0.3.tgz"; + sha512 = "FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug=="; + }; + }; "nomnom-1.8.1" = { name = "nomnom"; packageName = "nomnom"; @@ -39720,6 +39756,15 @@ let sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; + "normalize-node-version-10.0.0" = { + name = "normalize-node-version"; + packageName = "normalize-node-version"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-node-version/-/normalize-node-version-10.0.0.tgz"; + sha512 = "/gVbS/qAnowVxr2fJy3F0MxmCvx8QdXJDl8XUE7HT3vsDeDjQfZkX9OiPahF+51Hgy93cKG1hP6uyBjQsMCvWQ=="; + }; + }; "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -39729,13 +39774,13 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; - "normalize-package-data-3.0.1" = { + "normalize-package-data-3.0.2" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.1.tgz"; - sha512 = "D/ttLdxo71msR4FF3VgSwK4blHfE3/vGByz1NCeE7/Dh8reQOKNJJjk5L10mLq9jxa+ZHzT1/HLgxljzbXE7Fw=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz"; + sha512 = "6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg=="; }; }; "normalize-path-2.1.1" = { @@ -39936,13 +39981,13 @@ let sha512 = "/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig=="; }; }; - "npm-package-arg-8.1.1" = { + "npm-package-arg-8.1.2" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz"; - sha512 = "CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg=="; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.2.tgz"; + sha512 = "6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA=="; }; }; "npm-packlist-1.4.8" = { @@ -39972,6 +40017,15 @@ let sha512 = "ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw=="; }; }; + "npm-pick-manifest-6.1.1" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz"; + sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="; + }; + }; "npm-prefix-1.2.0" = { name = "npm-prefix"; packageName = "npm-prefix"; @@ -40603,13 +40657,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.164.1" = { + "office-ui-fabric-react-7.165.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.164.1"; + version = "7.165.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.164.1.tgz"; - sha512 = "pej4ScEHZshB8IW44IQsqcxDhd2UTUdPcuRELemZyOFAQ45/80whPfIu5gM2X6uehMcEoWQDxUNI7qs6uTPR0Q=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.165.0.tgz"; + sha512 = "alOv6F8ZRPaLkM9nEKSiuyAEE4y2OJLqCu9iadkjQykjypcAhDQSA6mrBN0nzS6helb1hxakNLkQja6rrVwjtg=="; }; }; "omggif-1.0.10" = { @@ -40783,13 +40837,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.24.0" = { + "oo-ascii-tree-1.25.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.24.0.tgz"; - sha512 = "rJYspYyrr2lDCDnybz4/70eml5cen98r4u2uw8sGodROePXiKKE+2Al8tfiS6uYx7vUEozEHCLoNQ/2jpxa7gw=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.25.0.tgz"; + sha512 = "bV3aHhVkSc862VMMj1JV9y8yBqzhXCMNE9UFt8w9NwkM7tvw94O8niGlvmFzNx2Hf4+qhO4gYdtRAYQqUaH+1w=="; }; }; "opal-runtime-1.0.11" = { @@ -41161,15 +41215,6 @@ let sha512 = "I9PKfIZC+e4RXZ/qr1RhgyCnGgYX0UEIlXgWnCOVACIvFgaC9rz6Won7xbdhoHrd8IIhV7YEpHjreNUNkqCGkQ=="; }; }; - "optimism-0.10.3" = { - name = "optimism"; - packageName = "optimism"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/optimism/-/optimism-0.10.3.tgz"; - sha512 = "9A5pqGoQk49H6Vhjb9kPgAeeECfUDF6aIICbMDL23kDLStBn1MWk3YvcZ4xWF9CsSf6XEgvRLkXy4xof/56vVw=="; - }; - }; "optimist-0.2.8" = { name = "optimist"; packageName = "optimist"; @@ -41341,6 +41386,15 @@ let sha512 = "zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g=="; }; }; + "ora-5.4.0" = { + name = "ora"; + packageName = "ora"; + version = "5.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz"; + sha512 = "1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -41602,6 +41656,15 @@ let sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; + "p-every-2.0.0" = { + name = "p-every"; + packageName = "p-every"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-every/-/p-every-2.0.0.tgz"; + sha512 = "MCz9DqD5opPC48Zsd+BHm56O/HfhYIQQtupfDzhXoVgQdg/Ux4F8/JcdRuQ+arq7zD5fB6zP3axbH3d9Nr8dlw=="; + }; + }; "p-filter-2.1.0" = { name = "p-filter"; packageName = "p-filter"; @@ -42763,15 +42826,6 @@ let sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; }; }; - "path-case-3.0.4" = { - name = "path-case"; - packageName = "path-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz"; - sha512 = "qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg=="; - }; - }; "path-dirname-1.0.2" = { name = "path-dirname"; packageName = "path-dirname"; @@ -43817,15 +43871,6 @@ let sha512 = "DsVLH3xJzut+VT+rYr0mtvOtpTjSyqDwPf5EZWXcb0uAKfitGpTY9Ec+afi2+TgdN8rWS9Cs88UDYehKo/RvOw=="; }; }; - "postcss-8.2.8" = { - name = "postcss"; - packageName = "postcss"; - version = "8.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz"; - sha512 = "1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw=="; - }; - }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -43997,15 +44042,6 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; - "postcss-modules-4.0.0" = { - name = "postcss-modules"; - packageName = "postcss-modules"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.0.0.tgz"; - sha512 = "ghS/ovDzDqARm4Zj6L2ntadjyQMoyJmi0JkLlYtH2QFLrvNlxH5OAVRPWPeKilB0pY7SbuhO173KOWkPAxRJcw=="; - }; - }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -44024,15 +44060,6 @@ let sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; - "postcss-modules-extract-imports-3.0.0" = { - name = "postcss-modules-extract-imports"; - packageName = "postcss-modules-extract-imports"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; - sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; - }; - }; "postcss-modules-local-by-default-1.2.0" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; @@ -44051,15 +44078,6 @@ let sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; }; }; - "postcss-modules-local-by-default-4.0.0" = { - name = "postcss-modules-local-by-default"; - packageName = "postcss-modules-local-by-default"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; - sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; - }; - }; "postcss-modules-scope-1.1.0" = { name = "postcss-modules-scope"; packageName = "postcss-modules-scope"; @@ -44078,15 +44096,6 @@ let sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; }; }; - "postcss-modules-scope-3.0.0" = { - name = "postcss-modules-scope"; - packageName = "postcss-modules-scope"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; - sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; - }; - }; "postcss-modules-values-1.3.0" = { name = "postcss-modules-values"; packageName = "postcss-modules-values"; @@ -44105,15 +44114,6 @@ let sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; }; }; - "postcss-modules-values-4.0.0" = { - name = "postcss-modules-values"; - packageName = "postcss-modules-values"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; - sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; - }; - }; "postcss-normalize-charset-4.0.1" = { name = "postcss-normalize-charset"; packageName = "postcss-normalize-charset"; @@ -44852,6 +44852,15 @@ let sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA=="; }; }; + "probing-1.3.4" = { + name = "probing"; + packageName = "probing"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/probing/-/probing-1.3.4.tgz"; + sha512 = "SAEJtgxcCn47d18RRck6bkyqWeS3u2K0bG3aGIhb/X0MEZ6tUzjrvCQ/uzR7+Me5Kae7muap5hKAJZfh8dVQGw=="; + }; + }; "process-0.10.1" = { name = "process"; packageName = "process"; @@ -45320,6 +45329,15 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; + "psbt-1.1.8" = { + name = "psbt"; + packageName = "psbt"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/psbt/-/psbt-1.1.8.tgz"; + sha512 = "gnGq1ikGhvcsJij9BU2DZWBfXp09yRi/72+790hNwPaMPobgWrdlQ6sg6rNyDNYf+lwzYV8WIyHOLk2zH/7fGg=="; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -46103,13 +46121,13 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-7.1.0" = { + "puppeteer-8.0.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-7.1.0.tgz"; - sha512 = "lqOLzqCKdh7yUAHvK6LxgOpQrL8Bv1/jvS8MLDXxcNms2rlM3E8p/Wlwc7efbRZ0twxTzUeqjN5EqrTwxOwc9g=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz"; + sha512 = "D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ=="; }; }; "purgecss-2.3.0" = { @@ -46157,13 +46175,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.121" = { + "pyright-1.1.123" = { name = "pyright"; packageName = "pyright"; - version = "1.1.121"; + version = "1.1.123"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.121.tgz"; - sha512 = "jb0BwO3nbiF808SDMpT4UXg30ats+8nsHyu4zTlSt1p4ZWl6+GNP98peDQyOYzgnoScTMomDYTDXejAAD3M+WA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.123.tgz"; + sha512 = "EYjELbm4G4icuIki6PfpzYrxNeGH78vNbXNmsbb/9XnnVQISdFcbc9oOBc2mU77enUwZctwZ6Nj2mZUMD9VibQ=="; }; }; "q-0.9.7" = { @@ -46292,6 +46310,15 @@ let sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; }; }; + "qs-6.10.0" = { + name = "qs"; + packageName = "qs"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.0.tgz"; + sha512 = "yjACOWijC6L/kmPZZAsVBNY2zfHSIbpdpL977quseu56/8BZ2LoF5axK2bGhbzhVKt7V9xgWTtpyLbxwIoER0Q=="; + }; + }; "qs-6.3.2" = { name = "qs"; packageName = "qs"; @@ -46328,13 +46355,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.6" = { + "qs-6.9.1" = { name = "qs"; packageName = "qs"; - version = "6.9.6"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz"; + sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="; }; }; "query-string-1.0.1" = { @@ -47867,13 +47894,13 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; - "remark-mdx-2.0.0-next.8" = { + "remark-mdx-2.0.0-next.9" = { name = "remark-mdx"; packageName = "remark-mdx"; - version = "2.0.0-next.8"; + version = "2.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.8.tgz"; - sha512 = "mjP0yo6BgjYrx5a+gKWYRFWbGnRiWi4Fdf17xGCr9VkSMnG4Dyo06spqbaLfHwl0KkQ/RQZlR2sn1mKnYduJdw=="; + url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.9.tgz"; + sha512 = "I5dCKP5VE18SMd5ycIeeEk8Hl6oaldUY6PIvjrfm65l7d0QRnLqknb62O2g3QEmOxCswcHTtwITtz6rfUIVs+A=="; }; }; "remark-message-control-6.0.0" = { @@ -47939,15 +47966,6 @@ let sha512 = "xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w=="; }; }; - "remark-stringify-8.1.1" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz"; - sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; - }; - }; "remark-stringify-9.0.1" = { name = "remark-stringify"; packageName = "remark-stringify"; @@ -48893,13 +48911,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.41.2" = { + "rollup-2.42.1" = { name = "rollup"; packageName = "rollup"; - version = "2.41.2"; + version = "2.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.41.2.tgz"; - sha512 = "6u8fJJXJx6fmvKrAC9DHYZgONvSkz8S9b/VFBjoQ6dkKdHyPpPbpqiNl2Bao9XBzDHpq672X6sGZ9G1ZBqAHMg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.42.1.tgz"; + sha512 = "/y7M2ULg06JOXmMpPzhTeQroJSchy8lX8q6qrjqil0jmLz6ejCWbQzVnWTsdmMQRhfU0QcwtiW8iZlmrGXWV4g=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -49307,6 +49325,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-compare-1.1.4" = { + name = "safe-compare"; + packageName = "safe-compare"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-compare/-/safe-compare-1.1.4.tgz"; + sha512 = "b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ=="; + }; + }; "safe-join-0.1.3" = { name = "safe-join"; packageName = "safe-join"; @@ -49532,6 +49559,15 @@ let sha1 = "033d60a3ad20ecf2e00940d14f97823465774335"; }; }; + "secp256k1-4.0.2" = { + name = "secp256k1"; + packageName = "secp256k1"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.2.tgz"; + sha512 = "UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg=="; + }; + }; "secret-handshake-1.1.20" = { name = "secret-handshake"; packageName = "secret-handshake"; @@ -49865,15 +49901,6 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "sentence-case-3.0.4" = { - name = "sentence-case"; - packageName = "sentence-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz"; - sha512 = "8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg=="; - }; - }; "sentence-splitter-2.3.2" = { name = "sentence-splitter"; packageName = "sentence-splitter"; @@ -50477,13 +50504,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.36.2" = { + "simple-git-2.37.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.36.2"; + version = "2.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.36.2.tgz"; - sha512 = "orBEf65GfSiQMsYedbJXSiRNnIRvhbeE5rrxZuEimCpWxDZOav0KLy2IEiPi1YJCF+zaC2quiJF8A4TsxI9/tw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.37.0.tgz"; + sha512 = "ZK6qRnP+Xa2v23UEZDNHUfzswsuNCDHOQpWZRkpqNaXn7V5wVBBx3zRJLji3pROJGzrzA7mXwY7preL5EKuAaQ=="; }; }; "simple-markdown-0.4.4" = { @@ -50504,13 +50531,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.9.3" = { + "simple-peer-9.10.0" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.9.3"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.9.3.tgz"; - sha512 = "T3wuv0UqBpDTV0x0pJPPsz4thy0tC0fTOHE4g9+AF43RUxxT+MWeXVtdQcK5Xuzv/XTVrB2NrGzdfO1IFBqOkw=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.10.0.tgz"; + sha512 = "sKrKtca1UdmwdZIbvuT3iEL05tDGt/xdLP6+ej8rh1ADgtDk44yLaEZjIyPJ6c34zsSih46Ou7zUIT7e4hPK7g=="; }; }; "simple-plist-1.1.1" = { @@ -50612,6 +50639,15 @@ let sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; }; }; + "sjcl-1.0.8" = { + name = "sjcl"; + packageName = "sjcl"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/sjcl/-/sjcl-1.0.8.tgz"; + sha512 = "LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ=="; + }; + }; "skin-tone-1.0.0" = { name = "skin-tone"; packageName = "skin-tone"; @@ -50747,13 +50783,13 @@ let sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; }; }; - "slugify-1.4.7" = { + "slugify-1.5.0" = { name = "slugify"; packageName = "slugify"; - version = "1.4.7"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.4.7.tgz"; - sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.5.0.tgz"; + sha512 = "Q2UPZ2udzquy1ElHfOLILMBMqBEXkiD3wE75qtBvV+FsDdZZjUqPZ44vqLTejAVq+wLLHacOMcENnP8+ZbzmIA=="; }; }; "smart-buffer-4.1.0" = { @@ -51278,13 +51314,13 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; - "socks-2.5.1" = { + "socks-2.6.0" = { name = "socks"; packageName = "socks"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.5.1.tgz"; - sha512 = "oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ=="; + url = "https://registry.npmjs.org/socks/-/socks-2.6.0.tgz"; + sha512 = "mNmr9owlinMplev0Wd7UHFlqI4ofnBnNzFuzrm63PPaHgbkqCFe4T5LzwKmtQ/f2tX0NTpcdVLyD/FHxFBstYw=="; }; }; "socks-proxy-agent-4.0.2" = { @@ -52088,13 +52124,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-1.18.3" = { + "ssb-db2-1.18.6" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "1.18.3"; + version = "1.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.18.3.tgz"; - sha512 = "A5QHs7WkZJky/aE6Joewy3bBjx4zJThbqW9UtRgvnF5OeqQB7JuIUKF24kwWLP7HOQv43PpVjlhHNSZPl67Oxw=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-1.18.6.tgz"; + sha512 = "Z6dkEhpwJbKWV5v28s2sFj2Nu8FAF/ANX24lrTlpr1ltLAb4Us1mtp1y6cZQhlXlmy+ILxDuhs51/hhbjKfpmA=="; }; }; "ssb-ebt-5.6.7" = { @@ -52520,15 +52556,6 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "stack-trace-0.0.9" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - }; "stack-utils-2.0.3" = { name = "stack-utils"; packageName = "stack-utils"; @@ -52628,6 +52655,15 @@ let sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa"; }; }; + "stats-lite-2.2.0" = { + name = "stats-lite"; + packageName = "stats-lite"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stats-lite/-/stats-lite-2.2.0.tgz"; + sha512 = "/Kz55rgUIv2KP2MKphwYT/NCuSfAlbbMRv2ZWw7wyXayu230zdtzhxxuXXcvsc6EmmhS8bSJl3uS1wmMHFumbA=="; + }; + }; "statsd-client-0.4.5" = { name = "statsd-client"; packageName = "statsd-client"; @@ -53069,15 +53105,6 @@ let sha512 = "78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="; }; }; - "string-hash-1.1.3" = { - name = "string-hash"; - packageName = "string-hash"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"; - sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b"; - }; - }; "string-kit-0.11.10" = { name = "string-kit"; packageName = "string-kit"; @@ -53996,13 +54023,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.181" = { + "svelte2tsx-0.1.182" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.181"; + version = "0.1.182"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.181.tgz"; - sha512 = "S68R8GYxzdw9Eu19+WRrirClj7lq/nbzhu8tgRkqg8BVtI3zZF9PlLXtpXwnlcWK9UjDM5DPF2H/8kTnIZqJYg=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.182.tgz"; + sha512 = "c0Qnc8sebPt940boE4CvRcmwLu+XRyhQsm89ZPXlxvZ3ea7VQmtWOhWkReSVyxnEFRm7VnrKCrTitZHKGNCptA=="; }; }; "sver-compat-1.5.0" = { @@ -54131,13 +54158,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.45.0" = { + "swagger-ui-dist-3.45.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.45.0"; + version = "3.45.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.45.0.tgz"; - sha512 = "SUqZbt0WQytjaI/bUr2gn8IqFE+Te6Tl4uA7n4xtylRdXKXmMm5s/mfTtvpnleHBjxcmQ6ONTA9ilN4iOxMulQ=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.45.1.tgz"; + sha512 = "QWotWWYkgSdPtI6HW12q4Ua5zxIhhvnYvx9iZKtDbZuVvJSTnMIzaHrE6KJVe/8plWh7Wpd/qqeBfpOxF8g1/g=="; }; }; "swagger2openapi-6.2.3" = { @@ -54257,13 +54284,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.34.17" = { + "systeminformation-4.34.19" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.34.17"; + version = "4.34.19"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.17.tgz"; - sha512 = "AvwizTc1QpFBf2VJtgO22JLKb1OPmztl6s480mIMWWDqMR/yvMWNL7gb3siRIa0hexoyUn3ptZMbG0s/Fn4QCw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.34.19.tgz"; + sha512 = "ssUYQ0s1FFeb8EGtyCX/41cC/XaF84gbNAUfaUTziibx+xCAaR0zrOy0yZlnUrsWDQ+snp/Utl8cx8IdtrevrA=="; }; }; "table-3.8.3" = { @@ -54329,6 +54356,15 @@ let sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7"; }; }; + "tabtab-2.2.2" = { + name = "tabtab"; + packageName = "tabtab"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tabtab/-/tabtab-2.2.2.tgz"; + sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14"; + }; + }; "tabtab-3.0.2" = { name = "tabtab"; packageName = "tabtab"; @@ -54582,6 +54618,15 @@ let sha512 = "va4VlrKWp64JrowFoZX/NPzzA6q38kvaIukVXOWFO1V+jR1G8+hCfgJy4TX8Z3rwLJzwaBEet1QhikHDRZWl3A=="; }; }; + "telegraf-4.1.2" = { + name = "telegraf"; + packageName = "telegraf"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/telegraf/-/telegraf-4.1.2.tgz"; + sha512 = "YZljmryOhcZgrRWU28AV7UhZ3y+jKRwPwB49PSDDmW7tKtQHrSLBkW0pCoLniDlQVz+ICBGCWXZlHfqDkQ2iNQ=="; + }; + }; "telegram-typings-3.6.1" = { name = "telegram-typings"; packageName = "telegram-typings"; @@ -54771,13 +54816,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.6.0" = { + "terser-5.6.1" = { name = "terser"; packageName = "terser"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.6.0.tgz"; - sha512 = "vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz"; + sha512 = "yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -56049,15 +56094,6 @@ let sha512 = "ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA=="; }; }; - "ts-invariant-0.3.3" = { - name = "ts-invariant"; - packageName = "ts-invariant"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.3.tgz"; - sha512 = "UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ=="; - }; - }; "ts-invariant-0.4.4" = { name = "ts-invariant"; packageName = "ts-invariant"; @@ -56094,15 +56130,6 @@ let sha512 = "XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w=="; }; }; - "ts-node-8.10.2" = { - name = "ts-node"; - packageName = "ts-node"; - version = "8.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz"; - sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA=="; - }; - }; "ts-pnp-1.2.0" = { name = "ts-pnp"; packageName = "ts-pnp"; @@ -56112,15 +56139,6 @@ let sha512 = "csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="; }; }; - "ts-process-promises-1.0.2" = { - name = "ts-process-promises"; - packageName = "ts-process-promises"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-process-promises/-/ts-process-promises-1.0.2.tgz"; - sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; - }; - }; "tsconfig-paths-3.9.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; @@ -56238,15 +56256,6 @@ let sha512 = "+bGy9iDAqg3WSfc2ZrprToSPJhZjqy7vUv9wupQzsiv+BVPVx1T2a6G4T0290SpQj+56Toaw9BiLO5j5Bd7QzA=="; }; }; - "tty-1.0.1" = { - name = "tty"; - packageName = "tty"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tty/-/tty-1.0.1.tgz"; - sha1 = "e4409ac98b0dd1c50b59ff38e86eac3f0764ee45"; - }; - }; "tty-browserify-0.0.0" = { name = "tty-browserify"; packageName = "tty-browserify"; @@ -56364,6 +56373,15 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; + "tweetnacl-util-0.15.1" = { + name = "tweetnacl-util"; + packageName = "tweetnacl-util"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz"; + sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="; + }; + }; "tweetsodium-0.0.5" = { name = "tweetsodium"; packageName = "tweetsodium"; @@ -56625,6 +56643,15 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; + "typegram-3.2.2" = { + name = "typegram"; + packageName = "typegram"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typegram/-/typegram-3.2.2.tgz"; + sha512 = "PC7MclSZcLnCEnflubX61/YEwZph98EHbCsrL9tFhU5bZYz3uXm3Mc6iseKjiS3VyKOCCyoT3A4ZDtPkoYyucg=="; + }; + }; "typescript-2.9.2" = { name = "typescript"; packageName = "typescript"; @@ -57453,6 +57480,15 @@ let sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; }; }; + "unist-util-remove-position-3.0.0" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-3.0.0.tgz"; + sha512 = "17kIOuolVuK16LMb9KyMJlqdfCtlfQY5FjY3Sdo9iC7F5wqdXhNjMq0PBvMpkVNNnAmHxXssUW+rZ9T2zbP0Rg=="; + }; + }; "unist-util-stringify-position-1.1.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; @@ -57840,15 +57876,6 @@ let sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; }; }; - "upper-case-2.0.2" = { - name = "upper-case"; - packageName = "upper-case"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz"; - sha512 = "KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg=="; - }; - }; "upper-case-first-1.1.2" = { name = "upper-case-first"; packageName = "upper-case-first"; @@ -57858,15 +57885,6 @@ let sha1 = "5d79bedcff14419518fd2edb0a0507c9b6859115"; }; }; - "upper-case-first-2.0.2" = { - name = "upper-case-first"; - packageName = "upper-case-first"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz"; - sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg=="; - }; - }; "uri-js-3.0.2" = { name = "uri-js"; packageName = "uri-js"; @@ -58633,13 +58651,13 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; - "vega-5.19.1" = { + "vega-5.20.0" = { name = "vega"; packageName = "vega"; - version = "5.19.1"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.19.1.tgz"; - sha512 = "UE6/c9q9kzuz4HULFuU9HscBASoZa+zcXqGKdbQP545Nwmhd078QpcH+wZsq9lYfiTxmFtzLK/a0OH0zhkghvA=="; + url = "https://registry.npmjs.org/vega/-/vega-5.20.0.tgz"; + sha512 = "L2hDaTH2gz9DFbu7l1B8fR637HzctViuosFCo/Db5aBe93fCJ/w/oJu+vQNfQELzfm9sntkS/+A4u+39xrDCNA=="; }; }; "vega-canvas-1.2.6" = { @@ -58804,13 +58822,13 @@ let sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA=="; }; }; - "vega-scenegraph-4.9.3" = { + "vega-scenegraph-4.9.4" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.9.3"; + version = "4.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.3.tgz"; - sha512 = "lBvqLbXqrqRCTGJmSgzZC/tLR/o+TXfakbdhDzNdpgTavTaQ65S/67Gpj5hPpi77DvsfZUIY9lCEeO37aJhy0Q=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.4.tgz"; + sha512 = "QaegQzbFE2yhYLNWAmHwAuguW3yTtQrmwvfxYT8tk0g+KKodrQ5WSmNrphWXhqwtsgVSvtdZkfp2IPeumcOQJg=="; }; }; "vega-selections-5.3.0" = { @@ -58849,31 +58867,31 @@ let sha512 = "PdqQd5oPlRyD405M2w+Sz9Bo+i7Rwi8o03SVK7RaeQsJC2FffKGJ6acIaSEgOq+yD1Q2k/1SePmCXcmLUlIiEA=="; }; }; - "vega-typings-0.19.2" = { + "vega-typings-0.20.0" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.19.2"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.19.2.tgz"; - sha512 = "YU/S9rDk4d+t4+4eTa9fzuw87PMNteeVtpcL51kUO8H7HvGaoW7ll8RHKLkR0NYBEGPRoFDKUxnoyMvhgjsdYw=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.20.0.tgz"; + sha512 = "S+HIRN/3WYiS5zrQjJ4FDEOlvFVHLxPXMJerrnN3YZ6bxCDYo7tEvQUUuByGZ3d19GuKjgejczWS7XHvF3WjDw=="; }; }; - "vega-util-1.16.0" = { + "vega-util-1.16.1" = { name = "vega-util"; packageName = "vega-util"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-util/-/vega-util-1.16.0.tgz"; - sha512 = "6mmz6mI+oU4zDMeKjgvE2Fjz0Oh6zo6WGATcvCfxH2gXBzhBHmy5d25uW5Zjnkc6QBXSWPLV9Xa6SiqMsrsKog=="; + url = "https://registry.npmjs.org/vega-util/-/vega-util-1.16.1.tgz"; + sha512 = "FdgD72fmZMPJE99FxvFXth0IL4BbLA93WmBg/lvcJmfkK4Uf90WIlvGwaIUdSePIsdpkZjBPyQcHMQ8OcS8Smg=="; }; }; - "vega-view-5.9.2" = { + "vega-view-5.10.0" = { name = "vega-view"; packageName = "vega-view"; - version = "5.9.2"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-view/-/vega-view-5.9.2.tgz"; - sha512 = "XAwKWyVjLClR3aCbTLCWdZj7aZozOULNg7078GxJIgVcBJOENCAidceI/H7JieyUZ96p3AiEHLQdWr167InBpg=="; + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.10.0.tgz"; + sha512 = "HuqTVimMqlgqe64EQkTEnt0+yDkt29/q1szg/m9QwCrSc5QMXI8Mkt58O/F7OD3QyVr7xrKHyPTk9I9gCaZ6sw=="; }; }; "vega-view-transforms-4.5.8" = { @@ -58912,13 +58930,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.2.1" = { + "verda-1.2.2" = { name = "verda"; packageName = "verda"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.2.1.tgz"; - sha512 = "hEkyReHbrar3MikWeZTLWaR3Sr7KAl/M+KczKgGs80LHTPaKC06ussYuWVg9lMeOrwbOZb1o3DRNv91VzoGoYg=="; + url = "https://registry.npmjs.org/verda/-/verda-1.2.2.tgz"; + sha512 = "qWyG2W2wgAw27sV5kVUjceb7GBwUFleVjBmH5XA4L9J8rLpB10N7uaP45ZDYGA7gRuNjo/5futihrBWbKKvJ0Q=="; }; }; "verror-1.1.0" = { @@ -59722,15 +59740,6 @@ let sha1 = "631bdbf716dccab0e65291a8dc25c23232085a52"; }; }; - "vscode-uri-1.0.6" = { - name = "vscode-uri"; - packageName = "vscode-uri"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.6.tgz"; - sha512 = "sLI2L0uGov3wKVb9EB+vIQBl9tVP90nqRvxSoJ35vI3NjxE8jfsE5DSOhWgSunHSZmKS4OCi2jrtfxK7uyp2ww=="; - }; - }; "vscode-uri-1.0.8" = { name = "vscode-uri"; packageName = "vscode-uri"; @@ -59776,31 +59785,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.7" = { - name = "vue"; - packageName = "vue"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.7.tgz"; - sha512 = "8h4TikD+JabbMK9aRlBO4laG0AtNHRPHynxYgWZ9sq1YUPfzynd9Jeeb27XNyZytC7aCQRX9xe1+TQJuc181Tw=="; - }; - }; - "vue-cli-plugin-apollo-0.21.3" = { - name = "vue-cli-plugin-apollo"; - packageName = "vue-cli-plugin-apollo"; - version = "0.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-cli-plugin-apollo/-/vue-cli-plugin-apollo-0.21.3.tgz"; - sha512 = "8CzRVrAsFkB9lpl600cRCNR9OUnrSYYAIVF9/qW4pP0TMXbhrd1F1wEAAN6E0CPimjTLB+qSt6zWS4vb2wC8Wg=="; - }; - }; - "vue-codemod-0.0.4" = { + "vue-codemod-0.0.5" = { name = "vue-codemod"; packageName = "vue-codemod"; - version = "0.0.4"; + version = "0.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.4.tgz"; - sha512 = "mAI9g4CcY3GJOOt/fTOC8Cz9lYtBEuSiDizQHgvcX0HpoKw1bNZBPaNUqFoNxnk6+nGZVgt0/CXYnq80rRK9vg=="; + url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.5.tgz"; + sha512 = "DE+24W1d3oanGqq7yna4ddOKXmVzjECgku2ddMcm7OS9Bp9QOblMHT88PzKiCc7npGiHf5+mTfrEW1JVIBbA2A=="; }; }; "vue-eslint-parser-2.0.3" = { @@ -60253,13 +60244,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.115.3" = { + "webtorrent-0.115.4" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.115.3"; + version = "0.115.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.115.3.tgz"; - sha512 = "DNryTNoAHse+zxArBZg25U8B97KNPeVjGzrjRB+oDnGROuKfQcvLh8/9K79FDfQTYVpInMmr9l0ksIsEjz/L2g=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.115.4.tgz"; + sha512 = "JJ3kZKZjM+3n0R0zyHZJARnqBLDfQHbMVarYieQFnZE4a2Ec/RpDP7c/NYeoKyBChsDOwrpxitk6FOmHdZkqyA=="; }; }; "well-known-symbols-2.0.0" = { @@ -60559,6 +60550,15 @@ let sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; }; }; + "window-size-1.1.1" = { + name = "window-size"; + packageName = "window-size"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-1.1.1.tgz"; + sha512 = "5D/9vujkmVQ7pSmc0SCBmHXbkv6eaHwXEx65MywhmUMsI8sGqJ972APq1lotfcwMKPFLuCFfL8xGHLIp7jaBmA=="; + }; + }; "windows-no-runnable-0.0.6" = { name = "windows-no-runnable"; packageName = "windows-no-runnable"; @@ -61234,6 +61234,15 @@ let sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; }; + "xdl-59.0.27" = { + name = "xdl"; + packageName = "xdl"; + version = "59.0.27"; + src = fetchurl { + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.27.tgz"; + sha512 = "AgC/90d0ZZg1TC7jGbQkD+9eIYc27gvnVgP2DAcesyWL/lSnvSpbtkOnUCQIdtM0d4RJCsTdie0748FO01Vo2g=="; + }; + }; "xenvar-0.5.1" = { name = "xenvar"; packageName = "xenvar"; @@ -61504,6 +61513,15 @@ let sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA=="; }; }; + "xmldom-0.5.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz"; + sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="; + }; + }; "xmlhttprequest-1.8.0" = { name = "xmlhttprequest"; packageName = "xmlhttprequest"; @@ -62258,15 +62276,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.4"; + version = "11.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.4.tgz"; - sha512 = "bbW93N3n/9GDk6OxQ5WzTWQcHXcj389Tg7gCov9MlRZg1ohqU/RtmQrMazzCCQjFUvJjEOT4a/lYbGYOYhMqag=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.5.tgz"; + sha512 = "GIwK8l6wtg/++8aDYW++LSf7v1uqDtB6so2rPjNlOm7oYk5iqM73KaorQb/1A52oxWE3IRSJLNQaSyUlWvHvSA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1102.4" - sources."@angular-devkit/core-11.2.4" - sources."@angular-devkit/schematics-11.2.4" + sources."@angular-devkit/architect-0.1102.5" + sources."@angular-devkit/core-11.2.5" + sources."@angular-devkit/schematics-11.2.5" sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.6" // { dependencies = [ @@ -62282,8 +62300,8 @@ in sources."read-package-json-fast-2.0.2" ]; }) - sources."@schematics/angular-11.2.4" - sources."@schematics/update-0.1102.4" + sources."@schematics/angular-11.2.5" + sources."@schematics/update-0.1102.5" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -62322,7 +62340,7 @@ in sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" sources."clone-1.0.4" sources."code-point-at-1.1.0" @@ -62398,6 +62416,7 @@ in sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -62411,7 +62430,7 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.21" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."magic-string-0.25.7" (sources."make-fetch-happen-8.0.14" // { @@ -62492,7 +62511,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."socks-proxy-agent-5.0.0" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" @@ -62902,10 +62921,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.15.0.tgz"; - sha512 = "Kks8LEiNakxopwV/EnEqRqUdAuWEEt3FvKVv8YRnYIm+v1b5s05wOpXBl64q+crgUm8NVO9ELSBWwy601TitwQ=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.15.1.tgz"; + sha512 = "kD+EkbSqFRtkwV/PXbgaCvrSOqVRTRaFhfT4XNoYbggWhMVwB6ebvdHvHe5I7pRKE8/xgP7WiIM/b0HP81bbHg=="; }; dependencies = [ sources."abab-2.0.5" @@ -63103,7 +63122,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.34" + sources."@types/node-14.14.35" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -63157,13 +63176,13 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" sources."chrome-trace-event-1.0.2" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."cli-table3-0.5.1" sources."cli-width-3.0.0" sources."clone-1.0.4" @@ -63178,7 +63197,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -63243,6 +63262,7 @@ in sources."is-interactive-1.0.0" sources."is-number-7.0.0" sources."is-stream-2.0.0" + sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."jest-worker-26.6.2" @@ -63258,7 +63278,7 @@ in sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.toarray-4.4.0" - (sources."log-symbols-4.0.0" // { + (sources."log-symbols-4.1.0" // { dependencies = [ sources."chalk-4.1.0" ]; @@ -63349,7 +63369,7 @@ in sources."supports-color-7.2.0" sources."symbol-observable-3.0.0" sources."tapable-1.1.3" - (sources."terser-5.6.0" // { + (sources."terser-5.6.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -63416,135 +63436,49 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.11"; + version = "4.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.11.tgz"; - sha512 = "w6B1+Fb0AHwAd8eE1q4/KrJph/kXo/cqQ0Lf5MnXCYt7SXdDPBGTdyFAumMaSPQESXgmdWgEo8EhnVEBNpXDIw=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.12.tgz"; + sha512 = "ZP0bxmM+VpmH8xT/5DbH8UD5nnlXLxJNYLiMcndx0pmuujabUORZdhIO3B9pq1w1Y204p2CJq3srrEUwhKKY5g=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" - (sources."@apollo/federation-0.20.7" // { - dependencies = [ - sources."apollo-server-env-2.4.5" - ]; - }) (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ sources."@types/node-10.17.55" ]; }) sources."@apollographql/apollo-tools-0.4.9" - sources."@apollographql/graphql-language-service-interface-2.0.2" - sources."@apollographql/graphql-language-service-parser-2.0.2" - sources."@apollographql/graphql-language-service-types-2.0.2" - sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.11" - (sources."@babel/core-7.13.10" // { - dependencies = [ - sources."@babel/generator-7.13.9" - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/generator-7.12.11" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-annotate-as-pure-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) + sources."@babel/core-7.13.10" + sources."@babel/generator-7.13.9" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" sources."@babel/helper-compilation-targets-7.13.10" sources."@babel/helper-create-class-features-plugin-7.13.11" sources."@babel/helper-create-regexp-features-plugin-7.12.17" sources."@babel/helper-define-polyfill-provider-0.1.5" - (sources."@babel/helper-explode-assignable-expression-7.13.0" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-function-name-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-get-function-arity-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-hoist-variables-7.13.0" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-member-expression-to-functions-7.13.0" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-module-imports-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-module-transforms-7.13.0" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-optimise-call-expression-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) + sources."@babel/helper-explode-assignable-expression-7.13.0" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-member-expression-to-functions-7.13.0" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.13.0" + sources."@babel/helper-optimise-call-expression-7.12.13" sources."@babel/helper-plugin-utils-7.13.0" - (sources."@babel/helper-remap-async-to-generator-7.13.0" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-replace-supers-7.13.0" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-simple-access-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helper-split-export-declaration-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) + sources."@babel/helper-remap-async-to-generator-7.13.0" + sources."@babel/helper-replace-supers-7.13.0" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - (sources."@babel/helper-wrap-function-7.13.0" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/helpers-7.13.10" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) + sources."@babel/helper-wrap-function-7.13.0" + sources."@babel/helpers-7.13.10" sources."@babel/highlight-7.13.10" sources."@babel/parser-7.13.11" sources."@babel/plugin-proposal-async-generator-functions-7.13.8" @@ -63608,11 +63542,7 @@ in sources."@babel/plugin-transform-typescript-7.13.0" sources."@babel/plugin-transform-unicode-escapes-7.12.13" sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.13.10" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) + sources."@babel/preset-env-7.13.10" sources."@babel/preset-flow-7.12.13" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.13.0" @@ -63624,135 +63554,22 @@ in ]; }) sources."@babel/runtime-7.13.10" - (sources."@babel/template-7.12.13" // { - dependencies = [ - sources."@babel/types-7.13.0" - ]; - }) - (sources."@babel/traverse-7.13.0" // { - dependencies = [ - sources."@babel/generator-7.13.9" - sources."@babel/types-7.13.0" - ]; - }) - sources."@babel/types-7.10.4" - sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.13.0" + sources."@babel/types-7.13.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" + (sources."@nodelib/fs.scandir-2.1.4" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.4" + ]; + }) + sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.6" - (sources."@oclif/color-0.1.2" // { - dependencies = [ - (sources."chalk-3.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."supports-color-7.2.0" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."strip-ansi-5.2.0" - ]; - }) - (sources."@oclif/command-1.8.0" // { - dependencies = [ - sources."@oclif/plugin-help-3.2.2" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."lru-cache-6.0.0" - sources."semver-7.3.4" - sources."supports-color-7.2.0" - ]; - }) - (sources."@oclif/config-1.17.0" // { - dependencies = [ - sources."globby-11.0.2" - sources."is-wsl-2.2.0" - sources."tslib-2.1.0" - ]; - }) - (sources."@oclif/errors-1.3.4" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."clean-stack-3.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."escape-string-regexp-4.0.0" - sources."fs-extra-8.1.0" - sources."wrap-ansi-7.0.0" - ]; - }) - sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.5" - (sources."@oclif/plugin-autocomplete-0.3.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."fs-extra-9.1.0" - sources."has-flag-4.0.0" - sources."jsonfile-6.1.0" - sources."supports-color-7.2.0" - sources."universalify-2.0.0" - ]; - }) - (sources."@oclif/plugin-help-2.2.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - (sources."widest-line-2.0.1" // { - dependencies = [ - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - ]; - }) - (sources."@oclif/plugin-not-found-1.2.4" // { - dependencies = [ - sources."cli-ux-4.9.3" - sources."indent-string-3.2.0" - sources."semver-5.7.1" - sources."strip-ansi-5.2.0" - ]; - }) - (sources."@oclif/plugin-plugins-1.9.5" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."fs-extra-9.1.0" - sources."has-flag-4.0.0" - sources."jsonfile-6.1.0" - sources."lru-cache-6.0.0" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."semver-7.3.4" - sources."supports-color-7.2.0" - sources."tslib-2.1.0" - sources."universalify-2.0.0" - ]; - }) - (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."@oclif/screen-1.0.4" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -63763,7 +63580,6 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@samverschueren/stream-to-observable-0.3.1" sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" sources."@types/body-parser-1.19.0" @@ -63772,7 +63588,7 @@ in sources."@types/cookies-0.7.6" sources."@types/cors-2.8.8" sources."@types/ejs-2.7.0" - sources."@types/express-4.17.7" + sources."@types/express-4.17.11" sources."@types/express-serve-static-core-4.17.18" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" @@ -63792,7 +63608,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.1" @@ -63804,117 +63620,50 @@ in sources."@types/serve-static-1.13.9" sources."@types/through-0.0.30" sources."@types/ws-7.4.0" - sources."@types/zen-observable-0.8.2" - sources."@vue/cli-shared-utils-4.5.11" - (sources."@vue/cli-ui-4.5.11" // { + sources."@vue/cli-shared-utils-4.5.12" + (sources."@vue/cli-ui-4.5.12" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.11" - sources."@vue/cli-ui-addon-widgets-4.5.11" + sources."@vue/cli-ui-addon-webpack-4.5.12" + sources."@vue/cli-ui-addon-widgets-4.5.12" (sources."@vue/compiler-core-3.0.7" // { dependencies = [ - sources."@babel/types-7.13.0" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.7" - (sources."@vue/compiler-sfc-3.0.7" // { - dependencies = [ - sources."@babel/types-7.13.0" - sources."source-map-0.6.1" - ]; - }) - sources."@vue/compiler-ssr-3.0.7" - sources."@vue/reactivity-3.0.7" - sources."@vue/runtime-core-3.0.7" - sources."@vue/runtime-dom-3.0.7" sources."@vue/shared-3.0.7" - sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" - sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" - (sources."ansi-align-2.0.0" // { + (sources."ansi-align-3.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" - sources."any-observable-0.3.0" - (sources."anymatch-2.0.0" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."extend-shallow-3.0.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-extendable-1.0.1" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."normalize-path-2.1.1" - sources."to-regex-range-2.1.1" - ]; - }) - (sources."apollo-2.32.5" // { - dependencies = [ - sources."graphql-tag-2.11.0" - sources."mkdirp-1.0.4" + sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - sources."apollo-cache-1.3.5" - sources."apollo-cache-control-0.11.6" - sources."apollo-cache-inmemory-1.6.6" - sources."apollo-client-2.6.10" - (sources."apollo-codegen-core-0.39.3" // { + (sources."ansi-escapes-4.3.1" // { dependencies = [ - sources."recast-0.20.4" - sources."source-map-0.6.1" - sources."tslib-2.1.0" + sources."type-fest-0.11.0" ]; }) - sources."apollo-codegen-flow-0.37.3" - sources."apollo-codegen-scala-0.38.3" - sources."apollo-codegen-swift-0.39.3" - sources."apollo-codegen-typescript-0.39.3" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."apollo-cache-control-0.11.6" sources."apollo-datasource-0.7.3" sources."apollo-env-0.6.6" sources."apollo-graphql-0.6.1" - sources."apollo-language-server-1.25.2" sources."apollo-link-1.2.14" - sources."apollo-link-context-1.0.20" - sources."apollo-link-error-1.1.13" - sources."apollo-link-http-1.5.17" - sources."apollo-link-http-common-0.2.16" - sources."apollo-link-persisted-queries-0.2.2" - sources."apollo-link-state-0.4.2" - sources."apollo-link-ws-1.0.20" sources."apollo-reporting-protobuf-0.6.2" (sources."apollo-server-caching-0.5.3" // { dependencies = [ sources."lru-cache-6.0.0" ]; }) - (sources."apollo-server-core-2.21.1" // { + (sources."apollo-server-core-2.21.2" // { dependencies = [ sources."lru-cache-6.0.0" sources."uuid-8.3.2" @@ -63922,48 +63671,34 @@ in }) sources."apollo-server-env-3.0.0" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.21.1" + sources."apollo-server-express-2.21.2" sources."apollo-server-plugin-base-0.10.4" sources."apollo-server-types-0.6.3" sources."apollo-tracing-0.12.2" - sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" ]; }) - sources."arg-4.1.3" - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.3" - ]; - }) + sources."argparse-1.0.10" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-flatten-1.1.1" - sources."array-union-2.1.0" + sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-2.0.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - (sources."ast-types-0.14.2" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) - sources."astral-regex-1.0.0" + sources."ast-types-0.13.3" sources."async-2.6.3" - sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."async-retry-1.3.1" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" - sources."await-to-js-2.1.1" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."babel-core-7.0.0-bridge.0" @@ -63980,11 +63715,7 @@ in }) sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."big.js-5.2.2" - sources."binary-extensions-1.13.1" - sources."bindings-1.5.0" sources."bl-1.2.3" - sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -63994,31 +63725,19 @@ in sources."setprototypeof-1.1.1" ]; }) - sources."boolean-3.0.2" (sources."boxen-4.2.0" // { dependencies = [ - (sources."ansi-align-3.0.0" // { - dependencies = [ - sources."string-width-3.1.0" - ]; - }) sources."ansi-styles-4.3.0" - sources."camelcase-5.3.1" sources."chalk-3.0.0" - sources."cli-boxes-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-7.0.3" sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."strip-ansi-5.2.0" sources."supports-color-7.2.0" - sources."term-size-2.2.1" sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" - sources."braces-3.0.2" + sources."braces-2.3.2" sources."browserslist-4.16.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -64028,63 +63747,22 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."busboy-0.3.1" - sources."byline-5.0.0" sources."bytes-3.1.0" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ sources."get-stream-3.0.0" sources."lowercase-keys-1.0.0" - sources."normalize-url-2.0.1" - sources."prepend-http-2.0.0" - sources."query-string-5.1.1" - sources."sort-keys-2.0.0" - sources."strict-uri-encode-1.1.0" ]; }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" - sources."caller-callsite-2.0.0" - sources."caller-path-2.0.0" - sources."callsites-2.0.0" - (sources."camel-case-4.1.2" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) - sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001200" - (sources."capital-case-1.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) - sources."capture-stack-trace-1.0.1" - sources."cardinal-2.1.1" + sources."camelcase-5.3.1" + sources."caniuse-lite-1.0.30001203" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" - (sources."change-case-4.1.2" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."chardet-0.7.0" - (sources."chokidar-2.1.8" // { - dependencies = [ - sources."braces-2.3.2" - sources."fill-range-4.0.0" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."to-regex-range-2.1.1" - ]; - }) - sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -64103,53 +63781,15 @@ in ]; }) sources."clean-stack-2.2.0" - sources."cli-boxes-1.0.0" + sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" - sources."cli-progress-3.9.0" - sources."cli-spinners-2.5.0" - (sources."cli-truncate-0.2.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - (sources."cli-ux-5.5.1" // { - dependencies = [ - sources."ansi-escapes-4.3.1" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."clean-stack-3.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."escape-string-regexp-4.0.0" - sources."extract-stack-2.0.0" - sources."fs-extra-8.1.0" - sources."has-flag-4.0.0" - sources."is-wsl-2.2.0" - sources."lru-cache-6.0.0" - sources."semver-7.3.4" - sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.1.0" - sources."tslib-2.1.0" - sources."type-fest-0.11.0" - ]; - }) + sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" sources."clipboard-2.0.8" - (sources."cliui-6.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."wrap-ansi-6.2.0" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."cmd-shim-3.0.3" - sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -64157,18 +63797,10 @@ in sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" - sources."common-tags-1.8.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."configstore-3.1.5" - sources."consolidate-0.16.0" - (sources."constant-case-3.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -64191,30 +63823,19 @@ in }) sources."core-util-is-1.0.2" sources."cors-2.8.5" - (sources."cosmiconfig-5.2.1" // { - dependencies = [ - sources."parse-json-4.0.0" - ]; - }) - sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."crypto-random-string-1.0.0" - sources."cssesc-3.0.0" sources."cssfilter-0.0.10" - sources."csstype-2.6.16" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" - sources."date-fns-1.30.1" (sources."debug-4.3.2" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { dependencies = [ @@ -64244,7 +63865,6 @@ in sources."pify-2.3.0" ]; }) - sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."define-properties-1.1.3" @@ -64254,24 +63874,11 @@ in sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" - sources."detect-node-2.0.4" sources."dicer-0.3.0" - sources."diff-4.0.2" - sources."dir-glob-3.0.1" - (sources."dot-case-3.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) - sources."dot-prop-4.2.1" - sources."dotenv-8.2.0" + sources."dir-glob-2.2.2" (sources."download-7.1.0" // { dependencies = [ sources."get-stream-3.0.0" - sources."got-8.3.2" - sources."into-stream-3.1.0" - sources."prepend-http-2.0.0" - sources."url-parse-lax-3.0.0" ]; }) sources."download-git-repo-3.0.2" @@ -64280,37 +63887,18 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.687" - sources."elegant-spinner-1.0.1" - sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" + sources."electron-to-chromium-1.3.693" + sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - (sources."env-ci-5.0.2" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-4.1.0" - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."npm-run-path-4.0.1" - sources."onetime-5.1.2" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."es-abstract-1.18.0" sources."es-to-primitive-1.2.1" - sources."es6-error-4.1.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."esm-3.2.25" sources."esprima-4.0.1" sources."estree-walker-2.0.2" sources."esutils-2.0.3" @@ -64357,22 +63945,17 @@ in sources."define-property-1.0.0" ]; }) - sources."extract-files-5.0.1" - sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" sources."fastq-1.11.0" sources."fd-slicer-1.1.0" - sources."figures-1.7.0" + sources."figures-3.2.0" sources."file-type-8.1.0" - sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" - sources."fill-range-7.0.1" - sources."filter-obj-1.1.0" + sources."fill-range-4.0.0" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -64387,7 +63970,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.146.0" + sources."flow-parser-0.147.0" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -64401,13 +63984,10 @@ in sources."fs-exists-sync-0.1.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-1.2.13" sources."fswin-2.17.1227" sources."function-bind-1.1.1" - sources."gaze-1.1.3" sources."generate-function-1.1.0" sources."generate-object-property-1.2.0" - sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -64417,92 +63997,43 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - (sources."git-parse-1.0.4" // { + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { dependencies = [ - sources."util.promisify-1.0.1" + sources."is-glob-3.1.0" ]; }) - (sources."git-rev-sync-2.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.15" - ]; - }) - sources."git-up-4.0.2" - sources."git-url-parse-11.4.3" - sources."glob-7.1.5" - sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" - (sources."global-agent-2.1.12" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.3.4" - ]; - }) sources."global-dirs-0.1.1" sources."globals-11.12.0" - sources."globalthis-1.0.2" (sources."globby-9.2.0" // { dependencies = [ - sources."@nodelib/fs.stat-1.1.3" - sources."array-union-1.0.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."dir-glob-2.2.2" - sources."extend-shallow-3.0.2" - sources."fast-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."glob-parent-3.1.0" - sources."ignore-4.0.6" - sources."is-extendable-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) sources."pify-4.0.1" sources."slash-2.0.0" - sources."to-regex-range-2.1.1" ]; }) - sources."globule-1.3.2" sources."good-listener-1.2.2" - (sources."got-6.7.1" // { + (sources."got-8.3.2" // { dependencies = [ sources."get-stream-3.0.0" + sources."into-stream-3.1.0" ]; }) sources."graceful-fs-4.2.6" sources."graphql-14.7.0" - (sources."graphql-anywhere-4.2.7" // { - dependencies = [ - sources."ts-invariant-0.3.3" - ]; - }) sources."graphql-extensions-0.12.8" sources."graphql-subscriptions-1.2.1" - sources."graphql-tag-2.12.1" + (sources."graphql-tag-2.12.3" // { + dependencies = [ + sources."tslib-2.1.0" + ]; + }) sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.2" sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" @@ -64511,106 +64042,70 @@ in sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."kind-of-4.0.0" ]; }) - sources."hash-sum-2.0.0" - sources."hash.js-1.1.7" - (sources."header-case-2.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.8" sources."http-cache-semantics-3.8.1" - (sources."http-call-5.3.0" // { - dependencies = [ - sources."is-stream-2.0.0" - sources."parse-json-4.0.0" - ]; - }) sources."http-errors-1.8.0" sources."http-signature-1.2.0" sources."human-signals-1.1.1" - sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" - sources."icss-replace-symbols-1.1.0" - sources."icss-utils-5.1.0" sources."ieee754-1.2.1" - sources."ignore-5.1.8" - sources."ignore-by-default-1.0.1" - sources."import-fresh-2.0.0" + sources."ignore-4.0.6" sources."import-global-0.1.0" - sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexes-of-1.0.1" - sources."inflected-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-escapes-4.3.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."figures-3.2.0" sources."has-flag-4.0.0" sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" sources."supports-color-7.2.0" - sources."type-fest-0.11.0" ]; }) - sources."interpret-1.4.0" sources."into-stream-2.0.1" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.1" - sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-ci-1.2.1" sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" - sources."is-directory-0.3.1" sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" sources."is-negative-zero-2.0.1" - sources."is-npm-1.0.0" - sources."is-number-7.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."is-number-object-1.0.4" - sources."is-obj-1.0.1" sources."is-object-1.0.2" - sources."is-observable-1.1.0" - sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-property-1.0.2" - sources."is-redirect-1.0.0" sources."is-regex-1.1.2" sources."is-retry-allowed-1.2.0" - sources."is-ssh-1.3.2" sources."is-stream-1.1.0" sources."is-string-1.0.5" sources."is-symbol-1.0.3" @@ -64624,36 +64119,22 @@ in sources."isstream-0.1.2" sources."isurl-1.0.0" sources."iterall-1.3.0" - sources."java-properties-1.0.2" sources."javascript-stringify-1.6.0" sources."js-message-1.0.7" sources."js-queue-2.0.2" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - (sources."jscodeshift-0.10.0" // { + (sources."jscodeshift-0.11.0" // { dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."extend-shallow-3.0.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-extendable-1.0.1" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" + sources."ast-types-0.14.2" + sources."recast-0.20.4" + sources."source-map-0.6.1" + sources."tslib-2.1.0" ]; }) sources."jsesc-2.5.2" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" @@ -64663,106 +64144,45 @@ in sources."jsprim-1.4.1" sources."keyv-3.0.0" sources."kind-of-6.0.3" - sources."latest-version-3.1.0" sources."launch-editor-2.2.1" sources."leven-3.1.0" sources."lines-and-columns-1.1.6" - sources."listr-0.14.3" - sources."listr-silent-renderer-1.1.1" - (sources."listr-update-renderer-0.5.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."indent-string-3.2.0" - sources."log-symbols-1.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - (sources."listr-verbose-renderer-0.5.0" // { - dependencies = [ - sources."figures-2.0.0" - ]; - }) - (sources."load-json-file-5.3.0" // { - dependencies = [ - sources."parse-json-4.0.0" - sources."pify-4.0.1" - sources."type-fest-0.3.1" - ]; - }) - (sources."loader-utils-1.4.0" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."lodash._reinterpolate-3.0.0" - sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" - sources."lodash.get-4.4.2" - sources."lodash.identity-3.0.0" sources."lodash.merge-4.6.2" - sources."lodash.pickby-4.6.0" sources."lodash.sortby-4.7.0" - sources."lodash.template-4.5.0" - sources."lodash.templatesettings-4.2.0" - sources."lodash.xorby-4.7.0" sources."log-symbols-2.2.0" - (sources."log-update-2.3.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) sources."loglevel-1.7.1" sources."long-4.0.0" sources."lowdb-1.0.0" - (sources."lower-case-2.0.2" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."lowercase-keys-1.0.1" (sources."lru-cache-5.1.1" // { dependencies = [ sources."yallist-3.1.1" ]; }) - sources."magic-string-0.25.7" sources."make-dir-1.3.0" - sources."make-error-1.3.6" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - (sources."matcher-3.0.0" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) sources."media-typer-0.3.0" sources."merge-1.2.1" sources."merge-descriptors-1.0.1" - (sources."merge-source-map-1.1.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.2" + (sources."micromatch-3.1.10" // { + dependencies = [ + sources."extend-shallow-3.0.2" + sources."is-extendable-1.0.1" + ]; + }) sources."mime-1.6.0" sources."mime-db-1.46.0" sources."mime-types-2.1.29" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -64771,10 +64191,8 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.29.1" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -64782,7 +64200,6 @@ in sources."is-extendable-1.0.1" ]; }) - sources."natural-orderby-2.0.3" sources."ndjson-1.5.0" (sources."neat-csv-2.1.0" // { dependencies = [ @@ -64792,11 +64209,6 @@ in sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - (sources."no-case-3.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."node-dir-0.1.17" sources."node-fetch-2.6.1" sources."node-ipc-9.1.4" @@ -64811,24 +64223,18 @@ in ]; }) sources."node-releases-1.1.71" - (sources."nodemon-1.19.4" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - sources."semver-5.7.1" - ]; - }) - sources."nopt-1.0.10" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."normalize-path-3.0.0" - sources."normalize-url-3.3.0" + (sources."normalize-url-2.0.1" // { + dependencies = [ + sources."sort-keys-2.0.0" + ]; + }) sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -64847,7 +64253,6 @@ in sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" - sources."object-treeify-1.1.33" sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" @@ -64856,7 +64261,6 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."open-6.4.0" - sources."optimism-0.10.3" (sources."ora-3.4.0" // { dependencies = [ sources."strip-ansi-5.2.0" @@ -64869,49 +64273,20 @@ in sources."p-is-promise-1.1.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-map-2.1.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - (sources."package-json-4.0.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - (sources."param-case-3.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."parse-git-config-2.0.3" sources."parse-json-5.2.0" sources."parse-passwd-1.0.0" - (sources."parse-path-4.0.3" // { - dependencies = [ - sources."qs-6.9.6" - ]; - }) - sources."parse-url-5.0.2" sources."parseurl-1.3.3" - (sources."pascal-case-3.1.2" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."pascalcase-0.1.1" - sources."password-prompt-1.1.2" - (sources."path-case-3.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" + sources."path-type-3.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" @@ -64936,35 +64311,20 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-8.2.8" // { - dependencies = [ - sources."nanoid-3.1.21" - sources."source-map-0.6.1" - ]; - }) - sources."postcss-modules-4.0.0" - sources."postcss-modules-extract-imports-3.0.0" - sources."postcss-modules-local-by-default-4.0.0" - sources."postcss-modules-scope-3.0.0" - sources."postcss-modules-values-4.0.0" - sources."postcss-selector-parser-6.0.4" - sources."postcss-value-parser-4.1.0" - sources."prepend-http-1.0.4" + sources."prepend-http-2.0.0" sources."prismjs-1.23.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."protocols-1.4.8" sources."proxy-addr-2.0.6" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" sources."psl-1.8.0" - sources."pstree.remy-1.1.8" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."query-string-6.14.1" + sources."query-string-5.1.1" sources."queue-microtask-1.2.2" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { @@ -64974,41 +64334,17 @@ in sources."setprototypeof-1.1.1" ]; }) - sources."rc-1.2.8" sources."read-pkg-5.2.0" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - (sources."readdirp-2.2.1" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."extend-shallow-3.0.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-extendable-1.0.1" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) (sources."recast-0.18.10" // { dependencies = [ - sources."ast-types-0.13.3" sources."source-map-0.6.1" ]; }) - sources."rechoir-0.6.2" - sources."redeyed-2.1.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" @@ -65020,22 +64356,17 @@ in ]; }) sources."regexpu-core-4.7.1" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.7" // { dependencies = [ sources."jsesc-0.5.0" ]; }) - sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."resolve-1.20.0" - sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -65043,7 +64374,6 @@ in sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."roarr-2.15.4" sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" @@ -65056,12 +64386,6 @@ in sources."seek-bzip-1.0.6" sources."select-1.1.2" sources."semver-6.3.0" - sources."semver-compare-1.0.0" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -65074,35 +64398,17 @@ in sources."setprototypeof-1.1.1" ]; }) - (sources."sentence-case-3.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) - (sources."serialize-error-7.0.1" // { - dependencies = [ - sources."type-fest-0.13.1" - ]; - }) sources."serve-static-1.14.1" - sources."set-blocking-2.0.0" sources."set-value-2.0.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."shelljs-0.8.4" sources."shellwords-0.1.1" sources."shortid-2.2.16" sources."signal-exit-3.0.3" sources."slash-3.0.0" - sources."slice-ansi-0.0.4" - (sources."snake-case-3.0.4" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -65141,12 +64447,10 @@ in ]; }) sources."source-map-url-0.4.1" - sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" - sources."split-on-first-1.1.0" (sources."split-string-3.1.0" // { dependencies = [ sources."extend-shallow-3.0.2" @@ -65154,7 +64458,7 @@ in ]; }) sources."split2-2.2.0" - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -65176,9 +64480,13 @@ in sources."statuses-1.5.0" sources."steno-0.4.4" sources."streamsearch-0.1.2" - sources."strict-uri-encode-2.0.0" - sources."string-hash-1.1.3" - sources."string-width-4.2.2" + sources."strict-uri-encode-1.1.0" + (sources."string-width-4.2.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + ]; + }) sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.1.1" // { @@ -65191,11 +64499,9 @@ in sources."ansi-regex-5.0.0" ]; }) - sources."strip-bom-3.0.0" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" - sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" (sources."subscriptions-transport-ws-0.9.18" // { dependencies = [ @@ -65203,21 +64509,7 @@ in ]; }) sources."supports-color-5.5.0" - (sources."supports-hyperlinks-1.0.1" // { - dependencies = [ - sources."has-flag-2.0.0" - ]; - }) sources."symbol-observable-1.2.0" - (sources."table-5.4.6" // { - dependencies = [ - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."slice-ansi-2.1.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) sources."tar-stream-1.6.2" (sources."taskkill-3.1.0" // { dependencies = [ @@ -65245,15 +64537,7 @@ in sources."rimraf-2.6.3" ]; }) - (sources."term-size-1.2.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.7.0" - sources."get-stream-3.0.0" - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) + sources."term-size-2.2.1" sources."through-2.3.8" sources."through2-2.0.5" sources."timed-out-4.0.1" @@ -65272,35 +64556,24 @@ in sources."is-extendable-1.0.1" ]; }) - sources."to-regex-range-5.0.1" + sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" - sources."touch-3.1.0" sources."tough-cookie-2.5.0" - sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.10.2" sources."tslib-1.14.1" - sources."tty-1.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.6.0" sources."type-is-1.6.18" - sources."typescript-3.9.9" + sources."typescript-4.1.5" sources."unbox-primitive-1.0.0" sources."unbzip2-stream-1.4.3" - (sources."undefsafe-2.0.3" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) sources."unicode-canonical-property-names-ecmascript-1.0.4" sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" - sources."uniq-1.0.1" - sources."unique-string-1.0.0" sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { @@ -65313,31 +64586,9 @@ in sources."has-values-0.1.4" ]; }) - sources."unzip-response-2.0.1" - sources."upath-1.2.0" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."boxen-1.3.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."widest-line-2.0.1" - ]; - }) - (sources."upper-case-2.0.2" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) - (sources."upper-case-first-2.0.2" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) sources."uri-js-4.4.1" sources."urix-0.1.0" - sources."url-parse-lax-1.0.0" + sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" @@ -65348,80 +64599,55 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-5.2.1" - sources."vscode-languageserver-protocol-3.14.1" - sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.6" sources."vue-2.6.12" - (sources."vue-cli-plugin-apollo-0.21.3" // { + (sources."vue-codemod-0.0.5" // { dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-3.4.0" - sources."fs-extra-8.1.0" - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."npm-run-path-4.0.1" - sources."onetime-5.1.2" - sources."p-finally-2.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - (sources."vue-codemod-0.0.4" // { - dependencies = [ - sources."globby-10.0.2" - sources."vue-3.0.7" + sources."@nodelib/fs.stat-2.0.4" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.5" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.2" + sources."globby-11.0.2" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."lru-cache-6.0.0" + sources."micromatch-4.0.2" + sources."path-type-4.0.0" + sources."source-map-0.6.1" + sources."to-regex-range-5.0.1" ]; }) sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" - sources."which-module-2.0.0" sources."widest-line-3.1.0" - (sources."wrap-ansi-4.0.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."ws-6.2.1" - sources."xdg-basedir-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.8" sources."xtend-4.0.2" - sources."y18n-4.0.1" + sources."y18n-5.0.5" sources."yallist-4.0.0" (sources."yaml-front-matter-3.4.1" // { dependencies = [ sources."commander-1.0.0" ]; }) - (sources."yargs-15.4.1" // { - dependencies = [ - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - ]; - }) - (sources."yargs-parser-18.1.3" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) - sources."yarn-1.22.10" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.7" sources."yauzl-2.10.0" - sources."yn-3.1.1" sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.21" ]; @@ -65677,7 +64903,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."browserslist-4.16.3" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -65688,7 +64914,7 @@ in sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -65782,7 +65008,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -65807,6 +65033,624 @@ in bypassCache = true; reconstructLock = true; }; + balanceofsatoshis = nodeEnv.buildNodePackage { + name = "balanceofsatoshis"; + packageName = "balanceofsatoshis"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.2.tgz"; + sha512 = "nDCutvBxOka9sBOXakzi8mt/5fHZ7UVCTpcsxJ3Z6XxuXGVY+bhfB08/LvqcoADTPZNx22a2nkMPy6MHssFAKw=="; + }; + dependencies = [ + sources."@alexbosworth/html2unicode-1.1.5" + (sources."@alexbosworth/request-2.88.3" // { + dependencies = [ + sources."safe-buffer-5.2.0" + ]; + }) + sources."@alexbosworth/saxophone-0.6.2" + sources."@cto.af/textdecoder-0.0.0" + (sources."@grpc/grpc-js-1.2.10" // { + dependencies = [ + sources."@types/node-14.14.35" + ]; + }) + sources."@grpc/proto-loader-0.5.6" + sources."@handsontable/formulajs-2.0.2" + sources."@mitmaro/errors-1.0.0" + sources."@mitmaro/http-authorization-header-1.0.0" + sources."@protobufjs/aspromise-1.1.2" + sources."@protobufjs/base64-1.1.2" + sources."@protobufjs/codegen-2.0.4" + sources."@protobufjs/eventemitter-1.1.0" + sources."@protobufjs/fetch-1.1.0" + sources."@protobufjs/float-1.0.2" + sources."@protobufjs/inquire-1.1.0" + sources."@protobufjs/path-1.1.2" + sources."@protobufjs/pool-1.1.0" + sources."@protobufjs/utf8-1.1.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/body-parser-1.19.0" + sources."@types/caseless-0.12.2" + sources."@types/connect-3.4.34" + sources."@types/express-4.17.11" + sources."@types/express-serve-static-core-4.17.19" + sources."@types/long-4.0.1" + sources."@types/mime-1.3.2" + sources."@types/node-10.12.18" + sources."@types/qs-6.9.6" + sources."@types/range-parser-1.2.3" + (sources."@types/request-2.48.5" // { + dependencies = [ + sources."form-data-2.5.1" + ]; + }) + sources."@types/serve-static-1.13.9" + sources."@types/tough-cookie-4.0.0" + sources."@types/ws-7.4.0" + sources."abort-controller-3.0.0" + sources."accepts-1.3.7" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."ajv-6.12.6" + sources."ansi-0.3.1" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."ansi-escapes-1.4.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-2.2.1" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."array-flatten-1.1.1" + sources."arrify-2.0.1" + sources."asciichart-1.5.25" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."astral-regex-2.0.0" + sources."async-3.2.0" + sources."asyncjs-util-1.2.3" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.9.1" + sources."base-x-3.0.8" + sources."base64-js-1.5.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."bcrypt-pbkdf-1.0.2" + sources."bech32-1.1.4" + sources."bessel-1.0.2" + sources."bignumber.js-9.0.1" + sources."bindings-1.5.0" + sources."bip174-2.0.1" + sources."bip32-2.0.6" + sources."bip65-1.0.3" + sources."bip66-1.1.5" + sources."bip68-1.0.4" + sources."bitcoin-ops-1.4.1" + sources."bitcoinjs-lib-5.2.0" + sources."bluebird-3.7.2" + sources."bn.js-4.12.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."qs-6.7.0" + ]; + }) + sources."bolt03-1.2.7" + (sources."bolt07-1.7.1" // { + dependencies = [ + sources."bn.js-5.2.0" + ]; + }) + sources."bolt09-0.1.3" + (sources."boxen-5.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."type-fest-0.20.2" + ]; + }) + sources."brorand-1.1.0" + sources."bs58-4.0.1" + sources."bs58check-2.1.2" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."bytes-3.1.0" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."camelcase-6.2.0" + sources."caporal-1.4.0" + sources."caseless-0.12.0" + sources."cbor-7.0.3" + sources."cert-info-1.5.1" + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."chardet-0.7.0" + sources."ci-info-2.0.0" + sources."cipher-base-1.0.4" + sources."cli-boxes-2.2.1" + sources."cli-cursor-1.0.2" + sources."cli-table3-0.5.1" + sources."cli-width-2.2.1" + sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colorette-1.2.2" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + sources."commander-6.2.1" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."configstore-5.0.1" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypto-js-4.0.0" + sources."crypto-random-string-2.0.0" + sources."csv-parse-4.15.3" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."debug-2.6.9" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."defer-to-connect-1.1.3" + sources."define-property-1.0.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dot-prop-5.3.0" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."elliptic-6.5.4" + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."event-target-shim-5.0.1" + sources."exit-hook-1.1.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."qs-6.7.0" + sources."safe-buffer-5.1.2" + ]; + }) + sources."extend-3.0.2" + sources."external-editor-1.1.1" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fast-text-encoding-1.0.3" + sources."figures-1.7.0" + sources."file-uri-to-path-1.0.0" + sources."finalhandler-1.1.2" + sources."forever-agent-0.6.1" + sources."form-data-3.0.0" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."gauge-1.2.7" + sources."gaxios-4.2.0" + sources."gcp-metadata-4.2.1" + sources."get-stream-4.1.0" + sources."getpass-0.1.7" + sources."global-dirs-3.0.0" + (sources."goldengate-10.0.2" // { + dependencies = [ + sources."bn.js-5.2.0" + ]; + }) + sources."google-auth-library-6.1.6" + sources."google-p12-pem-3.0.3" + sources."got-9.6.0" + sources."graceful-fs-4.2.6" + sources."gtoken-5.2.1" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" + sources."has-yarn-2.1.0" + sources."hash-base-3.1.0" + sources."hash.js-1.1.7" + sources."hmac-drbg-1.0.1" + sources."hot-formula-parser-4.0.0" + sources."http-cache-semantics-4.1.0" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-signature-1.3.1" + (sources."https-proxy-agent-5.0.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."iconv-lite-0.4.24" + sources."import-lazy-4.0.0" + sources."imurmurhash-0.1.4" + sources."inherits-2.0.4" + sources."ini-2.0.0" + (sources."inquirer-8.0.0" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."cli-cursor-3.1.0" + sources."cli-width-3.0.0" + sources."external-editor-3.1.0" + sources."figures-3.2.0" + sources."is-fullwidth-code-point-3.0.0" + sources."mute-stream-0.0.8" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" + sources."tmp-0.0.33" + ]; + }) + (sources."invoices-1.1.6" // { + dependencies = [ + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + ]; + }) + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-ci-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-fullwidth-code-point-2.0.0" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.3" + sources."is-stream-2.0.0" + sources."is-typedarray-1.0.0" + sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" + sources."isnumber-1.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-bigint-1.0.0" + sources."json-buffer-3.0.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."json2csv-5.0.6" + sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" + sources."jstat-1.9.4" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."latest-version-5.1.0" + (sources."lightning-3.2.20" // { + dependencies = [ + sources."@types/node-14.14.32" + sources."bn.js-5.2.0" + ]; + }) + sources."ln-accounting-4.2.6" + sources."ln-service-51.3.1" + sources."ln-sync-0.4.4" + sources."ln-telegram-3.2.1" + sources."lodash-4.17.21" + sources."lodash.camelcase-4.3.0" + sources."lodash.difference-4.5.0" + sources."lodash.get-4.4.2" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."lodash.uniq-4.5.0" + sources."long-4.0.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + (sources."macaroon-3.0.4" // { + dependencies = [ + sources."tweetnacl-1.0.3" + ]; + }) + sources."make-dir-3.1.0" + sources."md5.js-1.3.5" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."merkle-lib-2.0.10" + sources."methods-1.1.2" + sources."micromist-1.1.0" + sources."mime-1.6.0" + sources."mime-db-1.43.0" + sources."mime-types-2.1.26" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."module-alias-2.2.2" + sources."moment-2.29.1" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."ms-2.0.0" + sources."mute-stream-0.0.6" + sources."nan-2.14.2" + sources."negotiator-0.6.2" + sources."node-addon-api-2.0.2" + sources."node-fetch-2.6.1" + sources."node-forge-0.10.0" + sources."node-gyp-build-4.2.3" + sources."nofilter-2.0.3" + sources."normalize-url-4.5.0" + sources."npmlog-2.0.4" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-1.1.0" + sources."os-shim-0.1.3" + sources."os-tmpdir-1.0.2" + sources."p-cancelable-1.1.0" + sources."p-timeout-4.1.0" + sources."package-json-6.5.0" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."prepend-http-2.0.0" + sources."prettyjson-1.2.1" + sources."probing-1.3.4" + sources."process-nextick-args-2.0.1" + (sources."protobufjs-6.10.2" // { + dependencies = [ + sources."@types/node-13.13.47" + ]; + }) + sources."proxy-addr-2.0.6" + (sources."psbt-1.1.8" // { + dependencies = [ + sources."bn.js-5.2.0" + ]; + }) + sources."psl-1.8.0" + sources."pump-3.0.0" + sources."punycode-2.1.1" + sources."pupa-2.1.1" + sources."pushdata-bitcoin-1.0.1" + sources."qrcode-terminal-0.12.0" + sources."qs-6.9.1" + sources."randombytes-2.1.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."readable-stream-3.6.0" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + sources."require-from-string-2.0.2" + sources."responselike-1.0.2" + sources."restore-cursor-1.0.1" + sources."ripemd160-2.0.2" + sources."run-async-2.4.1" + sources."rx-4.1.0" + sources."rxjs-6.6.6" + sources."safe-buffer-5.2.1" + sources."safe-compare-1.1.4" + sources."safer-buffer-2.1.2" + sources."sandwich-stream-2.0.2" + sources."sanitize-filename-1.6.3" + sources."secp256k1-4.0.2" + sources."semver-6.3.0" + sources."semver-diff-3.1.1" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."signal-exit-3.0.3" + sources."sjcl-1.0.8" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."is-fullwidth-code-point-3.0.0" + ]; + }) + sources."spawn-sync-1.0.15" + sources."sshpk-1.16.1" + sources."stack-trace-0.0.10" + sources."stats-lite-2.2.0" + sources."statuses-1.5.0" + sources."string-width-2.1.1" + sources."string_decoder-1.3.0" + sources."strip-ansi-4.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-2.0.0" + (sources."table-6.0.7" // { + dependencies = [ + sources."ajv-7.2.3" + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."json-schema-traverse-1.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + (sources."tabtab-2.2.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."inquirer-1.2.3" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + (sources."telegraf-4.1.2" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."through-2.3.8" + sources."tiny-emitter-2.1.0" + sources."tiny-secp256k1-1.1.6" + sources."tmp-0.0.29" + sources."to-readable-stream-1.0.0" + sources."toidentifier-1.0.0" + sources."tough-cookie-3.0.1" + sources."truncate-utf8-bytes-1.0.2" + sources."tslib-1.14.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."tweetnacl-util-0.15.1" + sources."type-fest-0.11.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + sources."typeforce-1.18.0" + sources."typegram-3.2.2" + sources."unique-string-2.0.0" + sources."unpipe-1.0.0" + (sources."update-notifier-5.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."import-lazy-2.1.0" + sources."semver-7.3.4" + sources."supports-color-7.2.0" + ]; + }) + sources."uri-js-4.4.1" + sources."url-parse-lax-3.0.0" + sources."utf8-byte-length-1.0.4" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."varuint-bitcoin-1.1.2" + sources."vary-1.1.2" + sources."verror-1.10.0" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wif-2.0.6" + sources."window-size-1.1.1" + (sources."winston-2.4.5" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."ws-7.4.4" + sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Lightning balance CLI"; + homepage = "https://github.com/alexbosworth/balanceofsatoshis#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; @@ -66810,7 +66654,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.46" + sources."@types/node-13.13.47" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -67222,7 +67066,7 @@ in sha512 = "9PI2OLv8PmnnZSNP3PN16gr/yMxBJinh/LMgjk66PBfVmAduojFzJ1pTYPE/vb4qBxHYP4BkEbR8Auxa+qyEvw=="; }; dependencies = [ - sources."@jsii/spec-1.24.0" + sources."@jsii/spec-1.25.0" sources."@types/node-10.17.55" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -67235,7 +67079,7 @@ in sources."cdk8s-1.0.0-beta.10" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.24.0" // { + (sources."codemaker-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -67293,31 +67137,31 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.24.0" // { + (sources."jsii-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.24.0" // { + (sources."jsii-pacmak-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.24.0" // { + (sources."jsii-reflect-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.24.0" // { + (sources."jsii-rosetta-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.252" // { + (sources."jsii-srcmak-0.1.255" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -67339,7 +67183,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.24.0" + sources."oo-ascii-tree-1.25.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -67380,7 +67224,7 @@ in sources."which-typed-array-1.1.4" sources."wrap-ansi-7.0.0" sources."xmlbuilder-15.1.1" - sources."xmldom-0.4.0" + sources."xmldom-0.5.0" sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -67416,10 +67260,10 @@ in }; dependencies = [ sources."@cdktf/hcl2json-0.2.0" - sources."@jsii/spec-1.24.0" + sources."@jsii/spec-1.25.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.9.1" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@types/node-fetch-2.5.8" sources."@types/yoga-layout-1.9.2" (sources."ansi-escapes-4.3.1" // { @@ -67458,7 +67302,7 @@ in sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."cli-truncate-2.1.0" (sources."cliui-7.0.4" // { dependencies = [ @@ -67475,7 +67319,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.0" sources."concat-map-0.0.1" - sources."constructs-3.3.65" + sources."constructs-3.3.68" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -67555,7 +67399,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.24.0" // { + (sources."jsii-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67563,10 +67407,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.24.0" // { + (sources."jsii-pacmak-1.25.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.24.0" + sources."codemaker-1.25.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -67575,7 +67419,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.24.0" // { + (sources."jsii-reflect-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67583,7 +67427,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.24.0" // { + (sources."jsii-rosetta-1.25.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67591,7 +67435,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.252" // { + (sources."jsii-srcmak-0.1.255" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -67633,7 +67477,7 @@ in sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.24.0" + sources."oo-ascii-tree-1.25.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -67713,7 +67557,7 @@ in sources."wrappy-1.0.2" sources."ws-7.4.4" sources."xmlbuilder-15.1.1" - sources."xmldom-0.4.0" + sources."xmldom-0.5.0" sources."y18n-5.0.5" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { @@ -67741,15 +67585,15 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.1.tgz"; - sha512 = "y+nSP8lcBWXWHqBVK1o1UQjUR/s1Xu3H7rSXtp4R03orU8gGCkmYZjwhALMww6E6JChjoshpLodV+VfjAufaHw=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.2.2.tgz"; + sha512 = "XlgBVTpEAsU/aT7gxAZ/g5Q8P9glHZeg6yfNvE7hYuvoozMdw5Wd46b12QtzuDVs8/7UZ/GCulS0VR9TI5NWRg=="; }; dependencies = [ sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."clean-css-5.1.1" + sources."clean-css-5.1.2" sources."commander-7.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" @@ -68365,10 +68209,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.22"; + version = "1.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.22.tgz"; - sha512 = "4H7hWONnZ8kb0WzA9sd4HWMV1uDOMjQHYhLYEll+SShuZ11zUUWhg9tSiiY/srDJYKAUV2DsAE5kuoqYPa1jXg=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.23.tgz"; + sha512 = "9tjbN4O13DXlrNaZWtXozthLSW0LE+YjmBZf4LDdrpbfmzqLDvncDtOtqcRCd9LStoLPY7pv2o4Tucb2IrHjMw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -68451,7 +68295,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.0" // { @@ -68549,7 +68393,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -68690,7 +68534,7 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" sources."global-dirs-0.1.1" - (sources."globals-13.6.0" // { + (sources."globals-13.7.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -69211,7 +69055,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -69341,13 +69185,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.120"; + version = "1.1.122"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.120.tgz"; - sha512 = "dqCDYwHSZNQqN7PdqizgphNA9/wKLmlxIaLYJQZ7sxVu8yx214Oq+5bjiC67nAPE9fcowtVn9pXiib8SriXE7g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.122.tgz"; + sha512 = "On0ZR74g6wXH7BjSlfZdG35RYzIRHp7KF0V9gQG5f1cTlfy2T+pjzF5d9gO/cu0P6F1+i2RQ39anJ+FQ5P0wYA=="; }; dependencies = [ - sources."pyright-1.1.121" + sources."pyright-1.1.123" ]; buildInputs = globalBuildInputs; meta = { @@ -69421,10 +69265,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.38.0"; + version = "0.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.38.0.tgz"; - sha512 = "d4XkIyUcDwWIl1SR64daMq8qCmlLsdyw8+oAiiFfw6jL50XiqfzverR3QmUzmJBtkbRJoUr755+y7gWY27GbZw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.39.0.tgz"; + sha512 = "DImRvpT8AhiAX6GvnbQyFLd55Es0SFpiU1xZfFKfGfmJLNypEQHB7jYTttE7kuuePFBKdWhLLINlexYObsnglg=="; }; buildInputs = globalBuildInputs; meta = { @@ -69533,7 +69377,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -69548,7 +69392,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -69586,7 +69430,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -69619,7 +69463,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-4.0.0" + sources."hosted-git-info-4.0.1" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" @@ -69649,6 +69493,7 @@ in sources."is-plain-obj-2.1.0" sources."is-regexp-2.1.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -69660,7 +69505,7 @@ in sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" sources."lru-cache-6.0.0" sources."map-obj-4.2.0" @@ -69682,7 +69527,7 @@ in }) sources."ms-2.1.2" sources."node-releases-1.1.71" - (sources."normalize-package-data-3.0.1" // { + (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.4" ]; @@ -70069,7 +69914,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.2" - (sources."globals-13.6.0" // { + (sources."globals-13.7.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -70130,7 +69975,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -70663,7 +70508,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-3.0.8" + sources."hosted-git-info-4.0.1" sources."http-cache-semantics-4.1.0" (sources."http-errors-1.7.2" // { dependencies = [ @@ -70821,9 +70666,9 @@ in sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.1" + sources."npm-package-arg-8.1.2" sources."npm-packlist-2.1.4" - sources."npm-pick-manifest-6.1.0" + sources."npm-pick-manifest-6.1.1" sources."npm-registry-fetch-9.0.0" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" @@ -70941,7 +70786,7 @@ in sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."smart-buffer-4.1.0" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."socks-proxy-agent-5.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -70959,7 +70804,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.17" + sources."systeminformation-4.34.19" sources."tar-6.1.0" sources."term-size-2.2.1" sources."through-2.3.8" @@ -71051,7 +70896,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.34" + sources."@types/node-14.14.35" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -71422,12 +71267,13 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asynckit-0.4.0" + sources."call-bind-1.0.2" (sources."chalk-2.4.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -71473,9 +71319,13 @@ in sources."figures-2.0.0" sources."form-data-2.5.1" sources."formidable-1.2.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."globalthis-1.0.2" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { @@ -71506,13 +71356,14 @@ in sources."mute-stream-0.0.7" sources."next-tick-1.0.0" sources."object-assign-4.1.1" + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."onetime-2.0.1" sources."os-tmpdir-1.0.2" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.6" + sources."qs-6.10.0" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -71525,6 +71376,7 @@ in sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."snabbdom-0.7.0" sources."snabbdom-selector-1.2.1" @@ -71664,10 +71516,10 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.5.3"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.5.3.tgz"; - sha512 = "YJWlLKBx4tdOJ7NbUVqKATTAHB4IJTHSTJBAj0eBbdXdmpI4WGGS725MzoapgJPiBWUMtjgZcVcR5MHe3UHczQ=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.6.0.tgz"; + sha512 = "DlhSk4dbD4V+8ZnIRi3WW/Y+F90slstYUzbnz21pKxvMW1Pkri+081q+zAY1+piBq1wqUE5VbKrkXUKg019lnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -72503,7 +72355,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -72696,7 +72548,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -72752,7 +72604,7 @@ in sources."chownr-1.1.4" sources."chromium-pickle-js-0.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" (sources."cliui-7.0.4" // { dependencies = [ @@ -72799,7 +72651,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" - sources."detect-node-2.0.4" + sources."detect-node-2.0.5" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."electron-notarize-1.0.0" @@ -72930,6 +72782,7 @@ in sources."is-interactive-1.0.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" @@ -72950,7 +72803,7 @@ in sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-2.0.0" (sources."lru-cache-6.0.0" // { @@ -73054,7 +72907,7 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."open-7.4.2" - sources."ora-5.3.0" + sources."ora-5.4.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -73314,7 +73167,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.34" + sources."@types/node-14.14.35" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -73349,7 +73202,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -73386,7 +73239,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -73647,8 +73500,8 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.14" - sources."@fluentui/react-7.164.1" - sources."@fluentui/react-focus-7.17.5" + sources."@fluentui/react-7.165.0" + sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { @@ -73661,7 +73514,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.151" + sources."@microsoft/load-themed-styles-1.10.153" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -73679,7 +73532,7 @@ in sources."@types/connect-3.4.34" sources."@types/engine.io-3.1.5" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.18" + sources."@types/express-serve-static-core-4.17.19" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" sources."@types/hls.js-0.13.1" @@ -73710,12 +73563,12 @@ in sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.25" - sources."@uifabric/icons-7.5.22" + sources."@uifabric/foundation-7.9.26" + sources."@uifabric/icons-7.5.23" sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.13.12" + sources."@uifabric/react-hooks-7.14.0" sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.18.1" + sources."@uifabric/styling-7.19.0" sources."@uifabric/utilities-7.33.5" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -74014,7 +73867,11 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."copy-props-2.0.4" + (sources."copy-props-2.0.5" // { + dependencies = [ + sources."is-plain-object-5.0.0" + ]; + }) sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-3.8.0" @@ -74684,7 +74541,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.164.1" + sources."office-ui-fabric-react-7.165.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -75087,7 +74944,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.6.0" // { + (sources."terser-5.6.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -75401,7 +75258,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.2" - (sources."globals-13.6.0" // { + (sources."globals-13.7.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -75455,7 +75312,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -75568,7 +75425,7 @@ in sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.2" - (sources."globals-13.6.0" // { + (sources."globals-13.7.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -75623,7 +75480,7 @@ in sources."supports-color-8.1.1" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -75667,10 +75524,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.3.0"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.3.0.tgz"; - sha512 = "JZTWP7YajZD48VDAMqDmT7cLDqi+9blR/WzTXDlgiUgjYANYPAC8eMZxyuOnEvt0d9hSfEKuq1/mknUogXgjNA=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.3.2.tgz"; + sha512 = "H6YzchpWSV/2dPSns3IzGJBGqt1Thhbe1s6NO5UQMoRRkp7e64XMGVfzmw4W5t6CKCF+BB/MgXMFdipniPsY9w=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -75806,8 +75663,8 @@ in sources."@babel/types-7.13.0" sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/bunyan-4.0.0" - sources."@expo/config-3.3.31" - (sources."@expo/config-plugins-1.0.21" // { + sources."@expo/config-3.3.33" + (sources."@expo/config-plugins-1.0.23" // { dependencies = [ sources."uuid-3.4.0" sources."xcode-2.1.0" @@ -75820,7 +75677,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.57" // { + (sources."@expo/dev-server-0.1.59" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -75835,7 +75692,7 @@ in sources."statuses-1.5.0" ]; }) - sources."@expo/dev-tools-0.13.85" + sources."@expo/dev-tools-0.13.87" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -75843,7 +75700,7 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.10" // { + (sources."@expo/image-utils-0.3.11" // { dependencies = [ sources."tempy-0.3.0" ]; @@ -75854,7 +75711,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.57" + sources."@expo/metro-config-0.1.59" sources."@expo/osascript-2.0.24" (sources."@expo/package-manager-0.0.39-alpha.0" // { dependencies = [ @@ -75869,27 +75726,19 @@ in ]; }) sources."@expo/results-1.0.0" - sources."@expo/schemer-1.3.27-alpha.0" - sources."@expo/simple-spinner-1.0.2" - sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.61" // { + (sources."@expo/schemer-1.3.27-alpha.0" // { dependencies = [ - sources."@babel/runtime-7.9.0" - sources."is-wsl-2.2.0" - sources."react-refresh-0.8.3" + sources."ajv-5.5.2" + sources."fast-deep-equal-1.1.0" + sources."json-schema-traverse-0.3.1" ]; }) - (sources."@expo/xdl-59.0.25" // { + sources."@expo/simple-spinner-1.0.2" + sources."@expo/spawn-async-1.5.0" + (sources."@expo/webpack-config-0.12.63" // { dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."indent-string-3.2.0" - sources."minipass-2.9.0" - sources."tar-4.4.6" - sources."uuid-3.3.2" - sources."xcode-2.1.0" - sources."xmldom-0.1.27" - sources."yallist-3.1.1" + sources."@babel/runtime-7.9.0" + sources."react-refresh-0.8.3" ]; }) sources."@hapi/address-4.1.0" @@ -75970,16 +75819,20 @@ in (sources."@react-native-community/cli-tools-4.13.0" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."array-filter-0.0.1" sources."chalk-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."is-wsl-1.1.0" + sources."open-6.4.0" + sources."shell-quote-1.6.1" sources."supports-color-7.2.0" ]; }) sources."@segment/loosely-validate-event-2.0.0" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" + sources."@sindresorhus/is-4.0.0" + sources."@szmarczak/http-timer-4.0.5" sources."@tootallnate/once-1.1.2" sources."@types/anymatch-1.3.1" sources."@types/cacheable-request-6.0.1" @@ -76044,7 +75897,7 @@ in sources."agent-base-6.0.2" sources."agentkeepalive-4.1.4" sources."aggregate-error-3.1.0" - sources."ajv-5.5.2" + sources."ajv-6.12.6" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" @@ -76056,14 +75909,16 @@ in (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) sources."ansi-colors-3.2.4" - sources."ansi-escapes-3.2.0" + (sources."ansi-escapes-4.3.1" // { + dependencies = [ + sources."type-fest-0.11.0" + ]; + }) sources."ansi-html-0.0.7" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -76083,7 +75938,7 @@ in sources."array-flatten-1.1.1" sources."array-map-0.0.0" sources."array-reduce-0.0.0" - sources."array-union-1.0.2" + sources."array-union-2.1.0" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-2.0.1" @@ -76113,7 +75968,12 @@ in sources."axios-0.21.1" sources."axios-retry-3.1.9" sources."babel-extract-comments-1.0.0" - sources."babel-loader-8.1.0" + (sources."babel-loader-8.1.0" // { + dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" + ]; + }) sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-plugin-polyfill-corejs2-0.1.10" // { dependencies = [ @@ -76200,19 +76060,12 @@ in dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" - sources."p-map-4.0.0" sources."rimraf-3.0.2" ]; }) sources."cache-base-1.0.1" sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - sources."normalize-url-4.5.0" - ]; - }) + sources."cacheable-request-7.0.1" sources."call-bind-1.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -76226,7 +76079,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -76266,22 +76119,29 @@ in ]; }) sources."clean-stack-2.2.0" - sources."clean-webpack-plugin-3.0.0" + (sources."clean-webpack-plugin-3.0.0" // { + dependencies = [ + sources."array-union-1.0.2" + sources."del-4.1.1" + sources."globby-6.1.0" + sources."p-map-2.1.0" + sources."pify-2.3.0" + sources."rimraf-2.7.1" + ]; + }) sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."cli-table3-0.6.0" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" sources."wrap-ansi-5.1.0" ]; }) - sources."clone-2.1.2" + sources."clone-1.0.4" sources."clone-response-1.0.2" sources."co-4.6.0" (sources."coa-2.0.2" // { @@ -76339,20 +76199,15 @@ in sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-6.0.4" // { dependencies = [ - sources."array-union-2.1.0" sources."find-cache-dir-3.3.1" sources."find-up-4.1.0" - sources."globby-11.0.2" - sources."loader-utils-2.0.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" - sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" ]; }) - sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" ]; @@ -76384,6 +76239,8 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-3.6.0" // { dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."semver-6.3.0" ]; }) @@ -76427,24 +76284,23 @@ in sources."decache-4.4.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-equal-2.0.5" sources."deep-extend-0.6.0" sources."deep-scope-analyser-1.7.0" sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."defer-to-connect-1.1.3" + sources."defaults-1.0.3" + sources."defer-to-connect-2.0.1" sources."define-properties-1.1.3" sources."define-property-2.0.2" - (sources."del-4.1.1" // { + (sources."del-6.0.0" // { dependencies = [ - sources."p-map-2.1.0" - sources."rimraf-2.7.1" + sources."rimraf-3.0.2" ]; }) sources."delayed-stream-1.0.0" @@ -76453,7 +76309,7 @@ in sources."deprecated-decorator-0.1.6" sources."des.js-1.0.1" sources."destroy-1.0.4" - sources."detect-node-2.0.4" + sources."detect-node-2.0.5" (sources."detect-port-alt-1.1.6" // { dependencies = [ sources."debug-2.6.9" @@ -76496,13 +76352,13 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" ]; }) - sources."emoji-regex-8.0.0" + sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" (sources."encoding-0.1.13" // { @@ -76548,10 +76404,15 @@ in sources."etag-1.8.1" sources."eventemitter3-2.0.3" sources."events-3.3.0" - sources."eventsource-1.0.7" + sources."eventsource-1.1.0" sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" - sources."execa-1.0.0" + (sources."execa-1.0.0" // { + dependencies = [ + sources."get-stream-4.1.0" + sources."is-stream-1.1.0" + ]; + }) sources."exif-parser-0.1.12" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -76573,7 +76434,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.67" // { + (sources."expo-pwa-0.0.69" // { dependencies = [ sources."commander-2.20.0" ]; @@ -76597,18 +76458,14 @@ in ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-1.1.0" + sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.11.0" sources."faye-websocket-0.10.0" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" - (sources."file-loader-6.0.0" // { - dependencies = [ - sources."loader-utils-2.0.0" - ]; - }) + sources."file-loader-6.0.0" sources."file-type-9.0.0" sources."file-uri-to-path-1.0.0" sources."filesize-6.1.0" @@ -76620,14 +76477,7 @@ in ]; }) sources."find-cache-dir-2.1.0" - (sources."find-up-5.0.0" // { - dependencies = [ - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - ]; - }) + sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" sources."follow-redirects-1.13.3" @@ -76636,12 +76486,22 @@ in sources."forever-agent-0.6.1" (sources."fork-ts-checker-webpack-plugin-4.1.6" // { dependencies = [ - sources."braces-2.3.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."chalk-2.4.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."micromatch-3.1.10" sources."semver-5.7.1" sources."to-regex-range-2.1.1" @@ -76653,16 +76513,7 @@ in sources."freeport-async-2.0.0" sources."fresh-0.5.2" sources."from2-2.3.0" - (sources."fs-extra-9.0.0" // { - dependencies = [ - (sources."jsonfile-6.1.0" // { - dependencies = [ - sources."universalify-2.0.0" - ]; - }) - sources."universalify-1.0.0" - ]; - }) + sources."fs-extra-9.0.0" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.1.3" @@ -76685,9 +76536,9 @@ in sources."get-intrinsic-1.1.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" - sources."get-stream-4.1.0" + sources."get-stream-5.2.0" sources."get-value-2.0.6" - sources."getenv-0.7.0" + sources."getenv-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.2" @@ -76695,28 +76546,8 @@ in sources."global-modules-2.0.0" sources."global-prefix-3.0.0" sources."globals-11.12.0" - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - (sources."got-11.8.2" // { - dependencies = [ - sources."@sindresorhus/is-4.0.0" - sources."@szmarczak/http-timer-4.0.5" - sources."cacheable-request-7.0.1" - sources."decompress-response-6.0.0" - sources."defer-to-connect-2.0.1" - sources."get-stream-5.2.0" - sources."json-buffer-3.0.1" - sources."keyv-4.0.3" - sources."lowercase-keys-2.0.0" - sources."mimic-response-3.1.0" - sources."normalize-url-4.5.0" - sources."p-cancelable-2.1.0" - sources."responselike-2.0.0" - ]; - }) + sources."globby-11.0.1" + sources."got-11.8.2" sources."graceful-fs-4.2.6" sources."graphql-0.13.2" (sources."graphql-tools-3.0.0" // { @@ -76727,13 +76558,7 @@ in sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" sources."har-schema-2.0.0" - (sources."har-validator-5.1.5" // { - dependencies = [ - sources."ajv-6.12.6" - sources."fast-deep-equal-3.1.3" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" @@ -76769,17 +76594,18 @@ in sources."hsla-regex-1.0.0" sources."html-comment-regex-1.1.2" sources."html-entities-1.4.0" - (sources."html-loader-1.1.0" // { - dependencies = [ - sources."loader-utils-2.0.0" - ]; - }) + sources."html-loader-1.1.0" (sources."html-minifier-terser-5.1.1" // { dependencies = [ sources."commander-4.1.1" ]; }) - sources."html-webpack-plugin-4.3.0" + (sources."html-webpack-plugin-4.3.0" // { + dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" + ]; + }) sources."htmlparser2-4.1.0" sources."http-cache-semantics-4.1.0" sources."http-deceiver-1.2.7" @@ -76853,7 +76679,7 @@ in sources."is-docker-2.1.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.2" sources."is-glob-4.0.1" (sources."is-invalid-path-0.1.0" // { @@ -76869,14 +76695,34 @@ in sources."is-number-object-1.0.4" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" - sources."is-path-in-cwd-2.1.0" - sources."is-path-inside-2.1.0" + (sources."is-path-in-cwd-2.1.0" // { + dependencies = [ + sources."is-path-inside-2.1.0" + ]; + }) + sources."is-path-inside-3.0.3" sources."is-plain-object-2.0.4" sources."is-port-reachable-2.0.1" (sources."is-reachable-4.0.0" // { dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.3" + sources."get-stream-4.1.0" sources."got-9.6.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."lowercase-keys-1.0.1" + sources."p-cancelable-1.1.0" sources."p-timeout-3.2.0" + sources."responselike-1.0.2" ]; }) sources."is-regex-1.1.2" @@ -76885,7 +76731,7 @@ in sources."is-retry-allowed-1.2.0" sources."is-root-2.1.0" sources."is-set-2.0.2" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-string-1.0.5" sources."is-svg-3.0.0" sources."is-symbol-1.0.3" @@ -76895,7 +76741,7 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" sources."isarray-2.0.5" sources."isemail-3.2.0" sources."isexe-2.0.0" @@ -76916,26 +76762,31 @@ in sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" (sources."json-schema-deref-sync-0.13.0" // { dependencies = [ + sources."clone-2.1.2" sources."md5-2.2.1" ]; }) - sources."json-schema-traverse-0.3.1" + sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" sources."json5-2.2.0" - sources."jsonfile-4.0.0" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."keychain-1.3.0" - sources."keyv-3.1.0" + sources."keyv-4.0.3" sources."killable-1.0.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" @@ -76948,12 +76799,8 @@ in ]; }) sources."loader-runner-2.4.0" - (sources."loader-utils-1.4.0" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) - sources."locate-path-3.0.0" + sources."loader-utils-2.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" sources."lodash.assign-4.2.0" @@ -76976,7 +76823,7 @@ in sources."tslib-2.1.0" ]; }) - sources."lowercase-keys-1.0.1" + sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" (sources."make-dir-2.1.0" // { dependencies = [ @@ -77022,9 +76869,8 @@ in sources."min-document-2.19.0" (sources."mini-css-extract-plugin-0.5.0" // { dependencies = [ - sources."ajv-6.12.6" - sources."fast-deep-equal-3.1.3" - sources."json-schema-traverse-0.4.1" + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; }) @@ -77045,7 +76891,6 @@ in (sources."minipass-fetch-1.3.3" // { dependencies = [ sources."minipass-3.1.3" - sources."minizlib-2.1.2" ]; }) (sources."minipass-flush-1.0.5" // { @@ -77068,10 +76913,9 @@ in sources."minipass-3.1.3" ]; }) - (sources."minizlib-1.3.3" // { + (sources."minizlib-2.1.2" // { dependencies = [ - sources."minipass-2.9.0" - sources."yallist-3.1.1" + sources."minipass-3.1.3" ]; }) sources."mississippi-3.0.0" @@ -77128,7 +76972,7 @@ in sources."node-releases-1.1.71" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-3.3.0" + sources."normalize-url-4.5.0" sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" @@ -77139,16 +76983,19 @@ in ]; }) sources."npm-packlist-2.1.4" - (sources."npm-pick-manifest-6.1.0" // { + (sources."npm-pick-manifest-6.1.1" // { dependencies = [ - sources."npm-package-arg-8.1.1" + sources."hosted-git-info-4.0.1" + sources."npm-package-arg-8.1.2" + sources."semver-7.3.4" ]; }) (sources."npm-registry-fetch-9.0.0" // { dependencies = [ + sources."hosted-git-info-4.0.1" sources."minipass-3.1.3" - sources."minizlib-2.1.2" - sources."npm-package-arg-8.1.1" + sources."npm-package-arg-8.1.2" + sources."semver-7.3.4" ]; }) sources."npm-run-path-2.0.2" @@ -77186,8 +77033,12 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-6.4.0" - sources."opn-5.5.0" + sources."open-7.4.2" + (sources."opn-5.5.0" // { + dependencies = [ + sources."is-wsl-1.1.0" + ]; + }) sources."optimize-css-assets-webpack-plugin-5.0.4" sources."options-0.0.6" (sources."ora-3.4.0" // { @@ -77202,38 +77053,48 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - (sources."p-any-2.1.0" // { - dependencies = [ - sources."p-cancelable-2.1.0" - ]; - }) - sources."p-cancelable-1.1.0" + sources."p-any-2.1.0" + sources."p-cancelable-2.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-map-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-map-4.0.0" sources."p-retry-4.1.0" - (sources."p-some-4.1.0" // { - dependencies = [ - sources."p-cancelable-2.1.0" - ]; - }) + sources."p-some-4.1.0" sources."p-timeout-3.1.0" sources."p-try-2.2.0" (sources."package-json-6.4.0" // { dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.3" + sources."get-stream-4.1.0" sources."got-9.6.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."lowercase-keys-1.0.1" + sources."p-cancelable-1.1.0" sources."registry-auth-token-3.4.0" sources."registry-url-5.1.0" + sources."responselike-1.0.2" sources."semver-6.3.0" ]; }) (sources."pacote-11.3.0" // { dependencies = [ + sources."hosted-git-info-4.0.1" sources."minipass-3.1.3" sources."mkdirp-1.0.4" - sources."npm-package-arg-8.1.1" + sources."npm-package-arg-8.1.2" sources."rimraf-3.0.2" + sources."semver-7.3.4" ]; }) sources."pako-1.0.11" @@ -77260,10 +77121,14 @@ in ]; }) sources."pascalcase-0.1.1" - sources."password-prompt-1.1.2" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" @@ -77281,11 +77146,19 @@ in (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" ]; }) (sources."pkg-up-3.1.0" // { dependencies = [ sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" ]; }) sources."plist-3.0.1" @@ -77391,6 +77264,7 @@ in }) (sources."postcss-normalize-url-4.0.1" // { dependencies = [ + sources."normalize-url-3.3.0" sources."postcss-value-parser-3.3.1" ]; }) @@ -77473,7 +77347,6 @@ in (sources."react-dev-utils-11.0.4" // { dependencies = [ sources."@babel/code-frame-7.10.4" - sources."array-union-2.1.0" sources."browserslist-4.14.2" (sources."chalk-2.4.2" // { dependencies = [ @@ -77483,17 +77356,12 @@ in sources."cross-spawn-7.0.3" sources."escape-string-regexp-2.0.0" sources."find-up-4.1.0" - sources."globby-11.0.1" - sources."is-wsl-2.2.0" - sources."loader-utils-2.0.0" sources."locate-path-5.0.0" - sources."open-7.4.2" + sources."p-limit-2.3.0" sources."p-locate-4.1.0" - sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shell-quote-1.7.2" sources."which-2.0.2" ]; }) @@ -77573,7 +77441,7 @@ in }) sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."responselike-1.0.2" + sources."responselike-2.0.0" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" @@ -77594,13 +77462,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - (sources."schema-utils-2.7.1" // { - dependencies = [ - sources."ajv-6.12.6" - sources."fast-deep-equal-3.1.3" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."schema-utils-2.7.1" sources."select-hose-2.0.0" sources."selfsigned-1.10.8" sources."semver-7.3.2" @@ -77635,11 +77497,7 @@ in sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - (sources."shell-quote-1.6.1" // { - dependencies = [ - sources."array-filter-0.0.1" - ]; - }) + sources."shell-quote-1.7.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."simple-plist-1.1.1" @@ -77651,7 +77509,7 @@ in sources."uuid-2.0.3" ]; }) - sources."slugify-1.4.7" + sources."slugify-1.5.0" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -77694,7 +77552,7 @@ in sources."faye-websocket-0.11.3" ]; }) - sources."socks-2.5.1" + sources."socks-2.6.0" sources."socks-proxy-agent-5.0.0" sources."source-list-map-2.0.1" sources."source-map-0.5.7" @@ -77749,7 +77607,12 @@ in ]; }) sources."stream-shift-1.0.1" - sources."string-width-4.2.2" + (sources."string-width-4.2.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + ]; + }) sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" @@ -77762,11 +77625,7 @@ in sources."strip-comments-1.0.2" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - (sources."style-loader-1.2.1" // { - dependencies = [ - sources."loader-utils-2.0.0" - ]; - }) + sources."style-loader-1.2.1" (sources."stylehacks-4.0.3" // { dependencies = [ sources."postcss-selector-parser-3.1.2" @@ -77791,33 +77650,20 @@ in (sources."tar-6.1.0" // { dependencies = [ sources."minipass-3.1.3" - sources."minizlib-2.1.2" sources."mkdirp-1.0.4" ]; }) sources."temp-dir-1.0.0" (sources."tempy-0.7.1" // { dependencies = [ - sources."array-union-2.1.0" sources."crypto-random-string-2.0.0" - sources."del-6.0.0" - sources."globby-11.0.2" - sources."is-path-inside-3.0.3" - sources."is-stream-2.0.0" - sources."p-map-4.0.0" - sources."rimraf-3.0.2" sources."temp-dir-2.0.0" sources."type-fest-0.16.0" sources."unique-string-2.0.0" ]; }) sources."term-size-2.2.1" - (sources."terminal-link-2.1.1" // { - dependencies = [ - sources."ansi-escapes-4.3.1" - sources."type-fest-0.11.0" - ]; - }) + sources."terminal-link-2.1.1" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -77831,13 +77677,11 @@ in sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."make-dir-3.1.0" - sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" ]; }) - sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."source-map-0.6.1" @@ -77892,7 +77736,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" - sources."universalify-0.1.2" + sources."universalify-1.0.0" sources."unpipe-1.0.0" sources."unquote-1.1.1" (sources."unset-value-1.0.0" // { @@ -77922,10 +77766,6 @@ in sources."url-join-4.0.0" (sources."url-loader-4.1.1" // { dependencies = [ - sources."ajv-6.12.6" - sources."fast-deep-equal-3.1.3" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-2.0.0" sources."schema-utils-3.0.0" ]; }) @@ -77979,26 +77819,16 @@ in sources."wcwidth-1.0.1" (sources."webpack-4.43.0" // { dependencies = [ - sources."ajv-6.12.6" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."braces-2.3.2" sources."cacache-12.0.4" sources."chownr-1.1.4" - sources."fast-deep-equal-3.1.3" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."json-schema-traverse-0.4.1" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."is-wsl-1.1.0" + sources."json5-1.0.1" + sources."kind-of-3.2.2" + sources."loader-utils-1.4.0" sources."lru-cache-5.1.1" sources."micromatch-3.1.10" sources."rimraf-2.7.1" @@ -78014,9 +77844,9 @@ in sources."webpack-dev-middleware-3.7.3" (sources."webpack-dev-server-3.11.0" // { dependencies = [ - sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."anymatch-2.0.0" + sources."array-union-1.0.2" sources."binary-extensions-1.13.1" (sources."body-parser-1.19.0" // { dependencies = [ @@ -78028,13 +77858,13 @@ in sources."chokidar-2.1.8" sources."content-disposition-0.5.3" sources."cookie-0.4.0" + sources."del-4.1.1" (sources."express-4.17.1" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."extend-shallow-2.0.1" - sources."fast-deep-equal-3.1.3" sources."fill-range-4.0.0" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -78043,6 +77873,7 @@ in }) sources."fsevents-1.2.13" sources."glob-parent-3.1.0" + sources."globby-6.1.0" sources."http-errors-1.7.2" sources."iconv-lite-0.4.24" sources."inherits-2.0.3" @@ -78050,16 +77881,18 @@ in sources."is-binary-path-1.0.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" - sources."json-schema-traverse-0.4.1" sources."kind-of-3.2.2" sources."micromatch-3.1.10" sources."mime-1.6.0" sources."ms-2.0.0" sources."normalize-path-2.1.1" + sources."p-map-2.1.0" sources."p-retry-3.0.1" + sources."pify-2.3.0" sources."qs-6.7.0" sources."raw-body-2.4.0" sources."readdirp-2.2.1" + sources."rimraf-2.7.1" sources."schema-utils-1.0.0" sources."semver-6.3.0" (sources."send-0.17.1" // { @@ -78089,6 +77922,8 @@ in (sources."webpack-manifest-plugin-2.2.0" // { dependencies = [ sources."fs-extra-7.0.1" + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" ]; }) (sources."webpack-sources-1.4.3" // { @@ -78098,12 +77933,10 @@ in }) (sources."webpackbar-4.0.0" // { dependencies = [ - sources."ansi-escapes-4.3.1" sources."ansi-styles-4.3.0" sources."chalk-2.4.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."type-fest-0.11.0" sources."wrap-ansi-6.2.0" ]; }) @@ -78117,7 +77950,6 @@ in (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" ]; @@ -78129,7 +77961,9 @@ in (sources."workbox-build-3.6.3" // { dependencies = [ sources."fs-extra-4.0.3" + sources."jsonfile-4.0.0" sources."pretty-bytes-4.0.2" + sources."universalify-0.1.2" ]; }) sources."workbox-cache-expiration-3.6.3" @@ -78147,9 +77981,8 @@ in sources."worker-farm-1.7.0" (sources."worker-loader-2.0.0" // { dependencies = [ - sources."ajv-6.12.6" - sources."fast-deep-equal-3.1.3" - sources."json-schema-traverse-0.4.1" + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."schema-utils-0.4.7" ]; }) @@ -78169,6 +78002,21 @@ in sources."uuid-7.0.3" ]; }) + (sources."xdl-59.0.27" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."indent-string-3.2.0" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."p-map-3.0.0" + sources."tar-4.4.6" + sources."uuid-3.3.2" + sources."xcode-2.1.0" + sources."xmldom-0.1.27" + sources."yallist-3.1.1" + ]; + }) sources."xhr-2.6.0" sources."xml-js-1.6.11" sources."xml-parse-from-string-1.0.1" @@ -78185,9 +78033,11 @@ in (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -78525,7 +78375,7 @@ in ]; }) sources."clean-stack-3.0.1" - sources."cli-table-0.3.5" + sources."cli-table-0.3.6" (sources."cli-ux-4.9.3" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -78551,7 +78401,7 @@ in sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" - sources."cross-fetch-3.1.0" + sources."cross-fetch-3.1.2" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -79009,7 +78859,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.34" + sources."@types/node-14.14.35" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -79118,8 +78968,8 @@ in sources."cli-boxes-2.2.1" sources."cli-color-1.4.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.5.0" - sources."cli-table-0.3.5" + sources."cli-spinners-2.6.0" + sources."cli-table-0.3.6" sources."cli-width-2.2.1" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -79560,7 +79410,7 @@ in sources."promise-breaker-5.0.0" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.46" + sources."@types/node-13.13.47" ]; }) sources."proxy-addr-2.0.6" @@ -79637,7 +79487,7 @@ in sources."signal-exit-3.0.3" sources."simple-swizzle-0.2.2" sources."smart-buffer-4.1.0" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."socks-proxy-agent-5.0.0" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -79910,7 +79760,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."hosted-git-info-4.0.0" + sources."hosted-git-info-4.0.1" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."indent-string-4.0.0" @@ -79944,7 +79794,7 @@ in ]; }) sources."mute-stream-0.0.8" - sources."normalize-package-data-3.0.1" + sources."normalize-package-data-3.0.2" sources."npm-run-path-4.0.1" sources."num-sort-2.1.0" sources."once-1.4.0" @@ -80668,7 +80518,7 @@ in sources."separator-escape-0.0.1" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -80749,10 +80599,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.3.0.tgz"; - sha512 = "xvuBiQdo0pbBaucrIIGEicPU5ibX+aCDdr9X7kHpsy55q+qqLlzhDJ0aF8LtYFgSI4/hsrk2gSYMVLRAyy6HQg=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.3.1.tgz"; + sha512 = "wsCS8L8QTb9ghnJJpn1qKj+LokhGQ7OlKSM/n6/LhB8E4w/Pn4hiSgqcBthaL5J6CwJiWjpbNSA4t3sE0yqEPw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -80771,7 +80621,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."ajv-formats-1.5.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -80809,7 +80659,7 @@ in sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -80861,7 +80711,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" - sources."hosted-git-info-4.0.0" + sources."hosted-git-info-4.0.1" sources."http-cache-semantics-4.1.0" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" @@ -80885,6 +80735,7 @@ in sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -80902,7 +80753,7 @@ in ]; }) sources."lodash-4.17.21" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { @@ -80924,7 +80775,7 @@ in sources."minimist-options-4.1.0" sources."mute-stream-0.0.8" sources."node-fetch-2.6.1" - sources."normalize-package-data-3.0.1" + sources."normalize-package-data-3.0.2" sources."normalize-url-4.5.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -80933,7 +80784,7 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."ora-5.3.0" + sources."ora-5.4.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -81113,9 +80964,10 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/url-loader-6.8.1" // { + (sources."@graphql-tools/url-loader-6.8.2" // { dependencies = [ sources."@graphql-tools/utils-7.6.0" + sources."cross-fetch-3.1.1" sources."form-data-4.0.0" sources."tslib-2.1.0" ]; @@ -81145,9 +80997,9 @@ 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.34" + sources."@types/node-14.14.35" sources."@types/parse-json-4.0.0" - sources."@types/websocket-1.0.1" + sources."@types/websocket-1.0.2" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.1" // { @@ -81194,7 +81046,7 @@ in sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."cli-width-3.0.0" (sources."cliui-7.0.4" // { dependencies = [ @@ -81248,7 +81100,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."eventsource-1.0.7" + sources."eventsource-1.1.0" sources."execa-1.0.0" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { @@ -81299,7 +81151,7 @@ in sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" sources."graphql-upload-11.0.0" - sources."graphql-ws-4.1.5" + sources."graphql-ws-4.2.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -81356,6 +81208,7 @@ in sources."is-symbol-1.0.3" sources."is-typed-array-1.1.5" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-wsl-2.2.0" @@ -81457,7 +81310,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."cli-cursor-3.1.0" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" @@ -81594,7 +81447,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.3" + sources."ws-7.4.4" sources."y18n-5.0.5" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -82042,7 +81895,7 @@ in sources."cardinal-2.1.1" sources."chalk-1.1.3" sources."charm-0.1.2" - sources."cli-table-0.3.5" + sources."cli-table-0.3.6" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.0.3" @@ -82092,7 +81945,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.34.17" + sources."systeminformation-4.34.19" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -82210,7 +82063,11 @@ in sources."concat-stream-1.6.2" sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" - sources."copy-props-2.0.4" + (sources."copy-props-2.0.5" // { + dependencies = [ + sources."is-plain-object-5.0.0" + ]; + }) sources."core-util-is-1.0.2" sources."d-1.0.1" sources."debug-2.6.9" @@ -82632,7 +82489,7 @@ in sources."component-emitter-1.3.0" sources."concat-stream-1.6.2" sources."copy-descriptor-0.1.1" - sources."copy-props-2.0.4" + sources."copy-props-2.0.5" sources."core-util-is-1.0.2" sources."d-1.0.1" sources."debug-2.6.9" @@ -82642,7 +82499,11 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."detect-file-1.0.0" - sources."each-props-1.3.2" + (sources."each-props-1.3.2" // { + dependencies = [ + sources."is-plain-object-2.0.4" + ]; + }) sources."error-ex-1.3.2" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" @@ -82667,6 +82528,7 @@ in (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" + sources."is-plain-object-2.0.4" ]; }) (sources."extglob-2.0.4" // { @@ -82683,7 +82545,11 @@ in }) sources."find-up-1.1.2" sources."findup-sync-3.0.0" - sources."fined-1.2.0" + (sources."fined-1.2.0" // { + dependencies = [ + sources."is-plain-object-2.0.4" + ]; + }) sources."flagged-respawn-1.0.1" sources."for-in-1.0.2" sources."for-own-1.0.0" @@ -82739,7 +82605,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-plain-object-2.0.4" + sources."is-plain-object-5.0.0" sources."is-relative-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" @@ -82749,7 +82615,11 @@ in sources."isobject-3.0.1" sources."kind-of-5.1.0" sources."lcid-1.0.0" - sources."liftoff-3.1.0" + (sources."liftoff-3.1.0" // { + dependencies = [ + sources."is-plain-object-2.0.4" + ]; + }) sources."load-json-file-1.1.0" (sources."make-iterator-1.0.1" // { dependencies = [ @@ -82772,6 +82642,7 @@ in (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" + sources."is-plain-object-2.0.4" ]; }) sources."ms-2.0.0" @@ -82843,6 +82714,7 @@ in (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" + sources."is-plain-object-2.0.4" ]; }) (sources."snapdragon-0.8.2" // { @@ -83087,12 +82959,17 @@ in dependencies = [ sources."async-2.6.3" sources."basic-auth-1.1.0" + sources."call-bind-1.0.2" sources."colors-1.4.0" sources."corser-2.0.1" sources."debug-3.2.7" sources."ecstatic-3.3.2" sources."eventemitter3-4.0.7" sources."follow-redirects-1.13.3" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" + sources."has-1.0.3" + sources."has-symbols-1.0.2" sources."he-1.2.0" sources."http-proxy-1.18.1" sources."lodash-4.17.21" @@ -83100,11 +82977,13 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.3" + sources."object-inspect-1.9.0" sources."opener-1.5.2" sources."portfinder-1.0.28" - sources."qs-6.9.6" + sources."qs-6.10.0" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" + sources."side-channel-1.0.4" sources."union-0.5.0" sources."url-join-2.0.5" ]; @@ -83787,6 +83666,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."bytes-3.1.0" + sources."call-bind-1.0.2" (sources."chalk-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -83854,11 +83734,15 @@ in sources."string_decoder-0.10.31" ]; }) + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.1.6" sources."graceful-fs-4.2.6" + sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-symbols-1.0.2" sources."http-errors-1.7.3" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -83935,6 +83819,7 @@ in sources."path-key-2.0.1" ]; }) + sources."object-inspect-1.9.0" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.4.2" @@ -83951,7 +83836,7 @@ in sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.6" + sources."qs-6.10.0" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -83966,6 +83851,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -83976,7 +83862,7 @@ in ]; }) sources."smart-buffer-4.1.0" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."socks-proxy-agent-5.0.0" sources."source-map-0.6.1" sources."split2-3.2.2" @@ -84122,7 +84008,7 @@ in sources."@ot-builder/trace-1.0.3" sources."@ot-builder/var-store-1.0.3" sources."@ot-builder/variance-1.0.3" - sources."@unicode/unicode-13.0.0-1.0.4" + sources."@unicode/unicode-13.0.0-1.0.6" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -84131,7 +84017,6 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.0" - sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."camelcase-5.3.1" sources."chainsaw-0.0.9" @@ -84185,17 +84070,14 @@ in sources."find-up-4.1.0" sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."graceful-fs-4.2.6" - sources."has-1.0.3" sources."has-flag-3.0.0" sources."hashish-0.0.4" sources."iconv-lite-0.6.2" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" sources."jake-10.8.2" @@ -84229,14 +84111,12 @@ in sources."patel-0.34.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" sources."patrisika-0.22.2" sources."patrisika-scopes-0.11.1" sources."pegjs-0.10.0" sources."prelude-ls-1.1.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.20.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" @@ -84259,9 +84139,7 @@ in sources."tslib-1.14.1" ]; }) - sources."split-1.0.1" sources."sprintf-js-1.0.3" - sources."stack-trace-0.0.9" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" (sources."stylus-0.54.8" // { @@ -84274,14 +84152,13 @@ in sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" - sources."ts-process-promises-1.0.2" sources."tslib-2.1.0" sources."type-check-0.3.2" sources."typo-geom-0.11.2" sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."urix-0.1.0" - (sources."verda-1.2.1" // { + (sources."verda-1.2.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -84504,7 +84381,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.863.0" // { + (sources."aws-sdk-2.868.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -84702,7 +84579,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-10.6.0" + sources."highlight.js-10.7.1" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" @@ -84880,7 +84757,7 @@ in sources."ms-2.1.3" sources."multiparty-4.2.2" sources."mustache-4.1.0" - sources."nanoid-3.1.21" + sources."nanoid-3.1.22" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -85390,6 +85267,7 @@ in dependencies = [ sources."argparse-1.0.10" sources."asynckit-0.4.0" + sources."call-bind-1.0.2" sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."component-emitter-1.3.0" @@ -85401,7 +85279,11 @@ in sources."extend-3.0.2" sources."form-data-2.5.1" sources."formidable-1.2.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" + sources."has-1.0.3" + sources."has-symbols-1.0.2" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -85412,12 +85294,14 @@ in sources."mime-types-2.1.29" sources."ms-2.1.3" sources."native-promise-only-0.8.1" + sources."object-inspect-1.9.0" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.10.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" + sources."side-channel-1.0.4" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" @@ -85577,7 +85461,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.21" + sources."nanoid-3.1.22" sources."negotiator-0.6.2" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" @@ -85716,7 +85600,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.34" + sources."@types/node-14.14.35" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -86291,8 +86175,7 @@ in sources."@lerna/npm-install-4.0.0" (sources."@lerna/npm-publish-4.0.0" // { dependencies = [ - sources."hosted-git-info-4.0.0" - sources."normalize-package-data-3.0.1" + sources."normalize-package-data-3.0.2" sources."pify-5.0.0" sources."read-package-json-3.0.1" ]; @@ -86336,7 +86219,7 @@ in sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.4" sources."@octokit/auth-token-2.4.5" - sources."@octokit/core-3.3.0" + sources."@octokit/core-3.3.1" (sources."@octokit/endpoint-6.0.11" // { dependencies = [ sources."is-plain-object-5.0.0" @@ -86345,7 +86228,7 @@ in sources."@octokit/graphql-4.6.1" sources."@octokit/openapi-types-5.3.2" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.13.2" + sources."@octokit/plugin-paginate-rest-2.13.3" sources."@octokit/plugin-request-log-1.0.3" sources."@octokit/plugin-rest-endpoint-methods-4.13.5" (sources."@octokit/request-5.4.14" // { @@ -86443,8 +86326,7 @@ in sources."conventional-changelog-angular-5.0.12" (sources."conventional-changelog-core-4.2.2" // { dependencies = [ - sources."hosted-git-info-4.0.0" - sources."normalize-package-data-3.0.1" + sources."normalize-package-data-3.0.2" ]; }) sources."conventional-changelog-preset-loader-2.3.4" @@ -86584,7 +86466,7 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.2" sources."has-unicode-2.0.1" - sources."hosted-git-info-3.0.8" + sources."hosted-git-info-4.0.1" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -86608,8 +86490,7 @@ in sources."ini-1.3.8" (sources."init-package-json-2.0.2" // { dependencies = [ - sources."hosted-git-info-4.0.0" - sources."normalize-package-data-3.0.1" + sources."normalize-package-data-3.0.2" sources."read-package-json-3.0.1" ]; }) @@ -86665,8 +86546,7 @@ in sources."libnpmaccess-4.0.1" (sources."libnpmpublish-4.0.0" // { dependencies = [ - sources."hosted-git-info-4.0.0" - sources."normalize-package-data-3.0.1" + sources."normalize-package-data-3.0.2" ]; }) sources."lines-and-columns-1.1.6" @@ -86693,11 +86573,10 @@ in sources."map-obj-4.2.0" (sources."meow-8.1.2" // { dependencies = [ - sources."hosted-git-info-4.0.0" - sources."normalize-package-data-3.0.1" + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-3.0.2" (sources."read-pkg-5.2.0" // { dependencies = [ - sources."hosted-git-info-2.8.8" sources."normalize-package-data-2.5.0" sources."type-fest-0.6.0" ]; @@ -86770,9 +86649,9 @@ in ]; }) sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.1" + sources."npm-package-arg-8.1.2" sources."npm-packlist-2.1.4" - sources."npm-pick-manifest-6.1.0" + sources."npm-pick-manifest-6.1.1" sources."npm-registry-fetch-9.0.0" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" @@ -86805,7 +86684,7 @@ in sources."parse-json-5.2.0" (sources."parse-path-4.0.3" // { dependencies = [ - sources."qs-6.9.6" + sources."qs-6.10.0" ]; }) sources."parse-url-5.0.2" @@ -86882,11 +86761,12 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.4" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."slide-1.1.6" sources."smart-buffer-4.1.0" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."socks-proxy-agent-5.0.0" sources."sort-keys-2.0.0" sources."source-map-0.6.1" @@ -88017,7 +87897,7 @@ in ]; }) sources."@jest/types-25.5.0" - sources."@types/babel__core-7.1.12" + sources."@types/babel__core-7.1.14" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.11.1" @@ -88027,7 +87907,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.34" + sources."@types/node-14.14.35" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -88200,7 +88080,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.30001200" + sources."caniuse-lite-1.0.30001203" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -88324,7 +88204,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -89164,10 +89044,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.10.10-20210312173228"; + version = "1.10.11"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.10-20210312173228.tgz"; - sha512 = "iAMDS9p66qb03/eV4QyWRYj51RcU6KxRkvP/KOWKt5AhWWoXZv6EPPrTd5QxfZFGorPyWSFE4Ebw1aLfYQdcpQ=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.11.tgz"; + sha512 = "FRPAQcg7lUuWbxxvESO+bgxWg7brSKju7mD/0Lc8lGFv/VqR4RH+9v7ufRFNIrG7hrisyy9N+63/AwSCU8NqNg=="; }; dependencies = [ sources."acorn-5.7.4" @@ -89514,14 +89394,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.9.1"; + version = "8.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.1.tgz"; - sha512 = "I/p3LzJv6gOAgHWdx0QMVbLVBN/xolqi5elACsbEWAnKuLPC+bjELsWDj35AYWBJalX01u8q1LdV0uhcCIJlMg=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.9.2.tgz"; + sha512 = "Hw44+V/n4s6ViCnh5RR/uiza5QxaeUv/A4Q62ho+U1W1yoCLHle6kbx1ZXRSF3Jvl3BfQHuaoE3t+dyx2L4hnA=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -89580,7 +89460,7 @@ in sources."dagre-0.8.5" sources."dagre-d3-0.6.4" sources."debug-4.3.2" - sources."devtools-protocol-0.0.847576" + sources."devtools-protocol-0.0.854822" sources."end-of-stream-1.4.4" sources."entity-decode-2.0.2" sources."extract-zip-2.0.1" @@ -89627,7 +89507,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-7.1.0" + sources."puppeteer-8.0.0" sources."readable-stream-3.6.0" sources."relateurl-0.2.7" sources."rimraf-3.0.2" @@ -89679,19 +89559,19 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.14" - sources."@fluentui/react-7.164.1" - sources."@fluentui/react-focus-7.17.5" + sources."@fluentui/react-7.165.0" + sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.151" + sources."@microsoft/load-themed-styles-1.10.153" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.25" - sources."@uifabric/icons-7.5.22" + sources."@uifabric/foundation-7.9.26" + sources."@uifabric/icons-7.5.23" sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.13.12" + sources."@uifabric/react-hooks-7.14.0" sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.18.1" + sources."@uifabric/styling-7.19.0" sources."@uifabric/utilities-7.33.5" sources."accepts-1.3.7" sources."ajv-6.12.6" @@ -89819,7 +89699,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.164.1" + sources."office-ui-fabric-react-7.165.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -89910,7 +89790,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.45.0" + sources."swagger-ui-dist-3.45.1" sources."tail-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -90076,6 +89956,7 @@ in dependencies = [ sources."argparse-1.0.10" sources."asynckit-0.4.0" + sources."call-bind-1.0.2" sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."component-emitter-1.3.0" @@ -90087,7 +89968,11 @@ in sources."extend-3.0.2" sources."form-data-2.5.1" sources."formidable-1.2.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" + sources."has-1.0.3" + sources."has-symbols-1.0.2" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -90103,12 +89988,14 @@ in sources."mime-types-2.1.29" sources."ms-2.1.3" sources."native-promise-only-0.8.1" + sources."object-inspect-1.9.0" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.10.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" + sources."side-channel-1.0.4" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.1.1" @@ -90194,10 +90081,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.10.12"; + version = "3.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.10.12.tgz"; - sha512 = "W8y7oU40t5xxJLvBNiVxInZ6nvb6OgKDha/Wqmxxi9yUtoKLC+//oYctbTFLzVvtsPBTfhZwh3mm26aHPf052w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.13.5.tgz"; + sha512 = "H077yu7Tt7uPqTnN6ZEtKrFwVsvkAyiPDmHzOxA13g9h/5Ho9tUEFhOrxsYRo/CNqdYDqvun5edBcyvNmif+ow=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -90309,16 +90196,16 @@ in sources."@babel/template-7.12.13" sources."@babel/traverse-7.13.0" sources."@babel/types-7.13.0" - sources."@bugsnag/browser-7.7.0" - sources."@bugsnag/core-7.7.0" + sources."@bugsnag/browser-7.9.0" + sources."@bugsnag/core-7.9.0" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.8.0" - sources."@bugsnag/node-7.8.0" + sources."@bugsnag/js-7.9.0" + sources."@bugsnag/node-7.9.0" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-9.9.5" // { + (sources."@netlify/build-9.11.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -90333,19 +90220,19 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-4.1.3" // { + (sources."@netlify/config-4.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."execa-3.4.0" ]; }) - (sources."@netlify/framework-info-2.3.0" // { + (sources."@netlify/framework-info-3.2.0" // { dependencies = [ sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.20" + sources."@netlify/functions-utils-1.3.21" (sources."@netlify/git-utils-1.0.8" // { dependencies = [ sources."braces-3.0.2" @@ -90376,7 +90263,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/plugins-list-2.4.1" + sources."@netlify/plugins-list-2.4.3" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -90386,7 +90273,7 @@ in sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-2.7.1" // { + (sources."@netlify/zip-it-and-ship-it-3.0.1" // { dependencies = [ sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -90570,23 +90457,27 @@ in ]; }) sources."@szmarczak/http-timer-1.1.2" + sources."@types/cacheable-request-6.0.1" sources."@types/decompress-4.2.3" sources."@types/download-6.2.4" sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" sources."@types/got-8.3.5" sources."@types/hast-2.3.1" + sources."@types/http-cache-semantics-4.0.0" sources."@types/http-proxy-1.17.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" + sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@types/node-fetch-2.5.8" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/resolve-1.17.1" + sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@types/unist-2.0.3" sources."@types/yargs-13.0.11" @@ -90596,7 +90487,20 @@ in sources."accepts-1.3.7" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-7.2.1" + sources."ajv-7.2.3" + (sources."all-node-versions-8.0.0" // { + dependencies = [ + sources."@jest/types-25.5.0" + sources."@types/yargs-15.0.13" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."global-cache-dir-2.0.0" + sources."jest-get-type-25.2.6" + sources."jest-validate-25.5.0" + sources."pretty-format-25.5.0" + ]; + }) (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -90641,7 +90545,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.863.0" // { + (sources."aws-sdk-2.868.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -90700,6 +90604,12 @@ in sources."byline-5.0.0" sources."bytes-3.1.0" sources."cache-base-1.0.1" + (sources."cacheable-lookup-2.0.1" // { + dependencies = [ + sources."json-buffer-3.0.1" + sources."keyv-4.0.3" + ]; + }) (sources."cacheable-request-6.1.0" // { dependencies = [ sources."lowercase-keys-2.0.0" @@ -90709,7 +90619,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.30001200" + sources."caniuse-lite-1.0.30001203" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -90758,7 +90668,7 @@ in sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-progress-3.9.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" (sources."cli-truncate-0.2.1" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -90924,7 +90834,7 @@ in sources."depd-1.1.2" sources."deprecation-2.3.1" sources."destroy-1.0.4" - sources."detective-amd-3.0.1" + sources."detective-amd-3.1.0" sources."detective-cjs-3.1.1" sources."detective-es6-2.2.0" sources."detective-less-1.0.2" @@ -90967,7 +90877,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -90978,19 +90888,19 @@ in sources."envinfo-7.7.4" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.8.57" + sources."esbuild-0.9.6" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."escodegen-1.14.3" // { + (sources."escodegen-2.0.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."eslint-visitor-keys-1.3.0" sources."esprima-4.0.1" - sources."estraverse-4.3.0" + sources."estraverse-5.2.0" sources."estree-walker-1.0.1" sources."esutils-2.0.3" sources."etag-1.8.1" @@ -91059,6 +90969,39 @@ in sources."fastq-1.11.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" + (sources."fetch-node-website-5.0.3" // { + dependencies = [ + (sources."@jest/types-25.5.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."@sindresorhus/is-2.1.1" + sources."@szmarczak/http-timer-4.0.5" + sources."@types/yargs-15.0.13" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."cacheable-request-7.0.1" + sources."chalk-4.1.0" + sources."decompress-response-5.0.0" + sources."defer-to-connect-2.0.1" + sources."got-10.7.0" + sources."jest-get-type-25.2.6" + (sources."jest-validate-25.5.0" // { + dependencies = [ + sources."chalk-3.0.0" + ]; + }) + sources."json-buffer-3.0.1" + sources."keyv-4.0.3" + sources."lowercase-keys-2.0.0" + sources."mimic-response-2.1.0" + sources."p-cancelable-2.1.0" + sources."pretty-format-25.5.0" + sources."responselike-2.0.0" + sources."type-fest-0.10.0" + ]; + }) sources."figures-3.2.0" sources."file-size-0.0.5" sources."file-type-8.1.0" @@ -91444,6 +91387,7 @@ in sources."media-typer-0.3.0" sources."memoize-one-5.1.1" sources."merge-descriptors-1.0.1" + sources."merge-options-3.0.4" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -91464,7 +91408,7 @@ in }) sources."mkdirp-0.5.5" sources."module-definition-3.3.1" - sources."moize-6.0.0" + sources."moize-6.0.1" (sources."move-file-1.2.0" // { dependencies = [ (sources."cp-file-6.2.0" // { @@ -91490,7 +91434,12 @@ in sources."nested-error-stacks-2.1.0" (sources."netlify-6.1.16" // { dependencies = [ - sources."qs-6.9.6" + sources."@netlify/zip-it-and-ship-it-2.7.1" + sources."esbuild-0.8.57" + sources."locate-path-5.0.0" + sources."qs-6.10.0" + sources."resolve-2.0.0-next.3" + sources."semver-6.3.0" ]; }) sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" @@ -91500,7 +91449,31 @@ in sources."node-fetch-2.6.1" sources."node-releases-1.1.71" sources."node-source-walk-4.2.0" + (sources."node-version-alias-1.0.1" // { + dependencies = [ + sources."@jest/types-25.5.0" + sources."@types/yargs-15.0.13" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."jest-get-type-25.2.6" + sources."jest-validate-25.5.0" + sources."pretty-format-25.5.0" + ]; + }) sources."noop2-2.0.0" + (sources."normalize-node-version-10.0.0" // { + dependencies = [ + sources."@jest/types-25.5.0" + sources."@types/yargs-15.0.13" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-3.0.0" + sources."jest-get-type-25.2.6" + sources."jest-validate-25.5.0" + sources."pretty-format-25.5.0" + ]; + }) (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -91529,6 +91502,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.9.0" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object-visit-1.0.1" @@ -91566,6 +91540,11 @@ in }) sources."p-cancelable-1.1.0" sources."p-event-4.2.0" + (sources."p-every-2.0.0" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) (sources."p-filter-2.1.0" // { dependencies = [ sources."p-map-2.1.0" @@ -91716,7 +91695,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.41.2" + sources."rollup-2.42.1" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -91766,6 +91745,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -91900,7 +91880,7 @@ in ]; }) sources."term-size-2.2.1" - (sources."terser-5.6.0" // { + (sources."terser-5.6.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -92713,7 +92693,7 @@ in sources."caseless-0.12.0" sources."cheerio-0.22.0" sources."chownr-2.0.0" - sources."cli-table-0.3.5" + sources."cli-table-0.3.6" sources."clone-2.1.2" sources."code-point-at-1.1.0" sources."colors-1.0.3" @@ -93491,7 +93471,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.34" + sources."@types/node-14.14.35" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -93693,6 +93673,7 @@ in sources."is-scoped-2.1.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-url-superb-4.0.0" sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" @@ -93745,7 +93726,7 @@ in sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."lodash.zip-4.2.0" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" (sources."log-update-2.3.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -93788,9 +93769,9 @@ in sources."type-fest-0.4.1" ]; }) - (sources."normalize-package-data-3.0.1" // { + (sources."normalize-package-data-3.0.2" // { dependencies = [ - sources."hosted-git-info-4.0.0" + sources."hosted-git-info-4.0.1" ]; }) sources."normalize-url-4.5.0" @@ -94083,7 +94064,7 @@ in sources."cint-8.2.1" sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" - sources."cli-table-0.3.5" + sources."cli-table-0.3.6" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" @@ -94147,7 +94128,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."hosted-git-info-4.0.0" + sources."hosted-git-info-4.0.1" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -94215,7 +94196,7 @@ in }) sources."make-fetch-happen-8.0.14" sources."map-age-cleaner-0.1.3" - sources."mem-8.0.0" + sources."mem-8.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.2" sources."mime-db-1.46.0" @@ -94240,13 +94221,9 @@ in sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - (sources."npm-package-arg-8.1.1" // { - dependencies = [ - sources."hosted-git-info-3.0.8" - ]; - }) + sources."npm-package-arg-8.1.2" sources."npm-packlist-2.1.4" - sources."npm-pick-manifest-6.1.0" + sources."npm-pick-manifest-6.1.1" sources."npm-registry-fetch-9.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -94311,7 +94288,7 @@ in sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."smart-buffer-4.1.0" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."socks-proxy-agent-5.0.0" sources."spawn-please-1.0.0" sources."sshpk-1.16.1" @@ -94593,10 +94570,10 @@ in parcel-bundler = nodeEnv.buildNodePackage { name = "parcel-bundler"; packageName = "parcel-bundler"; - version = "1.12.4"; + version = "1.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.4.tgz"; - sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ=="; + url = "https://registry.npmjs.org/parcel-bundler/-/parcel-bundler-1.12.5.tgz"; + sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -94839,7 +94816,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -94974,7 +94951,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.687" + sources."electron-to-chromium-1.3.693" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -95229,7 +95206,7 @@ in }) sources."nice-try-1.0.5" sources."node-addon-api-1.7.2" - sources."node-forge-0.7.6" + sources."node-forge-0.10.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" @@ -96919,10 +96896,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.18.7"; + version = "5.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.18.7.tgz"; - sha512 = "7LSLQSeskkDtzAuq8DxEcVNWlqFd0ppWPT6Z4+TiS8SjxGCRSpnCeDVzwliAPd0hedl6HuUiSnDPgmg/kHUVXw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.18.8.tgz"; + sha512 = "MO0XZoJfZFn6KjhcDpS03P9MeKx3xzgoXJcIcTjJ29/pKeS1O5x/SeLjzsCsAbkPLrv6JdY5uotIz7LRKEe88w=="; }; buildInputs = globalBuildInputs; meta = { @@ -97471,10 +97448,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.121"; + version = "1.1.123"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.121.tgz"; - sha512 = "jb0BwO3nbiF808SDMpT4UXg30ats+8nsHyu4zTlSt1p4ZWl6+GNP98peDQyOYzgnoScTMomDYTDXejAAD3M+WA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.123.tgz"; + sha512 = "EYjELbm4G4icuIki6PfpzYrxNeGH78vNbXNmsbb/9XnnVQISdFcbc9oOBc2mU77enUwZctwZ6Nj2mZUMD9VibQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -97871,10 +97848,10 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.2.1-pre"; + version = "2.2.3-pre"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.2.1-pre.tgz"; - sha512 = "1f8y1ZeGRYskJyZZQzXVw5OlzQKs597JEr48wBzD6ZhmDhUbtqxswsFYROfCigWpkxywBsykesDy8ENKDOYQZg=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.2.3-pre.tgz"; + sha512 = "7dAkgA92K/xzFu+ZeS1oVDgjIMmBuWQBo0CNFucPxyWds7I8liDDdt2ph64eaZauzrSlfy3T8G895SDQb188cA=="; }; dependencies = [ sources."@gardenapple/yargs-17.0.0-candidate.0" @@ -98052,7 +98029,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.46" + sources."@types/node-13.13.47" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -98293,7 +98270,7 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."slugify-1.4.7" + sources."slugify-1.5.0" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" @@ -98413,10 +98390,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.41.2"; + version = "2.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.41.2.tgz"; - sha512 = "6u8fJJXJx6fmvKrAC9DHYZgONvSkz8S9b/VFBjoQ6dkKdHyPpPbpqiNl2Bao9XBzDHpq672X6sGZ9G1ZBqAHMg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.42.1.tgz"; + sha512 = "/y7M2ULg06JOXmMpPzhTeQroJSchy8lX8q6qrjqil0jmLz6ejCWbQzVnWTsdmMQRhfU0QcwtiW8iZlmrGXWV4g=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -98465,18 +98442,18 @@ in sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.3" - sources."@types/mocha-8.2.1" + sources."@types/mocha-8.2.2" sources."@types/node-12.12.70" sources."@types/node-fetch-2.5.8" sources."@types/resolve-1.17.1" sources."@types/vscode-1.54.0" - sources."@typescript-eslint/eslint-plugin-4.17.0" - sources."@typescript-eslint/experimental-utils-4.17.0" - sources."@typescript-eslint/parser-4.17.0" - sources."@typescript-eslint/scope-manager-4.17.0" - sources."@typescript-eslint/types-4.17.0" - sources."@typescript-eslint/typescript-estree-4.17.0" - sources."@typescript-eslint/visitor-keys-4.17.0" + sources."@typescript-eslint/eslint-plugin-4.18.0" + sources."@typescript-eslint/experimental-utils-4.18.0" + sources."@typescript-eslint/parser-4.18.0" + sources."@typescript-eslint/scope-manager-4.18.0" + sources."@typescript-eslint/types-4.18.0" + sources."@typescript-eslint/typescript-estree-4.18.0" + sources."@typescript-eslint/visitor-keys-4.18.0" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -98613,7 +98590,7 @@ in sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.2" - (sources."globals-13.6.0" // { + (sources."globals-13.7.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -98736,7 +98713,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.41.2" + sources."rollup-2.42.1" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.4" @@ -98766,7 +98743,7 @@ in sources."supports-color-5.5.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -99138,10 +99115,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.29.0"; + version = "2.30.3"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.29.0.tgz"; - sha512 = "p4Sfc1L8yUZ+gbxn7yniHpeXIcnPUD4jT3NIz/5uKhN3u/rMadEwEOeau/qFhFA0m/yhhQyLtVM5H3PnSb1pxQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.30.3.tgz"; + sha512 = "a/81mGvXwzw90iBGKRcXdVw0lKMWzECh/3BpX8BJvgjCSINmUPjA/HSTota2UWTFp7Ne1vuiBEiLT4x8E/6kgQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -99173,12 +99150,24 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.7.3" // { + (sources."@serverless/components-3.7.5" // { dependencies = [ + (sources."@serverless/utils-3.1.0" // { + dependencies = [ + sources."js-yaml-4.0.0" + ]; + }) sources."ansi-regex-5.0.0" - sources."js-yaml-3.14.1" + sources."argparse-2.0.1" + (sources."js-yaml-3.14.1" // { + dependencies = [ + sources."argparse-1.0.10" + ]; + }) + sources."jwt-decode-3.1.2" sources."ramda-0.27.1" sources."strip-ansi-6.0.0" + sources."write-file-atomic-3.0.3" ]; }) (sources."@serverless/core-1.1.2" // { @@ -99188,25 +99177,25 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-4.5.0" // { + (sources."@serverless/enterprise-plugin-4.5.1" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.0" // { + (sources."@serverless/platform-client-4.2.1" // { dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/platform-client-china-2.1.8" // { + (sources."@serverless/platform-client-china-2.1.9" // { dependencies = [ sources."js-yaml-3.14.1" ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-3.1.0" // { + (sources."@serverless/utils-4.0.0" // { dependencies = [ sources."jwt-decode-3.1.2" sources."write-file-atomic-3.0.3" @@ -99222,7 +99211,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.34" + sources."@types/node-14.14.35" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -99283,7 +99272,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.863.0" // { + (sources."aws-sdk-2.868.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -99365,6 +99354,7 @@ in sources."child-process-ext-2.1.1" sources."chokidar-3.5.1" sources."chownr-1.1.4" + sources."ci-info-3.1.1" sources."cli-boxes-2.2.1" (sources."cli-color-2.0.0" // { dependencies = [ @@ -99790,7 +99780,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.46" + sources."@types/node-13.13.47" sources."long-4.0.0" ]; }) @@ -99841,7 +99831,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.36.2" // { + (sources."simple-git-2.37.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -100300,7 +100290,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."cli-table-0.3.5" + sources."cli-table-0.3.6" sources."collection-visit-1.0.0" sources."colors-1.0.3" sources."commander-2.9.0" @@ -100651,10 +100641,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.487.0"; + version = "1.503.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.487.0.tgz"; - sha512 = "1PCG8FdbnEwsnURfmo6MsehpnaOwcuj4A9A0vlSBxZvaYp8O3728Py01HmKbeUOLHkqYlsTxPe6Xpdsc7BA4nQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.503.0.tgz"; + sha512 = "CCDlwvQJ/TyR6cbG38p/TxzE313CIvtPJe8LIxplfoLj6yswRtwspY5iYCOW4wdUzbZQyXk/Y4A7VSjXhBL9qQ=="; }; dependencies = [ sources."@deepcode/dcignore-1.0.2" @@ -100672,7 +100662,11 @@ in ]; }) sources."@snyk/composer-lockfile-parser-1.4.1" - sources."@snyk/dep-graph-1.27.1" + (sources."@snyk/dep-graph-1.28.0" // { + dependencies = [ + sources."semver-7.3.4" + ]; + }) sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/fast-glob-3.2.6-patch" sources."@snyk/gemfile-1.2.0" @@ -100716,7 +100710,7 @@ in sources."@types/lodash.omit-4.5.6" sources."@types/lodash.union-4.6.6" sources."@types/micromatch-4.0.1" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@types/responselike-1.0.0" sources."@types/sarif-2.1.3" sources."@types/uuid-8.3.0" @@ -100891,12 +100885,7 @@ in sources."debug-3.2.7" ]; }) - (sources."hosted-git-info-3.0.8" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) + sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -100998,7 +100987,7 @@ in sources."lodash.upperfirst-4.3.1" sources."lodash.values-4.3.0" sources."lowercase-keys-2.0.0" - sources."lru-cache-5.1.1" + sources."lru-cache-6.0.0" sources."macos-release-2.4.1" sources."make-dir-3.1.0" sources."merge2-1.4.1" @@ -101007,16 +100996,8 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-3.1.3" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."minipass-3.1.3" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -101074,7 +101055,12 @@ in sources."promise-7.3.1" sources."promise-fs-2.1.1" sources."promise-queue-2.2.5" - sources."proxy-agent-3.1.1" + (sources."proxy-agent-3.1.1" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -101187,7 +101173,9 @@ in }) (sources."snyk-policy-1.19.0" // { dependencies = [ + sources."lru-cache-5.1.1" sources."snyk-try-require-2.0.1" + sources."yallist-3.1.1" ]; }) sources."snyk-python-plugin-1.19.5" @@ -101241,11 +101229,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - (sources."tar-6.1.0" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) + sources."tar-6.1.0" (sources."tar-stream-2.2.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -101309,7 +101293,7 @@ in sources."xmlbuilder-11.0.1" sources."xregexp-2.0.0" sources."xtend-4.0.2" - sources."yallist-3.1.1" + sources."yallist-4.0.0" sources."yaml-1.10.2" ]; buildInputs = globalBuildInputs; @@ -101334,7 +101318,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.34" + sources."@types/node-14.14.35" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -101388,7 +101372,7 @@ in sources."ci-info-1.6.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."clone-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -102308,7 +102292,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.5.1" + sources."socks-2.6.0" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -102328,7 +102312,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-1.18.3" // { + (sources."ssb-db2-1.18.6" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -102592,7 +102576,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.863.0" // { + (sources."aws-sdk-2.868.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -102977,6 +102961,7 @@ in sources."oauth-sign-0.8.2" sources."object-assign-4.1.1" sources."object-hash-0.3.0" + sources."object-inspect-1.9.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -103117,6 +103102,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."side-channel-1.0.4" sources."signal-exit-3.0.3" sources."slash-1.0.0" sources."sntp-1.0.9" @@ -103182,7 +103168,7 @@ in dependencies = [ sources."debug-3.2.7" sources."form-data-2.5.1" - sources."qs-6.9.6" + sources."qs-6.10.0" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -103195,7 +103181,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.14.1" sources."lodash-3.10.1" - sources."qs-6.9.6" + sources."qs-6.10.0" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -103402,7 +103388,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.3" - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -103417,7 +103403,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -103455,7 +103441,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -103487,7 +103473,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-4.0.0" + sources."hosted-git-info-4.0.1" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" @@ -103517,6 +103503,7 @@ in sources."is-plain-obj-2.1.0" sources."is-regexp-2.1.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -103528,7 +103515,7 @@ in sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."log-symbols-4.0.0" + sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" sources."lru-cache-6.0.0" sources."map-obj-4.2.0" @@ -103550,7 +103537,7 @@ in }) sources."ms-2.1.2" sources."node-releases-1.1.71" - (sources."normalize-package-data-3.0.1" // { + (sources."normalize-package-data-3.0.2" // { dependencies = [ sources."semver-7.3.4" ]; @@ -103687,10 +103674,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.12.21"; + version = "0.12.22"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.21.tgz"; - sha512 = "bJjjewjz1kOlfbtSASamOeu1z53Di+Ph9kLbbDPESJ8tIrmMDEZkWMOCVB8mrIsS1ubaKkBPGQc86JhTGhiGig=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.12.22.tgz"; + sha512 = "Wb1gazaGXc2efzq6x+RUHA1BXNnYikFPHHN4eIO1Ju3Gl1OJ4oHpzOloKGN+dH3awche6xQjlo4Uo7ONrWPwOw=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -103699,7 +103686,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.34" + sources."@types/node-14.14.35" sources."@types/parse-json-4.0.0" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" @@ -103752,7 +103739,7 @@ in sources."supports-color-5.5.0" sources."svelte-3.35.0" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.181" + sources."svelte2tsx-0.1.182" sources."to-regex-range-5.0.1" sources."tslib-2.1.0" sources."typescript-4.2.3" @@ -103893,6 +103880,7 @@ in }) sources."bytes-1.0.0" sources."cache-base-1.0.1" + sources."call-bind-1.0.2" sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" @@ -104015,6 +104003,8 @@ in sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -104038,8 +104028,10 @@ in sources."source-map-0.6.1" ]; }) + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -104198,6 +104190,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."object-inspect-1.9.0" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -104215,7 +104208,7 @@ in dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" - sources."qs-6.9.6" + sources."qs-6.10.0" sources."superagent-3.8.3" ]; }) @@ -104279,6 +104272,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."side-channel-1.0.4" sources."sigmund-1.0.1" sources."signal-exit-3.0.3" sources."slash-1.0.0" @@ -104624,29 +104618,29 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "11.8.2"; + version = "11.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-11.8.2.tgz"; - sha512 = "YrTGagGzWKXYw6VjW4uhJ1y7LoW8zqWZIr8sWgeQVIFE84+G/cHPoZ8RhFlia+RZ4YryZPNOqevuF4vG+dbKNQ=="; + url = "https://registry.npmjs.org/textlint/-/textlint-11.9.0.tgz"; + sha512 = "a9ZCfCOcOTNxEQsRbYBDFNu8m5cjJC+znnXCBommGSdP0W+9QmwZnkralwpxrVhRgWvLz+QyuDXtLBZcqfDmHg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/ast-tester-2.3.2" - sources."@textlint/ast-traverse-2.3.2" - sources."@textlint/feature-flag-3.3.2" - sources."@textlint/fixer-formatter-3.3.2" - sources."@textlint/kernel-3.4.2" - sources."@textlint/linter-formatter-3.3.2" - sources."@textlint/markdown-to-ast-6.3.2" - sources."@textlint/module-interop-1.2.2" - sources."@textlint/source-code-fixer-3.4.2" - sources."@textlint/text-to-ast-3.3.2" - sources."@textlint/textlint-plugin-markdown-5.3.2" - sources."@textlint/textlint-plugin-text-4.3.2" - sources."@textlint/types-1.5.2" - sources."@textlint/utils-1.2.2" + sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/ast-tester-2.3.4" + sources."@textlint/ast-traverse-2.3.4" + sources."@textlint/feature-flag-3.3.4" + sources."@textlint/fixer-formatter-3.3.4" + sources."@textlint/kernel-3.4.4" + sources."@textlint/linter-formatter-3.3.4" + sources."@textlint/markdown-to-ast-6.3.4" + sources."@textlint/module-interop-1.2.4" + sources."@textlint/source-code-fixer-3.4.4" + sources."@textlint/text-to-ast-3.3.4" + sources."@textlint/textlint-plugin-markdown-5.3.4" + sources."@textlint/textlint-plugin-text-4.3.4" + sources."@textlint/types-1.5.4" + sources."@textlint/utils-1.2.4" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -104857,7 +104851,7 @@ in sha1 = "9139c65b8da891c983b368a50a286338cd76777a"; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.1" + sources."@textlint/ast-node-types-4.4.2" sources."txt-to-ast-3.0.3" ]; buildInputs = globalBuildInputs; @@ -104913,13 +104907,15 @@ in sources."@babel/highlight-7.13.10" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.2" + sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/types-1.5.4" sources."@types/hast-2.3.1" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" + sources."acorn-8.1.0" + sources."acorn-jsx-5.3.1" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -105000,6 +104996,7 @@ in sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."estree-util-is-identifier-name-1.1.0" sources."event-stream-3.1.7" sources."extend-3.0.2" sources."fault-1.0.4" @@ -105050,7 +105047,6 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-alphabetical-1.0.4" - sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" @@ -105101,11 +105097,22 @@ in sources."map-obj-4.2.0" sources."map-stream-0.1.0" sources."markdown-escapes-1.0.4" - sources."markdown-table-2.0.0" sources."mdast-comment-marker-1.1.2" - sources."mdast-util-compact-2.0.1" + sources."mdast-util-mdx-0.1.1" + sources."mdast-util-mdx-expression-0.1.1" + sources."mdast-util-mdx-jsx-0.1.3" + sources."mdast-util-mdxjs-esm-0.1.1" + sources."mdast-util-to-markdown-0.6.5" sources."mdast-util-to-nlcst-4.0.1" + sources."mdast-util-to-string-2.0.0" sources."meow-7.1.1" + sources."micromark-2.11.4" + sources."micromark-extension-mdx-0.2.1" + sources."micromark-extension-mdx-expression-0.3.2" + sources."micromark-extension-mdx-jsx-0.3.3" + sources."micromark-extension-mdx-md-0.1.1" + sources."micromark-extension-mdxjs-0.3.0" + sources."micromark-extension-mdxjs-esm-0.3.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -105165,11 +105172,14 @@ in sources."rehype-parse-7.0.1" sources."rehype-retext-2.0.4" sources."remark-frontmatter-2.0.0" - sources."remark-mdx-2.0.0-next.8" + sources."remark-mdx-2.0.0-next.9" sources."remark-message-control-6.0.0" - sources."remark-parse-8.0.3" + (sources."remark-parse-8.0.3" // { + dependencies = [ + sources."unist-util-remove-position-2.0.1" + ]; + }) sources."remark-retext-4.0.0" - sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" sources."resolve-1.20.0" sources."resolve-from-5.0.0" @@ -105267,7 +105277,7 @@ in sources."unist-util-is-4.1.0" sources."unist-util-modify-children-2.0.0" sources."unist-util-position-3.1.0" - sources."unist-util-remove-position-2.0.1" + sources."unist-util-remove-position-3.0.0" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-2.0.3" sources."unist-util-visit-children-1.1.4" @@ -105303,6 +105313,7 @@ in sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" sources."yargs-parser-18.1.3" + sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -105444,8 +105455,8 @@ in sha512 = "HydBbkWjnMn4KrnlpnusY1BGjIG+64UySxRCvRphUAIiuJL2nbkdrIIiOjwfQhllKUa7Sf33bs6RAcbEWjZVfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.2" + sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/types-1.5.4" sources."boundary-1.0.1" sources."buffer-from-1.1.1" sources."call-bind-1.0.2" @@ -105557,8 +105568,8 @@ in sha512 = "UW7nWrqBUHfz/sRLTFo40BNjwXOiXSHg00TJuYY4GVDQtsWRLyAsOnXSBqClP4i6wl7ejMBeYmB5mfllYAYMgA=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.2" + sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/types-1.5.4" sources."boundary-1.0.1" sources."lodash-4.17.21" sources."split-lines-2.0.0" @@ -105587,8 +105598,8 @@ in sha512 = "VW+ea4ByLPddSUqoFkVVJF8zWnO8kqKwvC681wGFAjI4CYz9WhjEQH1ikhoEHXnd5AFXNArcjyoa8hoihrXy0w=="; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.2" + sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/types-1.5.4" sources."boundary-1.0.1" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" @@ -105664,8 +105675,8 @@ in sha1 = "3c79b04091319d4e8be5fb442c596bf500e8493e"; }; dependencies = [ - sources."@textlint/ast-node-types-4.4.1" - sources."@textlint/types-1.5.2" + sources."@textlint/ast-node-types-4.4.2" + sources."@textlint/types-1.5.4" sources."adverb-where-0.0.9" sources."boundary-1.0.1" sources."call-bind-1.0.2" @@ -105714,7 +105725,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.34" + sources."@types/node-14.14.35" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -106684,7 +106695,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.34" + sources."@types/node-14.14.35" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -106813,7 +106824,7 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" - (sources."memorystore-1.6.5" // { + (sources."memorystore-1.6.6" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -106957,10 +106968,10 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.19.1"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.19.1.tgz"; - sha512 = "zUyyUYl2GgpAqdaQ3f/riNdaued3030hiJAjreX7/3XBiJ64vmF1l42x3KD8rq24ff9xLFwe0qyfnQOk4nK+fg=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.20.0.tgz"; + sha512 = "B7vV6u/6oXP+6WP91uPLKPmKXXu4YHncxue13mJwz8noRxsEYpeb0VtaCtwy+tf8otdXsM+YuKYzOJbtpuLXYQ=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -107076,7 +107087,7 @@ in sources."tar-4.4.13" sources."topojson-client-3.1.0" sources."util-deprecate-1.0.2" - sources."vega-5.19.1" + sources."vega-5.20.0" sources."vega-canvas-1.2.6" sources."vega-crossfilter-4.0.5" sources."vega-dataflow-5.7.3" @@ -107095,14 +107106,14 @@ in sources."vega-regression-1.0.9" sources."vega-runtime-6.1.3" sources."vega-scale-7.1.1" - sources."vega-scenegraph-4.9.3" + sources."vega-scenegraph-4.9.4" sources."vega-selections-5.3.0" sources."vega-statistics-1.7.9" sources."vega-time-2.0.4" sources."vega-transforms-4.9.3" - sources."vega-typings-0.19.2" - sources."vega-util-1.16.0" - sources."vega-view-5.9.2" + sources."vega-typings-0.20.0" + sources."vega-util-1.16.1" + sources."vega-view-5.10.0" sources."vega-view-transforms-4.5.8" sources."vega-voronoi-4.1.5" sources."vega-wordcloud-4.1.3" @@ -107169,7 +107180,7 @@ in sources."tslib-2.1.0" sources."vega-event-selector-2.0.6" sources."vega-expression-4.0.1" - sources."vega-util-1.16.0" + sources."vega-util-1.16.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.5" sources."yargs-16.2.0" @@ -108481,7 +108492,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.34" + sources."@types/node-14.14.35" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -109424,7 +109435,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.34" + sources."@types/node-14.14.35" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -109811,7 +109822,7 @@ in }) sources."mz-2.7.0" sources."nan-2.14.2" - sources."nanoid-3.1.21" + sources."nanoid-3.1.22" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" @@ -109955,7 +109966,7 @@ in sources."supports-color-7.2.0" (sources."table-6.0.7" // { dependencies = [ - sources."ajv-7.2.1" + sources."ajv-7.2.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -110029,17 +110040,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.25.1"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.25.1.tgz"; - sha512 = "dzFTJwehoLZkeHUkvMSwAgVdGL+PerfX0mke9tOWjJs4OzFctkxCqD8Zj5J387jLkC4gNqSin0/EurhH28boCg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.27.1.tgz"; + sha512 = "rxIDsPZ3Apl3JcqiemiLmWH+hAq04YeOXqvCxNZOnTp8ZgM9NEPtbu4CaMfMEf9KShnx/Ym8uLGmM6P4XnwCoA=="; }; dependencies = [ sources."@types/eslint-7.2.7" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -110062,11 +110073,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.3" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001200" + sources."caniuse-lite-1.0.30001203" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.693" sources."enhanced-resolve-5.7.0" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" @@ -110103,7 +110114,7 @@ in sources."source-map-support-0.5.19" sources."supports-color-7.2.0" sources."tapable-2.2.0" - (sources."terser-5.6.0" // { + (sources."terser-5.6.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -110207,7 +110218,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -110327,7 +110338,7 @@ in sources."del-4.1.1" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."detect-node-2.0.4" + sources."detect-node-2.0.5" sources."dns-equal-1.0.0" sources."dns-packet-1.3.1" sources."dns-txt-2.0.2" @@ -110339,7 +110350,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" - sources."eventsource-1.0.7" + sources."eventsource-1.1.0" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -110856,7 +110867,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.46" + sources."@types/node-13.13.47" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -110934,6 +110945,7 @@ in ]; }) sources."core-util-is-1.0.2" + sources."cpus-1.0.3" sources."create-torrent-4.5.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -111068,7 +111080,7 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-peer-9.9.3" // { + (sources."simple-peer-9.10.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -111124,7 +111136,7 @@ in sources."utp-native-2.3.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.115.3" // { + (sources."webtorrent-0.115.4" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -111281,7 +111293,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.34" + sources."@types/node-14.14.35" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -111374,7 +111386,7 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" - sources."cli-table-0.3.5" + sources."cli-table-0.3.6" sources."cli-width-2.2.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -111422,7 +111434,7 @@ in sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."detect-node-2.0.4" + sources."detect-node-2.0.5" sources."diff-3.5.0" (sources."dir-glob-2.0.0" // { dependencies = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index 2a437cd29d..5c7d36fcc0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,35 +1,29 @@ -{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, cppo, minimal ? true }: +{ stdenv, lib, fetchurl, ocaml, findlib, cppo +# De facto, option minimal seems to be the default. See the README. +, minimal ? true +}: -assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.7"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-extlib"; + version = "1.7.8"; src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; - sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; + url = "https://ygrek.org/p/release/ocaml-extlib/extlib-${version}.tar.gz"; + sha256 = "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k"; }; - patches = [ - (fetchpatch { - url = "https://github.com/ygrek/ocaml-extlib/pull/55.patch"; - sha256 = "0mj3xii56rh8j8brdyv5d06rbs6jjjcy4ib9chafkq3f3sbq795p"; - }) - ]; - buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true; + dontConfigure = true; - dontConfigure = true; # Skip configure - # De facto, option minimal=1 seems to be the default. See the README. - buildPhase = "make ${if minimal then "minimal=1" else ""} build"; - installPhase = "make ${if minimal then "minimal=1" else ""} install"; + makeFlags = lib.optional minimal "minimal=1"; meta = { homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; - license = lib.licenses.lgpl21; + license = lib.licenses.lgpl21Only; platforms = ocaml.meta.platforms or []; + maintainers = [ lib.maintainers.sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix new file mode 100644 index 0000000000..666eb68492 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, faraday, core, async }: + +buildDunePackage rec { + pname = "faraday-async"; + inherit (faraday) version src useDune2; + + minimumOCamlVersion = "4.08"; + + propagatedBuildInputs = [ faraday core async ]; + + meta = faraday.meta // { + description = "Async support for Faraday"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/lwt-unix.nix new file mode 100644 index 0000000000..23914de265 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/lwt-unix.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, faraday, faraday-lwt, lwt }: + +buildDunePackage rec { + pname = "faraday-lwt-unix"; + inherit (faraday) version src useDune2 minimumOCamlVersion; + + propagatedBuildInputs = [ lwt faraday-lwt ]; + + meta = faraday.meta // { + description = "Lwt + Unix support for Faraday"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/lwt.nix new file mode 100644 index 0000000000..7fe7319575 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/lwt.nix @@ -0,0 +1,12 @@ +{ buildDunePackage, faraday, lwt }: + +buildDunePackage rec { + pname = "faraday-lwt"; + inherit (faraday) version src useDune2 minimumOCamlVersion; + + propagatedBuildInputs = [ faraday lwt ]; + + meta = faraday.meta // { + description = "Lwt support for Faraday"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphics/default.nix index 6a3217431b..10d0b4ea6f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphics/default.nix @@ -3,13 +3,13 @@ buildDunePackage rec { pname = "graphics"; - version = "5.1.0"; + version = "5.1.1"; useDune2 = true; src = fetchurl { url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz"; - sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5"; + sha256 = "sha256-KGyD497ZKHA2xeXHezmh3P1zoSlre1h5N9zjkAFmMo4="; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix index 87fd72b756..5ba6cb08cc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix @@ -2,15 +2,17 @@ buildDunePackage rec { pname = "npy"; - version = "unstable-2019-04-02"; + version = "0.0.9"; + + useDune2 = true; minimumOCamlVersion = "4.06"; src = fetchFromGitHub { owner = "LaurentMazare"; repo = "${pname}-ocaml"; - rev = "c051086bfea6bee58208098bcf1c2f725a80a1fb"; - sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb"; + rev = version; + sha256 = "1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1"; }; propagatedBuildInputs = [ camlzip ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 46c84d8d70..a56621465f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -1,78 +1,21 @@ -{ buildDunePackage -, stdlib-shims -, ppx_yojson_conv_lib -, ocaml-syntax-shims -, yojson -, result -, omd -, octavius -, dune-build-info -, uutf -, csexp -, cmdliner -, fetchzip -, lib -}: -let - version = "1.4.1"; - src = fetchzip { - url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; - sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5"; - }; +{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }: - # unvendor some (not all) dependencies. - # They are vendored by upstream only because it is then easier to install - # ocaml-lsp without messing with your opam switch, but nix should prevent - # this type of problems without resorting to vendoring. - preBuild = '' - rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} - ''; - - buildInputs = [ - stdlib-shims - ppx_yojson_conv_lib - ocaml-syntax-shims - octavius - uutf - csexp - dune-build-info - omd - cmdliner - jsonrpc - ]; - - lsp = buildDunePackage { - pname = "lsp"; - inherit version src; - useDune2 = true; - minimumOCamlVersion = "4.06"; - - inherit buildInputs preBuild; - }; - - jsonrpc = buildDunePackage { - pname = "jsonrpc"; - inherit version src; - useDune2 = true; - minimumOCamlVersion = "4.06"; - - buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ]; - }; - -in buildDunePackage { pname = "ocaml-lsp-server"; - inherit version src; + inherit (jsonrpc) version src; useDune2 = true; - inherit preBuild; + inherit (lsp) preBuild; - buildInputs = buildInputs ++ [ lsp ]; + buildInputs = lsp.buildInputs ++ [ lsp ]; - meta = with lib; { + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/ocamllsp --prefix PATH : ${dot-merlin-reader}/bin + ''; + + meta = jsonrpc.meta // { description = "OCaml Language Server Protocol implementation"; - license = lib.licenses.isc; - platforms = platforms.unix; - maintainers = [ maintainers.symphorien maintainers.marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix new file mode 100644 index 0000000000..701604c871 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -0,0 +1,31 @@ +{ buildDunePackage +, stdlib-shims +, ppx_yojson_conv_lib +, ocaml-syntax-shims +, yojson +, result +, fetchzip +, lib +}: + + +buildDunePackage rec { + pname = "jsonrpc"; + version = "1.4.1"; + src = fetchzip { + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; + sha256 = "0hzpw17qfhb0cxgwah1fv4k300r363dy1kv0977anl44dlanx1v5"; + }; + + useDune2 = true; + minimumOCamlVersion = "4.06"; + + buildInputs = [ yojson stdlib-shims ocaml-syntax-shims ppx_yojson_conv_lib result ]; + + meta = with lib; { + description = "Jsonrpc protocol implementation in OCaml"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ symphorien marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix new file mode 100644 index 0000000000..b501282c15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -0,0 +1,44 @@ +{ buildDunePackage +, stdlib-shims +, ppx_yojson_conv_lib +, ocaml-syntax-shims +, jsonrpc +, omd +, octavius +, dune-build-info +, uutf +, csexp +, cmdliner +}: + +buildDunePackage { + pname = "lsp"; + inherit (jsonrpc) version src; + useDune2 = true; + minimumOCamlVersion = "4.06"; + + # unvendor some (not all) dependencies. + # They are vendored by upstream only because it is then easier to install + # ocaml-lsp without messing with your opam switch, but nix should prevent + # this type of problems without resorting to vendoring. + preBuild = '' + rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} + ''; + + buildInputs = [ + stdlib-shims + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + uutf + csexp + dune-build-info + omd + cmdliner + jsonrpc + ]; + + meta = jsonrpc.meta // { + description = "LSP protocol implementation in OCaml"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix index a4dd79cd58..1a27c8c1f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix @@ -11,20 +11,19 @@ , tornado , twisted , mock -, trollius , gevent , six , pytz , tzlocal , funcsigs -, futures , setuptools -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "APScheduler"; version = "3.7.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -45,7 +44,7 @@ buildPythonPackage rec { twisted mock gevent - ] ++ lib.optionals (!isPy3k) [ trollius ]; + ]; propagatedBuildInputs = [ six @@ -53,7 +52,7 @@ buildPythonPackage rec { tzlocal funcsigs setuptools - ] ++ lib.optional (!isPy3k) futures; + ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_submit_job" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix index 50e90ded76..118288acb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "WSME"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; + sha256 = "34209b623635a905bcdbc654f53ac814d038da65e4c2bc070ea1745021984079"; }; nativeBuildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix new file mode 100644 index 0000000000..078184275e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aionotion"; + version = "3.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytest-aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + disabledTestPaths = [ "examples" ]; + + pythonImportsCheck = [ "aionotion" ]; + + meta = with lib; { + description = "Python library for Notion Home Monitoring"; + homepage = "https://github.com/bachya/aionotion"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix index 6a0d69371a..2a3a2e60be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix @@ -1,22 +1,22 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pbr , aiohttp -, ddt , asynctest -, pytest +, buildPythonPackage +, ddt +, fetchPypi +, pbr +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aioresponses"; - version = "0.7.1"; + version = "0.7.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f65bba2be1e9a4997ee166bc0161a50be0fef7350ad09e6afdb2adccf74dfefe"; + sha256 = "sha256-guSV0Ri3SJaqW01H4X7/teLMeD5RCuOVzq3l6Hyr6Jo="; }; nativeBuildInputs = [ @@ -30,13 +30,16 @@ buildPythonPackage rec { checkInputs = [ asynctest ddt - pytest + pytestCheckHook ]; - # Skip a test which makes requests to httpbin.org - checkPhase = '' - pytest -k "not (test_address_as_instance_of_url_combined_with_pass_through or test_pass_through_with_origin_params)" - ''; + disabledTests = [ + # Skip a test which makes requests to httpbin.org + "test_address_as_instance_of_url_combined_with_pass_through" + "test_pass_through_with_origin_params" + ]; + + pythonImportsCheck = [ "aioresponses" ]; meta = { description = "A helper to mock/fake web requests in python aiohttp package"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix index 37c1efd9c1..99ee559da6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -33,18 +33,20 @@ buildPythonPackage rec { pandas six toolz + jinja2 ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ glibcLocales ipython - jinja2 pytest recommonmark sphinx vega_datasets ]; + pythonImportsCheck = [ "altair" ]; + checkPhase = '' export LANG=en_US.UTF-8 # histogram_responsive.py attempt network access, and cannot be disabled through pytest flags diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arrayqueues/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arrayqueues/default.nix index 82c8fc9326..79a44ad42c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arrayqueues/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arrayqueues/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "arrayqueues"; - version = "1.2.0b0"; + version = "1.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1gvrxb2rw0dk469wq5azylar7hhanfp07gl5mc6ajdbgz9gsd6ln"; + sha256 = "a955df768e39d459de28c7ea10ee02f67b1c70996cfa229846ab98df77a6fb69"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix index 19c1921f7c..33513b2289 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -1,54 +1,55 @@ { lib +, astropy , buildPythonPackage , fetchPypi -, pytest-astropy -, semantic-version -, pyyaml , jsonschema -, six , numpy -, isPy27 -, astropy -, setuptools_scm -, setuptools +, packaging +, pytest-astropy +, pytestCheckHook +, pythonOlder +, pyyaml +, semantic-version +, setuptools-scm }: buildPythonPackage rec { pname = "asdf"; - version = "2.7.1"; - disabled = isPy27; + version = "2.7.3"; + disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "4ba2e31cb24b974a10dfae3edee23db2e6bea2d00608604d062366aa3af6e81a"; + sha256 = "11dyr295wn5m2pcynlwj7kgw9xr66msfvwn1m6a5vv13vzj19spp"; }; + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + jsonschema + numpy + packaging + pyyaml + semantic-version + ]; + checkInputs = [ pytest-astropy astropy + pytestCheckHook ]; - propagatedBuildInputs = [ - semantic-version - pyyaml - jsonschema - six - numpy - setuptools_scm - setuptools - ]; - - checkPhase = '' - PY_IGNORE_IMPORTMISMATCH=1 pytest + preCheck = '' + export PY_IGNORE_IMPORTMISMATCH=1 ''; + pythonImportsCheck = [ "asdf" ]; + meta = with lib; { description = "Python tools to handle ASDF files"; homepage = "https://github.com/spacetelescope/asdf"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; - # many ValueError in tests - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix index e0294246fb..fb51b698ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro-python3/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro-python3"; - version = "1.10.1"; + version = "1.10.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9027abeab63dd9b66bd3c564fa0670c70f78027ecb1978d96c6af7ed415b626b"; + sha256 = "3b63f24e6b04368c3e4a6f923f484be0230d821aad65ac36108edbff29e9aaab"; }; buildInputs = [ pycodestyle isort ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix index 5a38e86eee..4c1fb77dc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "avro"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "b3a405df5aa8654b992d2aca7b80482b858a1919a44dc0b10a682162e8ee340a"; + sha256 = "381b990cc4c4444743c3297348ffd46e0c3a5d7a17e15b2f4a9042f6e955c31a"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix index 9538ed2a23..628d0bbcac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-marketplaceordering/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-marketplaceordering"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "85103080f9e59215036bdfb8f806d91ea182d72c46a13f55c3acc479849351e3"; + sha256 = "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix index c277122755..be011a1ed0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.6.0"; + version = "0.6.2"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d805a91b295edf52057ffab26b714160905406bdd5d7a1a3f93f6cdc3ede8412"; + sha256 = "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix index 5d0f098b8a..95bb22ce2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.21"; + version = "0.5.22"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0d86e9ae73e6472c26aeb4de7abd9bf99492fedcbb0485ed7fa23609d2673b42"; + sha256 = "ed0057dc22bd392df4b3bba23536117e1b2866e3201b12c5a37428d23421a5ba"; }; checkInputs = [ pytest nose glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix index 2c4f495a7f..88369f4187 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { - version = "2.3.3"; + version = "2.3.4"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0767ap2n9vk9dz40njndfhaprajr75fvzx7igbd1szc6x8wri8nr"; + sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA="; }; # Tests require files not included in the PyPI archive. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index cdd6af447b..8868b40259 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.30"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.33"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-05wEtR5gGX9VA/hInwQ7yQSYFWfMhDHTiTZ3Z9w/1a4="; + sha256 = "sha256-DKwv/8G6kV97tezuU5MYUy21HyGMkooij6/j5QHpRy4="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index ca8ef220c9..4aef369c60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.30"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.33"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-mP8eshDTlKH/5zazPIp75o8w8KA1ULVZxbtv3wwpMo0="; + sha256 = "sha256-41UwUwlpnTrKHgBQ/CHUhZW0DbBGyw0kkc1X/1smkgs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix index 7f7afd67e7..834dd42bc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildout-nix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.3"; + version = "2.13.4"; src = fetchPypi { inherit pname version; - sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn"; + sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63"; }; patches = [ ./nix.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 6057a770e0..ea6e2ed079 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.18.4"; + version = "0.19.1"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "16yhl1xgrgkyqnmbw9in3y7ypcxvvy21h32v50cd73a3iw4x27d0"; + sha256 = "0fkkz5k3h4pkxacrbacamnh4yfghxgajdzzmdlck7i4v5x06vz8f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix index 859fb091ec..e15a062a89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -4,19 +4,18 @@ , ecdsa , hidapi , fetchPypi -, pytest , pyaes , pythonOlder }: buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.0.3"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d83a77d94e9563c3fb0e982d847ec88ba6ac45e3e008e5e53729c0b9800097fc"; + sha256 = "b660225ac06fc06ad17b33ece428126eef785388450e14313f72d25d4082c5ab"; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix new file mode 100644 index 0000000000..907e144c86 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, six, cmigemo, pytestCheckHook }: + +buildPythonPackage rec { + pname = "cmigemo"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "09j68kvcskav2cqb7pj12caksmj4wh2lhjp0csq00xpn0wqal4vk"; + }; + + propagatedBuildInputs = [ six ]; + + preConfigure = '' + export LDFLAGS="-L${cmigemo}/lib" + export CPPFLAGS="-I${cmigemo}/include" + export LD_LIBRARY_PATH="${cmigemo}/lib" + ''; + + postPatch = '' + sed -i 's~dict_path_base = "/usr/share/cmigemo"~dict_path_base = "/${cmigemo}/share/migemo"~g' test/test_cmigemo.py + ''; + + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "test/" ]; + + pythonImportsCheck = [ "cmigemo" ]; + + meta = with lib; { + homepage = "https://github.com/mooz/python-cmigemo"; + description = "A pure python binding for C/Migemo"; + license = licenses.mit; + maintainers = with maintainers; [ illustris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix index 0740ee33b5..daff7bc76d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.7.2"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q"; + sha256 = "sha256-WbUxYMYJAsQFzewo04NW4J1AaGZZBIiT4CbsvViVFrE="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 4ea08c8a7b..8bfe8ea294 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -1,29 +1,43 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchPypi +, setuptools-scm +, toml +, importlib-metadata , mock , pytestCheckHook }: buildPythonPackage rec { pname = "cssutils"; - version = "2.0.0"; + version = "2.2.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c"; + sha256 = "5bef59f6b59bdccbea8e36cb292d2be1b6be1b485fc4a9f5886616f19eb31aaf"; }; + nativeBuildInputs = [ + setuptools-scm + toml + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + checkInputs = [ mock pytestCheckHook ]; disabledTests = [ - "test_parseUrl" # accesses network + # access network + "test_parseUrl" + "encutils" ]; pythonImportsCheck = [ "cssutils" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix index 18560734bd..b5b6f277fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.99.0"; + version = "0.99.1"; src = fetchPypi { inherit pname version; - sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a"; + sha256 = "4ed598a3866dfe7761b8099cf53ab44cb6ed5e4a7dbffb0da8c67a4af8d62fc5"; }; propagatedBuildInputs = [ aenum ] ++ lib.optional (pythonOlder "3.4") enum34; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix index d5f1445a67..025939f2db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/digi-xbee/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "digi-xbee"; - version = "1.3.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2ed798faee0853bf7ae9ca5aa4bdcbab496e3c2d56c9f0719a8e3e0d13270891"; + sha256 = "664737d1aab453ea40b9745f1ee1e88920acff1cce2e07c42e7f5aa64a16e6aa"; }; propagatedBuildInputs = [ pyserial srp ]; @@ -15,6 +15,24 @@ buildPythonPackage rec { # Upstream doesn't contain unit tests, only functional tests which require specific hardware doCheck = false; + pythonImportsCheck = [ + "digi.xbee.models" + "digi.xbee.packets" + "digi.xbee.util" + "digi.xbee.comm_interface" + "digi.xbee.devices" + "digi.xbee.exception" + "digi.xbee.filesystem" + "digi.xbee.firmware" + "digi.xbee.io" + "digi.xbee.profile" + "digi.xbee.reader" + "digi.xbee.recovery" + "digi.xbee.sender" + "digi.xbee.serial" + "digi.xbee.xsocket" + ]; + meta = with lib; { description = "Python library to interact with Digi International's XBee radio frequency modules"; homepage = "https://github.com/digidotcom/xbee-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index 2271be1d16..d89bc6023c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.2.0"; + version = "2.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf"; + sha256 = "5894317122a086c9955ed366562869a81459cf6b663636b152857bb5d3a0a3b7"; }; propagatedBuildInputs = [ ldap django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix new file mode 100644 index 0000000000..c9344d3bd0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchPypi +, lib +, django +, funcy +, redis +, six +}: + +buildPythonPackage rec { + pname = "django-cacheops"; + version = "5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0="; + }; + + propagatedBuildInputs = [ + django + funcy + redis + six + ]; + + # tests need a redis server + # pythonImportsCheck not possible since DJANGO_SETTINGS_MODULE needs to be set + doCheck = false; + + meta = with lib; { + description = "A slick ORM cache with automatic granular event-driven invalidation for Django"; + homepage = "https://github.com/Suor/django-cacheops"; + license = licenses.bsd3; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index 16b1e0bcc5..3d9d885daf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "523d54dcf1b66152c1b658f914f00ed3b518a3432a9decd4898738ca8dbbe10f"; + sha256 = "8871c602e2c7e892fbedc271d5b91c4a96803b689c3ee2f15464931f99f4e32b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix index 0724bf27b3..2a7f1e1da2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.5.13"; + version = "0.5.14"; src = fetchPypi { inherit pname version; - sha256 = "5e43ba3b61daf690ac0319157837bb57e31df8bddbdc9a59ef42ef1a99e21fa2"; + sha256 = "84b5c188e6ae50e9ecec5e5d734c5bc4d2a50fbbca7f59d2c12da9a3bbee5051"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix index a452db3cf2..3f717b0fb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-contrib-comments"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "26350b2c353816570a74b7fb19c558ce00288625ac32886a5274f4f931c098f9"; + sha256 = "d82f1d04690550df026553053903deec0c52dc54212e1b79241b08f0355cff2c"; }; propagatedBuildInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dwdwfsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dwdwfsapi/default.nix new file mode 100644 index 0000000000..6699050035 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dwdwfsapi/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, ciso8601 +}: + +buildPythonPackage rec { + pname = "dwdwfsapi"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-PX1b1msaZH8HKVBo3GU7TOr8Lo7INLjjJBkDHHs6mzk="; + }; + + propagatedBuildInputs = [ + requests + ciso8601 + ]; + + # All tests require network access + doCheck = false; + + pythonImportsCheck = [ "dwdwfsapi" ]; + + meta = with lib; { + description = "Python client to retrieve data provided by DWD via their geoserver WFS API"; + homepage = "https://github.com/stephan192/dwdwfsapi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ elohmeier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix index 4a85e5b883..108c5287eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, tkinter }: buildPythonPackage rec { pname = "easygui"; @@ -9,8 +9,18 @@ buildPythonPackage rec { sha256 = "073f728ca88a77b74f404446fb8ec3004945427677c5618bd00f70c1b999fef2"; }; + postPatch = '' + substituteInPlace setup.py --replace README.md README.txt + ''; + + propagatedBuildInputs = [ + tkinter + ]; + doCheck = false; # No tests available + pythonImportsCheck = [ "easygui" ]; + meta = with lib; { description = "Very simple, very easy GUI programming in Python"; homepage = "https://github.com/robertlugg/easygui"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 9161525c2b..465e8f6c77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.10.1"; + version = "7.11.0"; src = fetchPypi { inherit pname version; - sha256 = "a725dd923d349ca0652cf95d6ce23d952e2153740cf4ab6daf4a2d804feeed48"; + sha256 = "1e24b33a82bf381b42d3b0d390f76fdb9d6a9d47b310dea8eaeb0a5933c394c0"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix index ed67746658..6d84aa9ae6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }: buildPythonPackage rec { - version = "5.0.0"; + version = "5.0.1"; pname = "ftputil"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0dc82fa0a8ea385e8222b72bedb1ec31caac07822b6a1a9139adc98b0b051d06"; + sha256 = "394997ccb3cd4825c6e22b5e349c62cf5016c35db4d60940f3513db66d205561"; }; checkInputs = [ pytest freezegun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix index 2f5a1416e4..1ec6ce3342 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "0rgv77n0lvr7d3vk4qc8svipxafmm6s4lfxrl976hsygrhaqidch"; + sha256 = "sha256-mbkZZg2fmus4kOXFxHE/UV/nxemFAsoEZu8IUa7SPsg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix index 97d169283b..59da8f173d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -1,22 +1,23 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder -, pytestCheckHook, pyhamcrest, pytestrunner, pytest +{ lib, buildPythonPackage, fetchFromGitHub +, pytestCheckHook, pyhamcrest, pytestrunner , six, isodate, tornado, aenum, radish-bdd, mock }: buildPythonPackage rec { pname = "gremlinpython"; - version = "3.4.8"; + version = "3.4.10"; # pypi tarball doesn't include tests src = fetchFromGitHub { owner = "apache"; repo = "tinkerpop"; rev = version; - sha256 = "0kcyhfxz7z4f8i64gig8q1q9dhy24cprbh63vwsdiwryg74q4chl"; + sha256 = "0i9lkrwbsmpx1h9480vf97pibm2v37sgw2qm2r1c0i8gg5bcmhj3"; }; sourceRoot = "source/gremlin-python/src/main/jython"; postPatch = '' substituteInPlace setup.py \ + --replace 'aenum>=1.4.5,<3.0.0' 'aenum' \ --replace 'tornado>=4.4.1,<6.0' 'tornado' \ --replace 'PyHamcrest>=1.9.0,<2.0.0' 'PyHamcrest' \ --replace 'radish-bdd==0.8.6' 'radish-bdd' \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 38a770e879..4c74621b48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.1.0"; + version = "10.2.0.post1"; src = fetchPypi { inherit pname version; - sha256 = "a386e6ee2d9a0e332a49f1cb210c4c11ba9844bcd52808270f48e688314783d8"; + sha256 = "391aa877a61ed04c58b8d82d465b3771f632bb9b19f22cbf18f0e5a1f42f8d4e"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix index 94cef6d07f..ef66870ddf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "fd3eb915310335c63a54d4507289ecc7b3a7454cd2c22ac5086d061a3cbfd592"; + sha256 = "09ph6fd1362xdn2hgwdgh30z0zqjp3bgvr1akyvm36b8jm400sdb"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iaqualink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iaqualink/default.nix new file mode 100644 index 0000000000..223f3893e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/iaqualink/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-runner +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "iaqualink"; + version = "0.4.0"; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "flz"; + repo = "iaqualink-py"; + rev = "v${version}"; + sha256 = "13iwngjjqzr1pkmskbc2wakccvcjkf4bk65f4jp4ywpciilr4zjw"; + }; + + nativeBuildInputs = [ pytest-runner ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "iaqualink" ]; + + meta = with lib; { + description = "Python library for Jandy iAqualink"; + homepage = "https://github.com/flz/iaqualink-py"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix index 89f49d9cf6..2718b63405 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icmplib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "2.0.2"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "0djsbksgml2h18w6509w59s88730w1xaxdxzws12alq4m5v4hirr"; + sha256 = "06xx9854yzxa7x1mjfzbhhw5rfzgjnw269j5k0rshyqh3qvw1nwv"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index 3805b55bcf..cf3fca9aa0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -1,5 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, fetchpatch +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 , pandas , pytestCheckHook , scikitlearn @@ -7,24 +9,14 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.7.0"; + version = "0.8.0"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4"; + sha256 = "0a9xrw4qsh95g85pg2611hvj6xcfncw646si2icaz22haw1x410w"; }; - patches = [ - # Fix compatibility with scikit-learn 0.24. This patch will be included in releases of - # imbalanced-learn after 0.7.0 - (fetchpatch { - url = "https://github.com/scikit-learn-contrib/imbalanced-learn/commit/dc4051fe0011c68d900be05971b71016d4ad9e90.patch"; - sha256 = "1rv61k9wv4q37a0v943clr8fflcg9ly530smgndgkjlxkyzw6swh"; - excludes = ["doc/conf.py" "build_tools/*" "azure-pipelines.yml"]; - }) - ]; - propagatedBuildInputs = [ scikitlearn ]; checkInputs = [ pytestCheckHook pandas ]; preCheck = '' @@ -37,6 +29,9 @@ buildPythonPackage rec { "show_versions" "test_make_imbalanced_iris" "test_rusboost[SAMME.R]" + + # https://github.com/scikit-learn-contrib/imbalanced-learn/issues/824 + "ValueDifferenceMetric" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index 69fe83b877..6b3a46ea39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -1,38 +1,70 @@ { lib , buildPythonPackage -, fetchPypi -, requests , dateutil -, pytz -, six -, msgpack +, fetchFromGitHub , fetchpatch +, mock +, msgpack +, nose +, pandas +, pytestCheckHook +, pytz +, requests +, requests-mock +, six }: buildPythonPackage rec { pname = "influxdb"; version = "5.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6"; + src = fetchFromGitHub { + owner = "influxdata"; + repo = "influxdb-python"; + rev = "v${version}"; + sha256 = "1jfkf53jcf8lcq98qc0bw5d1d0yp3558mh8l2dqc9jlsm0smigjs"; }; + propagatedBuildInputs = [ + requests + dateutil + pytz + six + msgpack + ]; + + checkInputs = [ + pytestCheckHook + requests-mock + mock + nose + pandas + ]; + patches = [ (fetchpatch { + # Relaxes msgpack pinning url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch"; sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4"; }) ]; - # ImportError: No module named tests - doCheck = false; - propagatedBuildInputs = [ requests dateutil pytz six msgpack ]; + disabledTests = [ + # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas. + # https://github.com/influxdata/influxdb-python/pull/845 + # Also type mismatches in assertEqual on DataFrame: + # b'foo[30 chars]_one=1.0,column_two=1.0 0\nfoo,tag_one=red,tag[47 chars]00\n' != + # b'foo[30 chars]_one="1",column_two=1i 0\nfoo,tag_one=red,tag_[46 chars]00\n' + "test_write_points_from_dataframe_with_nan_json" + "test_write_points_from_dataframe_with_tags_and_nan_json" + ]; + + pythonImportsCheck = [ "influxdb" ]; meta = with lib; { description = "Python client for InfluxDB"; homepage = "https://github.com/influxdb/influxdb-python"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix new file mode 100644 index 0000000000..fdc28f08ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jupyter-packaging"; + version = "0.7.12"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-sUAyV3GIGn33t/LRSZe2GQY/51rnVrkCWFLkNGAAu7g="; + }; + + propagatedBuildInputs = [ packaging ]; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # disable tests depending on network connection + disabledTests = [ "test_develop" "test_install" ]; + + pythonImportsCheck = [ "jupyter_packaging" ]; + + meta = with lib; { + description = "Jupyter Packaging Utilities"; + homepage = "https://github.com/jupyter/jupyter-packaging"; + license = licenses.bsd3; + maintainers = [ maintainers.elohmeier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix index 372698744c..712117d501 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.2.0"; + version = "6.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7f6194f4f4692d292da3f501c7f343ccd5e36c6a1becf7b7515e23e66d6bf1e9"; + sha256 = "947f66bbdeee2221b4fb3a6b78225d337b8f10832f14cecf7932183635abe1d9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix new file mode 100644 index 0000000000..a9f98781b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix @@ -0,0 +1,75 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, pytest-tornasync +, jinja2 +, tornado +, pyzmq +, ipython_genutils +, traitlets +, jupyter_core +, jupyter_client +, nbformat +, nbconvert +, send2trash +, terminado +, prometheus_client +, anyio +, requests +}: + +buildPythonPackage rec { + pname = "jupyter_server"; + version = "1.4.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-sBJvI39nlTPuxGJEz8ZtYeOh+OwPrS1HNS+hnT51Tkc="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "anyio>=2.0.2" "anyio" + ''; + + propagatedBuildInputs = [ + jinja2 + tornado + pyzmq + ipython_genutils + traitlets + jupyter_core + jupyter_client + nbformat + nbconvert + send2trash + terminado + prometheus_client + anyio + ]; + + checkInputs = [ + pytestCheckHook + pytest-tornasync + requests + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pytestFlagsArray = [ "jupyter_server/tests/" ]; + + # disabled failing tests + disabledTests = [ "test_server_extension_list" "test_list_formats" "test_base_url" ]; + + meta = with lib; { + description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications."; + homepage = "https://github.com/jupyter-server/jupyter_server"; + license = licenses.bsdOriginal; + maintainers = [ maintainers.elohmeier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index ff725ce182..f22b52b25b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -4,19 +4,21 @@ , jupyterlab_server , notebook , pythonOlder +, jupyter-packaging +, nbclassic }: buildPythonPackage rec { pname = "jupyterlab"; - version = "2.2.9"; + version = "3.0.12"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3be8f8edea173753dd838c1b6d3bbcb6f5c801121f824a477025c1b6a1d33dc6"; + sha256 = "929c60d7fb4aa704084c02d8ededc209b8b378e0b3adab46158b7fa6acc24230"; }; - propagatedBuildInputs = [ jupyterlab_server notebook ]; + propagatedBuildInputs = [ jupyterlab_server notebook jupyter-packaging nbclassic ]; makeWrapperArgs = [ "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index 3d9b5b9f83..c110cc0590 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -1,34 +1,45 @@ { lib , buildPythonPackage , fetchPypi -, notebook , jsonschema , pythonOlder , requests -, pytest +, pytestCheckHook , pyjson5 +, Babel +, jupyter_server +, pytest-tornasync +, pytestcov +, strict-rfc3339 }: buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5431d9dde96659364b7cc877693d5d21e7b80cea7ae3959ecc2b87518e5f5d8c"; + sha256 = "sha256-56AkWqPeI6GAPeLv9AHkykWUU42fWYBhNPMEGabYtqM="; }; - checkInputs = [ requests pytest ]; - propagatedBuildInputs = [ notebook jsonschema pyjson5 ]; + propagatedBuildInputs = [ requests jsonschema pyjson5 Babel jupyter_server ]; - # test_listing test fails - # this is a new package and not all tests pass - doCheck = false; + checkInputs = [ + pytestCheckHook + pytest-tornasync + pytestcov + strict-rfc3339 + ]; - checkPhase = '' - pytest - ''; + disabledTests = [ + "test_get_locale" + "test_get_installed_language_pack_locales_passes" + "test_get_installed_package_locales" + "test_get_installed_packages_locale" + "test_get_language_packs" + "test_get_language_pack" + ]; meta = with lib; { description = "JupyterLab Server"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index 86a505d444..6f0532a390 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.01.15"; + version = "2021.03.13"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "5d7109fc779c44070e3c57186eae59b133014835d5fe15b262fa9438d7599c81"; + sha256 = "c13dd7a84eddfcf9c3068d57f3c9da90ea7c0d11688dc3f78f9265f3f093c6ea"; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix index e615582a28..4e68beba53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, fetchpatch, buildPythonPackage, pkg-config, pytest, fuse, attr, which -, contextlib2, osxfuse +, contextlib2, macfuse-stubs, DiskArbitration }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isLinux [ fuse ] - ++ lib.optionals stdenv.isDarwin [ osxfuse ]; + ++ lib.optionals stdenv.isDarwin [ DiskArbitration macfuse-stubs ]; checkInputs = [ pytest which ] ++ lib.optionals stdenv.isLinux [ attr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix index dbbe3d2521..71daa4bdbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.6.4"; + version = "0.6.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i"; + sha256 = "sha256-5SFb+psULyg9UKVY3oJPNLF3TGS/W+Bxoj79iTzReL4="; }; propagatedBuildInputs = [ aiohttp async-timeout ]; @@ -16,9 +16,11 @@ buildPythonPackage rec { # No tests implemented doCheck = false; + pythonImportsCheck = [ "luftdaten" ]; + meta = with lib; { description = "Python API for interacting with luftdaten.info"; - homepage = "https://github.com/fabaff/python-luftdaten"; + homepage = "https://github.com/home-assistant-ecosystem/python-luftdaten"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 2e720f8ba7..0b097024a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.12.0"; + version = "0.12.1"; disabled = pythonOlder "3.5"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - sha256 = "0amxwwmcf47dakfm6zvsksv6ja7rz7dpmd1z2rsspy8yds6zgxs7"; + sha256 = "sha256-TxHelOr7ygp4R+dW+oJ034l2w9zrB4gn0QLs5Pa4EFE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix new file mode 100644 index 0000000000..b1d0bf2b9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mplfinance/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, matplotlib, pandas }: + +buildPythonPackage rec { + pname = "mplfinance"; + version = "0.12.7a7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-pATiprTELt8GrEkeKjILPfpdNDVoex5t+Mc+6Gg7cPY="; + }; + + propagatedBuildInputs = [ matplotlib pandas ]; + + # tests are only included on GitHub where this version misses a tag + # and half of them fail + doCheck = false; + + pythonImportsCheck = [ "mplfinance" ]; + + meta = with lib; { + description = "Matplotlib utilities for the visualization, and visual analysis, of financial data"; + homepage = "https://github.com/matplotlib/mplfinance"; + license = [ licenses.bsd3 ]; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix new file mode 100644 index 0000000000..3644b4e48d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, notebook +, pythonOlder +, jupyter_server +, pytestCheckHook +, pytest-tornasync +}: + +buildPythonPackage rec { + pname = "nbclassic"; + version = "0.2.6"; + disabled = pythonOlder "3.5"; + + # tests only on github + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = pname; + rev = version; + sha256 = "sha256-stp0LZJAOCrnObvJIPEVt8mMb8yL29nlHECypbTg3ec="; + }; + + propagatedBuildInputs = [ jupyter_server notebook ]; + + checkInputs = [ + pytestCheckHook + pytest-tornasync + ]; + + meta = with lib; { + description = "Jupyter lab environment notebook server extension."; + license = with licenses; [ bsd3 ]; + homepage = "https://github.com/jupyterlab/nbclassic"; + maintainers = [ maintainers.elohmeier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index 582a6132c2..02eda2beb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -30,6 +30,16 @@ buildPythonPackage rec { sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; }; + # Add $out/share/jupyter to the list of paths that are used to search for + # various exporter templates + patches = [ + ./templates.patch + ]; + + postPatch = '' + substituteAllInPlace ./nbconvert/exporters/templateexporter.py + ''; + checkInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/templates.patch b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/templates.patch new file mode 100644 index 0000000000..cadaf69a7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/templates.patch @@ -0,0 +1,12 @@ +diff --git a/nbconvert/exporters/templateexporter.py b/nbconvert/exporters/templateexporter.py +index 0d540eb1..440f6382 100644 +--- a/nbconvert/exporters/templateexporter.py ++++ b/nbconvert/exporters/templateexporter.py +@@ -616,6 +616,7 @@ class TemplateExporter(Exporter): + if DEV_MODE: + root_dirs.append(os.path.abspath(os.path.join(ROOT, '..', '..', 'share', 'jupyter'))) + root_dirs.extend(jupyter_path()) ++ root_dirs.append(os.path.join("@out@", "share", "jupyter")) + return root_dirs + + def _init_resources(self, resources): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix index f4e625b12b..3b1ccbb73f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "netdata"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "14kyjp1q3clizs1bqx4rp31d2awjmi5v65z8sarr2ycgwqqmkrzw"; + sha256 = "sha256-oGOT4RvftI/2Ri2icM/AtglNZXt10jkFh/rlr6A46YE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index 17537be82b..b3fd0384ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , pytestCheckHook , setuptools +, packaging , toml , structlog , appdirs @@ -19,18 +21,26 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.2"; + version = "2.3"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - sha256 = "0b17pikqyxcsid69lwnjl44n8z46ydjmxxdnbzasfdl7r83l7ijr"; + sha256 = "0ikqjlw6v7va69i8qskj1lf07ik84q4n3qgsb7khk520gv2ks3sx"; }; + patches = [ + # Fix test that fail in sandbox build. See https://github.com/lilydjwg/nvchecker/pull/179 + (fetchpatch { + url = "https://github.com/lilydjwg/nvchecker/commit/7366d82bfc3dcf231f7908e259bf2437cf7dafd5.patch"; + sha256 = "0pwrwa2wyy4i668lk2mqzzy6y3xi08mq3w520b4954kfm07g75a9"; + }) + ]; + nativeBuildInputs = [ installShellFiles docutils ]; - propagatedBuildInputs = [ setuptools toml structlog appdirs tornado pycurl aiohttp ]; + propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ]; checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; disabled = pythonOlder "3.7"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix index d9f4cb6b1a..8311cb6c57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.1.5"; + version = "0.1.6"; src = fetchPypi { inherit pname version; - sha256 = "1f3iqwl8ynvrkdd961v2hjsbldwbr217pv5pay2m5f0m974bhblx"; + sha256 = "sha256-e60aVIoKFqo++WJHUYGutugkjB8YgyNQgJbILgAyOOY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 7661295ba2..7b806ecebe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "openwrt-luci-rpc"; - version = "1.1.8"; + version = "1.1.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bo9HLT0q0yiLJI7i5v/36G82FHbGCtnAI50iGniyKSU="; + sha256 = "sha256-DkitN+mwCZ14QEn2fTOqUrQTtoncR1ifP3WDSQ6qkkk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix new file mode 100644 index 0000000000..afca46ec8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage, fetchPypi, lib, pytestCheckHook }: + +buildPythonPackage rec { + pname = "packageurl-python"; + version = "0.9.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mpvj8imsaqhrgfq1cxx16flc5201y78kqa7bh2i5zxsc29843mx"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "packageurl" ]; + + meta = with lib; { + description = "Python parser and builder for package URLs"; + homepage = "https://github.com/package-url/packageurl-python"; + license = licenses.mit; + maintainers = with maintainers; [ armijnhemel ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/percol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/percol/default.nix index eddf58e559..58e7aff560 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/percol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/percol/default.nix @@ -1,25 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, six -}: +{ lib, buildPythonPackage, fetchFromGitHub, cmigemo }: buildPythonPackage rec { pname = "percol"; - version = "0.2.1"; - disabled = isPy3k; + version = "unstable-2019-07-24"; - src = fetchPypi { - inherit pname version; - sha256 = "7a649c6fae61635519d12a6bcacc742241aad1bff3230baef2cedd693ed9cfe8"; + src = fetchFromGitHub { + owner = "mooz"; + repo = "percol"; + rev = "4b28037e328da3d0fe8165c11b800cbaddcb525e"; + sha256 = "07sq3517wzn04j2dzlmczmcvx3w6r7xnzz3634zgf1zi6dbr2a3g"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ cmigemo ]; + + # package has no tests + doCheck = false; + pythonImportsCheck = [ "percol" ]; meta = with lib; { homepage = "https://github.com/mooz/percol"; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; maintainers = with maintainers; [ koral ]; - broken = true; # missing cmigemo package which is missing libmigemo.so - # also doesn't support python3 }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix index 84cc4530b3..37f0a13599 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/privacyidea/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python +{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python, nixosTests , cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script , defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow , python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel , ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2 +, pydash -, mock, pytest, responses, testfixtures +, mock, pytestCheckHook, responses, testfixtures }: buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.3"; + version = "3.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b"; + sha256 = "sha256-XJnrrpU0x2Axu7W4G3oDTjSJuqEyh3C/0Aga5D0gw9k="; + fetchSubmodules = true; }; propagatedBuildInputs = [ @@ -24,11 +26,24 @@ buildPythonPackage rec { defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 + pydash ]; - checkInputs = [ openssl mock pytest responses testfixtures ]; - # issues with hardware token tests - doCheck = false; + passthru.tests = { inherit (nixosTests) privacyidea; }; + + checkInputs = [ openssl mock pytestCheckHook responses testfixtures ]; + disabledTests = [ + "AESHardwareSecurityModuleTestCase" + "test_01_cert_request" + "test_01_loading_scripts" + "test_02_cert_enrolled" + "test_02_enroll_rights" + "test_02_get_resolvers" + "test_02_success" + "test_03_get_identifiers" + "test_04_remote_user_auth" + "test_14_convert_timestamp_to_utc" + ]; pythonImportsCheck = [ "privacyidea" ]; @@ -46,6 +61,6 @@ buildPythonPackage rec { description = "Multi factor authentication system (2FA, MFA, OTP Server)"; license = licenses.agpl3Plus; homepage = "http://www.privacyidea.org"; - maintainers = [ maintainers.globin ]; + maintainers = with maintainers; [ globin ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 742ea3d08c..cbf96f11a1 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.1.0"; + version = "9.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3wKV9lPO51LeOM+O8J8TrZeCxTkk37qhkcpivV4dzhQ="; + sha256 = "sha256-q52h0u9CSx/HVfZDb1RaVgVuxt4kB16T82nqyOuCGDc="; }; disabled = !isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch new file mode 100644 index 0000000000..56a5ff3911 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydash/0001-Only-build-unit-tests.patch @@ -0,0 +1,30 @@ +From 2fe7a445bafedee2c43050e40697d8b0fd7f7b30 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Fri, 19 Mar 2021 19:37:34 +0100 +Subject: [PATCH] Only build unit-tests + +--- + setup.cfg | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/setup.cfg b/setup.cfg +index 2c2f49f..a5ec152 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -83,13 +83,6 @@ force_sort_within_sections = true + junit_family = xunit2 + addopts = + --verbose +- --doctest-modules +- --no-cov-on-fail +- --cov-fail-under=100 +- --cov-report=term-missing +- --cov-report=xml:build/coverage/coverage.xml +- --cov-report=html:build/coverage +- --junitxml=build/testresults/junit.xml + + [coverage:run] + omit = +-- +2.29.3 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix new file mode 100644 index 0000000000..7d75896397 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }: + +buildPythonPackage rec { + pname = "pydash"; + version = "4.9.3"; + + src = fetchFromGitHub { + owner = "dgilland"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; + }; + + patches = [ ./0001-Only-build-unit-tests.patch ]; + + checkInputs = [ mock pytestCheckHook invoke ]; + + meta = with lib; { + homepage = "https://github.com/dgilland/pydash"; + description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library."; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix new file mode 100644 index 0000000000..b2cf038f79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -0,0 +1,41 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pydeconz"; + version = "77"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Kane610"; + repo = "deconz"; + rev = "v${version}"; + sha256 = "0qpipw3si3a23c3nafagfx3zl3v481ha8yakcz1d42mbwsc6hkk4"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pydeconz" ]; + + meta = with lib; { + description = "Python library wrapping the Deconz REST API"; + homepage = "https://github.com/Kane610/deconz"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix index 26812ff915..b16ea62717 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -1,27 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, certifi, six -, setuptools_scm +{ lib +, buildPythonPackage +, certifi +, fetchPypi +, flaky +, pytestCheckHook +, pythonOlder +, setuptools-scm +, six }: buildPythonPackage rec { pname = "pylast"; - version = "4.1.0"; - - disabled = !isPy3k; + version = "4.2.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932"; + sha256 = "sha256-w/mkAUUgj7L7Xv+nz1pI1TYKfihH3S3MbxaNQ4VtoH0="; }; - nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ certifi six ]; + nativeBuildInputs = [ setuptools-scm ]; - # tests require last.fm credentials - doCheck = false; + propagatedBuildInputs = [ + certifi + six + ]; + + checkInputs = [ + pytestCheckHook + flaky + ]; + + pythonImportsCheck = [ "pylast" ]; meta = with lib; { + description = "Python interface to last.fm (and compatibles)"; homepage = "https://github.com/pylast/pylast"; - description = "A python interface to last.fm (and compatibles)"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix index f1005fe0b7..5cc86e909f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.3.5"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16"; + sha256 = "sha256-BOVALVFb/p2q3A4NkvgtwmL5fNvwMCk0hb1L5MRWzHY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index 7108a8f4c1..6e243b55bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -9,6 +9,14 @@ buildPythonPackage rec { sha256 = "c2a892906192663f85030a6ab91304e508e546cddfe557d692d61ec57a1d946b"; }; + patches = [ + # Fix build with pytest ≥ 6.2.0, https://github.com/RKrahl/pytest-dependency/pull/51 + (fetchpatch { + url = "https://github.com/RKrahl/pytest-dependency/commit/0930889a13e2b9baa7617f05dc9b55abede5209d.patch"; + sha256 = "0ka892j0rrlnfvk900fcph0f6lsnr9dy06q5k2s2byzwijhdw6n5"; + }) + ]; + propagatedBuildInputs = [ pytest ]; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix index 634ccea371..906f084398 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "python-opendata-transport"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { pname = "python_opendata_transport"; inherit version; - sha256 = "0pxs9zqk00vn1s74cx1416mqmixrr74wb0jb0j6b1c3xpvzlfbks"; + sha256 = "sha256-Z0VHkKYHpwbBwwFrMtA5JRy0m7f0566IjCmGizoKEoo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix index 2fd88858de..dc967b5430 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , libcap +, pytestCheckHook }: buildPythonPackage rec { @@ -13,9 +14,25 @@ buildPythonPackage rec { sha256 = "b4ca9a25a7d4f1ace4fffd1f3a2e64ef5208fe05f929f3edd5e27081ca7e67ce"; }; - patches = [ ./skip_bad_tests.patch ]; buildInputs = [ libcap ]; + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + # Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6 + "test_mpx" + + # The Nix build sandbox has no_new_privs already enabled + "test_no_new_privs" + + # The Nix build sandbox has seccomp already enabled + "test_seccomp" + + # This will fail if prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_FORCE_DISABLE) + # has been set system-wide, even outside the sandbox + "test_speculation_ctrl" + ]; + meta = { description = "Python(ic) interface to the linux prctl syscall"; homepage = "https://github.com/seveas/python-prctl"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch deleted file mode 100644 index 19d70f234a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/skip_bad_tests.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- ./test_prctl.py 2018-01-26 16:02:52.000000000 -0500 -+++ ./test_prctl.py 2018-06-21 18:26:43.370065009 -0400 -@@ -154,6 +154,7 @@ - prctl.set_keepcaps(False) - self.assertEqual(prctl.get_keepcaps(), False) - -+ @unittest.skip("No access to /proc in the Nix build sandbox") - @require('set_mce_kill') - def test_mce_kill(self): - """Test the MCE_KILL setting""" -@@ -173,6 +174,7 @@ - prctl.set_name(name) - self.assertEqual(prctl.get_name(), name[:15]) - -+ @unittest.skip("The Nix build sandbox has no_new_privs already enabled") - @require('get_no_new_privs') - def test_no_new_privs(self): - """Test the no_new_privs function""" -@@ -189,6 +191,7 @@ - self.assertNotEqual(sp.returncode, 0) - os._exit(0) - -+ @unittest.skip("No access to /proc in the Nix build sandbox") - def test_proctitle(self): - """Test setting the process title, including too long titles""" - title = "This is a test!" -@@ -225,6 +228,7 @@ - os._exit(0) - self.assertRaises(OSError, prctl.set_ptracer, new_pid) - -+ @unittest.skip("The Nix build sandbox has seccomp already enabled") - @require('get_seccomp') - def test_seccomp(self): - """Test manipulation of the seccomp setting""" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix index 0de5d6de3b..57c52ff49b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix @@ -38,6 +38,10 @@ buildPythonPackage rec { description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; homepage = "https://pypi.python.org/pypi/rabbitpy"; license = licenses.bsd3; + + # broken by pamqp==3, tracked in + # https://github.com/gmr/rabbitpy/issues/125 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix index b747304446..97f2e5a6af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix @@ -40,8 +40,8 @@ let }; in buildPythonPackage rec { - version = "2020.09.3"; pname = "rdkit"; + version = "2020.09.5"; src = let @@ -51,7 +51,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - sha256 = "1k1wvzcd1yfx4nhz3iq2aaadzdk5w6sfcb4imhvm7pkbzij0nicx"; + sha256 = "1ycbjia223d0w9xiwk36x2vkdidsx198rzkfyxz48cbax9vvklzq"; }; unpackPhase = '' @@ -89,7 +89,7 @@ buildPythonPackage rec { ]; hardeningDisable = [ "format" ]; # required by yaehmop - # doCheck = false; + dontUseSetuptoolsBuild = true; dontUsePipInstall = true; dontUseSetuptoolsCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix index c4e451aade..21d5886efe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, nose }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }: buildPythonPackage rec { pname = "rope"; @@ -9,6 +9,15 @@ buildPythonPackage rec { sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04"; }; + patches = [ + # Python 3.9 ast changes + (fetchpatch { + url = "https://github.com/python-rope/rope/pull/333.patch"; + excludes = [ ".github/workflows/main.yml" ]; + sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0"; + }) + ]; + checkInputs = [ nose ]; checkPhase = '' # tracked upstream here https://github.com/python-rope/rope/issues/247 @@ -19,6 +28,6 @@ buildPythonPackage rec { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; maintainers = with maintainers; [ goibhniu ]; - license = licenses.gpl2; + license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index f95696e20b..8476701d47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.30.0"; + version = "2.31.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3BxRDoaKxaXlKYGYQqhQ2DUO3XONvf6dlofE0pbXIho="; + sha256 = "sha256-RMw7l3s0QBzB+exiZg2aBQYeprHUJM+f0Rf+N8ywaBU="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplekml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplekml/default.nix index 6b8bac25b8..42e93d63fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplekml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplekml/default.nix @@ -1,4 +1,7 @@ -{ lib , buildPythonPackage , fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "simplekml"; @@ -9,11 +12,13 @@ buildPythonPackage rec { sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5"; }; - doCheck = false; # no tests are defined in 1.3.5 + # no tests are defined in 1.3.5 + doCheck = false; + pythonImportsCheck = [ "simplekml" ]; meta = with lib; { - description = "Generate KML with as little effort as possible"; - homepage = "https://readthedocs.org/projects/simplekml/"; + description = "Python package to generate KML"; + homepage = "https://simplekml.readthedocs.io/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix new file mode 100644 index 0000000000..5b8925b0a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, python-engineio +, python-socketio +, pythonOlder +, pytz +, voluptuous +, websockets +}: + +buildPythonPackage rec { + pname = "simplisafe-python"; + version = "9.6.9"; + format = "pyproject"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1q5w5pvrgj94bzd5wig79l4hipkfrcdah54rvwyi7b8q46gw77sg"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + aiohttp + python-engineio + python-socketio + pytz + voluptuous + websockets + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + disabledTestPaths = [ "examples/" ]; + + pythonImportsCheck = [ "simplipy" ]; + + meta = with lib; { + description = "Python library the SimpliSafe API"; + homepage = "https://simplisafe-python.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix index 958fc613f6..d973bc70bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; patches = [ - # Fix for newer versions of scikit-learn. See: https://github.com/rsteca/sklearn-deap/pull/62 + # Fix for scikit-learn v0.21.1. See: https://github.com/rsteca/sklearn-deap/pull/62 (fetchpatch { url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch"; sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk"; @@ -31,6 +31,8 @@ buildPythonPackage rec { homepage = "https://github.com/rsteca/sklearn-deap"; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; + # broken by scikit-learn 0.24.1 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix index 02e5711e88..ae56a9fdce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-navtree/default.nix @@ -14,5 +14,7 @@ buildPythonPackage rec { description = "Navigation tree customization for Sphinx"; homepage = "https://github.com/bintoro/sphinx-navtree"; license = lib.licenses.mit; + # not compatible with sphinx 3.3, not updated since 2016 + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 940dbdab98..065228eca2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -1,17 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, stdenv , file +, stdenv }: buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.12"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "166adazdrv92azx4p0qng0cm3va6i301vfsr4yyf0azj3sdg0waj"; + sha256 = "sha256-b2Q5Zelz0AWbNQotOLWdwN5+20Q5jATH3nzLEJQRwno="; }; postPatch = '' @@ -29,9 +29,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "sqlmap" ]; meta = with lib; { - homepage = "http://sqlmap.org"; - license = licenses.gpl2; description = "Automatic SQL injection and database takeover tool"; + homepage = "http://sqlmap.org"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 071bbcd306..694b678930 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -10,7 +10,6 @@ , python-multipart , pyyaml , requests -, ujson , aiosqlite , databases , pytestCheckHook @@ -21,16 +20,21 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.13.8"; + version = "0.14.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "11i0yd8cqwscixajl734g11vf8pghki11c81chzfh8ifmj6mf9jk"; + sha256 = "0fz28czvwiww693ig9vwdja59xxs7m0yp1df32ms1hzr99666bia"; }; + postPatch = '' + # remove coverage arguments to pytest + sed -i '/--cov/d' setup.cfg + ''; + propagatedBuildInputs = [ aiofiles graphene @@ -39,7 +43,6 @@ buildPythonPackage rec { python-multipart pyyaml requests - ujson ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; checkInputs = [ @@ -50,9 +53,10 @@ buildPythonPackage rec { typing-extensions ]; + # fails to import graphql, but integrated graphql support is about to + # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. disabledTestPaths = [ "tests/test_graphql.py" ]; - # https://github.com/encode/starlette/issues/1131 - disabledTests = [ "test_debug_html" ]; + pythonImportsCheck = [ "starlette" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index ac80be2fe0..6ed265f656 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -1,38 +1,49 @@ { lib -, buildPythonPackage -, fetchFromGitHub , aiohttp , asynctest -, stdiomask +, buildPythonPackage , cryptography -, pytestcov +, fetchFromGitHub , pytest-asyncio , pytestCheckHook +, pythonOlder +, stdiomask }: buildPythonPackage rec { pname = "subarulink"; - version = "0.3.12"; + version = "0.3.13"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "G-Two"; repo = pname; rev = "subaru-v${version}"; - sha256 = "0mhy4np3g10k778062sp2q65cfjhp4y1fghn8yvs6qg6jmg047z6"; + sha256 = "0dqbb1iiil1vn97zxnpphn63bl8z0ibgyca90ynx958cy78kys0g"; }; - propagatedBuildInputs = [ aiohttp stdiomask ]; + propagatedBuildInputs = [ + aiohttp + stdiomask + ]; checkInputs = [ asynctest cryptography pytest-asyncio - pytestcov pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg --replace "--cov=subarulink" "" + ''; + __darwinAllowLocalNetworking = true; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "subarulink" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index 3a72b5c310..d5dfda53c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -1,31 +1,26 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, colorama, mypy, pyyaml, regex -, dataclasses, typing -, pytestrunner, pytest-mypy +, colorama, regex +, pytestrunner, pytestCheckHook, pytest-mypy }: buildPythonPackage rec { - pname = "TatSu"; - version = "5.5.0"; + pname = "tatsu"; + version = "5.6.1"; src = fetchFromGitHub { owner = "neogeny"; - repo = pname; + repo = "TatSu"; rev = "v${version}"; - sha256 = "07bmdnwh99p60cgzhlb8s5vwi5v4r5zi8shymxnnarannkc66hzn"; + sha256 = "149ra1lwax5m1svlv4dwjfqw00lc5vwyfj6zw2v0ammmfm1b94x9"; }; disabled = pythonOlder "3.8"; nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ colorama mypy pyyaml regex ] - ++ lib.optionals (pythonOlder "3.7") [ dataclasses ] - ++ lib.optionals (pythonOlder "3.5") [ typing ]; - checkInputs = [ pytest-mypy ]; + propagatedBuildInputs = [ colorama regex ]; + checkInputs = [ pytestCheckHook pytest-mypy ]; - checkPhase = '' - pytest test/ - ''; + pythonImportsCheck = [ "tatsu" ]; meta = with lib; { description = "Generates Python parsers from grammars in a variation of EBNF"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index bebd32877d..19dcc70865 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.3.3"; + version = "4.4.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-KII7ZR+vnCxCxUcBOQo9y0KxZa+XuIIAkSJejk8HrlA="; + hash = "sha256-kl1Z2FBo+yqVXUqLaUtet6IycmdcAtfydNTI4MNNrkc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix index b86394bc2b..6bd509d7cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/volkszaehler/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "volkszaehler"; - version = "0.2.1"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "13zhxq08wn5y9yn6xbazfl0gxxysmirwpc26wcnr6jk2va1kpc4l"; + sha256 = "sha256-1oqzhC3Yq2V30F3ilr80vKFnTmI/CdIVLuzMlIr40xI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 30c0614446..600d0efc92 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0mlw0z20qf0g9qrmdmbykzf87wlcgmah8bacmp4mk6dwfzr9g9n3"; + sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo="; }; buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 0c6c9dbad0..bbee2768a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.146.0"; + version = "0.147.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0kxws51hri0b4z7k05li6vg1arcdc7i5jzfibi0iplsfyy14159q"; + sha256 = "sha256-3U8BOYUHl1YiOnxAIV2V6Ib+LZ0DydtSfwAxN2Hj09g="; }; installPhase = '' @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/facebook/flow/releases/tag/v${version}"; license = licenses.mit; platforms = ocamlPackages.ocaml.meta.platforms; - broken = stdenv.isAarch64; # https://github.com/facebook/flow/issues/7556 maintainers = with maintainers; [ marsam puffnfresh ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix index 3623893ea6..287321804e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -105,12 +105,12 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "25480"; - gittap = "5.0.0"; - gittip = "a476454c00f64acbb7425c178c98714ef76e26d7"; - rev = "5.0.0"; - version = "5.0.0"; - sha256 = "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"; + version_commit = "25741"; + gittap = "5.1.1"; + gittip = "a86f8077fc148abd6443384362a3717cd4310e64"; + rev = "5.1.1"; + version = "5.1.1"; + sha256 = "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3"; cs_ver = "4.0.2"; cs_sha256 = "0y5g74yjyliciawpn16zhdwya7bd3d7b1cccpcccc2wg8vni1k2w"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py index ebd6e073fe..a9a0a23431 100755 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/update.py @@ -124,6 +124,7 @@ def main() -> None: radare2_info = get_repo_info(dirname, radare2_rev) + git(dirname, "fetch", r2_cutter_rev) git(dirname, "checkout", r2_cutter_rev) timestamp = git(dirname, "log", "-n1", "--format=%at") diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix index 3455d78b23..a562a1baee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.16"; + version = "0.4.18"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU="; + sha256 = "sha256-p002oWwTQxesWLgLq8oKKzuZKXUdO4C1TZ7lR/Mh1PA="; }; - cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE="; + cargoSha256 = "sha256-M0hng1JcR5Q829bVOaTASl0Eq6fFm8mUFsS5zx1JX94="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index c3c3d2dd2b..87143766d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.39.8"; + version = "0.39.10"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7LC7QT92Ecva/uQPwYEfbLQUpIesxa8pXrauMxIwZ98="; + sha256 = "sha256-T2soogk5KcNSeluNyJ4b2GjLkvauvvznaLSMQVgVZgI="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 41ae9ce211..5b20ece768 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -62,6 +62,7 @@ let srcs.rules_cc srcs.rules_java srcs.rules_proto + srcs.com_google_protobuf ]); distDir = runCommand "bazel-deps" {} '' @@ -527,6 +528,13 @@ stdenv.mkDerivation rec { --output=./bazel_src/output/bazel-complete.bash \ --prepend=./bazel_src/scripts/bazel-complete-header.bash \ --prepend=./bazel_src/scripts/bazel-complete-template.bash + + # need to change directory for bazel to find the workspace + cd ./bazel_src + # build execlog tooling + export HOME=$(mktemp -d) + ./output/bazel build src/tools/execlog:parser_deploy.jar + cd - ''; installPhase = '' @@ -537,7 +545,15 @@ stdenv.mkDerivation rec { # The binary _must_ exist with this naming if your project contains a .bazelversion # file. cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + + mkdir $out/share + cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + cat < $out/bin/bazel-execlog + #!${runtimeShell} -e + ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ + EOF + chmod +x $out/bin/bazel-execlog # shell completion files installShellCompletion --bash \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 4f92f8448a..31dbc2779c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -560,6 +560,13 @@ stdenv.mkDerivation rec { ${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \ --bazel=./bazel_src/output/bazel \ --output=./bazel_src/output/bazel-complete.fish + + # need to change directory for bazel to find the workspace + cd ./bazel_src + # build execlog tooling + export HOME=$(mktemp -d) + ./output/bazel build src/tools/execlog:parser_deploy.jar + cd - ''; installPhase = '' @@ -572,6 +579,14 @@ stdenv.mkDerivation rec { cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + mkdir $out/share + cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar + cat < $out/bin/bazel-execlog + #!${runtimeShell} -e + ${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@ + EOF + chmod +x $out/bin/bazel-execlog + # shell completion files installShellCompletion --bash \ --name bazel.bash \ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix index 0f4ea722d9..16b2967e63 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/shards/default.nix @@ -44,8 +44,8 @@ rec { }; shards_0_14 = generic { - version = "0.14.0"; - sha256 = "sha256-HEyGXoGkQvLrk672/ekmBxnR1eRM//GwRPd/19LM8Wo="; + version = "0.14.1"; + sha256 = "sha256-/C6whh5RbTBkFWqpn0GqyVe0opbrklm8xPv5MIG99VU="; crystal = crystal_0_36; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix index abf5845b7e..3095d661ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ccloud-cli/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "ccloud-cli"; - version = "0.202.0"; + version = "1.25.0"; # To get the latest version: - # curl -L 'https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/&delimiter=/' | nix run nixpkgs.libxml2 -c xmllint --format - + # curl -L https://cnfl.io/ccloud-cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 src = fetchurl (if stdenv.hostPlatform.isDarwin then { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz"; - sha256 = "1w7c7fwpjj6f26nmcgm6rkrl4v9zhdpygkh02la77n23lg8wxah5"; + sha256 = "0306jg36dpccwyy239r2xvw3bvsrnrdc88390g26fhcb0048qmgb"; } else { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz"; - sha256 = "1xbhv2viw8cbwv03rfq99jddnw5lwy812a8xby348290l323xi89"; + sha256 = "02sly7cxqlrfd6chamlp05k9ar93mpfrkx5183js0hf595nlki61"; }); nativeBuildInputs = [ autoPatchelfHook ]; @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { homepage = "https://docs.confluent.io/current/cloud/cli/index.html"; license = licenses.unfree; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; + + # TODO: There's support for i686 systems but I do not have any such system + # to build it locally on, it's also unfree so I cannot rely on ofborg to + # build it. Get the list of supported system by looking at the list of + # files in the S3 bucket: + # + # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/1.25.0/&delimiter=/%27 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index aee2a4e234..73aefdd0cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "05hz59qzadkk4ji5icv5sxih31pnn0abnmiwcyfa2mr3l5jaqjnd"; + sha256 = "sha256-AIa+hEYtPJ4CFvAFSpNJFxY+B3+DJH1Q0hL/3BD/yN0="; }; - vendorSha256 = "0jxh3yhh0sdvaykhinxngpipk369hw8z1y3g2z4c1115m5rjp2bb"; + vendorSha256 = "sha256-4AH9PZWSrBXi9w4Mr7dpXqDkQZGzuELG876YCaFTj2Q="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix new file mode 100644 index 0000000000..a2e7b73971 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "drone-runner-docker"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "drone-runners"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-WI3pr0t6EevIBOQwCAI+CY2O8Q7+W/CLDT/5Y0+tduQ="; + }; + + vendorSha256 = "15lpdliqz129yq5zgzjvndwdxngxa96g0ska4zkny7ycb3vwq0xm"; + + meta = with lib; { + maintainers = with maintainers; [ endocrimes ]; + license = licenses.unfreeRedistributable; + homepage = "https://github.com/drone-runners/drone-runner-docker"; + description = "Drone pipeline runner that executes builds inside Docker containers"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 3b0a0f4022..91c494f731 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-WpwMx8mPedunBKlRUDdcVA1sLWkZvuoaw6DEtvGSyAg="; + sha256 = "sha256-M0Jo4DyvPghhVLK3eFdew10lGUJJODxKoL+v16y9CW8="; }; - vendorSha256 = "sha256-OxU+Hb8bX71SFuyAw583Z7bEu+b/j2i/fOGE5S9C91M="; + vendorSha256 = "sha256-W6m+nDNcZBVfa1OTkOHWf4E9LmEUewsTLT/56Iyp6+Y="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ad886e0c3c..eeffee057d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.9.0"; + version = "13.10.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0zgnp6l0p1i7x6lppd24nfb6kqa8mw7rnr2p5gmwbmjv9i9zkycs"; + sha256 = "0lw087xcbzf4d68mq0h0s31na7lww2d9nv43icw9qx05aknlcddv"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "06b5p9ygcnrjrisp6bcgw9s3j2zlycp8jsri259bjf7rrfbwpkma"; + sha256 = "1mf3w85ivc8r2rmb78r4b87rrxmbb1zda9pp8n4nvd0igg23xqk8"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0wzqrfjg43wnf9lr34jn3ydlxi7vsnqs55pm5igba592q8ykfbxk"; + sha256 = "0xy5mpcpxcmwfdrspd29z8nyn1m9i4ma7d5kbihwa2yxznylydpx"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index bb5f8a4c9c..69e55463cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.14"; + version = "2.0.15"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-mGVOg+I42O3VYj7RStEOfZajS9RZo9hLWKap6UdjJCE="; + sha256 = "sha256-XfTW8GNoPsNXamy0K9Ai3SSzBSyS1dNNCeWsbD8xCQI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix b/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix index 86d55ab078..26124b1054 100644 --- a/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "drm_info"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "ascent12"; repo = "drm_info"; rev = "v${version}"; - sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; + sha256 = "sha256-UTDYLe3QezPCyG9CIp+O+KX716JDTL9mn+OEjjyTwlg="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/fission/default.nix b/third_party/nixpkgs/pkgs/development/tools/fission/default.nix new file mode 100644 index 0000000000..133db2d9ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/fission/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "fission"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "fission"; + repo = "fission"; + rev = version; + sha256 = "0izvkjd7ydcxhr6zmgrbfm3ybz2kf4p27099lr07gd4x7c6xxmqr"; + }; + + vendorSha256 = "12clw0wy4lypf45imqnabj39yxqpi348csr4m5d0d1rksxgvwngq"; + + buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; + + subPackages = [ "cmd/fission-cli" ]; + + postInstall = '' + ln -s $out/bin/fission-cli $out/bin/fission + ''; + + meta = with lib; { + description = "The cli used by end user to interact Fission"; + homepage = "https://fission.io"; + license = licenses.asl20; + maintainers = with maintainers; [ neverbehave ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix index db876ea09f..a65a9276ad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.5.1"; + version = "2.7.4"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "5W5WGWqxpZzOqk1VOlLeggIqfneRb7s7ZT5faNEhDos="; + sha256 = "sha256-St8QgUZUU7THM9H8i7Z+bgKu9LhXhUqH/B14LGmDCn0="; }; - vendorSha256 = "//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; + vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; meta = with lib; { homepage = "https://github.com/vektra/mockery"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix index 1fa027ae72..b463ecd5de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.4.3"; + version = "1.5.1"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "1kf1d7xmyjvy0z6j5czp6nqyvj9zrk6liv6znif08927xqfrzyln"; + sha256 = "sha256-TYx7nAyUE70hoCNKnR74FzWhrQyWG17VPoKH3vR+qOM="; }; - vendorSha256 = "04w9vhkrwb2zfqk73xmhignjyvjqmz1j93slkqp7v8jj2dhyla54"; + vendorSha256 = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix index e6d34ba413..b9241174ea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "0x94z023rsl7h9prw0i4zkwb5xf2frjz8f15mmcknw48r9ymw598"; + sha256 = "sha256-+JhU0DXSUbpaHWJYEgiUwsR8DucGRwkiNiKDyhJroqk="; }; - vendorSha256 = "05sh4jbva23ggg2viknl49bwgkhf8dfvsv3rqkl4wwi9ag64qgha"; + vendorSha256 = "sha256-pNKzqUtEIQs0TP387ACHfCv1RsMjZi7O8P1A8df+QtI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 364117577b..23bd3dd326 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "865" "884" "8104" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix index 37763c7260..bb244c57cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.67.1"; + version = "0.68.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-ZwjgdOmpLl2kTpQU1mqfwq0nBLmK/Ej5ckDItQWeDKY="; + sha256 = "sha256-+hBI4asgRZg1nu50GMCl0/djqCxjb92xlO3roU4LZS8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index 4c8693b0e5..e073c4f2e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "0sr4d7amwn62xywwn83y58ynl8xv6l1q6zwbky5rmy0qxk909bqp"; + sha256 = "sha256-aJGYkWMMg26V/T5BcWo3ibtHJBm4g2iIQn8cxs105Ys="; }; - vendorSha256 = "0vn6vrczbdln7ngz061xixjwn899jn7p2a46770xqx44bh3f2lgv"; + vendorSha256 = "sha256-6yfsGGzdUQySyQNuB58gwbsMjJgtUhfgfPI2zYlyUQo="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix index 5d4441ecfb..c027640351 100644 --- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }: +{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang, useIcon ? true }: -let noweb = stdenv.mkDerivation rec { +lib.fix (noweb: stdenv.mkDerivation rec { pname = "noweb"; version = "2.12"; @@ -11,25 +11,28 @@ let noweb = stdenv.mkDerivation rec { sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95"; }; - patches = [ ./no-FAQ.patch ]; + sourceRoot = "source/src"; - nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ]; + patches = [ + # Remove FAQ + ./no-FAQ.patch + ]; + + postPatch = '' + substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip' + ''; + + nativeBuildInputs = [ groff ] ++ lib.optionals useIcon [ icon-lang ]; + buildInputs = [ nawk ]; preBuild = '' mkdir -p "$out/lib/noweb" - cd src ''; - makeFlags = lib.optionals (!isNull icon-lang) [ + makeFlags = lib.optionals useIcon [ "LIBSRC=icon" "ICONC=icont" - ] ++ lib.optionals stdenv.isDarwin [ - "CC=clang" - ]; - - - installFlags = [ - ]; + ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; preInstall = '' mkdir -p "$tex/tex/latex/noweb" @@ -50,11 +53,11 @@ let noweb = stdenv.mkDerivation rec { for f in $out/bin/no{index,roff,roots,untangle,web} \ $out/lib/noweb/to{ascii,html,roff,tex} \ $out/lib/noweb/{bt,empty}defn \ - $out/lib/noweb/{noidx,unmarkup}; do + $out/lib/noweb/{noidx,pipedocs,unmarkup}; do # NOTE: substituteInPlace breaks Icon binaries, so make sure the script # uses (n)awk before calling. if grep -q nawk "$f"; then - substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk" + substituteInPlace "$f" --replace "nawk" "${nawk}/bin/awk" fi done @@ -77,4 +80,4 @@ let noweb = stdenv.mkDerivation rec { maintainers = with maintainers; [ yurrriq ]; platforms = with platforms; linux ++ darwin; }; -}; in noweb +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch b/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch index 3230924990..2fa601d35c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch +++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch @@ -1,5 +1,5 @@ ---- a/src/Makefile 2006-06-12 22:14:20.000000000 +0200 -+++ b/src/Makefile 2010-06-17 11:30:11.804018145 +0200 +--- a/Makefile 2006-06-12 22:14:20.000000000 +0200 ++++ b/Makefile 2010-06-17 11:30:11.804018145 +0200 @@ -198,7 +198,7 @@ (cd elisp; ci -l $(CINAME) $(CIMSG) *.el) ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix index 97aedfd8f8..c1e0a356df 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.5.3"; + version = "2.5.5"; in stdenv.mkDerivation { pname = "minizinc"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "1kc65sxkc64pr560qaaznc44jnlvq7pbpzwijad410lpcnna5byg"; + sha256 = "sha256-9z2E6KqOys9UUXlXWB4eDhg34kS3PhUB1Dd1F6iGYoE="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix new file mode 100644 index 0000000000..cf84a98467 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/automaticcomponenttoolkit/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + pname = "AutomaticComponentToolkit"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "Autodesk"; + repo = pname; + rev = "v${version}"; + sha256 = "1r0sbw82cf9dbcj3vgnbd4sc1lklzvijic2z5wgkvs21azcm0yzh"; + }; + + nativeBuildInputs = [ go ]; + + buildPhase = '' + cd Source + export HOME=/tmp + go build -o act *.go + ''; + + installPhase = '' + install -Dm0755 act $out/bin/act + ''; + + meta = with lib; { + description = "Toolkit to automatically generate software components: abstract API, implementation stubs and language bindings"; + homepage = "https://github.com/Autodesk/AutomaticComponentToolkit"; + license = licenses.bsd2; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index e8e84a7f51..2d5e77f791 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.15108"; + version = "0.1.15149"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r0GSv9JaQQkVLYDh51Rz6OIDTqV75RIT+NIWAFXWcV8="; + sha256 = "sha256-pmLDCNgCQv4fetl/q6ZokH1qF6pSqsR0DUWbzGeEtaw="; }; vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index ccadaa8aeb..4379efd507 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cfdwf00jgwsv0f72427asid1xr57s56jk5xj489dgppvgy7wdbj"; - cargoBuildFlags = [ "--features=dist-client,dist-server" ]; + cargoBuildFlags = lib.optionals (!stdenv.isDarwin) [ "--features=dist-client,dist-server" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mozilla/sccache"; maintainers = with maintainers; [ doronbehar ]; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index 29edccf496..b51cfa96d0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "1f0wi5mlb9r7ncvyvgmcdfngxrzgbdv7hm2ckb8bwmzcki2h2255"; + sha256 = "sha256-RX2L9EwxfZ+utptTDR3+W9ACVPALF/hiE40SJTmZuLs="; }; - vendorSha256 = "015r7zvah7lk5rbkaqhh2abbv19ky1in3ngzzrdvhbcqfns25iqr"; + vendorSha256 = "sha256-sN9GTcG5cZxvMaLqNjY2jfLkf8a3lugM2aV3bBdT5Ww="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 009998a3f8..b3b7377605 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -1,6 +1,4 @@ -{ lib, fetchurl, ocamlPackages }: - -with ocamlPackages; +{ lib, fetchurl, yojson, csexp, result, buildDunePackage }: buildDunePackage rec { pname = "dot-merlin-reader"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index b328f32dc2..1225d78d71 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.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-8wmH9DeI+tm3c/6n7bwMe5SslGNCUg4d5BE0+wQ7KTU="; + sha256 = "sha256-K8lNo2XmHzgbaVCMNvwDwr86hrXBPws9v3HD8ku+D6w="; }; - cargoSha256 = "sha256-f0Wisel7NQOyfbhhs0GwyTBiUfydPMSVAysrov/RxxI="; + cargoSha256 = "sha256-spTy9vzldzqu66904wRVwAeH1rNOQ3WeC6miJkRiAGg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix index 1c1a4c32c6..177b12aea0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,18 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "1.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; - # repo lacks the 1.3.0 tag - # https://github.com/jfrimmel/cargo-valgrind/issues/33 - rev = "d47dd810e3971d676cde5757df8b2e05ed563e41"; - sha256 = "163ch5bpwny1di758rpfib1ddqclxm48j0lmmv741ji3l4nqid32"; + rev = version; + sha256 = "0knsq6n3wrsd3ir2r1wpxm6ks7rgkw33bk008s8fq33m3bq2yvm7"; }; - cargoSha256 = "008s1y3pkn8613kp1gqf494fs93ix0nrwhrkqi5q9bim2mixgccb"; + cargoSha256 = "09mhdi12wgg7s4wdnn0vfxhj7hwj5hjrq32mjgjr2hwm6yzhkzr2"; passthru = { updateScript = nix-update-script { @@ -33,6 +31,9 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/cargo-valgrind --prefix PATH : ${lib.makeBinPath [ valgrind ]} ''; + # Disable check phase as there are failures (2 tests fail) + doCheck = false; + meta = with lib; { description = ''Cargo subcommand "valgrind": runs valgrind and collects its output in a helpful manner''; homepage = "https://github.com/jfrimmel/cargo-valgrind"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 09e24775a3..d8b31810c5 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-03-15"; + rev = "2021-03-22"; version = "unstable-${rev}"; - sha256 = "150gydm0mg72bbhgjjks8qc5ldiqyzhai9z4yfh4f1s2bwdfh3yf"; - cargoSha256 = "10l0lk5p11002q59dqa5yrrz6n6s11i7bmr1wnl141bxqvm873q2"; + sha256 = "sha256-Q8yr5x4+R9UCk5kw/nJgBtGVBeZTDwyuwpyNJUKSPzA="; + cargoSha256 = "sha256-cJ5KPNrX1H4IfHENDGyU2rgxl5TTqvoeXk7558oqwuA="; inherit CoreServices; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix new file mode 100644 index 0000000000..d31c030eda --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix @@ -0,0 +1,25 @@ +{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }: + +rustPlatform.buildRustPackage rec { + pname = "trunk"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "thedodd"; + repo = "trunk"; + rev = "v${version}"; + sha256 = "W6d05MKquG1QFkvofqWk94+6j5q8yuAjNgZFG3Z3kNo="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s="; + + meta = with lib; { + homepage = "https://github.com/thedodd/trunk"; + description = "Build, bundle & ship your Rust WASM application to the web"; + maintainers = with maintainers; [ freezeboy ]; + license = with licenses; [ asl20 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix b/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix index fdf66004de..adec30a14c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -86,11 +86,6 @@ stdenv.mkDerivation rec { "-DBUILD_LAYER_SUPPORT_FILES=ON" ]; - # Help vulkan-loader find the validation layers - setupHook = writeText "setup-hook" '' - export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS - ''; - # Include absolute paths to layer libraries in their associated # layer definition json files. patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/xcode-install/Gemfile b/third_party/nixpkgs/pkgs/development/tools/xcode-install/Gemfile new file mode 100644 index 0000000000..b9d313ce14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/xcode-install/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'xcode-install' diff --git a/third_party/nixpkgs/pkgs/development/tools/xcode-install/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/xcode-install/Gemfile.lock new file mode 100644 index 0000000000..589543fe47 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/xcode-install/Gemfile.lock @@ -0,0 +1,204 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.3) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + artifactory (3.0.15) + atomos (0.1.3) + aws-eventstream (1.1.0) + aws-partitions (1.419.0) + aws-sdk-core (3.111.2) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.41.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.87.0) + aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + claide (1.0.3) + colored (1.2) + colored2 (3.1.2) + commander-fastlane (4.4.6) + highline (~> 1.7.2) + declarative (0.0.20) + declarative-option (0.1.0) + digest-crc (0.6.3) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.6) + emoji_regex (3.2.1) + excon (0.78.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) + multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-net_http (1.0.1) + faraday_middleware (1.0.0) + faraday (~> 1.0) + fastimage (2.2.1) + fastlane (2.172.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.3, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored + commander-fastlane (>= 4.4.6, < 5.0.0) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-api-client (>= 0.37.0, < 0.39.0) + google-cloud-storage (>= 1.15.0, < 2.0.0) + highline (>= 1.7.2, < 2.0.0) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (~> 2.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.3) + simctl (~> 1.6.3) + slack-notifier (>= 2.0.0, < 3.0.0) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (>= 1.4.5, < 2.0.0) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3) + gh_inspector (1.1.3) + google-api-client (0.38.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + signet (~> 0.12) + google-apis-core (0.2.1) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.14) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + rexml + signet (~> 0.14) + webrick + google-apis-iamcredentials_v1 (0.1.0) + google-apis-core (~> 0.1) + google-apis-storage_v1 (0.1.0) + google-apis-core (~> 0.1) + google-cloud-core (1.5.0) + google-cloud-env (~> 1.0) + google-cloud-errors (~> 1.0) + google-cloud-env (1.4.0) + faraday (>= 0.17.3, < 2.0) + google-cloud-errors (1.0.1) + google-cloud-storage (1.30.0) + addressable (~> 2.5) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.1) + google-cloud-core (~> 1.2) + googleauth (~> 0.9) + mini_mime (~> 1.0) + googleauth (0.15.0) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.14) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.4.0) + json (2.5.1) + jwt (2.2.2) + memoist (0.16.2) + mini_magick (4.11.0) + mini_mime (1.0.2) + multi_json (1.15.0) + multipart-post (2.0.0) + nanaimo (0.3.0) + naturally (2.2.1) + os (1.1.1) + plist (3.6.0) + public_suffix (4.0.6) + rake (13.0.3) + representable (3.0.4) + declarative (< 0.1.0) + declarative-option (< 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.4) + rouge (2.0.7) + ruby2_keywords (0.0.4) + rubyzip (2.3.0) + security (0.1.3) + signet (0.14.0) + addressable (~> 2.3) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.8) + CFPropertyList + naturally + slack-notifier (2.3.2) + terminal-notifier (2.0.0) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + tty-cursor (0.7.1) + tty-screen (0.8.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + unicode-display_width (1.7.0) + webrick (1.7.0) + word_wrap (1.0.0) + xcode-install (2.6.8) + claide (>= 0.9.1, < 1.1.0) + fastlane (>= 2.1.0, < 3.0.0) + xcodeproj (1.19.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + xcode-install + +BUNDLED WITH + 1.17.2 diff --git a/third_party/nixpkgs/pkgs/development/tools/xcode-install/default.nix b/third_party/nixpkgs/pkgs/development/tools/xcode-install/default.nix new file mode 100644 index 0000000000..677217b5c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/xcode-install/default.nix @@ -0,0 +1,17 @@ +{ lib +, bundlerApp +}: + +bundlerApp { + pname = "xcode-install"; + gemdir = ./.; + exes = [ "xcversion" ]; + + meta = with lib; { + description = "Install and update your Xcodes automatically"; + homepage = "https://github.com/xcpretty/xcode-install"; + platforms = platforms.unix; + maintainers = with maintainers; [ q3k ]; + license = with licenses; [ mit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/xcode-install/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/xcode-install/gemset.nix new file mode 100644 index 0000000000..c6355de34a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/xcode-install/gemset.nix @@ -0,0 +1,833 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + artifactory = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wify8rhjwr5bw5y6ary61vba290vk766cxw9a9mg05yswmaisls"; + type = "gem"; + }; + version = "3.0.15"; + }; + atomos = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx"; + type = "gem"; + }; + version = "0.1.3"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz0djj8w3ns0sz5gvkla5jml8xzx6skbcfj255m81fyww1x6ws8"; + type = "gem"; + }; + version = "1.419.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + type = "gem"; + }; + version = "3.111.2"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + type = "gem"; + }; + version = "1.41.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + type = "gem"; + }; + version = "1.87.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; + type = "gem"; + }; + version = "1.2.2"; + }; + babosa = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq"; + type = "gem"; + }; + version = "1.0.4"; + }; + CFPropertyList = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; + type = "gem"; + }; + version = "3.0.3"; + }; + claide = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + type = "gem"; + }; + version = "1.0.3"; + }; + colored = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; + colored2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + commander-fastlane = { + dependencies = ["highline"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y8d3ac9qwm1cg6rnpf8rcdsy1yxacrd2g2kl809xsp2vi973g65"; + type = "gem"; + }; + version = "4.4.6"; + }; + declarative = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; + type = "gem"; + }; + version = "0.0.20"; + }; + declarative-option = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; + type = "gem"; + }; + version = "0.1.0"; + }; + digest-crc = { + dependencies = ["rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "118d5p02kdw6a5pi8af12dxma7q3b77zz5q5xjjf5kgp8qh1930a"; + type = "gem"; + }; + version = "0.6.3"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + dotenv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; + emoji_regex = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qbzlracxw4xwyvrgr0qcl1alk4ijk6pv53ni6f43csi649y3n3s"; + type = "gem"; + }; + version = "3.2.1"; + }; + excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16ij8617v3js03yj1zd32mmrf7kpi9l96bid5mpqk30c4mzai55r"; + type = "gem"; + }; + version = "0.78.1"; + }; + faraday = { + dependencies = ["faraday-net_http" "multipart-post" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + type = "gem"; + }; + version = "1.3.0"; + }; + faraday-cookie_jar = { + dependencies = ["faraday" "http-cookie"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; + type = "gem"; + }; + version = "0.0.7"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; + type = "gem"; + }; + version = "1.0.0"; + }; + fastimage = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vqp53s9vgd28f4l17q0vs7xv32y64af0ny3wb1fgg4i534rzg6j"; + type = "gem"; + }; + version = "2.2.1"; + }; + fastlane = { + dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander-fastlane" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-api-client" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "plist" "rubyzip" "security" "simctl" "slack-notifier" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0crr42qdgy9l409pffpfs7nq8ha18lp1nxngny2dc9hiq1xx4r5d"; + type = "gem"; + }; + version = "2.172.0"; + }; + gh_inspector = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04"; + type = "gem"; + }; + version = "1.1.3"; + }; + google-api-client = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jybks8i00rxrxx9mkx90dbdk6pczh2w757wchlavmrkrk0dp9s1"; + type = "gem"; + }; + version = "0.38.0"; + }; + google-apis-core = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet" "webrick"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "184pqw7z7s8mc1r5gj8f76xvp8z650xq50vdfj5gjwsbmzd99z2f"; + type = "gem"; + }; + version = "0.2.1"; + }; + google-apis-iamcredentials_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xjlzq2fxpwvp9b6ajs8cpyjv8vs2d2npg9v23yj181hj2fnn82c"; + type = "gem"; + }; + version = "0.1.0"; + }; + google-apis-storage_v1 = { + dependencies = ["google-apis-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0axycds5q20fqm6vqxa5r922021p0f8jhwvlgw8r1vq600ljribi"; + type = "gem"; + }; + version = "0.1.0"; + }; + google-cloud-core = { + dependencies = ["google-cloud-env" "google-cloud-errors"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qjn7vs8f85vxi1nkikbjfja6bv9snrj26vzscjii0cm8n4dy0i1"; + type = "gem"; + }; + version = "1.5.0"; + }; + google-cloud-env = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; + type = "gem"; + }; + version = "1.4.0"; + }; + google-cloud-errors = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hvs1x39g77hbdqjxmzcl6gq8160pv3kskvzbbch0ww1np6qwm67"; + type = "gem"; + }; + version = "1.0.1"; + }; + google-cloud-storage = { + dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17axi5gmy0g04801v11lww5mvqzffqdc3w6k1j7f95v90hy4yn6m"; + type = "gem"; + }; + version = "1.30.0"; + }; + googleauth = { + dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pwm0mzb5zffhk6yw4v3n1yj8qr6jla6f78vsv4g0bxh9z0ikc2z"; + type = "gem"; + }; + version = "0.15.0"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + type = "gem"; + }; + version = "2.5.1"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ynyq1q483spj20ffl4xayfqx1a8qr761mqjfxczf8lwlap392n"; + type = "gem"; + }; + version = "2.2.2"; + }; + memoist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; + type = "gem"; + }; + version = "0.16.2"; + }; + mini_magick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + type = "gem"; + }; + version = "4.11.0"; + }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + type = "gem"; + }; + version = "1.0.2"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + nanaimo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + type = "gem"; + }; + version = "0.3.0"; + }; + naturally = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59"; + type = "gem"; + }; + version = "2.2.1"; + }; + os = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; + type = "gem"; + }; + version = "1.1.1"; + }; + plist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1whhr897z6z6av85x2cipyjk46bwh6s4wx6nbrcd3iifnzvbqs7l"; + type = "gem"; + }; + version = "3.6.0"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + type = "gem"; + }; + version = "13.0.3"; + }; + representable = { + dependencies = ["declarative" "declarative-option" "uber"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; + type = "gem"; + }; + version = "3.0.4"; + }; + retriable = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; + type = "gem"; + }; + version = "3.1.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; + rouge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; + type = "gem"; + }; + version = "2.0.7"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs"; + type = "gem"; + }; + version = "0.0.4"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + type = "gem"; + }; + version = "2.3.0"; + }; + security = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryjxs0j66wrbky2c08yf0mllwalvpg12rpxzbdx2rdhj3cbrlxa"; + type = "gem"; + }; + version = "0.1.3"; + }; + signet = { + dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp"; + type = "gem"; + }; + version = "0.14.0"; + }; + simctl = { + dependencies = ["CFPropertyList" "naturally"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v9rsdmg5c5kkf8ps47xnrfbvjnq11sbaifr186jwkh4npawz00x"; + type = "gem"; + }; + version = "1.6.8"; + }; + slack-notifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pkfn99dhy5s526r6k8d87fwwb6j287ga9s7lxqmh60z28xqh3bv"; + type = "gem"; + }; + version = "2.3.2"; + }; + terminal-notifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs"; + type = "gem"; + }; + version = "2.0.0"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + tty-spinner = { + dependencies = ["tty-cursor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; + type = "gem"; + }; + version = "0.9.3"; + }; + uber = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; + }; + word_wrap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm"; + type = "gem"; + }; + version = "1.0.0"; + }; + xcode-install = { + dependencies = ["claide" "fastlane"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhslanqw8r0mhls2hira05c8xjzzr7mnz1ab9p5qwg4z45ddjj8"; + type = "gem"; + }; + version = "2.6.8"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + type = "gem"; + }; + version = "1.19.0"; + }; + xcpretty = { + dependencies = ["rouge"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm"; + type = "gem"; + }; + version = "0.3.0"; + }; + xcpretty-travis-formatter = { + dependencies = ["xcpretty"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14rg4f70klrs910n7rsgfa4dn8s2qyny55194ax2qyyb2wpk7k5a"; + type = "gem"; + }; + version = "1.0.1"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index b2d0581c05..9ea5dcc55f 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.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "mikefarah"; rev = "v${version}"; repo = "yq"; - sha256 = "sha256-pP00y9auYeuz0NSA+QrnGybW5T7TfGFFw/FMPu/JXjM="; + sha256 = "sha256-Hv1o1MzkpapmeIsZJ4peyG5kSHt0EXjTA+gE0iq1XF8="; }; - vendorSha256 = "sha256-66ccHSKpl6yB/NVhZ1X0dv4wnGCJAMvZhpKu2vF+QT4="; + vendorSha256 = "sha256-vpvIl1lfaziuoHs+oDEIztufH1somphiBAn6qTaQaZw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 17a3ae58f2..8e45b0b337 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tyqZ/vjQ9gjLoK+Juj30It3H6+2sT9Fj/s0kEv0HRwI="; + sha256 = "sha256-fZuhI+ZvYsFz2gDpHkRRqmmHRyEiEO+vWfqKYdeNtaU="; }; - cargoSha256 = "sha256-LpBQztMqw7IbgTJkfiD+6Fcy5XXmN58HO/zhVen3oCI="; + cargoSha256 = "sha256-us0Kzst7iq+H/WBAlSBQJSpnirsl4zImse2bFREoW4I="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index 31dbce0892..41c06fbf7c 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.20.0"; + version = "0.21.0"; shas = { - x86_64-linux = "sha256-pTWNYQzChyYJh+afn1AMw/MxUE+Cv4k2FnM3+KDYCvg="; - aarch64-linux = "sha256-SPRtQO0tnuEf49GuSsuo403QO0Y6ioRkOp4cjohXRhw="; - x86_64-darwin = "sha256-k0kS5NiITqW/WEFWe/Bnt7Z9HZp2YN19L7DvVlptrj4="; - aarch64-darwin = "sha256-CDGxSv7fPR+5kF3+5NVTOH8ugLaM07Kv5mjoEW6/g/8="; + x86_64-linux = "sha256-oxGCM6jlqafjAfTtFwARxBv/8tiUaD9A2TlLyj/3LlQ="; + aarch64-linux = "sha256-yeDcrxEp3qeE6/NWEc1v7VoHjlgppIOkcHTNVksXNsM="; + x86_64-darwin = "sha256-QqdBa59xPxM8eDRzvPxvv9HFVgp2rt+5jiwIOgsi8JE="; + aarch64-darwin = "sha256-aq2Kjn8QSDMhNg8pEbXkJCHUKmDTNnitq42SDDVyRd4="; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index b9dcfa4fc8..345b7c1542 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.1.0"; + version = "2021.1.1"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-3T334t+Oje6LOzUBqQCK6wdJ/4Mi4WLmW5vcHig8zj4="; + sha256 = "sha256-GPOeLSbKiaJR5ppzyJMllzM+2gSddZN7+P5ttkocuDg="; }; nativeBuildInputs = diff --git a/third_party/nixpkgs/pkgs/games/0ad/data.nix b/third_party/nixpkgs/pkgs/games/0ad/data.nix index 1bebf922c4..5cb28b3f3b 100644 --- a/third_party/nixpkgs/pkgs/games/0ad/data.nix +++ b/third_party/nixpkgs/pkgs/games/0ad/data.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "04x7729hk6zw1xj3n4s4lvaviijsnbjf5rhzvjxlr5fygvg4l6z1"; + sha256 = "0b53jzl64i49rk3n3c3x0hibwbl7vih2xym8jq5s56klg61qdxa1"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/games/0ad/game.nix b/third_party/nixpkgs/pkgs/games/0ad/game.nix index 1ba975aa88..bb3b7c0138 100644 --- a/third_party/nixpkgs/pkgs/games/0ad/game.nix +++ b/third_party/nixpkgs/pkgs/games/0ad/game.nix @@ -1,29 +1,45 @@ -{ stdenv, lib, perl, fetchurl, python2 -, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium +{ stdenv, lib, perl, fetchurl, python2, fmt, libidn +, pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 -, gloox, nvidia-texture-tools -, withEditor ? true, wxGTK ? null +, gloox, nvidia-texture-tools, zeroad-data +, withEditor ? true, wxGTK }: -assert withEditor -> wxGTK != null; +# You can find more instructions on how to build 0ad here: +# https://trac.wildfiregames.com/wiki/BuildInstructions +let + # the game requires a special version 78.6.0 of spidermonkey, otherwise + # we get compilation errors. We override the src attribute of spidermonkey_78 + # in order to reuse that declartion, while giving it a different source input. + spidermonkey_78_6 = spidermonkey_78.overrideAttrs(old: rec { + version = "78.6.0"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + sha256 = "0lyg65v380j8i2lrylwz8a5ya80822l8vcnlx3dfqpd3s6zzjsay"; + }; + patches = (old.patches or []) ++ [ + ./spidermonkey-cargo-toml.patch + ]; + }); +in stdenv.mkDerivation rec { pname = "0ad"; - version = "0.0.23b"; + version = "0.0.24b"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"; + sha256 = "1a1py45hkh2cswi09vbf9chikgxdv9xplsmg6sv6xhdznv4j6p1j"; }; nativeBuildInputs = [ python2 perl pkg-config ]; buildInputs = [ - spidermonkey_38 boost icu libxml2 libpng libjpeg - zlib curl libogg libvorbis enet miniupnpc openal + spidermonkey_78_6 boost icu libxml2 libpng libjpeg + zlib curl libogg libvorbis enet miniupnpc openal libidn libGLU libGL xorgproto libX11 libXcursor nspr SDL2 gloox - nvidia-texture-tools libsodium + nvidia-texture-tools libsodium fmt ] ++ lib.optional withEditor wxGTK; NIX_CFLAGS_COMPILE = toString [ @@ -31,35 +47,22 @@ stdenv.mkDerivation rec { "-I${libX11.dev}/include/X11" "-I${libXcursor.dev}/include/X11" "-I${SDL2}/include/SDL2" - ]; - - patches = [ - ./rootdir_env.patch - # Fixes build with spidermonkey-38.8.0, includes the minor version check: - # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b - (fetchurl { - url = "https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch"; - sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa"; - }) + "-I${fmt.dev}/include" ]; configurePhase = '' # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} - # Workaround invalid pkg-config name for mozjs - mkdir pkg-config - ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc - PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH" - # Update Makefiles pushd build/workspaces ./update-workspaces.sh \ --with-system-nvtt \ - --with-system-mozjs38 \ + --with-system-mozjs \ ${lib.optionalString withEditor "--enable-atlas"} \ --bindir="$out"/bin \ --libdir="$out"/lib/0ad \ + --datadir="$out"/share/0ad/data \ --without-tests \ -j $NIX_BUILD_CORES popd @@ -82,6 +85,11 @@ stdenv.mkDerivation rec { # Copy l10n data. install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/* + # Link in game data from package + ln -s ${zeroad-data}/share/0ad/data/config $out/share/0ad/data/config + ln -s ${zeroad-data}/share/0ad/data/mods $out/share/0ad/data/mods + ln -s ${zeroad-data}/share/0ad/data/tools $out/share/0ad/data/tools + # Copy libraries. install -Dm644 -t $out/lib/0ad binaries/system/*.so diff --git a/third_party/nixpkgs/pkgs/games/0ad/rootdir_env.patch b/third_party/nixpkgs/pkgs/games/0ad/rootdir_env.patch deleted file mode 100644 index c001473e51..0000000000 --- a/third_party/nixpkgs/pkgs/games/0ad/rootdir_env.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp ---- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 2015-02-14 04:45:13.000000000 +0300 -+++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp 2016-11-03 16:23:47.241514876 +0300 -@@ -155,32 +155,8 @@ - - /*static*/ OsPath Paths::Root(const OsPath& argv0) - { --#if OS_ANDROID -- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus --#else -- -- // get full path to executable -- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation -- if(pathname.empty()) // failed, use argv[0] instead -- { -- errno = 0; -- pathname = wrealpath(argv0); -- if(pathname.empty()) -- WARN_IF_ERR(StatusFromErrno()); -- } -- -- // make sure it's valid -- if(!FileExists(pathname)) -- { -- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8()); -- WARN_IF_ERR(StatusFromErrno()); -- } -- -- for(size_t i = 0; i < 2; i++) // remove "system/name.exe" -- pathname = pathname.Parent(); -- return pathname; -- --#endif -+ UNUSED2(argv0); -+ return getenv("ZEROAD_ROOTDIR"); - } - - /*static*/ OsPath Paths::RootData(const OsPath& argv0) diff --git a/third_party/nixpkgs/pkgs/games/0ad/spidermonkey-cargo-toml.patch b/third_party/nixpkgs/pkgs/games/0ad/spidermonkey-cargo-toml.patch new file mode 100644 index 0000000000..4cb8c3735d --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/0ad/spidermonkey-cargo-toml.patch @@ -0,0 +1,15 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 6f6199ab26..c3f92db9d8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -68,8 +68,8 @@ panic = "abort" + libudev-sys = { path = "dom/webauthn/libudev-sys" } + packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" } + rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } +-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } +-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } ++nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1" } ++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" } + # failure's backtrace feature might break our builds, see bug 1608157. + failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } + failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 90901bf2ee..a700f2bc4f 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.312.0"; + version = "2021.320.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "xMq4KrEfSNuXpi4h+BDaHOuWBBPcWNByiKxxsR6EJwA="; + sha256 = "jFroWbNvJRD+r5w6BPj8QBnHJ9uXJZdx4kzmu5gmVSY="; }; 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 c378e817e2..7b13fa4157 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -19,6 +19,11 @@ version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) + (fetchNuGet { + name = "HidSharpCore"; + version = "1.2.1.1"; + sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; + }) (fetchNuGet { name = "Humanizer"; version = "2.8.26"; @@ -426,18 +431,13 @@ }) (fetchNuGet { name = "Microsoft.CSharp"; - version = "4.0.1"; - sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; - }) - (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.5.0"; - sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { name = "Microsoft.Data.Sqlite.Core"; - version = "2.2.6"; - sha256 = "0fx8698k71vzr8pdc6q8bsbzg6r8a42s4hkzmiyv13ibmyb5q68k"; + version = "5.0.4"; + sha256 = "0cpcw1mgxm47s6bn181iswrd41c7jyqxv1zwk0xw0hag0jy80xwm"; }) (fetchNuGet { name = "Microsoft.Diagnostics.NETCore.Client"; @@ -451,89 +451,64 @@ }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; - version = "2.1.0"; - sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; + version = "3.1.6"; + sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore"; - version = "2.2.6"; - sha256 = "18j2cr50wsikwv7gy3vrjvmpdxckvv537qma8afdpr3yn2klayh5"; + version = "5.0.4"; + sha256 = "17r5knq984j6mgbv7w4lyl12ma15pii09zmvf7zw651k46a7lmdz"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "2.2.6"; - sha256 = "1dyxb5ibx24frlgbqy7zch0falq9p1189zvlbxgl94m0hvpml5j3"; + version = "5.0.4"; + sha256 = "0ilj2625nmr8l9al7xk1q1kxcx5p52wlsh8x3qvs8kf2dgvvckn6"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "2.2.6"; - sha256 = "10f2lxxmh0xrdjvnam31fqfnjkaick23mpfvahj3ca5l07bph0rc"; + version = "5.0.4"; + sha256 = "193c63kqgrdiy0wwsbd5hc9b7cjmngiy6rbam24cilafm68nhiif"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Design"; - version = "2.2.6"; - sha256 = "0kjjkh1yfb56wnkmciqzfn9vymqfjap364y5amia0lmqmhfz8g7f"; + version = "5.0.4"; + sha256 = "1xb50lrdyrxa6yi2a8k71znqw2cpjr6qpwx7z5wa5fabdjlywdxh"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Relational"; - version = "2.2.6"; - sha256 = "0c0z4mrqldjfslyxywb2ydk8hn9ybhkvz6lxx3idrfalq3ni5f1z"; + version = "5.0.4"; + sha256 = "0by7is7h3i3w4a1bsffls81dyklp2k4jlysjv1wh3l2wp76c42xa"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "2.2.6"; - sha256 = "0z8k5ns841imaqha5abb1ka0rsfzy90k6qkrvix11sp6k9i7lsam"; + version = "5.0.4"; + sha256 = "0pf55yqjlrjmh8hdcd55awxykhqwzzi5cc447232sa0fdn8a2yh8"; }) (fetchNuGet { name = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "2.2.6"; - sha256 = "0jzqw4672mzxjvzas09sl0zyzzayfgkv003a7bw5g2gjyiphf630"; + version = "5.0.4"; + sha256 = "0ma6y292hgh7bgaancmvvyv0fl6hibjbcbfhn35h01dg6bnz00wr"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; - version = "2.2.0"; - sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; + version = "5.0.0"; + sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; }) (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; - version = "2.2.0"; - sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "2.2.0"; - sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.2.0"; - sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; + version = "5.0.0"; + sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "2.2.0"; - sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection"; - version = "2.2.0"; - sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "5.0.1"; sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "2.2.0"; - sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; - }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; @@ -541,24 +516,14 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; - version = "2.1.0"; - sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging"; - version = "2.2.0"; - sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; + version = "5.0.0"; + sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.2.0"; - sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; - }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; @@ -569,21 +534,11 @@ version = "5.0.3"; sha256 = "1slfc4ncl83dl2g1xm95qb04bkyir26zhvz26lkph1jff0ycx2wb"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "2.2.0"; - sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; - }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "2.2.0"; - sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; - }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; @@ -614,21 +569,11 @@ version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "3.1.0"; - sha256 = "04cc2wl90p7g9zscnxgyj55vzl7srrrjwadl2dxgicfb2x2499ca"; - }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; - }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; version = "4.3.0"; @@ -644,11 +589,6 @@ version = "0.9.6.1"; sha256 = "1fr7969h5q611l5227xw6nvv5rzap76vbpk0wg9hxbcxk3hn7szf"; }) - (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.0"; - sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; - }) (fetchNuGet { name = "NETStandard.Library"; version = "1.6.1"; @@ -669,11 +609,6 @@ version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "9.0.1"; - sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; - }) (fetchNuGet { name = "NuGet.Common"; version = "5.8.0"; @@ -724,10 +659,20 @@ version = "3.13.1"; sha256 = "07156gr0yl9rqhyj44cp1xz9jpngbl5kb7ci3qfy9fcp01dczmm9"; }) + (fetchNuGet { + name = "OpenTabletDriver"; + version = "0.5.2.1"; + sha256 = "0czbgxjkc5ryrnn9hl68wp464p4xp0883517iq87d1f7qb32gppl"; + }) + (fetchNuGet { + name = "OpenTabletDriver.Plugin"; + version = "0.5.2.1"; + sha256 = "199yasnq5dsb5c37vl8vry8lf536gpgclsk402sxdw9lz11xmmqd"; + }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.309.0"; - sha256 = "1da0jgdcxd4zq0fzqhbm31gg66l8sgdgypis8xlch2xny1g854z6"; + version = "2021.317.0"; + sha256 = "1nych95lrxs2hb3bcnw9h0f843k9lrn1f4hwdnaf5q3p8ny1pmph"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -754,11 +699,6 @@ version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) - (fetchNuGet { - name = "Remotion.Linq"; - version = "2.2.0"; - sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; - }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -774,41 +714,21 @@ version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.1.0"; - sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; - }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; - }) (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; - }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; @@ -890,55 +810,40 @@ sha256 = "154w9q0z8697rcpqs4x233crx5ap1z4pl4xc21hsd3csbhw13ykf"; }) (fetchNuGet { - name = "SQLitePCLRaw.bundle_green"; - version = "1.1.12"; - sha256 = "0jbyd25ag15fyn9nawjikv0v5ylk2zh5pxgr6gm4kpbpqys86sq9"; + name = "SQLitePCLRaw.bundle_e_sqlite3"; + version = "2.0.4"; + sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; }) (fetchNuGet { name = "SQLitePCLRaw.core"; - version = "1.1.12"; - sha256 = "03gflsn2wl6v0a8zvh6y5xdhx0xxmfrn6jfldiy829x3fx74zgdl"; + version = "2.0.4"; + sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; }) (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.linux"; - version = "1.1.12"; - sha256 = "10mlq914d3zggdjf4bv27w6jx0gqqjf6f91y5ri6pbvaqyhi28h5"; + name = "SQLitePCLRaw.lib.e_sqlite3"; + version = "2.0.4"; + sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; }) (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.osx"; - version = "1.1.12"; - sha256 = "1hixg6n9sqllfrcihj145lh1l38inv827808difvazd4zr3mi0z1"; + name = "SQLitePCLRaw.provider.dynamic_cdecl"; + version = "2.0.4"; + sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; }) (fetchNuGet { - name = "SQLitePCLRaw.lib.e_sqlite3.v110_xp"; - version = "1.1.12"; - sha256 = "107sivk5p38dg1kyvqrxgp67dj89s8l6brf9l52k6s4vrn4hrrk7"; - }) - (fetchNuGet { - name = "SQLitePCLRaw.provider.e_sqlite3.netstandard11"; - version = "1.1.12"; - sha256 = "0qr2d7ka6f5c7bybdhiyq7nl90c9575szmi0nfpknd9c0w024if4"; + name = "SQLitePCLRaw.provider.e_sqlite3"; + version = "2.0.4"; + sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7"; }) (fetchNuGet { name = "StbiSharp"; version = "1.0.13"; sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q"; }) - (fetchNuGet { - name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; - }) (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { - name = "System.Buffers"; - version = "4.0.0"; - sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; - }) (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; @@ -964,11 +869,6 @@ version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; - }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; @@ -989,11 +889,6 @@ version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { - name = "System.ComponentModel.Annotations"; - version = "4.5.0"; - sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; - }) (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "5.0.0"; @@ -1029,11 +924,6 @@ version = "1.0.31"; sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; }) - (fetchNuGet { - name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; - }) (fetchNuGet { name = "System.Console"; version = "4.3.0"; @@ -1049,51 +939,31 @@ version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.5.0"; - sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; - }) (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + name = "System.Diagnostics.DiagnosticSource"; + version = "5.0.1"; + sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; }) (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; - }) (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; - }) (fetchNuGet { name = "System.Globalization"; version = "4.0.11"; @@ -1104,31 +974,16 @@ version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; - }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; - }) (fetchNuGet { name = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { - name = "System.Interactive.Async"; - version = "3.2.0"; - sha256 = "0y5r5y7dlccjpgg17rjrrzi3jya4ysyydamxs33qckkv4jb3534d"; - }) (fetchNuGet { name = "System.IO"; version = "4.1.0"; @@ -1139,41 +994,21 @@ version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; - }) (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; - }) (fetchNuGet { name = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; - }) (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; @@ -1199,26 +1034,11 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; - }) (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { - name = "System.Linq.Queryable"; - version = "4.0.1"; - sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; - }) - (fetchNuGet { - name = "System.Memory"; - version = "4.5.1"; - sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; - }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; @@ -1229,31 +1049,16 @@ version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; - }) (fetchNuGet { name = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; - }) (fetchNuGet { name = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; - }) (fetchNuGet { name = "System.Net.Sockets"; version = "4.3.0"; @@ -1269,11 +1074,6 @@ version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; - }) (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; @@ -1289,11 +1089,6 @@ version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; @@ -1304,21 +1099,11 @@ version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) - (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; - }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; - }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; @@ -1329,11 +1114,6 @@ version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) - (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; - }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; @@ -1359,11 +1139,6 @@ version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; - }) (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; @@ -1389,11 +1164,6 @@ version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.1"; - sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; - }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; @@ -1444,51 +1214,26 @@ version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; - }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; - }) (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; - }) (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; - }) (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; @@ -1499,31 +1244,16 @@ version = "5.0.0-preview.3.20214.6"; sha256 = "050xx94ki5zmclplfns1v463wlf97ha2knwnxp08vqkgy0bdg1mv"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; - }) (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; - }) (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; - }) (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; @@ -1534,11 +1264,6 @@ version = "5.0.0-preview.3.20214.6"; sha256 = "1q38rzpzhzpc8l75m06g6swq23qbl22ijzd9k76jfq08px3wq09k"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; - }) (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; @@ -1549,11 +1274,6 @@ version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; - }) (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; @@ -1584,11 +1304,6 @@ version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; @@ -1609,11 +1324,6 @@ version = "5.0.1"; sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; - }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; @@ -1644,11 +1354,6 @@ version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; @@ -1669,31 +1374,16 @@ version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) - (fetchNuGet { - name = "System.Threading.Timer"; - version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; - }) (fetchNuGet { name = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; - }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; - }) (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; diff --git a/third_party/nixpkgs/pkgs/games/steam/steam.nix b/third_party/nixpkgs/pkgs/games/steam/steam.nix index 43c1512c65..2c5932cf7f 100644 --- a/third_party/nixpkgs/pkgs/games/steam/steam.nix +++ b/third_party/nixpkgs/pkgs/games/steam/steam.nix @@ -2,7 +2,7 @@ let traceLog = "/tmp/steam-trace-dependencies.log"; - version = "1.0.0.68"; + version = "1.0.0.69"; in stdenv.mkDerivation { pname = "steam-original"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; - sha256 = "sha256-ZeiCYjxnH0Ath5bB20QHmE8R3wU4/3RiAw2NUhrrKNM="; + sha256 = "sha256-b5g4AUprE/lTunJs59IDlGu5O/1dB0kBvCFq0Eqyx2c="; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index a7411c331a..c280d03edb 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.13.7-patch2"; + version = "3.13.10"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-5QYUYTnRblWWLYnhR1DBzoAt4d9EiYeXhzJRODmDHUA="; + sha256 = "sha256-5UT/STcU+/17wjc/guOXgkD6UCtn97EQkVRgnTliFjg="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix index ae8749f032..29ebfa1732 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epkowa/default.nix @@ -13,7 +13,6 @@ , rpm , cpio , getopt -, patchelf , autoPatchelfHook , gcc }: @@ -99,6 +98,35 @@ let plugins = { }; meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; + v600 = stdenv.mkDerivation rec { + pname = "iscan-gt-x820-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin" + ''; + hw = "Perfection V600 Photo"; + }; + meta = common_meta // { description = "iscan esci x820 plugin for " + passthru.hw; }; + }; x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "2.30.4"; @@ -266,14 +294,14 @@ let fwdir = symlinkJoin { in let iscan-data = stdenv.mkDerivation rec { pname = "iscan-data"; - version = "1.39.1-2"; + version = "1.39.2-1"; src = fetchurl { urls = [ "http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz" "https://web.archive.org/web/http://support.epson.net/linux/src/scanner/iscan/iscan-data_${version}.tar.gz" ]; - sha256 = "04zrvbnxf1k6zinrd13hwnbzscc3qhmwlvx3k2jhjys2lginw7w4"; + sha256 = "092qhlnjjgz11ifx6mng7mz20i44gc0nlccrbmw18xr5hipbqqka"; }; buildInputs = [ @@ -295,17 +323,16 @@ stdenv.mkDerivation rec { sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config libtool makeWrapper ]; buildInputs = [ gtk2 libxml2 - libtool libusb-compat-0_1 sane-backends - makeWrapper ]; patches = [ + # Patch for compatibility with libpng versions greater than 10499 (fetchpatch { urls = [ "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch?h=b6e4c805d53b49da79a0f64ef16bb82d6d800fcf" @@ -313,7 +340,9 @@ stdenv.mkDerivation rec { ]; sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd"; }) + # Patch iscan to search appropriate folders for firmware files ./firmware_location.patch + # Patch deprecated use of sscanf code to use a more modern C99 compatible version ./sscanf.patch ]; patchFlags = [ "-p0" ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix index 6b20984016..ee91a010df 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/sameboy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sameboy"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; rev = "v${version}"; - sha256 = "0h42cixbf0m2qiwrqzygh0x166h9ikxa5dzi3jbqld2dygk932n7"; + sha256 = "sha256-VGyB0Em9VFU1Z1K2XfbS9wGs6gZ8/eH/FiaFAKnFdaA="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix index 6698d0a5b4..3b5cb487f7 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = "cd gtk"; meta = with lib; { - homepage = "http://www.snes9x.com"; + homepage = "https://www.snes9x.com"; description = "Super Nintendo Entertainment System (SNES) emulator"; longDescription = '' @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { includes some real gems that were only ever released in Japan. ''; - license = licenses.lgpl2; + # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ qknight ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix b/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix index 98f368132a..2b645817a7 100644 --- a/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix +++ b/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix @@ -1,17 +1,27 @@ -{ lib, buildPythonApplication, fetchPypi, xcffib, pyyaml, click, i3ipc, marshmallow, cffi, xpybutil, pytestrunner }: +{ lib, python3 }: - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "flashfocus"; version = "2.2.2"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv"; }; - nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ]; + nativeBuildInputs = with python3.pkgs; [ + pytestrunner + ]; + + propagatedBuildInputs = with python3.pkgs; [ + i3ipc + xcffib + click + cffi + xpybutil + marshmallow + pyyaml + ]; # Tests require access to a X session doCheck = false; diff --git a/third_party/nixpkgs/pkgs/misc/scimark/default.nix b/third_party/nixpkgs/pkgs/misc/scimark/default.nix new file mode 100644 index 0000000000..7558c676ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/scimark/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, unzip +}: + +stdenv.mkDerivation rec { + pname = "scimark"; + version = "4c"; + + src = fetchurl { + url = "https://math.nist.gov/scimark2/${pname}${version}.zip"; + hash = "sha256-kcg5vKYp0B7+bC/CmFMO/tMwxf9q6nvuFv0vRSy3MbE="; + }; + + nativeBuildInputs = [ + unzip + ]; + + dontConfigure = true; + + installPhase = '' + install -d $out/bin/ + install scimark4 $out/bin/ + ''; + + meta = with lib; { + homepage = "https://math.nist.gov/scimark2/index.html"; + description = "Scientific and numerical computing benchmark (ANSI C version)"; + license = licenses.publicDomain; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; + }; +} +# TODO [ AndersonTorres ]: Java version diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 8cb02185f1..6529ac4bfb 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -49,6 +49,10 @@ let })); in rec { + inherit mkTmuxPlugin; + + mkDerivation = throw "tmuxPlugins.mkDerivation is deprecated, use tmuxPlugins.mkTmuxPlugin instead"; # added 2021-03-14 + battery = mkTmuxPlugin { pluginName = "battery"; version = "unstable-2019-07-04"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 810622cfe8..98fafe4bb7 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-03-15"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "dc40ece3c389804df6d9423e0d52c8da2355ea17"; - sha256 = "0r4s8mbwa7zr3xa73viw8abvaz4ifvjahnifqd9nkivc2qz6s5x9"; + rev = "f7852dbd0a063d6d82ee17a5057fea53cb79b21d"; + sha256 = "16cslwkc8kcr2z0crchl9w5p5vsbzfwpfa103wysyvq9d0q309xk"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -149,12 +149,12 @@ let async-vim = buildVimPluginFrom2Nix { pname = "async-vim"; - version = "2020-12-30"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "async.vim"; - rev = "236debf1a68d69a74f1f6647c273b0477e1ec1bf"; - sha256 = "12xz71182shfj8l300j7wnngxm5zkx2g1c2d4l6dvbk5z1dbzlj6"; + rev = "0fb846e1eb3c2bf04d52a57f41088afb3395212e"; + sha256 = "1glzg0i53wkm383y1vbddbyp1ivlsx2hivjchiw60sr9gccn8f8l"; }; meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-03-10"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "2d14a46d485363cdfc86c9a723f73b2a3e3930bd"; - sha256 = "04c516xkr499z7yfpzmab7aa3y60qhid5zx2kf0askancpvxkmvc"; + rev = "eb24bdceff4f73b8081e2c801752105265f4b1b3"; + sha256 = "18rcikrlcdyg6gfbhaqnqf1p0pyfym9a0mxh430slhzzjhr2a7gh"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-03-16"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "9bfc3e5c79577b15be4b4a464573a4225d41184c"; - sha256 = "0l7jm2v79kisk4xr33wdfm8fsx1g7c217m8dqn6d7bhj9s3nyf47"; + rev = "8f7238502c742fe098e0d681c3597452aa053b89"; + sha256 = "1cppnzf1slzxf3kb24pg18r2izdpd6mylrhc49rla083mr7hqx15"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -485,36 +485,36 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2021-03-01"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "62206b3cf8e06137919e8cbdcb52c474fe1dbd95"; - sha256 = "0y1j2qmncp0n2piiayfbfk39rj0nivjx0wfjh9wnq0s1y2ijcg91"; + rev = "123ef20cd2e5fa85df29912d545c2699844cd9b9"; + sha256 = "1bdqvmi1g8vziqkslwhbsjlnxk24vkc0c24hzn71zxlpnw1i3axz"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-03-13"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "4f44d0749bf9ac1e3755c276222a20015c3fe3be"; - sha256 = "0qrg8m82pmzs8pia16z05pkm9hhcijlw8w79r35silccsicsz8l1"; + rev = "8f27377229c5d2dcee9ae9cda8dea0fad4a5ac3b"; + sha256 = "0ri0rlz4fwxli6ssz69zyifrdwhc8yx4p996rw8d2m76nm7hflv0"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-03-16"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "f149d512bd183db51ef0c714568a64d647d3e7ef"; - sha256 = "0lrbn7rd6w5xqs9z7gsdka8kcaz46azzd9s3ppzdanq7715d8qx4"; + rev = "ed79b7745d31c2981feb9922e8a4ec2f7be5f376"; + sha256 = "0ncxa7xjgkdjha7jyqfd3s7lmm459lg9achmid0qjwx0r0cavzdb"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-03-15"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d3fa3e2a184c174ccdf68051886782fbe8fb8ade"; - sha256 = "0ywicgnld69qp4vv0x2aq9xjaks6i3vmzq1lsr4nhss02jgd0ldx"; + rev = "3b3c5f88bcb25c3d68351f417fa5e8425a3a3142"; + sha256 = "1fkgyb0a5wirndk99d9ajdvxaiipgnv3r0cmvzldvy6ps5ljxabm"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -630,12 +630,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-03-03"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "0739a2587e8d12fd746964578ba5c579fec1560a"; - sha256 = "11fjpvzng735b7zyaia6dhshca9j22gx65k6r85j0698pwrk9wz6"; + rev = "ae0d64e63e80bf3c4f3e88d2e6d3f837332e0a81"; + sha256 = "152ydvfdp0ny95y6n17wsds4kj19fsbkrzd2whc1zbqi5qzsn0ww"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -702,12 +702,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-02-27"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "4dc7c745618a24799af44797c51af7cc308e42a4"; - sha256 = "1p0bck7gh1alybfz14s0yaawx056mfqjc8hba1wappch4jp07si6"; + rev = "a2298d12aaa2065f4a395f017ee1f3d392db283c"; + sha256 = "0ifmv5n0mvvlasa56kr6bwnlm7p1y59kxmvpbdw42cp3az9mcrhj"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -738,12 +738,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-03-14"; + version = "2021-03-16"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "0c633489b6e6d2282b3abb9c5396c5f4c27afb55"; - sha256 = "07vdzpy9ws76csgr8qs7m0krb6rkd17fbcn5168lyzcil52d3dwn"; + rev = "7365334fe6326c5b8d8d98cad3f0da583414ebf7"; + sha256 = "0ilqqf9ghwi7zj01y1arbvdds79hkkq0hj8r639g7q2gc3j4vfi9"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -894,12 +894,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-03-15"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "6224e6981dc33887bc045a7eab7df6f94106c4af"; - sha256 = "0spj16d6n4swxcq2iv48si5l3pahmx6wypp4yc2mnaj2yxcjr39p"; + rev = "a07fdb14c2ae04f1dd4cd78ddeaba9ce1eda4070"; + sha256 = "0z57vvw7jjh021qis4bywznwaywyznrh2zns6wl3ar65zys4dym7"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -942,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-03-16"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "c1dcff549abba061670a67af69eff7021955733c"; - sha256 = "0vqdxjadxz1xh5q7i7m6964l9gqss59lv1n4s7109cfjylacmsxx"; + rev = "8c44de41ec46c44f84dd70907a5763112df2eacb"; + sha256 = "1y235ap3hchkf3hc85frcjl5kwr56lz3vw12qzhhzhrl2k7k5ziw"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1256,12 +1256,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-03-08"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "561c21a96249e7411b409817c00d472a26337b8d"; - sha256 = "0nb1s9c6av6jkvc3gc239llzsa34n50nfqf6swvvbazn7j29sz7c"; + rev = "ab37ffc5aeb1693002f30254b3b9992965f45d5d"; + sha256 = "0affiaa2ng43r3rj2yzxs50fiilsk5vqkgjah2zqa159lb2058ra"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1329,12 +1329,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2020-10-21"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "60930a968d26fc7abf4f8fd5c3926bdcda2dd787"; - sha256 = "1sf0518rq9idj0sbyplh7y9a481i3y57wwkvdakqvngbpm4bf6ms"; + rev = "1f5daf6810d205844c039a4c9efa89317e62259d"; + sha256 = "0250dp2jcxrhx333i6mk99q7ygwa8ac055id9qafdx331v9wxcil"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -1366,12 +1366,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2021-02-01"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "e2efdb0d0827f7ec417583b25142f19714ece2ea"; - sha256 = "1s4i9rv1kcpry1zldpml908xv1r5hn0darip701y14njbmk9fff8"; + rev = "2ba0036e19adbefaf0beffe545e349964a68cc0a"; + sha256 = "0pg3i1dvbjv746szki36yszz6bd82pgzvfyr3ayxf7lih4pjbxmj"; }; meta.homepage = "https://github.com/fenetikm/falcon/"; }; @@ -1547,12 +1547,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-03-14"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "6a88f1bc181bef0ad2b10e962e30896cb064818a"; - sha256 = "0gjqfiq0gqbbqd2irb5j0xhjmhriipy3vn8rsls5cmx3mfaxrz1r"; + rev = "19488f58e7fce74d7f773402005b2014b6d3c9f1"; + sha256 = "16lk7gqhz1bhhszwybpa6805yina38h52nqza17gvz17aqkc6zy3"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1607,24 +1607,24 @@ let git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame-nvim"; - version = "2021-02-20"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "0ae9a1bd371b92e666c55b64447d8f75d5c7665a"; - sha256 = "0i9gwpi00mn9mn20v8qz4q8v1dq79vq7f2i5f8ssnrgprqmc87zr"; + rev = "c6515f6de67f50448a0f865b39c3c459b40856f5"; + sha256 = "1cm6x58qm5jzgncrpwixcvs7cfdv02gf13zz1v4gxicxlllrh70f"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger-vim"; - version = "2021-02-28"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "b79422434a419b97c5817d9ff645216952152443"; - sha256 = "0xwz4kw5mwqrh6s9vyzzx4fdl7335n9qjxzhm1c41hh1j2ikwqa9"; + rev = "6fe62ce47491953487dac540964a4cfb037be7f3"; + sha256 = "0g8gaprkrqs69rplmbf6nc03km6qcapipyc13rghb7fyksad51nr"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -1643,12 +1643,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-03-15"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "89e8320d58b0a2aba32aca576510e4f08d27ae07"; - sha256 = "1yd6jfakykl467m2glvy3alw7jw461jwgnnvfh47fy2a375rwy65"; + rev = "18d0a4bab12193460e6443d02d22218b5ce05a35"; + sha256 = "0qizdphmady0baz5wgi92vdy9wbz1npgahsx0kmpx8c4vfvcdv10"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1667,12 +1667,12 @@ let glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2020-12-12"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "fcd055b797553ffaa03061cb7e81b02a4626c6a6"; - sha256 = "0kbwgw5q9i6irzdy656j4xbqfv5r1p8cd3xdfjszxymnnzrivy49"; + rev = "ba97852b0279ed44d0e06c8bcac17aef2a18ad80"; + sha256 = "02ajb5y5zj5h8dyzzyl55b6izh6bxlmqy48nasig1n68rpdwc0ni"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -1727,12 +1727,12 @@ let gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-03-02"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "197103a55543b1398c194369306cff896bfd3fc1"; - sha256 = "18ng4qk4wi56bq64hc7sw3dx299cnjcg0zghk9r39dpi5fv68d8h"; + rev = "8a36e8dae3e31fa5edfb5ae91fb1c2d36b05979e"; + sha256 = "0yq8bvpqlnj57pl2j4jwwpihpwmq0lym1q5sigvkp0yghlwliqxx"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -1811,12 +1811,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-03-15"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "ac45488406e2a21735be80d634bf0c218bffddd2"; - sha256 = "1pzb1mw019wjx174jnaxnivblajrh00776jck7bdcn5rdpk2dmqs"; + rev = "8d1a199236590a6e6667a45e0084d26aaeb32fb6"; + sha256 = "1skya8iqkf9bblpdf1vvkl73i9rqm0lqd40114a8ppk8vbqjp53x"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2015,12 +2015,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2021-02-26"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "088469a8eeffe421d522e953c4b49de486a0cbce"; - sha256 = "0vwz33ffawazdk6dsmd6m2fiygi9sn7xn601bzfcgf73z1sc41gh"; + rev = "8763462331600951f2d9e729c4d8e26b6049c804"; + sha256 = "0rfrqsgpy501k0cy01br2rrlrsxls73yrhfhnsiafdi3dw6x9anj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -2220,12 +2220,12 @@ let lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-03-10"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "0618a099fa7895c5d25b80cc1bea948ebdc64a96"; - sha256 = "1k2kz3475f15n1y7dkac45fw4mbr33fgbf2j7vmlshb4796j5fw3"; + rev = "4b59e0470c4b9b359a4f6229c420686d6d8ea65f"; + sha256 = "0fbzkmargimal2xyjsyrc6kmw6gdl61hcf17arqp9wv3yn18k637"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2256,12 +2256,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2021-01-11"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "8e013f32f524157bf14ccaa87d97be3d3a7201e2"; - sha256 = "0yl5r1dv91wzkgflh37fd52dinwsm4rcf4kfizn4xg5lbzdafkmn"; + rev = "8a712365f9708044667589d9fffd87a4825d29f6"; + sha256 = "1622qd5lizfv65m5iy3r0bl3zy8phh4anyx93kj631p836s8y6cq"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2280,12 +2280,12 @@ let lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs-nvim"; - version = "2021-02-22"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "2410236d448aa8f407f6a203d90282c34d48b52a"; - sha256 = "0kkg7nbnqj1v46bqq73l58m743p0p7jcbgpscjb16n9ab0n8jqns"; + rev = "ff82d3668497e4520e195748d295cbe9513086b7"; + sha256 = "03698f1lydnql9xi0a1iggpqv3001yn390z9j1hvpwmra3k7lnpg"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; @@ -2328,24 +2328,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-03-16"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "a89d3290ee259c5afca6eb32f236077aa91466f0"; - sha256 = "0pm6069h1p84jj80jd8jyi0lb6s73qvrqg1hjks88cfgbq5p9ryy"; + rev = "855a8d816fa4fcd4cc378b32585474bf407812eb"; + sha256 = "1f440mmc6j2ybp86vaxwc0icvxl3l00i3vbr12knbcf2p3aigkm9"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-03-15"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "62cdc8ec983eb189cfab7481f49e6bf058ff52ac"; - sha256 = "1p25mpg448abqy1bi568mqzbh75xvvfnf0rgsrfah2rlxz468f5a"; + rev = "f80d5adb415812484c1b86692846feb3a8ce7e46"; + sha256 = "0gp0nw173ryn6mn9z98jvrk9y7fyhm08r90qc1zv7z85lngd9226"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2412,12 +2412,12 @@ let minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-03-14"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "98c598c4fd067735e16fc78a3d24be605c5d4588"; - sha256 = "1mzbbfbayihlgd8xbj30vw0nbdyd6fd0wp4v5gnsgbdzfn63qda7"; + rev = "adc19481ceececc53b4a6e3157bae7ebf7b9bb66"; + sha256 = "14hjfnqh9wvbhgf55arjhwbcsm1d91x9mhglz2qdmln6nr66ayz4"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -2724,12 +2724,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-03-14"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "f60af4296507c453ea74b2557aac8eedd8a432b4"; - sha256 = "1iby4h6wlkql7r8szahgjwpyzn8r0jh3yg9zdin3b21ywqld0jp0"; + rev = "0b969a8f6a7d38aed32ca7bddfeb19f80a2b1a29"; + sha256 = "1x9q4kl5595dq7ydpv21apbff5pr15diyww8cd600ibjwybmlm8v"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -2902,6 +2902,18 @@ let meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; + nginx-vim = buildVimPluginFrom2Nix { + pname = "nginx-vim"; + version = "2021-02-25"; + src = fetchFromGitHub { + owner = "chr4"; + repo = "nginx.vim"; + rev = "7b8e3ef48d8e60fe64bb1a85be52e66dd412c84d"; + sha256 = "00n3kx4gczryx968n0l7hqdxg6i4vfi3n3m4bdl5d3rwpbwdy6zy"; + }; + meta.homepage = "https://github.com/chr4/nginx.vim/"; + }; + nim-vim = buildVimPluginFrom2Nix { pname = "nim-vim"; version = "2020-10-16"; @@ -2928,12 +2940,12 @@ let nnn-vim = buildVimPluginFrom2Nix { pname = "nnn-vim"; - version = "2021-02-28"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "edfc91e1189a36a5f0d5438d7f9c575571f759fa"; - sha256 = "11dzqhd2kp537ig8zcny0j56644mmrgygiw3wvfh1ly9gb9l2r9f"; + rev = "6408b859f9fac3880d82109d25874fb6656026d9"; + sha256 = "0r5s89882hj54qyi5rcwmf8g54jkjmap5c2rd2mhfjs3j4dfny72"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; @@ -2964,12 +2976,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-03-15"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "8d26e7cfbc2cd8cdca19432d2048e8e01a751573"; - sha256 = "007vi49s9la0w31wcikf233f43nkhfdk29dh6bha1z0wrrys20kj"; + rev = "e22ce2c391e0fe82f66c767cf2b99ff1e044d428"; + sha256 = "1dl967mc8slsfm8c8dk7kbzsrnr6ll7y8m36aq5v827f49f1byak"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -3024,12 +3036,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-03-16"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "f38ab64d66be371aae19495bc9880bd9232db7a8"; - sha256 = "196nyan70mhh7p3fqdgnyy7hb5pbhg05gq8nlp8xaaas19ai6kqa"; + rev = "08dbc5f47d2be27cbc92c9684ec876b1eb778a4f"; + sha256 = "09fnzidcmknkrmls3wmjfa6drp5i8hmcbfs3hrvvp8jywgfyrpr3"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3096,12 +3108,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-03-15"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "3e975aaaf19af2c11535cfa99fd4765b9836a3fd"; - sha256 = "1dw1mq461jl3vrq9n920j630sqdbs716lyqs75p94xxdw9rrdd04"; + rev = "fb6bf0c836b384f3afa66c43b24de112e2e05764"; + sha256 = "1p887iysf2a2nhj3cih9a7mzlipqakglzgw6ll065ghrn4dmr28p"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3120,12 +3132,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-03-12"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "de1fbbb64f57a5b770812ed0e8d515429f31f564"; - sha256 = "08dbdmnl56yks8aqjszxi9qs0a47m92q2azhxgsri8566jsc3ny8"; + rev = "c4199f88d5f6bf269b91ae5d775a082aef05f9bd"; + sha256 = "18cnhhybhzw20l6v4rxzk5a5jcgv8l7jhbmzl529rd9jdhxqikfa"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3144,12 +3156,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-03-14"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "73691999f77db352823c0e92e7cb083582127dd8"; - sha256 = "14d3w6gjkvc1pjsj106w34k7qgp92b8gwd9l12rmci805i9l696m"; + rev = "00e9a7450eac88121768df21fde7d21f43de7529"; + sha256 = "0qqr6zz4a1i13hmj4hvcx08m5ipy28iz3hlaa239jf5yx9rw0y1h"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3168,36 +3180,36 @@ let nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-03-15"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "62af84ae39407d8afbd6bbc53cbca1167df476f3"; - sha256 = "0jbdyixpr8s6q3wd6hncc78qvs0rswx1kgmvnv4sl2nzimbpzfkw"; + rev = "f136ab905ac99c9bd20a8bc4c470eb33768c54a0"; + sha256 = "1590gszcra3pagva6zplib35fqlgj26masjq3i6qgq85kpx5s55j"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-03-06"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "b88638d1067364965c214860cc2e5048caa617f7"; - sha256 = "17hc37f7gm1wbrj6mzq3walb1a5km901viq0nx8n93r957sj98dd"; + rev = "11b7719ab73a7d69b081b129927c6dc8638518c6"; + sha256 = "1y9ff1plfd592jdy4v0m9ivkg293fjmz5ssaf20hmx4x5rlz871l"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-03-14"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "58612e2b4fb4406bad3c916651dd00580cf69a61"; - sha256 = "162vvgarasbq9x6l5k2b85a0pq1jilswfj7d12wvjczw8w0h2x6r"; + rev = "693b93d273c4c0c0670d364cab9f3ab880d2f306"; + sha256 = "04dsjc6f8ag0vfr4sa6nmpfqimx48cvadwv7dd3m9g2mwivkfgyi"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3216,24 +3228,24 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-03-14"; + version = "2021-03-16"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "4c46d2b1927590e1bba4ee4656a771e9941b2727"; - sha256 = "1sjn6fnwc9k0nv2jz88m34g0nyf43knb9f1l53nj69inilxirhmy"; + rev = "f7ad4ce5f4c93c91aca00f0d9f10316c98471798"; + sha256 = "0l7ixschycw3lvg488bxgbbzsba59k0zkm8yrjdh63dp2nk2p2kj"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-03-16"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "df81a91ba9e6ae29a70e168b49e21dc1835c0948"; - sha256 = "0b8bv36d3wg1qsnfmaa2cwinj196yqly9d9227a298xqdbfq083x"; + rev = "600509aad6c3e38c45a0f67802ede5d2204e0250"; + sha256 = "0j92ayfrlapgh09mz9rxfjzxag2kjmljd2qkbv54jl5dzr6p0f3q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3252,36 +3264,36 @@ let nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2021-03-02"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "c87b8ecd7ae2d337499df9f2e70400250c921ca9"; - sha256 = "17z9p6vkpw264cbrh9napkqkqazlp90yv0qz7j6w6ac4z5mgv0mp"; + rev = "edf1790d9cd365785d4f86848c079704aa7e4854"; + sha256 = "12rp2mj7va5qf55jzca0rgy1xrwkyf7p3zd3xw262m9lqm4hjqqc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-03-15"; + version = "2021-03-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "704f7cbdc464a0bdec2ebcaa5e8400c61bf6a4eb"; - sha256 = "1a37s6cyk3w0cprrm10qn09165nmg1vddidh5rznl2h6rlxp6rn3"; + rev = "29b9e29cef885293ba02a590ba1f6618df8c3018"; + sha256 = "0gnpkdglm2y35n6ffmb0mj70j7ka94x8y2xl46z5d3312iimi30c"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-03-16"; + version = "2021-03-22"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "f4de826ac4cba3a355f10064d9c3957e8096a884"; - sha256 = "0hzfiajl02rnhxyz84444jrnc5n6fx6gzkfr9vbvm95ap62bjawr"; + rev = "4c9043e117bfa5ea8e4d5b04b60b2e29c0548e14"; + sha256 = "1ada87qkka1bsjdy52xqcnj5rmd9fl8q2v0km1pml3lcjyi0zdf5"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3348,12 +3360,12 @@ let one-nvim = buildVimPluginFrom2Nix { pname = "one-nvim"; - version = "2021-03-11"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "Th3Whit3Wolf"; repo = "one-nvim"; - rev = "a6fe11693bedb58a4ccf36491e6ce0e70772ff32"; - sha256 = "04lxrawpkgvfsbd0v3q8ssv0r3x0czlar4q3b5lxm40dv1afz9mi"; + rev = "b1461ea89c940bdc5ed142327e1cd85ed2c0e877"; + sha256 = "1w5avzyrcbg60prx3239iazcjvh2mk7lk6k256a1iyxb6dnkpbas"; }; meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; @@ -3384,12 +3396,12 @@ let open-browser-github-vim = buildVimPluginFrom2Nix { pname = "open-browser-github-vim"; - version = "2020-11-11"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser-github.vim"; - rev = "ee132b0f8ea180f996a2e34c5e977d23c615b47a"; - sha256 = "17da42h05840vv8n4sj0im4rc18g2drb9sh0grjlpnz86mc8fqj0"; + rev = "ac7c034e300f36d591ef234dcd5eb5cd5c07c74f"; + sha256 = "0n62h0gjakdc3bnpysny0rndhqhq7g5c97pgr42wz599wnr1pily"; }; meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; @@ -3719,6 +3731,18 @@ let meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; + registers-nvim = buildVimPluginFrom2Nix { + pname = "registers-nvim"; + version = "2021-03-21"; + src = fetchFromGitHub { + owner = "tversteeg"; + repo = "registers.nvim"; + rev = "ba84c085ca868515520310073d922132fd811a24"; + sha256 = "02qadqyppn7w2ssc7m7zqr5s9iknhj0fbg88w2mdn7s4kcf8jyim"; + }; + meta.homepage = "https://github.com/tversteeg/registers.nvim/"; + }; + Rename = buildVimPluginFrom2Nix { pname = "Rename"; version = "2011-08-31"; @@ -3767,6 +3791,18 @@ let meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; + rspec-vim = buildVimPluginFrom2Nix { + pname = "rspec-vim"; + version = "2020-08-20"; + src = fetchFromGitHub { + owner = "keith"; + repo = "rspec.vim"; + rev = "e49d306de952c2195233b83f9ca9fa94e19affe4"; + sha256 = "0445abk039qlhk5s9jm5hawfksds5dgshb1lspvfkz8slk6m076z"; + }; + meta.homepage = "https://github.com/keith/rspec.vim/"; + }; + rtorrent-syntax-file = buildVimPluginFrom2Nix { pname = "rtorrent-syntax-file"; version = "2016-03-19"; @@ -3877,12 +3913,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-03-12"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "4de948c5fada3ce15a4fc29be8e075131986a199"; - sha256 = "0gj5ij81kvaalz91hp7ipf9498j6ip5qd9a9an8f3fhfyhfzqv7q"; + rev = "171d6a39eb46973b229aaf1d88691e40d45f64ad"; + sha256 = "097f0il1dcn2kshsngvklgwlhac86cjwxxagqvcz3yiaa1qpzhlp"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4287,12 +4323,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-03-14"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "284f38c57539967b25c7d32700acffd46599c49f"; - sha256 = "14gbwm1184n0nkyhz9zcwd87l141swyrch9dhwwydgnd5m853842"; + rev = "a7fa60411efbfddc0674d65346a5311e33f6deb1"; + sha256 = "0g8rp6qx3n43ipycav5jrhzbd5p3kp9cmcn277yn81y3f76sarij"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4371,12 +4407,12 @@ let todo-txt-vim = buildVimPluginFrom2Nix { pname = "todo-txt-vim"; - version = "2016-11-10"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "freitass"; repo = "todo.txt-vim"; - rev = "6845221d45bd62e604c2024bc511a56e79d1118b"; - sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v"; + rev = "ed9d639de2e34eafb82f2682010ab361966ee40f"; + sha256 = "1vw4vhbgxnlkl5m5y55xk81vrknw35s01dw21s815i8clp38zr7i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/freitass/todo.txt-vim/"; @@ -4468,12 +4504,12 @@ let undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2021-03-05"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "1dce5c869f2cec23b6bcc0b40330e358ada9f37d"; - sha256 = "198bvd54m8dvhj0jwfzkws35fw18cc075023c8hirplbsgyj6msm"; + rev = "da7aeb3dc307a2995b6b761fe94cad61da9845e0"; + sha256 = "1mg9r7kc4jpbmh8b0wcax82a80r0qjl2yq61cc55x7i91wssrj60"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -4552,12 +4588,12 @@ let vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2021-03-14"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "2b866c8946b00b2e97bfe12bc2ca0b3d5e5b3276"; - sha256 = "1k721a7wlrdjnmnfj83v40jxcl8g7la5f15g345b6g3ix1w5yhjr"; + rev = "3f0c8faadf0c5b68bcf40785c1c42e3731bfa522"; + sha256 = "1w9zim2v1av3f43z8q7zh0ia8dgjxjwnvmzd4j3y25vy25avn0lb"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -4900,12 +4936,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-02-10"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "2a6f931987c1cc5e5bc0c4c44f21ac9bd4c72f3b"; - sha256 = "17w0cjzppx9zxrqxaa975xazcnps4v1b93bmy19dccvc7z1gipby"; + rev = "e9104aeece94652b064a15ae220bd4926a715dbd"; + sha256 = "1kvnmzs1wbqaiswsjra13f06m8dpdn62h8zqrnr9vv13rm8a2326"; }; meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; @@ -5332,12 +5368,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-03-15"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "fc44257bc9f5e41de0f01ff2d1e3907052307463"; - sha256 = "0mcw8hq5by6k6rdldsn79a3ch2mlkd1ysan91571gr11gsv82k0v"; + rev = "8d9dd450941b98df3f333923b807f799b8088f63"; + sha256 = "1m0dlvz3ah54wwc5ahhjv4ynxp7crxl3092fspyzgr5fl2p94ida"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -5428,12 +5464,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2020-04-19"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "fe6a34322829e466a7e8ce710a6ac5eabddff9fd"; - sha256 = "1m0dfm8r3d8zph6i4ln3jqfzs8hxbkq9rvxpij1m2vvk2hgy2nf5"; + rev = "895c8fa958018fa3366f0e70a18cfeb73a204588"; + sha256 = "10q8xgbds6r34ka004qvzd3nkkqv8sas5ca7vx0jwvyhglijy644"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -5668,12 +5704,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-10-30"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "433ff6468d8ee0be5cbcf5bbd940f9ce2acf0f79"; - sha256 = "1mjiwzl631v4yxgfbvgc66rxbyn3w1shy7836ksd2xnbd0m6kx8h"; + rev = "e04a615e72ec2e216116b5c6514ac4d86b21ffc3"; + sha256 = "1q17xlwprkvx27fbb9xg1zh5nyx8gif3pp6p8vd3r6zhzqqdl469"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -5728,19 +5764,19 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-03-07"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "7b0eb92e72a6d6aef3c31faa868e2d2a4af81951"; - sha256 = "08sf9idvrjqf6bvi5p98w8fj2r7c1czkvsyfjch77bwr20gdf2wy"; + rev = "2d9107b1e1ceb3d4f118647f2cd5f9165172ccf9"; + sha256 = "1ja58d2x8a5af7vhvbjp8x7l4bzbvndr2nd97p115q89l2zy6ayp"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-03-16"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; @@ -5788,12 +5824,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-03-16"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "3eb6f316c09553989e59bb3802da100a6fb7c091"; - sha256 = "043vbbjaf04hza2bysiggl4bif4mf7pjvwkzbryq4mrwn0zs22y3"; + rev = "58d2b25836f420cf2fe20cc0b6f988165ae33782"; + sha256 = "0550dq20axl1qj6rasws2hsar7x4kjx9fspqzmkisv4wzrxr1kp5"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5836,12 +5872,12 @@ let vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-03-14"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "0d2b79b7e74e9bd1d48ea91246f3cf3200328acd"; - sha256 = "0bs7xnkrzni5pcvqfn80if9mlw7idi8g3lsllmgxgk3cjlhg7q19"; + rev = "e9058ebb9b9563ec77bc96fb19b2138f6512beef"; + sha256 = "17wpar2ais3cx1jaak9l8fck7fks2yczn7flcvgfcwvjxd9vyxgq"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -5860,12 +5896,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-03-16"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "64062dfe022885f6900ba016eb24faee22a72d26"; - sha256 = "18cjabpm7icxjix58krvanzs1mmqaw80935n6wd3mnfxqj4qln8s"; + rev = "24cc47789557827209add5881c226243711475ce"; + sha256 = "0fk8691wkhb7mb5ssmydipb61kh3hjnl31ngqbrbifzsqlkvibid"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5908,12 +5944,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-03-14"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "fe66df2057a90ae38bd154035b0751f0f50e6752"; - sha256 = "13hinmg92n19clgnl0dnlcdnw7zh53ag9hhk98xrd3g6sngjyvpm"; + rev = "a60ff48be1d57991866320886569d012cdfb9e6f"; + sha256 = "1w3cbvdl08vf7d9w4d3vaw3l4ccvzvgfkamk7qxanmcg2vd0k1rg"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5932,12 +5968,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2021-02-03"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "553d125f7b0e56743e80e2439f5cd7f27771a8e3"; - sha256 = "0nfp411zxjda5k7mh9400rjipqg6liizdkfqcc887zicaw3pylkm"; + rev = "de5753e3fbd89f2939a43cfc2c6a2313ff129a21"; + sha256 = "15qy6adhgfwjh6jrw9902hl67qzhdi72kqgzdk5shgfyndzar25g"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -6028,12 +6064,12 @@ let vim-hcl = buildVimPluginFrom2Nix { pname = "vim-hcl"; - version = "2021-03-10"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "jvirtanen"; repo = "vim-hcl"; - rev = "92aa0081d0de6876bbbe3758e418d5b4eda3f14b"; - sha256 = "0v9m83f62v9dqn3jks21vfs3l59rif1f6jsg3f01iknb8ghhwrpi"; + rev = "d50f93204b606b4ff40a9522be0e8dbf6055b815"; + sha256 = "0sdaldmdrgha5ij02flsqrc77ijjifdvl8b6pdw24xrpd9j5cwhs"; }; meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; @@ -6281,12 +6317,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-01-31"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "fb39c1e6ab815270b9d1ba07f7d34059710b5035"; - sha256 = "1n541shva0c7frihgv0ngg3vqm3d549wbqa15n2n6j1cfpsasbyd"; + rev = "b01e32ec3d005423d5e6043b18b563086a623dc8"; + sha256 = "0d9a6ynir9hgl9yp0mh0ng935llj4z9jkd9rvpddskcvq7h5590c"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -6426,12 +6462,12 @@ let vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2020-01-20"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "48ba343c8c1ca3039224727096aae214f51327d1"; - sha256 = "0m8skd86p2cr0wz8rghj4is3fgnlh7vrw7can916li35i3hajid2"; + rev = "af91003c4852e94abc508a3c67bb92958c56fcbe"; + sha256 = "0bjzdli80pmcxp0rfhxkdmwnlq5s61ih7a3h2fybgqrphz87sazm"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -6558,24 +6594,24 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2021-03-15"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "4b3c07ccedecb101c75ff974e5d1526933f69e03"; - sha256 = "09vcc0w9fvpz4bqzpfgpw0hvafx1p8pwy4wbrjkn55gg14j4k93i"; + rev = "d2b394c0033014288daac317c32918bed469ff66"; + sha256 = "0a8hd20v5q3bjq5pcs8p708f5jmh1y87aqa0f7ip4snldnf6gq2d"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-03-16"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "8be2f495b8c5801131c8af87a9aa7a30be19ae33"; - sha256 = "13whd8ydq1vls20nsmjvchbw7k48gdsqjf1508v3pndw1hgj2ps1"; + rev = "b8e75ef927b48848f3f21b7033aa68c9c88e9392"; + sha256 = "0c3b7r7vkxcfgznwylj5psbkvrph5qqsifawrxjdjgx2imc7arva"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6655,12 +6691,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-03-14"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "5ce13cec884906819ef21be634b89b0693625b01"; - sha256 = "0sgxnn9fjcr42hcmyib22vs7y11jxhzk4r99va7wwpsa5k6kn2yr"; + rev = "e477123fcc47cc419d04beee6695d8558272ca8c"; + sha256 = "0j37dx8ka7qb9wpdx5kqnf6rwmrhpcla1838v97f0dfhljxd4w27"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6979,12 +7015,12 @@ let vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-02-08"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "fdbac11f36172d6e47e212385d2f4482e472f815"; - sha256 = "1mbs8v8k7698qnck5n38lqaz8sl07d1p31c84injb460l6jfv1s7"; + rev = "a4270c71344c146959f166cad14e9f56bd2611e0"; + sha256 = "027idhv524qqp54scfdb6zbwjwalff80aji6w5q9c02k8hvnc2v7"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -7219,24 +7255,24 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2021-01-22"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "348e070867d02bd471df486bfbe25e2e2ce13061"; - sha256 = "0fyp1zikw16kzjcs7a6g3kjk74xr46bdhwrwfi9ppfqlhb936kgr"; + rev = "7d2853e7550e6ff6459096c211a4177303a2e5d2"; + sha256 = "0qvsm0bd5nbd0dcgcrsa45vxmb4ccsm6yn4j3xiwd52gnyacp14s"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2020-11-01"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "ad008dbdcd04ee1758f4475263c2a37789d32702"; - sha256 = "14fcvghqbv7mx2yi112vc9cq69mw98fgv0vc8x256v639bj1y5g9"; + rev = "976f3e61c2dd4ab709ea5eccbbab9e42d35d7e8c"; + sha256 = "01dbiwj1x8rd5yy19cphxysga3fi5l3il2ph8hr1v4adzvw8269z"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -7831,12 +7867,12 @@ let vim-swap = buildVimPluginFrom2Nix { pname = "vim-swap"; - version = "2020-11-16"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-swap"; - rev = "699b7492c965a3dd96128d16b6b68a15091a931a"; - sha256 = "0vw4d1375xhp1fbv88fp96ry0hzyqkbfn4dccrlfl4sanvkh0r6y"; + rev = "f363ea636f4e18b4a3382ff352d3cf2e2ac5840e"; + sha256 = "1pa5crmamama4v3yzcjfbizvpx03wb67zbjx1mn5rz6dcar903f6"; }; meta.homepage = "https://github.com/machakann/vim-swap/"; }; @@ -8132,12 +8168,12 @@ let vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-03-11"; + version = "2021-03-19"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "71ad5b657e7dc4e44758e45ccdd0be160cd87161"; - sha256 = "17mi2fhw97xwgy9a7hyvvn1rmfxchh8xwrpv4x7v7v59pq7fcqi2"; + rev = "cf8aa913329991bfeaa1cabab4bbd8889b0f0790"; + sha256 = "0j0h95xhb5c59qyx8gc1yrcnsjxffbnycya6wnl7axd71iawwgh8"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -8192,12 +8228,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-02-16"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "4c99296b8f29d8936de8c33d98f0acdafcdbd388"; - sha256 = "1w936x8zz0f6v77bhixd48q09naqglq3ar4y26kpr9vscfmsbc00"; + rev = "08e37d47406d7f57e5907af4dc6bd35cff2b04b3"; + sha256 = "157gvlpb0i3jn9gjcjgz02y843jh03pqnwfkv2bf9qh7bknrnxr5"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -8216,12 +8252,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-02-28"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "925fb3d0163e4c50b8d639029837696ead0f5a56"; - sha256 = "06ssm3m64mcfzasf2sx09nrk8rizgjm9dgl36nm7qk2vchrcbg33"; + rev = "fe1f56cb924a67ce3b3b70583f00e05e780509e5"; + sha256 = "0kd4pfjrjcssql154pnrzvw3kgp6rnll2p0d4bgph1b0lc5xp1nk"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -8468,12 +8504,12 @@ let vimsence = buildVimPluginFrom2Nix { pname = "vimsence"; - version = "2021-03-12"; + version = "2021-03-17"; src = fetchFromGitHub { owner = "vimsence"; repo = "vimsence"; - rev = "f04fc0d4c52c29bcf8b0a8bf06d1c10f15261fff"; - sha256 = "17vc6vqlpqvf1nkvynvh6r9z88fvpxj488ys8y3hbkc9mx43x8lr"; + rev = "ad036250a116472218430aed1817e5b6c204d0b8"; + sha256 = "0yn3w193h9h1fyaniwdj4y7b744kwj11prxcq8iyg897v8jj25bk"; }; meta.homepage = "https://github.com/vimsence/vimsence/"; }; @@ -8492,12 +8528,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-03-12"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "af2670ef9a631d1719250f0abc71e844f10ec352"; - sha256 = "1jw6bsc4ynjv76kdmi4y94qyysq93irw4gr6wnmix4mk9ljv15fs"; + rev = "35e5b3d56e193ee6129eabedcd48fd17b8293b2d"; + sha256 = "0njs7bn3hzr44sn04lg44baia5khpxra0l1llshx42bkdidcj1s1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8505,24 +8541,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-03-15"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2bdee8f56ec224e65d18d55f9883b6f71b463fa9"; - sha256 = "1nn2pfjfzwwdwg9bclps53gvixmpkd50bs1z6y53b6vfx61xdgn5"; + rev = "4b9e69dc5e817c3436843ee0cb431e59fa5705b0"; + sha256 = "1s2h2bgd751jf7vj9dr1756g7gxdx3b7pwx49686273ibv1spnwf"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-03-09"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "29d46f6bc158c28b85ae540dc29459ff41211233"; - sha256 = "1yd9pmyzqyk7mcsa9gkvsz6i9g6zkm63mm9h26713simy1idl536"; + rev = "708ce200d56d6fc326a8c1acd7f0f4f7c6a9e552"; + sha256 = "0wkxq1a3phmxskmqcn3067s56k6n9v8k9qqy0mwhxhp2d53asxpf"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8686,12 +8722,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-02-07"; + version = "2021-03-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "dbf67638cb7084883c7463b0d6226be9d9159b9a"; - sha256 = "1qxwgjfhzz7ymkbbnjm3xrp368rmcphdaj4lxrkkbp9d2pn9g8s7"; + rev = "3352684bfb6a08be8e864a46b0773e459d4d201f"; + sha256 = "03mqrprmiain4n9aw5388msq4smczw1avcls71rj0c7igzpdc4vw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -8735,24 +8771,24 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-03-14"; + version = "2021-03-18"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "979f78f024178c1e9aff6fbebc33d291f64b121d"; - sha256 = "04vfx1axq157qbqj832i04wsd4xk0zwh5bzs4g71q4hxhqdvy678"; + rev = "05315a214fc0b4681e596cbcb40045d54564ff8c"; + sha256 = "0bapbwyvvbvqd8ggcyns2y5iya44jvb0jxq14xh5qfnxiycrwrgi"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-03-08"; + version = "2021-03-16"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "ead21935391bb1f3906c7358af7ebe5572592cfd"; - sha256 = "1qcd7w5hadf6h4lxrvj8xjl729csy0bc0dch39xy4j6iph9w8jpq"; + rev = "33b62b688ef4f0b3810c4d3d1b3901f572488691"; + sha256 = "0dsc1h8ih5jgfni5szm8dby368naxh3igndm80yrciy2glcj1ayn"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index b37679f896..b72aeb0d10 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -45,6 +45,7 @@ cespare/vim-toml Chiel92/vim-autoformat chikatoike/concealedyank.vim chikatoike/sourcemap.vim +chr4/nginx.vim chrisbra/CheckAttach chrisbra/csv.vim chrisbra/NrrwRgn @@ -263,6 +264,7 @@ kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/investigate.vim +keith/rspec.vim keith/swift.vim kevinhwang91/nvim-bqf@main kevinhwang91/nvim-hlslens@main @@ -633,6 +635,7 @@ travitch/hasksyn tremor-rs/tremor-vim@main triglav/vim-visual-increment troydm/zoomwintab.vim +tversteeg/registers.nvim@main twerth/ir_black twinside/vim-haskellconceal Twinside/vim-hoogle diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 6bbe9a9a40..533c2e3f4a 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }: +{ config, lib, callPackage, vscode-utils, nodePackages, jdk, llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -246,6 +246,18 @@ let }; }; + emmanuelbeziat.vscode-great-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-great-icons"; + publisher = "emmanuelbeziat"; + version = "2.1.64"; + sha256 = "sha256-qsL1vWiEAYeWkMDNSrr1yzg0QxroEQQeznoDL3Ujy/o="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + esbenp.prettier-vscode = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -377,8 +389,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.205"; - sha256 = "0s7bmnsx40lz9wiijrh7cnazwqvmkhsbnidl832qx27pzk0977ix"; + version = "0.0.206"; + sha256 = "1xalwk2bndb73p8p2b4w5qz7m1n80xyw67wb5qlq1rrfjchhicyv"; }; meta = with lib; { license = licenses.mit; @@ -582,6 +594,20 @@ let }; }; + redhat.java = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "java"; + publisher = "redhat"; + version = "0.76.0"; + sha256 = "0xb9brki4s00piv4kqgz6idm16nk6x1j6502jljz7y9pif38z32y"; + }; + buildInputs = [ jdk ]; + meta = { + license = lib.licenses.epl20; + broken = lib.versionOlder jdk.version "11"; + }; + }; + redhat.vscode-yaml = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-yaml"; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix index 801c0a10e9..7c9eaa6561 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.8.2"; + version = "2.8.3"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; - sha256 = "0f1ck3h8ckvr75j27w2lxjbwnr24nc6fjki0gnn715ynkqg7w9bi"; + sha256 = "1cng82q9079qmn5q71h9knh9qzhqrl3phaamkqfjy1jallgi43b1"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix index 8a814e9558..b88107f992 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -241,6 +241,18 @@ in rec { popd >/dev/null ''; }; + + sandbox = stdenv.mkDerivation { + name = "apple-lib-sandbox"; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/include $out/lib + ln -s "${lib.getDev sdk}/include/sandbox.h" $out/include/sandbox.h + cp "${darwin-stubs}/usr/lib/libsandbox.1.tbd" $out/lib + ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd + ''; + }; }; overrides = super: { diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/macfuse/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/macfuse/default.nix new file mode 100644 index 0000000000..a5162b3aed --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/macfuse/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchurl, cpio, xar, undmg, libtapi }: + +stdenv.mkDerivation rec { + pname = "macfuse-stubs"; + version = "4.1.0"; + + src = fetchurl { + url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; + sha256 = "118hg64w5wb95lbxw6w1hbqxrx3plcbxfjhvxx86q0zx0saa9diw"; + }; + + nativeBuildInputs = [ cpio xar undmg libtapi ]; + + postUnpack = '' + xar -xf 'Install macFUSE.pkg' + cd Core.pkg + gunzip -dc Payload | cpio -i + ''; + + sourceRoot = "."; + + buildPhase = '' + pushd usr/local/lib + for f in *.dylib; do + tapi stubify --filetype=tbd-v2 "$f" -o "''${f%%.dylib}.tbd" + done + sed -i "s|^prefix=.*|prefix=$out|" pkgconfig/fuse.pc + popd + ''; + + # NOTE: Keep in mind that different parts of macFUSE are distributed under a + # different license + installPhase = '' + mkdir -p $out/include $out/lib/pkgconfig + cp usr/local/lib/*.tbd $out/lib + cp usr/local/lib/pkgconfig/*.pc $out/lib/pkgconfig + cp -R usr/local/include/* $out/include + ''; + + meta = with lib; { + homepage = "https://osxfuse.github.io"; + description = "Build time stubs for FUSE on macOS"; + platforms = platforms.darwin; + maintainers = with maintainers; [ midchildan ]; + + # macFUSE as a whole includes code with restrictions on commercial + # redistribution. However, the build artifacts that we actually touch for + # this derivation are distributed under a free license. + license = with licenses; [ + lgpl2Plus # libfuse + ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix deleted file mode 100644 index d0f6b0f531..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/osxfuse/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, runCommand, fetchFromGitHub, autoreconfHook }: - -let - version = "3.8.3"; - - headers = runCommand "osxfuse-common-${version}" { - src = fetchFromGitHub { - owner = "osxfuse"; - repo = "osxfuse"; - rev = "osxfuse-${version}"; - sha256 = "13lmg41zcyiajh8m42w7szkbg2is4551ryx2ia2mmzvvd23pag0z"; - }; - } '' - mkdir -p $out/include - cp --target-directory=$out/include $src/common/*.h - ''; -in - -stdenv.mkDerivation { - - pname = "osxfuse"; - inherit version; - - src = fetchFromGitHub { - owner = "osxfuse"; - repo = "fuse"; - rev = "1a1977a"; # Submodule reference from osxfuse/osxfuse at tag osxfuse-${version} - sha256 = "101fw8j40ylfbbrjycnwr5qp422agyf9sfbczyb9w5ivrkds3rfw"; - }; - - postPatch = '' - touch config.rpath - ''; - - postInstall = '' - ln -s osxfuse.pc $out/lib/pkgconfig/fuse.pc - ''; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ headers ]; - - meta = with lib; { - homepage = "https://osxfuse.github.io"; - description = "C-based FUSE for macOS SDK"; - platforms = platforms.darwin; - license = licenses.gpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix index b79f0bd84f..f986ed790a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/acpi-call/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "acpi-call"; - version = "2020-04-07-${kernel.version}"; + version = "1.2.1"; + name = "${pname}-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "nix-community"; repo = "acpi_call"; - rev = "fe4cd0124099b88b61f83006023bc0d95e742e75"; - sha256 = "1rksbg78i7y2wzam9p6kbhx8rmkaiq0kqg8nj7k0j6d25m79289s"; + rev = "v${version}"; + sha256 = "0mr4rjbv6fj4phf038addrgv32940bphghw2v9n1z4awvw7wzkbg"; }; hardeningDisable = [ "pic" ]; @@ -26,8 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ raskin mic92 ]; - inherit (src.meta) homepage; + homepage = "https://github.com/nix-community/acpi_call"; platforms = platforms.linux; description = "A module allowing arbitrary ACPI calls; use case: hybrid video"; + license = licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix index 026ef5b0f4..815dc6a2ee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/akvcam/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "ULEhfF+uC/NcVUGAtmP1+BnrcgRgftNS97nLp81avQ8="; + sha256 = "0r5xg7pz0wl6pq5029rpzm9fn978vq0md31xjkp2amny7rrgxw72"; }; nativeBuildInputs = [ qmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index d994aed6d0..290e3b5618 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -6,13 +6,13 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.18.0"; + version = "0.19.0"; disabled = !stdenv.isLinux; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "sha256-0F8tppVFu7cnuSnlgcEvbEdykxYhGJnTc04I98/yIVs="; + sha256 = "sha256-TEH8Gmp+8ghLQ8UsGy5hBCMLqfMeApWEFr8THYSOdOQ="; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix index 61b66c6c86..0e7eaa19b4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix @@ -68,13 +68,13 @@ with lib; stdenv.mkDerivation rec { pname = "conky"; - version = "1.11.6"; + version = "1.12.1"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "0y2g66fjqp2hdk0y1h4ijxhnv34j16gizvxpmbigwh4n6zijcm6v"; + sha256 = "sha256-qQx9+Z1OAQlbHupflzHD5JV4NqedoF8A57F1+rPT3/o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index ced77f3fcc..2809605910 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.36"; + version = "0.38"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda"; + sha256 = "sha256-UR6NHIO/L/QbuVerXe32RNT33wwrDvIZpV6nlYaImI8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index 11886e8e9c..6e703feb99 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchgit -, fetchpatch , autoreconfHook , pkg-config , ell @@ -13,12 +12,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.11"; + version = "1.12"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "0wnyg0f1swi7gvvgf5kzbiz44g2wscf5d5bp320iwyfwnlbqb1bn"; + sha256 = "sha256-o3Vc5p/AFZwbkEWJZzO6wWAJ/BmSh0eKxdnjm5B9BFU="; }; outputs = [ "out" "man" ] @@ -88,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; description = "Wireless daemon for Linux"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill fpletz ]; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 01158d9c4f..d1d8c9c555 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,26 +7,26 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.181-hardened1.patch", - "sha256": "13j15nwmnzl1s17403icrpx9cdpfpzb5y1pnl6zaj5wsnjda7k5d", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.181-hardened1/linux-hardened-4.19.181-hardened1.patch" + "name": "linux-hardened-4.19.182-hardened1.patch", + "sha256": "02848qbglzj0w8lwic0fp19zc2b3d229ghfn804qx2h2rxh48c96", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.182-hardened1/linux-hardened-4.19.182-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.24-hardened1.patch", - "sha256": "0d2kwz01kgh43li6b76b7dhnx37hchzx99rk4h6jdz364272lh1p", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.24-hardened1/linux-hardened-5.10.24-hardened1.patch" + "name": "linux-hardened-5.10.25-hardened1.patch", + "sha256": "0d5fid229769frifr7g20ly553gxdqqvajfwyzqwjpr82jjzxlis", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.25-hardened1/linux-hardened-5.10.25-hardened1.patch" }, "5.11": { "extra": "-hardened1", - "name": "linux-hardened-5.11.7-hardened1.patch", - "sha256": "1d3rg722k796qh2zj97fyk30qak9i71yqy7mk2dpbmdpv0ksacax", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.7-hardened1/linux-hardened-5.11.7-hardened1.patch" + "name": "linux-hardened-5.11.8-hardened1.patch", + "sha256": "1qlvhj8g6vkg3bsd3fl27n6j5c3ykcyypigf22vfy8yl55mnbmv6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.8-hardened1/linux-hardened-5.11.8-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.106-hardened1.patch", - "sha256": "1hg18p1n26am6y2i459jrpnkq06rv0f5hds1znnm7jw4f61k395f", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.106-hardened1/linux-hardened-5.4.106-hardened1.patch" + "name": "linux-hardened-5.4.107-hardened1.patch", + "sha256": "1wy66a97zjrk2g061xj0va0km3y15m0w4p1bvqsyvjlj5x4wwmwh", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.107-hardened1/linux-hardened-5.4.107-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index 53fb707ab2..8d2f607dbf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.181"; + version = "4.19.182"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j"; + sha256 = "0r93mgvjypmj0glg0912vfq9zbagi59w4d88ynz5gm8sl05pbnq5"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index c415fc601c..80b3ee780c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.24"; + version = "5.10.25"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66"; + sha256 = "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix index 319ef0bfea..6f59b234ef 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.7"; + version = "5.11.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cd87v6j8nk89pjqqsaviyzx9lj0d51j46n1in7cjlg18wng3da9"; + sha256 = "17y8q0gy4b00rms6pgglzmzz4msvmn2frqvln9vac39m78k3kyci"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 8823e58088..cb5e9ef7a2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.106"; + version = "5.4.107"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"; + sha256 = "0q3m4d96d0hhhzn71aarh314i4cx9h3qvhhi5hrmcsrnbxafyg0w"; }; } // (args.argsOverride or {})) 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 b437bb4988..d8fc7a71b5 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.11.1"; + version = "5.11.8"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "00cji0dkfsjz6agwvcqpy7771hqbzcxk8awpbhlhpwa5j161r7l4"; + sha256 = "1zvd74l6vb0rwrkwwh67i8l6ipin0p981vzdmiwpbpfzasbw59xk"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 6f9b1eaa31..0aa63af52d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.102-rt53"; # updated by ./update-rt.sh + version = "5.4.106-rt54"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx"; + sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0d1653cd5dcv4p13mxmva3jz5mp1phvmibfabhha0wsiqkabvx80"; + sha256 = "0xwbpn1k1b4bxq15sw7gicrzkfg32nkja308a5pcwx1ihv9khchf"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index e54a05c6e8..0323bf81c7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.11.1"; + version = "5.11.8"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "10xpb6r1ccqy2lsndf16dksi40z1cgm3wqjp3yjwzhad8zdjlm5d"; + sha256 = "1hb05shhqb6747m131sw30h36ak1m9bwzhfldjypn8phlfkflgkq"; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch index 69dbf479f9..e112e69152 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch @@ -121,3 +121,15 @@ index fd2028d..ecb0141 100644 if (!cwd) return NULL; +--- a/shared/util.h 2018-01-31 18:10:59.000000000 +0100 ++++ b/shared/util.h 2020-12-28 19:48:21.000000000 +0100 +@@ -7,6 +7,9 @@ + #include + #include + #include ++#ifdef __APPLE__ ++#include ++#endif + + #include + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix new file mode 100644 index 0000000000..258f4296e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, kernel, fetchFromGitHub, }: + +stdenv.mkDerivation rec { + pname = "mbp2018-bridge-drv"; + version = "0.01"; + + src = fetchFromGitHub { + owner = "MCMrARM"; + repo = "mbp2018-bridge-drv"; + rev = "${version}"; + sha256 = "0ac2l51ybfrvg8m36x67rsvgjqs1vwp7c89ssvbjkrcq3y4qdb53"; + }; + + buildPhase = '' + make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ + -j$NIX_BUILD_CORES M=$(pwd) modules + ''; + + installPhase = '' + make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ + INSTALL_MOD_PATH=$out M=$(pwd) modules_install + ''; + + meta = with lib; { + description = "A driver for MacBook models 2018 and newer, which makes the keyboard, mouse and audio output work."; + longDescription = '' + A driver for MacBook models 2018 and newer, implementing the VHCI (required for mouse/keyboard/etc.) and audio functionality. + ''; + homepage = "https://github.com/MCMrARM/mbp2018-bridge-drv"; + license = lib.licenses.gpl2Only; + platforms = platforms.linux; + maintainers = [ lib.maintainers.hlolli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix index 3310692b31..ae175a3632 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/musl/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0jz8fzwgvfyjgxjbpw35ixdglp2apqjvp8m386f6yr4zacc6xbv8"; + url = "https://musl.libc.org/releases/${pname}-${version}.tar.gz"; + sha256 = "1p8r6bac64y98ln0wzmnixysckq3crca69ys7p16sy9d04i975lv"; }; enableParallelBuilding = true; @@ -67,12 +67,6 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) - # wcsnrtombs destination buffer overflow, remove >= 1.2.2 - (fetchurl { - name = "CVE-2020-28928.patch"; - url = "https://www.openwall.com/lists/oss-security/2020/11/20/4/1"; - sha256 = "077n2p165504nz9di6n8y5421591r3lsbcxgih8z26l6mvkhcs2h"; - }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; @@ -149,7 +143,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An efficient, small, quality libc implementation"; - homepage = "http://www.musl-libc.org"; + homepage = "https://musl.libc.org/"; + changelog = "https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice dtzWill ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix index 7f26ae80ed..5e4e15c364 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix @@ -2,16 +2,15 @@ stdenv.mkDerivation rec { pname = "pam_mount"; - version = "2.16"; + version = "2.17"; src = fetchurl { - url = "mirror://sourceforge/pam-mount/pam_mount/${version}/${pname}-${version}.tar.xz"; - sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"; + url = "mirror://sourceforge/pam-mount/pam_mount/${pname}-${version}.tar.xz"; + sha256 = "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy"; }; patches = [ ./insert_utillinux_path_hooks.patch - ./support_luks2.patch ]; postPatch = '' @@ -31,7 +30,6 @@ stdenv.mkDerivation rec { "--sbindir=${placeholder "out"}/bin" "--sysconfdir=${placeholder "out"}/etc" "--with-slibdir=${placeholder "out"}/lib" - "--with-ssbindir=${placeholder "out"}/bin" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/support_luks2.patch b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/support_luks2.patch deleted file mode 100644 index 0b8557f1ba..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/support_luks2.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit d4434c05e7c0cf05d87089404cfa2deedc60811a -Author: Ingo Franzki -Date: Mon Oct 29 16:47:40 2018 +0100 - - crypto: Add support for LUKS2 - - Cryptsetup version 2.0 added support for LUKS2. - This patch adds support for mounting LUKS2 volumes with - pam_mount. - - Signed-off-by: Ingo Franzki - -diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c -index d0ab6ca..abd0358 100644 ---- a/src/crypto-dmc.c -+++ b/src/crypto-dmc.c -@@ -21,6 +21,12 @@ - #include "libcryptmount.h" - #include "pam_mount.h" - -+#ifndef CRYPT_LUKS -+ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will -+ default to LUKS(1) on older -+ libcryptsetup versions. */ -+#endif -+ - /** - * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt) - * @path: path to the crypto container -@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev) - - ret = crypt_init(&cd, device); - if (ret == 0) { -- ret = crypt_load(cd, CRYPT_LUKS1, NULL); -+ ret = crypt_load(cd, CRYPT_LUKS, NULL); - if (ret == -EINVAL) - ret = false; - else if (ret == 0) -@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req, - #endif - } - -- ret = crypt_load(cd, CRYPT_LUKS1, NULL); -+ ret = crypt_load(cd, CRYPT_LUKS, NULL); - if (ret == 0) { - ret = crypt_activate_by_passphrase(cd, mt->crypto_name, - CRYPT_ANY_SLOT, req->key_data, req->key_size, flags); diff --git a/third_party/nixpkgs/pkgs/servers/bird/default.nix b/third_party/nixpkgs/pkgs/servers/bird/default.nix index e90445e29c..bc8c8df355 100644 --- a/third_party/nixpkgs/pkgs/servers/bird/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bird/default.nix @@ -58,7 +58,7 @@ in }; bird2 = generic { - version = "2.0.7"; - sha256 = "0rhhbfmfw2d93rvhglv03rdzxsq2disw6s1wm8d6bgdxmrc2n7b3"; + version = "2.0.8"; + sha256 = "1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix index 51f3d10cd0..1e5697cb59 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/appdaemon.nix @@ -6,6 +6,14 @@ let python = python3.override { packageOverrides = self: super: { + astral = super.astral.overridePythonAttrs (oldAttrs: rec { + version = "1.10.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1wbvnqffbgh8grxm07cabdpahlnyfq91pyyaav432cahqi1p59nj"; + }; + }); + bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec { version = "3.1.7"; src = oldAttrs.src.override { @@ -62,7 +70,6 @@ in python.pkgs.buildPythonApplication rec { --replace "sockjs==0.10.0" "sockjs" \ --replace "deepdiff==4.3.1" "deepdiff" \ --replace "voluptuous==0.11.7" "voluptuous" \ - --replace "astral==1.10.1" "astral" \ --replace "python-socketio==4.4.0" "python-socketio" \ --replace "feedparser==5.2.1" "feedparser>=5.2.1" \ --replace "aiohttp_jinja2==1.2.0" "aiohttp_jinja2>=1.2.0" \ 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 98fba35b9f..c699830ba6 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -151,7 +151,7 @@ "datadog" = ps: with ps; [ datadog ]; "ddwrt" = ps: with ps; [ ]; "debugpy" = ps: with ps; [ debugpy ]; - "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz + "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi "default_config" = ps: with ps; [ pynacl aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa netdisco pillow scapy sqlalchemy zeroconf ]; @@ -192,7 +192,7 @@ "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ ]; # missing inputs: dwdwfsapi + "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ]; @@ -374,7 +374,7 @@ "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ ]; # missing inputs: hyperion-py "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter - "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink + "iaqualink" = ps: with ps; [ iaqualink ]; "icloud" = ps: with ps; [ pyicloud ]; "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; @@ -563,7 +563,7 @@ "norway_air" = ps: with ps; [ pymetno ]; "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events - "notion" = ps: with ps; [ ]; # missing inputs: aionotion + "notion" = ps: with ps; [ aionotion ]; "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat @@ -741,7 +741,7 @@ "sighthound" = ps: with ps; [ pillow simplehound ]; "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush - "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python + "simplisafe" = ps: with ps; [ simplisafe-python ]; "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index dc61317876..a5949e738b 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -28,6 +28,21 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # Pinned due to API changes in iaqualink>=2.0, remove after + # https://github.com/home-assistant/core/pull/48137 was merged + (self: super: { + iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { + version = "0.3.4"; + src = fetchFromGitHub { + owner = "flz"; + repo = "iaqualink-py"; + rev = "v${version}"; + sha256 = "16mn6nd9x3hm6j6da99qhwbqs95hh8wx21r1h1m9csl76z77n9lh"; + }; + checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ]; + }); + }) + # Pinned due to bug in ring-doorbell 0.7.0 # https://github.com/tchellomello/python-ring-doorbell/issues/240 (mkOverride "ring-doorbell" "0.6.2" @@ -178,6 +193,7 @@ in with py.pkgs; buildPythonApplication rec { "conversation" "counter" "cover" + "deconz" "default_config" "demo" "derivative" @@ -213,6 +229,7 @@ in with py.pkgs; buildPythonApplication rec { "html5" "http" "hue" + "iaqualink" "ifttt" "image" "image_processing" @@ -250,6 +267,7 @@ in with py.pkgs; buildPythonApplication rec { "mqtt_statestream" "mullvad" "notify" + "notion" "number" "ozw" "panel_custom" @@ -274,13 +292,16 @@ in with py.pkgs; buildPythonApplication rec { "search" "shell_command" "shopping_list" + "simplisafe" "simulated" + "sma" "sensor" "smarttub" "smtp" "sql" "ssdp" "stream" + "subaru" "sun" "switch" "system_health" diff --git a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix index 72c6286af3..4ed03450af 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apt-cacher-ng/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.6"; + version = "3.6.1"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "sha256-/4jA5acNpHpdQ9kb/1A9thtoUCqsYFxSCr4JLmFYdt4="; + sha256 = "sha256-avyjp4KH7l6OZxnMVDv1U/MIWcadqyPPtnLYzEYkqlA="; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix b/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix new file mode 100644 index 0000000000..f907e337ce --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/irc/inspircd/default.nix @@ -0,0 +1,221 @@ +let + # inspircd ships a few extra modules that users can load + # via configuration. Upstream thus recommends to ship as + # many of them as possible. There is however a problem: + # inspircd is licensed under the GPL version 2 only and + # some modules link libraries that are incompatible with + # the GPL 2. Therefore we can't provide them as binaries + # via our binary-caches, but users should still be able + # to override this package and build the incompatible + # modules themselves. + # + # This means for us we need to a) prevent hydra from + # building a module set with a GPL incompatibility + # and b) dynamically figure out the largest possible + # set of modules to use depending on stdenv, because + # the used libc needs to be compatible as well. + # + # For an overview of all modules and their licensing + # situation, see https://docs.inspircd.org/packaging/ + + # Predicate for checking license compatibility with + # GPLv2. Since this is _only_ used for libc compatibility + # checking, only whitelist licenses used by notable + # libcs in nixpkgs (musl and glibc). + compatible = lib: drv: + lib.any (lic: lic == drv.meta.license) [ + lib.licenses.mit # musl + lib.licenses.lgpl2Plus # glibc + ]; + + # compatible if libc is compatible + libcModules = [ + "regex_posix" + "sslrehashsignal" + ]; + + # compatible if libc++ is compatible + # TODO(sternenseemann): + # we could enable "regex_stdlib" automatically, but only if + # we are using libcxxStdenv which is compatible with GPLv2, + # since the gcc libstdc++ license is GPLv2-incompatible + libcxxModules = [ + "regex_stdlib" + ]; + + compatibleModules = lib: stdenv: [ + # GPLv2 compatible dependencies + "argon2" + "ldap" + "mysql" + "pgsql" + "regex_pcre" + "regex_re2" + "regex_tre" + "sqlite3" + "ssl_gnutls" + ] ++ lib.optionals (compatible lib stdenv.cc.libc) libcModules; + +in + +{ lib +, stdenv +, fetchFromGitHub +, nixosTests +, perl +, pkg-config +, libargon2 +, openldap +, postgresql +, libmysqlclient +, pcre +, tre +, re2 +, sqlite +, gnutls +, libmaxminddb +, openssl +, mbedtls +# For a full list of module names, see https://docs.inspircd.org/packaging/ +, extraModules ? compatibleModules lib stdenv +}: + +let + extras = { + # GPLv2 compatible + argon2 = [ + (libargon2 // { + meta = libargon2.meta // { + # use libargon2 as CC0 since ASL20 is GPLv2-incompatible + # updating this here is important that meta.license is accurate + # libargon2 is licensed under either ASL20 or CC0. + license = lib.licenses.cc0; + }; + }) + ]; + ldap = [ openldap ]; + mysql = [ libmysqlclient ]; + pgsql = [ postgresql ]; + regex_pcre = [ pcre ]; + regex_re2 = [ re2 ]; + regex_tre = [ tre ]; + sqlite3 = [ sqlite ]; + ssl_gnutls = [ gnutls ]; + # depends on stdenv.cc.libc + regex_posix = []; + sslrehashsignal = []; + # depends on used libc++ + regex_stdlib = []; + # GPLv2 incompatible + geo_maxmind = [ libmaxminddb ]; + ssl_mbedtls = [ mbedtls ]; + ssl_openssl = [ openssl ]; + }; + + # buildInputs necessary for the enabled extraModules + extraInputs = lib.concatMap + (m: extras."${m}" or (builtins.throw "Unknown extra module ${m}")) + extraModules; + + # if true, we can't provide a binary version of this + # package without violating the GPL 2 + gpl2Conflict = + let + allowed = compatibleModules lib stdenv; + in + !lib.all (lib.flip lib.elem allowed) extraModules; + + # return list of the license(s) of the given derivation + getLicenses = drv: + let + lics = drv.meta.license or []; + in + if lib.isAttrs lics || lib.isString lics + then [ lics ] + else lics; + + # Whether any member of list1 is also member of list2, i. e. set intersection. + anyMembers = list1: list2: + lib.any (m1: lib.elem m1 list2) list1; + +in + +stdenv.mkDerivation rec { + pname = "inspircd"; + version = "3.9.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0x3paasf4ynx4ddky2nq613vyirbhfnxzkjq148k7154pz3q426s"; + }; + + outputs = [ "bin" "lib" "man" "doc" "out" ]; + + nativeBuildInputs = [ + perl + pkg-config + ]; + buildInputs = extraInputs; + + configurePhase = '' + patchShebangs configure make/*.pl + + # configure is executed twice, once to set the extras + # to use and once to do the Makefile setup + ./configure \ + --enable-extras \ + ${lib.escapeShellArg (lib.concatStringsSep " " extraModules)} + + # this manually sets the flags instead of using configureFlags, because otherwise stdenv passes flags like --bindir, which make configure fail + ./configure \ + --disable-auto-extras \ + --distribution-label nixpkgs${version} \ + --uid 0 \ + --gid 0 \ + --binary-dir ${placeholder "bin"}/bin \ + --config-dir /etc/inspircd \ + --data-dir ${placeholder "lib"}/lib/inspircd \ + --example-dir ${placeholder "doc"}/share/doc/inspircd \ + --log-dir /var/log/inspircd \ + --manual-dir ${placeholder "man"}/share/man/man1 \ + --module-dir ${placeholder "lib"}/lib/inspircd \ + --runtime-dir /var/run \ + --script-dir ${placeholder "bin"}/share/inspircd \ + ''; + + postInstall = '' + # for some reasons the executables are not executable + chmod +x $bin/bin/* + ''; + + enableParallelBuilding = true; + + passthru.tests = { + nixos-test = nixosTests.inspircd; + }; + + meta = { + description = "A modular C++ IRC server"; + license = [ lib.licenses.gpl2Only ] + ++ lib.concatMap getLicenses extraInputs + ++ lib.optionals (anyMembers extraModules libcModules) (getLicenses stdenv.cc.libc) + # FIXME(sternenseemann): get license of used lib(std)c++ somehow + ++ lib.optional (anyMembers extraModules libcxxModules) "Unknown" + # Hack: Definitely prevent a hydra from building this package on + # a GPL 2 incompatibility even if it is not in a top-level attribute, + # but pulled in indirectly somehow. + ++ lib.optional gpl2Conflict lib.licenses.unfree; + maintainers = [ lib.maintainers.sternenseemann ]; + # windows is theoretically possible, but requires extra work + # which I am not willing to do and can't test. + # https://github.com/inspircd/inspircd/blob/master/win/README.txt + platforms = lib.platforms.unix; + homepage = "https://www.inspircd.org/"; + } // lib.optionalAttrs gpl2Conflict { + # make sure we never distribute a GPLv2-violating module + # in binary form. They can be built locally of course. + hydraPlatforms = []; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index c5d1f6c058..a89d4f2162 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.668"; + version = "0.17.699"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA="; + sha256 = "sha256-dftllucRemUdZjYDLKPJ4XJ031OZpsW4bpJDuWPyses="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix index 6b67ef939d..92f31126e8 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.7.0"; + version = "10.7.1"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://repo.jellyfin.org/releases/server/portable/versions/stable/combined/${version}/jellyfin_${version}.tar.gz"; - sha256 = "sha256-63T1EBjtTWxg41W5gBDYCthgnokZ/e/B1s6BmymO32w="; + sha256 = "sha256-pgFksZz0sD73uZDyUIhdFCgHPo67ZZiwklafyemJFGs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index a9954b4a14..468c46b126 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.29.0"; + version = "1.30.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BySztUwVqyaL0AvmJMWEbjVqf981ABKMAU9f9C/0wkU="; + sha256 = "1ca69v479537bbj2hjliwk9zzy9fqqsf7fm188k6xxj0a37q9y41"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 64ee8752f1..c25c23671b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.65"; + version = "2.0.66"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "0gz9kp1x39xpklq77xpm8kldsc4w87732if90w5p9pw0ip4cn6df"; + sha256 = "sha256-1aikMRY1YiSQNUnYqsw1Eew9D9JHbkX+BXNCof6YK50="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 3a01acbb37..285db02e1c 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.17.3"; + version = "1.18.0"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-DJvXGjh1FN6SHcfVUlbfoKgBD1ThaJMvKUqvIKCyzeI="; + sha256 = "sha256-1sFl+F3g2anssW59eKbjPdVCIyGq8JuoJGXVQZys854="; }; - vendorSha256 = "sha256-UTdJT4cwRCqkn01YXB1KYc7hp1smpZFke9aAODd/2x0="; + vendorSha256 = "sha256-m53S/L71nyioCBbIDDAWEnqStBdqTFGq16y5ozsXq1c="; preBuild = '' buildFlagsArray+=("-ldflags=-w -s -X main.version=${version}") diff --git a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index abec3c5f79..4a6db24bc4 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Event sourcing database with processing logic in JavaScript"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ puffnfresh ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index 02fd763151..d7612d3076 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.52.0"; + version = "1.54.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1sqzpr48sylgiy4zaf3f8hnwzv7imf57bxg6sin9lv291ybhxs68"; + sha256 = "sha256-nZSNn1vLk3y6s4ie1AkSkGmKUiIrcBr3yKW5uAEtRt0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 6261e2f9bf..6e6bf845d0 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.4.4079-1b7748a7b"; + version = "1.22.0.4163-d8c4875dd"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0843sdl9c6382vjj3ykvcl6rizs2jnb4jqx19ah3phbcvsnjlhdb"; + sha256 = "16lwcimgnpxcyxbk4qwkqz5mzmizqfzihwqb41awc38qlfbjzh5g"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "02v4jf6jajm5gvsilllln1vvnxx30gi2b8ljsby5d3xhhca6kmqx"; + sha256 = "0wvqrn7mycrx0rn4zkp6cr2mr59nfqh63czm0awsfpqc6hqggz8y"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/rippled/default.nix b/third_party/nixpkgs/pkgs/servers/rippled/default.nix index cd19c77cab..0b2a0e38f0 100644 --- a/third_party/nixpkgs/pkgs/servers/rippled/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rippled/default.nix @@ -160,7 +160,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Ripple P2P payment network reference server"; homepage = "https://github.com/ripple/rippled"; - maintainers = with maintainers; [ ehmry offline RaghavSood ]; + maintainers = with maintainers; [ offline RaghavSood ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix index 4533e3138a..64a6dddfaa 100644 --- a/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -20,14 +20,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.1.1"; + version = "3.2.0"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0m39r2il7d014kf2p6v28lw2hzshm6bhhdchqa8wzyvvmygqmwf2"; + sha256 = "sha256-h+efFsyCqcMktKpKOqaHkfFdJKGAjvIOc6NmIyXnZDA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index ae0ae2e3ee..ff464c6282 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.11"; + version = "0.23.14"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-1VUW8WBNlGSL9JpKhpYfAgCFp3ZGYgWFXTehOAueuZI="; + sha256 = "sha256-QhBdOXu+KizeSYHUbNflDaDpzjeEFaYkhY+K1MgLzzc="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix index 37c697f367..22110f3b4f 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = { description = "Client library that can be used to connect to MySQL or MariaDB"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ globin ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/servers/swego/default.nix b/third_party/nixpkgs/pkgs/servers/swego/default.nix index 184c54ba9c..92c31ead6c 100644 --- a/third_party/nixpkgs/pkgs/servers/swego/default.nix +++ b/third_party/nixpkgs/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "0.92"; + version = "0.93"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-SiB0Z6Eqbn/6VGDTt5bQtgcT4V4AjRIIYYk98EW7ss4="; + sha256 = "sha256-oTeSh7OzjzbgKbSQSNhnCUZw5FdUkN+Y9LkIbWFhn5c="; }; - vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; + vendorSha256 = "sha256-TK1LN9EmVH95jPO6K7gtCwdnW4WOKH3K7Q0FhgNMVUQ="; postInstall = '' mv $out/bin/src $out/bin/$pname diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix index 1c2e16f76f..ae56fed52b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "0hpgqqv8mp1d3sk7dk49m3yv0cv4afa0v3vdd4w8mdnx6pcqdgy1"; + sha256 = "1pl3mnkmfqykhq55q36kvvnvn9fgsk72pfa7nii3hywzad0bj0ar"; }; - vendorSha256 = "12b7andpzsgzmd56gg4gc5ilkxvjrpwpmwbdmygfzgkd5jncmcgp"; + vendorSha256 = "0jrc6y5chkj25bnpzn6blvfb0vd09h6fdcz75g54605z8nqd397p"; outputs = [ "out" "static" ]; diff --git a/third_party/nixpkgs/pkgs/shells/mksh/default.nix b/third_party/nixpkgs/pkgs/shells/mksh/default.nix index c10537959d..360380e19b 100644 --- a/third_party/nixpkgs/pkgs/shells/mksh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/mksh/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, installShellFiles +}: stdenv.mkDerivation rec { pname = "mksh"; @@ -6,20 +10,30 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" - "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" + "https://www.mirbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" + "http://pub.allbsd.org/MirOS/dist/mir/mksh/${pname}-R${version}.tgz" ]; - sha256 = "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp"; + hash = "sha256-d64WZaM38cSMYda5Yds+UhGbOOWIhNHIloSvMfh7xQY="; }; + nativeBuildInputs = [ + installShellFiles + ]; + dontConfigure = true; - buildPhase = "sh ./Build.sh -r"; + buildPhase = '' + runHook preBuild + sh ./Build.sh -r + runHook postBuild + ''; installPhase = '' - install -D -m 755 mksh $out/bin/mksh - install -D -m 644 mksh.1 $out/share/man/man1/mksh.1 - install -D -m 644 dot.mkshrc $out/share/mksh/mkshrc + runHook preInstall + install -D mksh $out/bin/mksh + install -D dot.mkshrc $out/share/mksh/mkshrc + installManPage mksh.1 + runHook postInstall ''; meta = with lib; { @@ -32,7 +46,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - license = licenses.bsd3; + license = with licenses; [ miros isc unicode-dfs-2016 ]; maintainers = with maintainers; [ AndersonTorres joachifm ]; platforms = platforms.unix; }; @@ -41,3 +55,5 @@ stdenv.mkDerivation rec { shellPath = "/bin/mksh"; }; } +# TODO [ AndersonTorres ]: lksh +# TODO [ AndersonTorres ]: a more accurate licensing info diff --git a/third_party/nixpkgs/pkgs/tools/X11/libstrangle/default.nix b/third_party/nixpkgs/pkgs/tools/X11/libstrangle/default.nix index 1f0a7a8e3a..d8c220d0fd 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/libstrangle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/libstrangle/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitLab, libGL, libX11 }: stdenv.mkDerivation rec { pname = "libstrangle"; - version = "2017-02-22"; + version = "0.1.1"; - src = fetchFromGitHub { - owner = "milaq"; + buildInputs = [ libGL libX11 ]; + + src = fetchFromGitLab { + owner = "torkel104"; repo = pname; - rev = "6020f9e375ba747c75eb7996b7d5f0214ac3221e"; - sha256 = "04ikacbjcq9phdc8q5y1qjjpa1sxmzfm0idln9ys95prg289zp4h"; + rev = version; + sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w"; }; makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; @@ -17,10 +19,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteAllInPlace src/strangle.sh + substituteAllInPlace src/stranglevk.sh ''; meta = with lib; { - homepage = "https://github.com/milaq/libstrangle"; + homepage = "https://gitlab.com/torkel104/libstrangle"; description = "Frame rate limiter for Linux/OpenGL"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/libstrangle/nixos.patch b/third_party/nixpkgs/pkgs/tools/X11/libstrangle/nixos.patch index 03c8c19b54..05364028e3 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/libstrangle/nixos.patch +++ b/third_party/nixpkgs/pkgs/tools/X11/libstrangle/nixos.patch @@ -1,29 +1,43 @@ diff --git a/makefile b/makefile -index eb13054..a3a1125 100644 --- a/makefile +++ b/makefile -@@ -27,12 +27,10 @@ $(BUILDDIR)libstrangle32.so: $(BUILDDIR) - $(CC) $(CFLAGS) $(LDFLAGS) -m32 -o $(BUILDDIR)libstrangle32.so $(SOURCES) +@@ -86,10 +86,6 @@ install-common: + install -m 0755 -D -T $(SOURCEDIR)/stranglevk.sh $(DESTDIR)$(bindir)/stranglevk + install -m 0644 -D -T $(SOURCEDIR)/vulkan/libstrangle_vk.json $(DESTDIR)$(datarootdir)/vulkan/implicit_layer.d/libstrangle_vk.json - install: all -- install -m 0644 -D -T $(BUILDDIR)libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf - install -m 0755 -D -T $(BUILDDIR)libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so - install -m 0755 -D -T $(BUILDDIR)libstrangle64.so $(DESTDIR)$(LIB64_PATH)/libstrangle.so - install -m 0755 -D -T $(SOURCEDIR)strangle.sh $(DESTDIR)$(bindir)/strangle - install -m 0644 -D -T COPYING $(DESTDIR)$(DOC_PATH)/LICENSE +-install-ld: ld +- install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf - ldconfig +- + install-32: 32-bit + install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so + install -m 0755 -D -T $(BUILDDIR)/libstrangle32_nodlsym.so $(DESTDIR)$(LIB32_PATH)/libstrangle_nodlsym.so +@@ -109,8 +105,7 @@ install: \ + all \ + install-common \ + install-32 \ +- install-64 \ +- install-ld ++ install-64 clean: - rm -f $(BUILDDIR)libstrangle64.so + rm -f $(BUILDDIR)/libstrangle64.so diff --git a/src/strangle.sh b/src/strangle.sh -index e280e86..b2dd42b 100755 --- a/src/strangle.sh +++ b/src/strangle.sh -@@ -31,6 +31,5 @@ if [ "$#" -eq 0 ]; then - exit 1 +@@ -130,6 +130,5 @@ if [ "$STRANGLE_VKONLY" != "1" ]; then + fi fi -# Execute the strangled program under a clean environment # pass through the FPS and overriden LD_PRELOAD environment variables --exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@" -+FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@" +-exec env ENABLE_VK_LAYER_TORKEL104_libstrangle=1 LD_PRELOAD="${LD_PRELOAD}" "$@" ++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 XDG_DATA_DIRS="${XDG_DATA_DIRS}${XDG_DATA_DIRS:+:}@out@/share" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}" exec "$@" +diff --git a/src/stranglevk.sh b/src/stranglevk.sh +--- a/src/stranglevk.sh ++++ b/src/stranglevk.sh +@@ -1,3 +1,3 @@ + #!/bin/sh + +-ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 strangle "$@" ++ENABLE_VK_LAYER_TORKEL104_libstrangle=1 STRANGLE_VKONLY=1 @out@/bin/strangle "$@" diff --git a/third_party/nixpkgs/pkgs/tools/X11/screen-message/default.nix b/third_party/nixpkgs/pkgs/tools/X11/screen-message/default.nix index c1cef23a69..58bac8702b 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/screen-message/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/screen-message/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "screen-message"; - version = "0.25"; + version = "0.26"; src = fetchurl { url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz"; - sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0"; + sha256 = "sha256-vBKnuXOEQZDACmlNP9wjJ3NbIdixIx7I72a6Nj6pjzc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 13860b4bf7..56a0d252a8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "aws-vault"; - version = "6.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j"; + sha256 = "sha256-bmqmT/gkdgczrDfZdI+FySX5CuesJXWKS0JatzaubIw="; }; - vendorSha256 = "18lmxx784377x1v0gr6fkdx5flhcajsqlzyjx508z0kih6ammc0z"; + vendorSha256 = "sha256-Lb5iiuT/Fd3RMt98AafIi9I0FHJaSpJ8pH7r4yZiiiw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 58d87a033f..e9d2bb713d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.30"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.33"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-XD0CwBTDUvCTSL7JrcQCAd8zq+Ve0zSDpfz0Vzi8oeM="; + sha256 = "sha256-Rz0aZTsFV3RAdH04d3jvvqi1wFuIIx3SFddONhM8c8E="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index db6b1de456..e24f002248 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-2kxJcQ0kzIbXUSecDR5CRlgp0y59wftFPUwU1MSHOn0="; + sha256 = "sha256-f4DkmIi4Uf4qJ3zkDWcpuN6nqXAwa91lj9Jd1MIskJ8="; }; - vendorSha256 = "sha256-m+qldNgY3+DKTFjxwKo4Sbi0F7y4xomiIuR+apek61Q="; + vendorSha256 = "sha256-G6rOmI1Q+bMRqOrkByff2q1AtuUN4hBfFzYaFq4TsxY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index 3d91847a9a..347a936c3a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.9"; + version = "1.5.10"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fR4MFEytYZA4zt4WFGnEp9YDCtX6peQoI+NynqyReT8="; + sha256 = "sha256-cedreUdLjUONA8iVlQ/OfOJtM8EgCI8zaKDCbruUIVo="; }; - vendorSha256 = "sha256-GQACtHTid1Aq5iSQqks10hmGS+VUlwNoM1LG+liynhU="; + vendorSha256 = "sha256-hYvW5xAbnxOEapFc70wOF9ybbDv7hLGljKqHI+1Itaw="; subPackages = [ "cmd/stripe" diff --git a/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix new file mode 100644 index 0000000000..63e6033534 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook }: + +let platform = if stdenv.isi686 then "x86" + else if stdenv.isx86_64 then "x64" + else if stdenv.isAarch32 then "arm" + else if stdenv.isAarch64 then "arm64" + else throw "Unsupported architecture"; + + url = "https://7-zip.org/a/7z2101-linux-${platform}.tar.xz"; + + hashes = { + x86 = "0k6vg85ld8i2pcv5sv3xbvf3swqh9qj8hf2jcpadssys3yyidqyj"; + x64 = "1yfanx98fizj8d2s87yxgsy30zydx7h5w9wf4wy3blgsp0vkbjb3"; + arm = "04iah9vijm86r8rbkhxig86fx3lpag4xi7i3vq7gfrlwkymclhm1"; + arm64 = "0a26ginpb22aydcyvffxpbi7lxh4sgs9gb6cj96qqx7cnf7bk2ri"; + }; + sha256 = hashes."${platform}"; + +in stdenv.mkDerivation { + pname = "7zz"; + version = "21.01"; + + src = fetchurl { inherit url sha256; }; + sourceRoot = "."; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D -t $out/bin 7zz + runHook postInstall + ''; + + meta = with lib; { + description = "Command line archiver utility"; + homepage = "https://www.7-zip.org"; + + # source not released yet. will be under LGPL 2.1+ with RAR exception + license = licenses.unfree; + + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ anna328p ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/backup/rsbep/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rsbep/default.nix index d7967c018a..7f59b0af94 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rsbep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rsbep/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, coreutils, gnused, gawk, fetchurl }: +{ lib, stdenv, coreutils, gawk, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rsbep"; - version = "0.1.0"; + version = "0.2.0"; - src = fetchurl { - url = "https://www.thanassis.space/rsbep-0.1.0-ttsiodras.tar.bz2"; - sha256 = "1zji34kc9srxp0h1s1m7k60mvgsir1wrx1n3wc990jszfplr32zc"; + src = fetchFromGitHub { + owner = "ttsiodras"; + repo = "rsbep-backup"; + rev = "v${version}"; + sha256 = "0is4jgil3wdqbvx9h66xcyzbqy84ndyydnnay2g9k81a4mcz4dns"; }; postFixup = '' @@ -18,20 +20,27 @@ stdenv.mkDerivation { mv rsbep_chopper $libexecDir # Fix store dependencies in scripts - path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gnused gawk ]}" + path="export PATH=$out/bin:$libexecDir:${lib.makeBinPath [ coreutils gawk ]}" sed -i "2i$path" freeze.sh sed -i "2i$path" melt.sh - substituteInPlace freeze.sh --replace /bin/ls ls - # Remove unneded binary rm poorZFS.py ''; + doInstallCheck = true; + installCheckPhase = '' + cd $TMP + echo hello > input + $out/bin/freeze.sh input > packed + $out/bin/melt.sh packed > output + diff -u input output + ''; + meta = with lib; { description = "Create resilient backups with Reed-Solomon error correction and byte-spreading"; homepage = "https://www.thanassis.space/rsbep.html"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.earvstedt ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix index adf845f943..b5d08770ed 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "apfs-fuse-unstable"; - version = "2019-07-23"; + version = "2020-09-28"; src = fetchFromGitHub { owner = "sgan81"; repo = "apfs-fuse"; - rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15"; - sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2"; + rev = "ee71aa5c87c0831c1ae17048951fe9cd7579c3db"; + sha256 = "0wvsx708km1lnhghny5y69k694x0zy8vlbndswkb7sq81j1r6kwx"; fetchSubmodules = true; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/sgan81/apfs-fuse"; description = "FUSE driver for APFS (Apple File System)"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ealasu ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index 44c5e5d0fe..a6d2382a1a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fuse, pkg-config, osxfuse }: +{ lib, stdenv, fetchurl, fuse, pkg-config, macfuse-stubs }: stdenv.mkDerivation rec { version = "1.15.1"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = if stdenv.isDarwin - then [ osxfuse ] + then [ macfuse-stubs ] else [ fuse ]; postFixup = '' ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix index e80e653037..63a6153e8c 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/s3fs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, osxfuse }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, openssl, libxml2, fuse, macfuse-stubs }: stdenv.mkDerivation rec { pname = "s3fs-fuse"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl openssl libxml2 ] ++ lib.optionals stdenv.isLinux [ fuse ] - ++ lib.optionals stdenv.isDarwin [ osxfuse ]; + ++ lib.optionals stdenv.isDarwin [ macfuse-stubs ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index 98f8861699..3bbff2903b 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smbnetfs"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2"; - sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0"; + sha256 = "sha256-6sN7l2n76cP0uvPrZMYaa1mtTyqgXf3culoaxK301WA="; }; nativeBuildInputs = [ pkg-config autoconf ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix index 6af582d91a..acfd3b1e9a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, osxfuse }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse, macfuse-stubs }: stdenv.mkDerivation rec { pname = "unionfs-fuse"; @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ - --replace '/usr/local/include/osxfuse/fuse' '${osxfuse}/include/osxfuse/fuse' - substituteInPlace src/CMakeLists.txt \ - --replace 'target_link_libraries(unionfs fuse pthread)' 'target_link_libraries(unionfs osxfuse pthread)' + --replace '/usr/local/include/osxfuse/fuse' '${macfuse-stubs}/include/fuse' ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ (if stdenv.isDarwin then osxfuse else fuse) ]; + buildInputs = [ (if stdenv.isDarwin then macfuse-stubs else fuse) ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index 1a78266146..1297b61e7f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.201"; + version = "1.202"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-XVaROIxyNBBFoXf+K1mv4mW8wWozqMcs1cgaWj8L8Q0="; + sha256 = "sha256-QXjORfwPxNF9iWF29YcVyT2EAwcR4UQjF4Zv7dPMC9c="; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix new file mode 100644 index 0000000000..2963539495 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/boltbrowser/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "boltbrowser"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "br0xen"; + repo = pname; + rev = version; + sha256 = "17v3pv80dxs285d0b6x772h5cb4f0xg9n5p9jwlir5hjbfn1635i"; + }; + + vendorSha256 = "1x28m72626cchnsasyxips8jaqs0l2p9jhjrdcgws144zm6fz3hv"; + + meta = with lib; { + description = "CLI Browser for BoltDB files"; + homepage = "https://github.com/br0xen/boltbrowser"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index dc1a49a40b..372ea2decf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.11"; + version = "2.0.3"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA="; + sha256 = "sha256-kOxA9FtVfS1lFSsV5E1+eGQF7D9C7TzhzLGw2r7LlOY="; }; - vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY="; + vendorSha256 = "sha256-V05cCKQeqw6BEjLIYDeHeDePkA7rs7kjqPCys5eLefA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix index 462fc51b28..6a253a493f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/code-minimap/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t+zHAneINLd8JHkhaR+aF55gAWJmphYEqbx74CqAmM8="; + sha256 = "sha256-5YNY0MRlKKX6u32Id6J7bIPSHRi44TISoKqpAS9T8ow="; }; - cargoSha256 = "sha256-eVh+6gTzKTelZ3MypkqYMXHr9QwaNG8H0xS82kilR/s="; + cargoSha256 = "sha256-87aRZC4OE3UTVToHi5XDBxVqEH4oFeFR4REf69OBkIw="; meta = with lib; { description = "A high performance code minimap render"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix index a23675fe91..fac8fbcfee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cpuminer-multi/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation { description = "Multi-algo CPUMiner"; homepage = "https://github.com/wolf9466/cpuminer-multi"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/digitemp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/digitemp/default.nix new file mode 100644 index 0000000000..adf23e4bdf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/digitemp/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "digitemp"; + version = "3.7.2"; + + src = fetchFromGitHub { + owner = "bcl"; + repo = "digitemp"; + rev = "v${version}"; + sha256 = "19zka5fcdxhhginaspak76l984iqq9v2j6qrwvi5mvca7bcj8f72"; + }; + + enableParallelBuilding = true; + + makeFlags = [ + "LOCK=no" + "ds9097" + "ds9097u" + ]; + + installPhase = '' + runHook preInstall + install -D -m555 -t $out/bin digitemp_* + install -D -m444 -t $out/share/doc/${pname} FAQ README + runHook postInstall + ''; + + meta = with lib; { + description = "Temperature logging and reporting using Maxim's iButtons and 1-Wire protocol"; + longDescription = '' + DigiTemp is a command line application used for reading 1-wire sensors like + the DS18S20 temperature sensor, or DS2438 battery monitor. DigiTemp supports + the following devices: + + DS18S20 (and older DS1820) Temperature Sensor + DS18B20 Temperature Sensor + DS1822 Temperature Sensor + DS2438 Battery monitor + DS2409 1-wire coupler (used in 1-wire hubs) + DS2422 Counter + DS2423 Counter + + The output format can be customized and all settings are stored in a + configuration file (.digitemprc) in the current directory. DigiTemp can + repeatedly read the sensors and output to stdout and/or to a logfile. + ''; + homepage = "https://www.digitemp.com"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zseri ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix index 80afcb5cd9..58f7da84fc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "llathasa-veleth"; repo = "disfetch"; rev = version; - sha256 = "sha256-P5Sq8ld6pPACHn7iOJ9Uk+zR8ZLxHVvnRyFfkfGGv6I="; + sha256 = "sha256-AAfpv1paEnHu1S2B8yC0hyYOj5deKTkCyLGvp6Roz64="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix index 2a2f44d818..e9efd66b2f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fdtools/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation { homepage = "https://code.dogmap.org./fdtools/"; description = "A set of utilities for working with file descriptors"; license = lib.licenses.gpl2; - platforms = lib.platforms.all; + platforms = lib.platforms.linux; maintainers = [ lib.maintainers.Profpatsch ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix index e53c51c33e..e9286e6a11 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fet-sh/default.nix @@ -2,26 +2,28 @@ stdenvNoCC.mkDerivation rec { pname = "fet-sh"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "6gk"; repo = "fet.sh"; rev = "v${version}"; - sha256 = "1czjsyagwzbf8l023l1saz9ssb1hc245a64nfwc8wl0cn4h9byky"; + sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E="; }; - dontBuild = true; + postPatch = '' + patchShebangs fet.sh + ''; installPhase = '' - install -m755 -D ./fet.sh $out/bin/fet.sh + install -m755 -D fet.sh $out/bin/fet.sh ''; meta = with lib; { - description = "A fetch written in posix shell without any external commands (linux only)"; + description = "A fetch written in posix shell without any external commands"; homepage = "https://github.com/6gk/fet.sh"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ elkowar ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index b164c8c0ae..d4c0c6e214 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.159.0"; + version = "0.160.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-02uM37tulJ78IwOAqXm5Ym30kHVepnMBVg+eTMj34qQ="; + sha256 = "sha256-XrZlDYHGexBGxEhpFVjovUYE9Cpu/QaYp11JmBnqT8o="; }; - vendorSha256 = "sha256-whcHI/qkNBPYcR5WLWQCPdHiwYdLEOgorbAKTTYIWDk="; + vendorSha256 = "sha256-mzT9PLthx08Hil0DBxtw6/ouZrZZSfyElWro1iyJsTY="; buildFlagsArray = [ "-ldflags=" diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index 19d2e862ec..ad7a74e813 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -35,7 +35,7 @@ let canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); - version = "2.04"; + version = "2.06-rc1"; in ( @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.savannah.gnu.org/grub.git"; rev = "${pname}-${version}"; - sha256 = "02gly3xw88pj4zzqjniv1fxa1ilknbq1mdk30bj6qy8n44g90i8w"; + sha256 = "1ngc960g4w91rg13l724v6nlj6fq1adxp6is2mrq4bnp7sm9mysa"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix new file mode 100644 index 0000000000..1d825c866c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "handlr"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "chmln"; + repo = pname; + rev = "v${version}"; + sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg"; + }; + + cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p"; + + # Most tests fail (at least some due to directory permissions) + doCheck = false; + + meta = with lib; { + description = "Alternative to xdg-open to manage default applications with ease"; + homepage = "https://github.com/chmln/handlr"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix new file mode 100644 index 0000000000..74bb771c1d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/hidrd/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation { + pname = "hidrd"; + version = "unstable-2019-06-03"; + + src = fetchFromGitHub { + owner = "DIGImend"; + repo = "hidrd"; + rev = "6c0ed39708a5777ac620f902f39c8a0e03eefe4e"; + sha256 = "1rnhq6b0nrmphdig1qrpzpbpqlg3943gzpw0v7p5rwcdynb6bb94"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "HID report descriptor I/O library and conversion tool"; + homepage = "https://github.com/DIGImend/hidrd"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pacien ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix index 8c24848f4b..34b9340348 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/kubespray/kargo-cli"; description = "A tool helps to deploy a kubernetes cluster with Ansible"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.gpl3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix index cb02d87e22..8c4cb5c1a7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcpuid"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "anrieff"; repo = "libcpuid"; rev = "v${version}"; - sha256 = "13v5x8gyka2v4kx52khwalb6ai328z7kk9jlipbbbys63p6nyddr"; + sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix new file mode 100644 index 0000000000..d2396f0086 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/librespeed-cli/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "librespeed-cli"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "librespeed"; + repo = "speedtest-cli"; + rev = "v${version}"; + sha256 = "03bhxx33fy1cgp83anm51fm8v079v0az0d0p785dz98jg14vzibl"; + }; + + vendorSha256 = "1kccxmmzbkzbrxypcrz0j1zz51c0q1d5hh25lcpfbkm3498mj02c"; + + # Tests have additonal requirements + doCheck = false; + + meta = with lib; { + description = "Command line client for LibreSpeed"; + homepage = "https://github.com/librespeed/speedtest-cli"; + license = with licenses; [ lgpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix index ad1210e954..6c1f175908 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-3kDaaPDRbhJyp/CblTKhB0dUeOjroCs3WkjEXL87Od4="; + sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g="; }; vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix b/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix index e6945f0512..6671791259 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix @@ -1,27 +1,17 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "microplane"; - version = "0.0.26"; + version = "0.0.28"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "0dba8cz13ljcsfibcwycd9vb759fzlllh2bv31vgbs2pjgcinzvm"; + sha256 = "00ayci0a4lv67sg2bb4fw5wpdlps4pjqiiam595dar82lsjwj63j"; }; - goPackagePath = "github.com/Clever/microplane"; - - subPackages = ["."]; - - # Regenerate deps.nix with the following steps: - # git clone git@github.com:Clever/microplane.git - # cd microplane - # git checkout v - # dep2nix - - goDeps = ./deps.nix; + vendorSha256 = "0hn2gsm9bgmrm620fn2cx28l2gj1yfgvjix9ds50m7kwkx6q0dga"; buildFlagsArray = '' -ldflags="-s -w -X main.version=v${version}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/microplane/deps.nix b/third_party/nixpkgs/pkgs/tools/misc/microplane/deps.nix deleted file mode 100644 index 2c8266c2dc..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/microplane/deps.nix +++ /dev/null @@ -1,228 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "1d903dcb749992f3741d744c0f8376b4bd7eb3e1"; - sha256 = "1p1ncq4vv244w9v144vplsb2vbl3369wdxn4gc7xbfafkjwn8bxc"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/facebookgo/errgroup"; - fetch = { - type = "git"; - url = "https://github.com/facebookgo/errgroup"; - rev = "779c8d7ef069c522bc72ee5f31a98d89a37f3fb6"; - sha256 = "1kyqrnvr158f5lgb1pbianjd8xnmxxvpgz7qilmp7zvr69gykbas"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "570b54cabe6b8eb0bc2dfce68d964677d63b5260"; - sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "130e6b02ab059e7b717a096f397c5b60111cae74"; - sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "e881974953e6ab6d1a6a1610e98ed6401a3aa1ba"; - sha256 = "0qaxcm2p655r1jd59rv1hd58driadw5hxlfy7h53c7pzcsmf2546"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; - sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "c7d06af17c68cd34c835053720b21f6549d9b0ee"; - sha256 = "1dmj8wkpmkw4z4c7wmnscs4ykrcv7p8lgwb75g5akahwqjaf9zcp"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/nathanleiby/diffparser"; - fetch = { - type = "git"; - url = "https://github.com/nathanleiby/diffparser"; - rev = "936553ce5db1b73e63cbcd7546416d13538e8d85"; - sha256 = "0qlxkbda4l1glwxdy52fhk3bqkyyc55si4xplf54jpi2x9khi2v4"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c"; - sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"; - sha256 = "0k4xswdfd2ridj7m48ijb4klq9mxpw03g8h2rvq99yddi8vmlbvn"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; - sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; - }; - } - { - goPackagePath = "github.com/xanzy/go-gitlab"; - fetch = { - type = "git"; - url = "https://github.com/xanzy/go-gitlab"; - rev = "ee3313ca5478c4786248d63dd75e4cd8e1fad2db"; - sha256 = "0xbn94rb9ihpw1g698xbz9vdl7393z9zbb0lck52nxs838gkr4mb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a"; - sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "aabf50738bcdd9b207582cbe796b59ed65d56680"; - sha256 = "0gq60lfzbyc6ggp5v3vbl6li818nmv0n32l9qf80ckpqpqkknkh5"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bb50c06baba3d0c76f9d125c0719093e315b5b44"; - sha256 = "19fkbykwjhwa0833cqcphv7sfwc1538ad5wlsdkgdwr59qb9d32i"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "09787c993a3ab68e3d1f5c9b2394ab9433f391be"; - sha256 = "1nv4mwi9njkkyc7lwmxrjr8ggfh2cf1c67a9bq85dnss81vpj61y"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "28a7276518d399b9634904daad79e18b44d481bc"; - sha256 = "0qsj394qyy27iaf8srl7bkbsx7sp4aifrv3z2xllkydya8y18rv8"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 81437378c3..7b40e21313 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -4,24 +4,27 @@ , fetchFromGitHub , pkg-config , zlib +, libiconv , Security }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-/vtiHRHsbF7lfn9tfgfKhm5YwofjSJniNNnKahphHFg="; + sha256 = "sha256-hTNwEspM1qlQkC6lD7N947tvS7O7RCIUYACvj4KYsAY="; }; - cargoSha256 = "sha256-gwy/LeVznZyawliXnkULyyVSXATk0sjSTUZPHO2K+9o="; + cargoSha256 = "sha256-7G+h+g00T/aJ1cQ1SChxy8dq3CWWdHlx5DAH77xM9Oc="; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + + checkFlags = [ "--skip=cant_navigate_up_the_root" ]; meta = with lib; { description = "For when you really just want to serve some files over HTTP right now!"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix b/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix new file mode 100644 index 0000000000..3604e4ddcb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonApplication +, click +, fetchFromGitHub +, freezegun +, pytestCheckHook +, tqdm +}: + +buildPythonApplication rec { + pname = "past-time"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "fabaff"; + repo = pname; + rev = version; + sha256 = "0yhc0630rmcx4ia9y6klpx002mavfmqf1s3jb2gz54jlccwqbfgl"; + }; + + propagatedBuildInputs = [ + click + tqdm + ]; + + checkInputs = [ + freezegun + pytestCheckHook + ]; + + pythonImportsCheck = [ "past_time" ]; + + meta = with lib; { + description = "Tool to visualize the progress of the year based on the past days"; + homepage = "https://github.com/fabaff/past-time"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix index f4572d0e5b..90c128f8ac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pdf-parser/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication { homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; license = licenses.publicDomain; maintainers = [ maintainers.lightdiscord ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix b/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix index 77f865a6a1..59bbe2c2ab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/profile-cleaner/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/graysky2/profile-cleaner"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; maintainers = [ lib.maintainers.devhell ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index a3b613611f..354075df54 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-1udmtstmTmoW45tvDSVQPoMymw5YRKMls1CmWnqIaNE="; + sha256 = "sha256-kRKU6ynZffV17GqEArkXxz6M9xoa3kn2yNqjyLRY0rc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmtrash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rmtrash/default.nix index d50079f82c..61b8ead738 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rmtrash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rmtrash/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper , trash-cli, coreutils, which, getopt }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "rmtrash"; version = "1.14"; @@ -12,9 +12,6 @@ stdenv.mkDerivation rec { sha256 = "0wfb2ykzlsxyqn9krfsis9jxhaxy3pxl71a4f15an1ngfndai694"; }; - dontConfigure = true; - dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -35,5 +32,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; maintainers = with maintainers; [ peelz ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix index a18a8d6d38..963a0832ef 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpi-imager/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "rpi-imager"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "0596c7rpkykmjr3gsz9yczqsj7fzq04kc97s0rqkygjnwiqh2rwz"; + sha256 = "sha256-wX9EO5hgEM2ftOov0AERloH6GxrwptWltBYWLFXkPUw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix index 1ff7349240..0c338fd91b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908"; + sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s="; }; - cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb"; + cargoSha256 = "sha256-1sekLS+jhMeFJcW7pH/X8t28//xA+L54u81uKOo1kHE="; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix index 533ef192e8..2f504a0cef 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "upterm"; - version = "0.5.2"; + version = "0.6.5"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq"; + sha256 = "sha256-wzDK7iQN/z/M1mTKPCH3c+OjFsavplV/0oMiOe5thuI="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix index 6de95b34e6..728fde4b1e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.xz"; - sha256 = "sha256-AYI7WfRTb5R0/hDX5Iqkq5nrLZ4gQecAGObSajSA+vw="; + sha256 = "sha256-fRSYwQmyV0WapjUJNG0UGO/tUDNTGUraj/BWq/a1QTo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 7a7bb0ab51..7d3c662b36 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -1,4 +1,9 @@ -{ lib, buildGoModule, fetchFromGitHub, openssh, makeWrapper }: +{ lib +, buildGoModule +, fetchFromGitHub +, openssh +, makeWrapper +}: buildGoModule rec { pname = "assh"; @@ -15,6 +20,10 @@ buildGoModule rec { doCheck = false; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X moul.io/assh/v2/pkg/version.Version=${version}") + ''; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index b2710a2c33..8c57d94695 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.10"; + version = "8.6.11"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/JS173hIW3doDCP/5v8dUSEW44pyq6VdF17Za6JWtys="; + sha256 = "sha256-+ej6Q2XczWVcu7lMRjt+Sj2FZxlfFSepE6crCFgPuoc="; }; - vendorSha256 = "sha256-5UaOFTm72RG/xsShliU32Vp6qNANDyAotbaRYyan87U="; + vendorSha256 = "sha256-50ESG3GL9BcTaGp1Q5rc1XklF3H7WKcyM1yq7SZa2QE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 8cf669494d..0b36c76ca6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.35.5"; + version = "0.36.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DScN/swigecdhucxhfP1mNr2mDX6HbY2dktkN8BxBjI="; + sha256 = "sha256-VTmQ37kUWlc18p8Qdm2ZFID+t6OIp7y2qU12rXqE6Xo="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix index 1f33855017..ba31aba8d6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsviz/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "dnsviz"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "dnsviz"; repo = "dnsviz"; rev = "v${version}"; - sha256 = "sha256-tIxjlNtncZJSdfQelIR9fTohBDkyC0+YwEcs2gNfKec="; + sha256 = "sha256-QsTYpNaAJiIRUrr2JYjXWOKFihENhAccvmB/DRhX1PA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix index 681f6002ca..a32e98ca18 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "3.1.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-mZJyxbxMIw3jr7ASzYKEfZFh4GS6ZfGKsRkzOtUCYOA="; + sha256 = "sha256-uv1boI9iaBeobo/58Di4oslh1eGLuK9HR5EwQQeWn+0="; }; - cargoSha256 = "sha256-JIyv21u+r2CpgsiW5O7Fy4CWXpkW4jRDrH0CSY2CgiU="; + cargoSha256 = "sha256-31OD/sv4br9cdBNqNGr4McypSGkBbKs7b7H1u7mFt3o="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "The fastest and cross-platform subdomain enumerator"; homepage = "https://github.com/Edu4rdSHL/findomain"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 375d0dc162..871dd5ee5b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5BwSRHqsCLAD/p8U0zblAhtkpzkPVzHvS4VaTAYNF9o="; + sha256 = "sha256-oOq5Y/6n7VHU9WPjnt+moVWZgo8mQl6Jd8daLJ2/pSQ="; }; vendorSha256 = "sha256-Q4ZwCH/RTa8cLtSg06s1S790MdZLgfWOvaD+WAt/RBM="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix index 90f969f2d7..e6f3a2f108 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "getmail6"; - version = "6.14"; + version = "6.15"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1a3bw4wwdapd9n051dgwqldd8gwiipb5shaz08qwp1jndpvylm7d"; + sha256 = "0cvwvlhilrqlcvza06lsrm5l1yazzvym3s5kcjxcm9cminfaf4qb"; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index e00e971b8e..41f55e19ab 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-bUYg5dodk+118ikBEhbbgdUJe2i/F14wny+rKJC7oDY="; + sha256 = "sha256-Mbp6zQ14NnxxtW5Kh8nxHNI1/FYCvFuEaQd5Eg4KMFs="; }; buildInputs = [ openssl zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix new file mode 100644 index 0000000000..40353ea278 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix @@ -0,0 +1,35 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "lychee"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "lycheeverse"; + repo = pname; + rev = "v${version}"; + sha256 = "03dsp0384mwr51dkqfl25xba0m17sppabiz7slhxcig89b0ksykm"; + }; + + cargoSha256 = "08y2wpm2qgm2jsy257b2p2anxy4q3bj2kfdr5cnb6wnaz9g4ypq2"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + # Disabled because they currently fail + doCheck = false; + + meta = with lib; { + description = "A fast, async, resource-friendly link checker written in Rust."; + homepage = "https://github.com/lycheeverse/lychee"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ tuxinaut ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index 8f46e657ed..4553063929 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe -, xapian, glib, gmime3, texinfo , emacs, guile +, xapian, glib, gmime3, texinfo, emacs, guile , gtk3, webkitgtk, libsoup, icu +, makeWrapper , withMug ? false , batchSize ? null }: @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isDarwin) guile ++ lib.optionals withMug [ gtk3 webkitgtk ]; - nativeBuildInputs = [ pkg-config autoreconfHook pmccabe ]; + nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ]; enableParallelBuilding = true; @@ -37,8 +38,12 @@ stdenv.mkDerivation rec { --replace "@abs_top_builddir@" "$out" ''; - # Install mug - postInstall = lib.optionalString withMug '' + # Make sure included scripts can find their dependencies & optionally install mug + postInstall = '' + wrapProgram "$out/bin/mu" \ + --prefix LD_LIBRARY_PATH : "$out/lib" \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2" + '' + lib.optionalString withMug '' for f in mug ; do install -m755 toys/$f/$f $out/bin/$f done diff --git a/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix b/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix index 752f43b334..60bd2f8cc7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/philter/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Mail sorter for Maildirs"; homepage = "http://philter.sourceforge.net"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix index 6155d411e1..c8c5ca118d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pixiecore/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bbigras danderson ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix index ad9bfcfb1d..561daacfd5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wiire/pixiewps"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nico202 ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix b/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix index af2dfe8040..83d52fdf10 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/troglobit/redir"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/rshijack/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rshijack/default.nix index 59558028c0..e4bb7315a4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/rshijack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/rshijack/default.nix @@ -18,6 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kpcyrd/rshijack"; license = licenses.gpl3; maintainers = with maintainers; [ xrelkd ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix index 6159201bac..3d72b61431 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/s6-networking/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, skawarePackages # Whether to build the TLS/SSL tools and what library to use -# acceptable values: "libressl", false -# TODO: add bearssl -, sslSupport ? "libressl" , libressl +# acceptable values: "bearssl", "libressl", false +, sslSupport ? "bearssl" , libressl, bearssl }: with skawarePackages; @@ -11,6 +10,7 @@ let sslSupportEnabled = sslSupport != false; sslLibs = { libressl = libressl; + bearssl = bearssl; }; in @@ -58,7 +58,7 @@ buildPackage { # remove all s6 executables from build directory rm $(find -name "s6-*" -type f -mindepth 1 -maxdepth 1 -executable) rm minidentd - rm libs6net.* libstls.* libs6tls.* + rm libs6net.* libstls.* libs6tls.* libsbearssl.* mv doc $doc/share/doc/s6-networking/html ''; diff --git a/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix index a983ef9c42..f5c8317d89 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; - sha256 = "0pnim3xyfsmv6alsvhwjs4v9lp39wwiyj63rxsqyz4wx4vkmn12z"; + sha256 = "sha256-+4FNC+rMxIoVXlW7HnBXUg0P4FhNvMTAqJ9c7lXQ6vE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix b/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix index d9bf06e825..70bb545351 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power"; homepage = "https://gitlab.com/surfraw/Surfraw"; maintainers = []; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; license = lib.licenses.publicDomain; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix index 9ef0c9d46d..ca40f9a7cb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.79"; + version = "1.0.80"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "18bp7fcpv7879q3ppdxlqj7ayqmlh5zwrkz8gch6rq9lkmmrklrf"; + sha256 = "sha256-5qBqCHbkL6yw/iT2AtSumw8V0bV74TEyYMRgcPHW2lg="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix index 48f842f60c..4379aa89ce 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wormhole-william/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wormhole-william"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "psanford"; repo = "wormhole-william"; rev = "v${version}"; - sha256 = "1v6kw10gqhyd1adj0wwrr5bmpjqbshdnywsrjpqgg9bl61m5j3wr"; + sha256 = "sha256-75pSFMzaZW+rtikO0khuxXIgb3Wj8ieSE4sB6quKgo4="; }; - vendorSha256 = "1niky252gcxai6vz0cx7pvflg530bc1lmcd2wm2hqg6446r1yxsq"; + vendorSha256 = "sha256-8GZ4h+DFQaCizOCxsMzAllXyaQgzQQBsbCnVi5MWbFg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index d5ecae75eb..8228132b5c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.15"; + version = "0.3.16"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "1nf00ygp55l01c0gdkw15f08p3hmn6s2r99lgf2xpq8jn75qra4i"; + sha256 = "sha256-uUF0zkgtzdMZB/GKOtawjn7AQBkRoiAEj9nUUmpQSVQ="; }; - vendorSha256 = "1zk6h1isxyml9asyb7g4scbhnfwghqwnv40a5f5j7z0s0s4nybdp"; + vendorSha256 = "sha256-619PSqd7pl3Akj/kzLQhDIp1adumBGhLrzQsZvMzC7w="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 75cf8403d9..4c5fae8829 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -2,18 +2,25 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "11gwpqmq611j07pjscch28jsrfgyzy69ph2w1miz3arqmxz7dqjp"; + sha256 = "04l5bfyq53r8803q24bfw49ji7jx8z9irhhh30cvq2va1ywwd4ww"; }; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python3Packages; [ click feedparser lxml sqlalchemy youtube-dl ]; + propagatedBuildInputs = with python3Packages; [ + click + feedparser + lxml + sqlalchemy + youtube-dl + wcwidth + ]; checkInputs = with python3Packages; [ nose pytestCheckHook ]; @@ -24,6 +31,11 @@ python3Packages.buildPythonApplication rec { "download_videos" "update_all" "add_channel_duplicate" + "test_subscribe" + "test_import" + "test_import_duplicate" + "test_update" + "test_download" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix index c2cda02ca2..3cb5340d1d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-about/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "1jdp5ksxm4rsqhirgl5zwpiahrz2lx046pkvf6xvr6ms70l2xiwj"; + sha256 = "sha256-MsXNneKj2xCci1guj1TKcIrX7XByJ5/lWUmjxAsgzPY="; }; - cargoSha256 = "07bjxsg5kgx8dg3wf6mvi5460db206l68irqc21hz10plz5llmnr"; + cargoSha256 = "sha256-NdzgIB6uXMtGiLwOACEIeAb4iv7mYLnwRte3M/TkSMA="; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix index df492863a1..12bf27165f 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "1q8i2c3f8ir1pxkvla4dshz7n0cl97mjydc64xis5pph39f69yc1"; + sha256 = "sha256-w3wKUAAp9z4iQbx16z5chpKHYxCDLZzJesnIct2Qy4g="; }; - cargoSha256 = "1b62mcj4gjz2arjf3r30k9qcg81i5x0149a4bfj39xdrz55gg0wh"; + cargoSha256 = "sha256-ychF3qbwEjumLyqc+xDI8bbKzvdoRYF/X/idlk+JxDE="; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix index c41ef6836a..1b8aa8fc3f 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-02Pn5saPrw1PIFZXVSCgsnvo/78CdT17/rCtS9R9bvU="; + sha256 = "sha256-6dmXWqkf8Z+cc4wnOuVCe4+Byfk3VTYXehTN1MCiFLE="; }; - cargoSha256 = "sha256-ety50v0jxm45fzzkR9c/rvpJn3mWQUvAOHcHSJTTSd4="; + cargoSha256 = "sha256-uDoxMHSNoqH/AOixmkV6pwrDu/XSqXBCrAz4L7MMPU8="; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix index 8897a313e8..db60d5e842 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2021-01-16"; + version = "2021-03-21"; src = fetchFromGitHub { owner = "nix-community"; repo = "home-manager"; - rev = "8127799f79ee96129b295d78294f40a54078131f"; - sha256 = "0iji8nxa66s409pvjwi370ycsw4m74w6b3ywnjpfkl2filpapjns"; + rev = "ddcd476603dfd3388b1dc8234fa9d550156a51f5"; + sha256 = "sha256-E6ABXtzw6bHmrIirB1sJL6S2MEa3sfcvRLzRa92frCo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/third_party/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index 3256b5431a..13327a84ff 100644 --- a/third_party/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; description = "Convert ASCII-armored PGP keys to animated QR code"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ asymmetric ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix index 3eb192e8fc..ba80734e5c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bash-supergenpass/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { supergenpass will ask for your master password interactively, and it will not be displayed on your terminal. ''; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; homepage = "https://github.com/lanzz/bash-supergenpass"; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix index 940086788a..1383de79fe 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bettercap/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "bettercap"; - version = "2.30"; + version = "2.30.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ge+fbNEWq+84LypUbNrnNMOxcDJb8rFlP/QUoE7yEds="; + sha256 = "sha256-5CAWMW0u/8BUn/8JJBApyHGH+/Tz8hzAmSChoT2gFr8="; }; vendorSha256 = "sha256-fApxHxdzEEc+M+U5f0271VgrkXTGkUD75BpDXpVYd5k="; diff --git a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix index 29703ee1fc..b358507bba 100644 --- a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix @@ -7,22 +7,22 @@ }: rustPlatform.buildRustPackage rec { pname = "genpass"; - version = "0.4.9"; + version = "0.4.12"; src = fetchgit { url = "https://git.sr.ht/~cyplo/genpass"; rev = "v${version}"; - sha256 = "1dpv2iyd48xd8yw9bmymjjrkhsgmpwvsl5b9zx3lpaaq59ypi9g9"; + sha256 = "154kprbqc59f06ciz60il4ax299zapwa0hz8vjn25rl4gr5gzn4l"; }; - cargoSha256 = "1cwxpc3xkw673wiamr4v7clrzwxl8ma1vdr6bw0hixm37gxdxz7x"; + cargoSha256 = "1nc699n7f732lhzfhsfknay6z3igyiqy5jymm5x815mv9y1vwaj1"; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; meta = with lib; { description = "A simple yet robust commandline random password generator"; homepage = "https://sr.ht/~cyplo/genpass/"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = with maintainers; [ cyplo ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 92845c6cab..ef4c673652 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.2"; + version = "1.12.4"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "14ylvb7crx32h7inklvvxjc72jz9xq3dhzr5905i76kgx57h64w9"; + sha256 = "1cwmka6shyycp9gq5js1hnbamdhqzpmzraxdaniz1cdqhxcvdkcb"; }; - vendorSha256 = "0gjzghrykdw1vp873yi7k8piz3gshzndm12jm6dxgl0ph4335a54"; + vendorSha256 = "1qnxdrqpav6ky6gs9w63l0hbhakh23rrc9197br1nmbg0slb8vcj"; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index dc4b487747..6d67f038e4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-co00Ye/QVNSG4h67m56+37JLilBVzHxUwMs1vS3wYX4="; + sha256 = "sha256-/OgAh33DF0UkBcc5GriGgeoZ7kae9GhGnUnIX6lGlys="; }; - vendorSha256 = "sha256-q7n8WLw/A2wr3z5h7zaFERY7lO5UIsmTD2mrcH/vpNs="; + vendorSha256 = "sha256-SGO8RKSOK0PHqSIJfTdcuAmqMtFuo9MBdiEylDUpOFo="; propagatedBuildInputs = [ docker ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index cb6ee5aefe..8389f798bd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.34" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.36" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 17d21d9642..4e00f206c4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 010e4d5a643a857e09bafbcf79b541e607de3c4c - ref: refs/tags/6.0.34 + revision: 49e599f499bd466af4d47d2d60a4dc80e158a52d + ref: refs/tags/6.0.36 specs: - metasploit-framework (6.0.34) + metasploit-framework (6.0.36) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -123,22 +123,22 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.432.0) + aws-partitions (1.434.0) aws-sdk-core (3.113.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.227.0) + aws-sdk-ec2 (1.229.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.49.0) + aws-sdk-iam (1.50.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.91.0) + aws-sdk-s3 (1.92.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -183,7 +183,7 @@ GEM http_parser.rb (0.6.0) i18n (1.8.9) concurrent-ruby (~> 1.0) - io-console (0.5.8) + io-console (0.5.9) irb (1.3.4) reline (>= 0.1.5) jmespath (1.4.0) diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index b5fb78fd1f..ed9180b67e 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.34"; + version = "6.0.36"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-sKt1hN7thNhA+bjeFF3gxJs/82EPXPiM81zcMpDRDyg="; + sha256 = "sha256-c0OlZkTFgyfh4DVm93CRbFYPLeGTD/8QZo4p0luVbQ0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index edd4d305fd..d3f7efba9d 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 = "0y0z25hgghy3i8azx0mn8pda2qvd47zkilwjps0x32zn091blzgg"; + sha256 = "1ia9b013blnwzz46hbnrqgkzf77vj60i93hbmf7a51jy2fvrcjl1"; type = "gem"; }; - version = "1.432.0"; + version = "1.434.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,20 +134,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhpwxad3yc5c3a8jmp116qx5jmym0ykpv39iwdq5km4h3as6h2d"; + sha256 = "0xi63wz30zch7wnimb2l1qi85a5gdrp8qb7jl5ildygswjbwqcvj"; type = "gem"; }; - version = "1.227.0"; + version = "1.229.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7vnkwh6z7nxgpmdw8hy70wxiimszyp644vmj8p1pr7ybz6sv9l"; + sha256 = "046c7p26q63q33w9w5x4kgx75xq02v5g5isax2bp2hs05ix8wnql"; type = "gem"; }; - version = "1.49.0"; + version = "1.50.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs3zg9d3lzi7rwys4qv62mcmga39s4rg4rmb0dalqknz6lqzhrq"; + sha256 = "1zs7sa7sh6zqkqlmjr9xjpjgcn9iqlpnilnj7vvlmh057f2mjhgy"; type = "gem"; }; - version = "1.91.0"; + version = "1.92.0"; }; aws-sigv4 = { groups = ["default"]; @@ -424,10 +424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0prpvq05wzp8n7vk44zcwmn53p1akn4r105n5py6bmbxsmmkvyhr"; + sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja"; type = "gem"; }; - version = "0.5.8"; + version = "0.5.9"; }; irb = { groups = ["default"]; @@ -514,12 +514,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "010e4d5a643a857e09bafbcf79b541e607de3c4c"; - sha256 = "0a0gs6835p2wyf6ghp0gc7rkz6y4w1fi9pmqz50di17dvs27baxh"; + rev = "49e599f499bd466af4d47d2d60a4dc80e158a52d"; + sha256 = "03bdjmdx4acfcq8gy3wkw4nhymkcj5qgfrimw3hjg0y58ikaahvk"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.34"; + version = "6.0.36"; }; metasploit-model = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix b/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix index afef0d4c47..451cdd5591 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "http://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; license = with licenses; [ gpl2 ]; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ qoelet ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/shc/default.nix b/third_party/nixpkgs/pkgs/tools/security/shc/default.nix index 4cbedb2321..0c1bf93ed1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/shc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/shc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://neurobin.org/projects/softwares/unix/shc/"; description = "Shell Script Compiler"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; license = licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/steghide/default.nix b/third_party/nixpkgs/pkgs/tools/security/steghide/default.nix deleted file mode 100644 index cb2a0473cf..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/steghide/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, libjpeg, libmcrypt, zlib, libmhash, gettext, libtool}: - -stdenv.mkDerivation rec { - buildInputs = [ libjpeg libmcrypt zlib libmhash gettext libtool ]; - version = "0.5.1"; - pname = "steghide"; - - src = fetchurl { - url = "mirror://sourceforge/steghide/steghide/${version}/steghide-${version}.tar.gz" ; - sha256 = "78069b7cfe9d1f5348ae43f918f06f91d783c2b3ff25af021e6a312cf541b47b"; - }; - - patches = [ - ./patches/steghide-0.5.1-gcc34.patch - ./patches/steghide-0.5.1-gcc4.patch - ./patches/steghide-0.5.1-gcc43.patch - ]; - - # AM_CXXFLAGS needed for automake - preConfigure = '' - export AM_CXXFLAGS="$CXXFLAGS -std=c++0x" - ''; - - meta = with lib; { - homepage = "http://steghide.sourceforge.net/"; - description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch b/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch deleted file mode 100644 index 373316c784..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc34.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- steghide-0.5.1.old/src/Makefile.am -+++ steghide-0.5.1.new/src/Makefile.am 2004-07-16 19:01:39.673947633 +0200 -@@ -33,5 +33,5 @@ - WavPCMSampleValue.cc error.cc main.cc msg.cc SMDConstructionHeuristic.cc - LIBS = @LIBINTL@ @LIBS@ - localedir = $(datadir)/locale --LIBTOOL = $(SHELL) libtool -+LIBTOOL = $(SHELL) libtool --tag=CXX - MAINTAINERCLEANFILES = Makefile.in ---- steghide-0.5.1.old/src/AuSampleValues.cc -+++ steghide-0.5.1.new/src/AuSampleValues.cc 2004-07-16 18:59:18.934578427 +0200 -@@ -17,21 +17,21 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ -- -+#include "common.h" - #include "AuSampleValues.h" - - // AuMuLawSampleValue --const BYTE AuMuLawSampleValue::MinValue = 0 ; --const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ; -+template<> const BYTE AuMuLawSampleValue::MinValue = 0 ; -+template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ; - - // AuPCM8SampleValue --const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ; --const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ; -+template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ; -+template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ; - - // AuPCM16SampleValue --const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ; --const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ; -+template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ; -+template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ; - - // AuPCM32SampleValue --const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ; --const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ; -+template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ; -+template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ; diff --git a/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch b/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch deleted file mode 100644 index a8df1735e9..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc4.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h ---- steghide-0.5.1-orig/src/AuData.h 2003-09-28 09:30:29.000000000 -0600 -+++ steghide-0.5.1/src/AuData.h 2007-05-11 22:04:56.000000000 -0600 -@@ -26,22 +26,30 @@ - - // AuMuLawAudioData - typedef AudioDataImpl AuMuLawAudioData ; -+template<> - inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; } -+template<> - inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; } - - // AuPCM8AudioData - typedef AudioDataImpl AuPCM8AudioData ; -+template<> - inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; } -+template<> - inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; } - - // AuPCM16AudioData - typedef AudioDataImpl AuPCM16AudioData ; -+template<> - inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; } -+template<> - inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; } - - // AuPCM32AudioData - typedef AudioDataImpl AuPCM32AudioData ; -+template<> - inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; } -+template<> - inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; } - - #endif // ndef SH_AUDATA_H -diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc ---- steghide-0.5.1-orig/src/MHashPP.cc 2003-10-05 04:17:50.000000000 -0600 -+++ steghide-0.5.1/src/MHashPP.cc 2007-05-11 22:07:01.000000000 -0600 -@@ -120,7 +120,7 @@ - - std::string MHashPP::getAlgorithmName (hashid id) - { -- char *name = mhash_get_hash_name (id) ; -+ char *name = (char *) mhash_get_hash_name (id) ; - std::string retval ; - if (name == NULL) { - retval = std::string ("") ; diff --git a/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch b/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch deleted file mode 100644 index ca66b9c544..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/steghide/patches/steghide-0.5.1-gcc43.patch +++ /dev/null @@ -1,349 +0,0 @@ ---- steghide-0.5.1.old/configure.in 2003-10-15 09:48:52.000000000 +0200 -+++ steghide-0.5.1.new/configure.in 2008-05-09 19:04:46.000000000 +0200 -@@ -7,27 +7,26 @@ - dnl checks for programs. - AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_AWK - AC_PROG_LN_S -+AC_CXX_COMPILE_STDCXX_0X - - dnl GNU gettext - AC_CHECK_FUNCS(strchr) - AM_GNU_GETTEXT - AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes) - - dnl check if debugging support is requested --AC_MSG_CHECKING([wether to enable debugging]) -+AC_MSG_CHECKING([whether to enable debugging]) - AC_ARG_ENABLE(debug,[ --enable-debug enable debugging], - if test "$enableval" = yes ; - then - AC_MSG_RESULT([yes]) - AC_DEFINE(DEBUG,1,[enable code used only for debugging]) -- CXXFLAGS="-O2 -Wall -g" - else - AC_MSG_RESULT([no]) -- CXXFLAGS="-O2 -Wall" - fi - , - AC_MSG_RESULT([no]) - CXXFLAGS="-O2 -Wall" - ) -@@ -213,7 +212,18 @@ - echo "libmhash can be downloaded from http://mhash.sourceforge.net/."; - echo "**********"; - AC_MSG_ERROR([[libmhash not found]]) - fi - -+dnl Should we add std=c++0x? -+ -+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes; -+then -+ CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra" -+else -+ CXXFLAGS="${CXXFLAGS} -Wall -Wextra" -+fi -+ -+AC_SUBST(CXXFLAGS) -+ - dnl create Makefiles - AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile]) ---- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4 1970-01-01 01:00:00.000000000 +0100 -+++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4 2008-05-09 19:04:46.000000000 +0200 -@@ -0,0 +1,107 @@ -+# =========================================================================== -+# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AC_CXX_COMPILE_STDCXX_0X -+# -+# DESCRIPTION -+# -+# Check for baseline language coverage in the compiler for the C++0x -+# standard. -+# -+# LAST MODIFICATION -+# -+# 2008-04-17 -+# -+# COPYLEFT -+# -+# Copyright (c) 2008 Benjamin Kosnik -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. -+ -+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [ -+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags, -+ ac_cv_cxx_compile_cxx0x_native, -+ [AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ AC_TRY_COMPILE([ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check check_type; -+ check_type c; -+ check_type&& cr = c;],, -+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no) -+ AC_LANG_RESTORE -+ ]) -+ -+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x, -+ ac_cv_cxx_compile_cxx0x_cxx, -+ [AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS -std=c++0x" -+ AC_TRY_COMPILE([ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check check_type; -+ check_type c; -+ check_type&& cr = c;],, -+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no) -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ AC_LANG_RESTORE -+ ]) -+ -+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x, -+ ac_cv_cxx_compile_cxx0x_gxx, -+ [AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ ac_save_CXXFLAGS="$CXXFLAGS" -+ CXXFLAGS="$CXXFLAGS -std=gnu++0x" -+ AC_TRY_COMPILE([ -+ template -+ struct check -+ { -+ static_assert(sizeof(int) <= sizeof(T), "not big enough"); -+ }; -+ -+ typedef check> right_angle_brackets; -+ -+ int a; -+ decltype(a) b; -+ -+ typedef check check_type; -+ check_type c; -+ check_type&& cr = c;],, -+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no) -+ CXXFLAGS="$ac_save_CXXFLAGS" -+ AC_LANG_RESTORE -+ ]) -+ -+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes || -+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes || -+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then -+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ]) -+ fi -+]) ---- steghide-0.5.1.old/src/Arguments.cc 2003-10-11 23:25:04.000000000 +0200 -+++ steghide-0.5.1.new/src/Arguments.cc 2008-05-09 19:04:44.000000000 +0200 -@@ -26,10 +26,12 @@ - #include "Terminal.h" - #include "common.h" - #include "error.h" - #include "msg.h" - -+float Arguments::Default_Goal = 100.0 ; -+ - // the global Arguments object - Arguments Args ; - - Arguments::Arguments (int argc, char* argv[]) - { ---- steghide-0.5.1.old/src/Arguments.h 2003-10-11 23:23:57.000000000 +0200 -+++ steghide-0.5.1.new/src/Arguments.h 2008-05-09 19:04:44.000000000 +0200 -@@ -98,11 +98,11 @@ - static const bool Default_EmbedEmbFn = true ; - static const bool Default_Force = false ; - static const VERBOSITY Default_Verbosity = NORMAL ; - static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats - static const unsigned int Max_Algorithm = 3 ; -- static const float Default_Goal = 100.0 ; -+ static float Default_Goal ; - static const DEBUGCOMMAND Default_DebugCommand = NONE ; - static const bool Default_Check = false ; - static const unsigned int Default_DebugLevel = 0 ; - static const unsigned int Default_GmlGraphRecDepth = 0 ; - static const unsigned int Default_GmlStartVertex = 0 ; ---- steghide-0.5.1.old/src/EncryptionMode.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/EncryptionMode.h 2008-05-09 19:04:46.000000000 +0200 -@@ -69,11 +69,11 @@ - static const unsigned int NumValues = 8 ; - IRep Value ; - - typedef struct struct_Translation { - IRep irep ; -- char* srep ; -+ const char* srep ; - } Translation ; - static const Translation Translations[] ; - } ; - - #endif // ndef SH_ENCMODE_H ---- steghide-0.5.1.old/src/Graph.cc 2003-10-11 23:54:26.000000000 +0200 -+++ steghide-0.5.1.new/src/Graph.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -20,10 +20,12 @@ - - #include - #include - #include - #include -+#include -+#include - - #include "BitString.h" - #include "CvrStgFile.h" - #include "Edge.h" - #include "Graph.h" ---- steghide-0.5.1.old/src/Matching.cc 2003-10-11 23:54:30.000000000 +0200 -+++ steghide-0.5.1.new/src/Matching.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -16,10 +16,11 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -+#include - #include "Edge.h" - #include "Graph.h" - #include "Matching.h" - #include "ProgressOutput.h" - #include "common.h" ---- steghide-0.5.1.old/src/ProgressOutput.cc 2003-10-11 11:20:51.000000000 +0200 -+++ steghide-0.5.1.new/src/ProgressOutput.cc 2008-05-09 19:04:44.000000000 +0200 -@@ -21,10 +21,12 @@ - #include - - #include "ProgressOutput.h" - #include "common.h" - -+float ProgressOutput::NoAvgWeight = 1.0 ; -+ - ProgressOutput::ProgressOutput () - : Message("__nomessage__") - { - LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time - } ---- steghide-0.5.1.old/src/ProgressOutput.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/ProgressOutput.h 2008-05-09 19:04:44.000000000 +0200 -@@ -60,13 +60,13 @@ - /** - * update the output appending rate, [average edge weight], "done" and a newline - * \param rate the rate of matched vertices - * \param avgweight the average edge weight (is not printed if not given) - **/ -- void done (float rate, float avgweight = NoAvgWeight) const ; -+ void done (float rate, float avgweight = 1.0) const ; - -- static const float NoAvgWeight = -1.0 ; -+ static float NoAvgWeight ; - - protected: - std::string vcompose (const char *msgfmt, va_list ap) const ; - - private: ---- steghide-0.5.1.old/src/SMDConstructionHeuristic.cc 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/SMDConstructionHeuristic.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -16,10 +16,12 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -+#include -+ - #include "Edge.h" - #include "Graph.h" - #include "Matching.h" - #include "SMDConstructionHeuristic.h" - #include "Vertex.h" ---- steghide-0.5.1.old/src/WavFile.cc 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/WavFile.cc 2008-05-09 19:04:46.000000000 +0200 -@@ -19,10 +19,11 @@ - */ - - #include - #include - #include -+#include - - #include "CvrStgFile.h" - #include "DFSAPHeuristic.h" - #include "SampleValueAdjacencyList.h" - #include "SMDConstructionHeuristic.h" ---- steghide-0.5.1.old/src/wrapper_hash_map.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/wrapper_hash_map.h 2008-05-09 19:04:46.000000000 +0200 -@@ -25,17 +25,21 @@ - - #ifdef __GNUC__ - # if __GNUC__ < 3 - # include - namespace sgi { using ::hash ; using ::hash_map ; } ; --# else -+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 ) - # include --# if __GNUC_MINOR__ == 0 -+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0 - namespace sgi = std ; // GCC 3.0 - # else - namespace sgi = __gnu_cxx ; // GCC 3.1 and later - # endif -+# else -+# include -+# define hash_map unordered_map -+ namespace sgi = std ; - # endif - #else - namespace sgi = std ; - #endif - ---- steghide-0.5.1.old/src/wrapper_hash_set.h 2003-09-28 17:30:30.000000000 +0200 -+++ steghide-0.5.1.new/src/wrapper_hash_set.h 2008-05-09 19:04:46.000000000 +0200 -@@ -26,17 +26,21 @@ - - #ifdef __GNUC__ - # if __GNUC__ < 3 - # include - namespace sgi { using ::hash ; using ::hash_set ; } ; --# else -+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 ) - # include --# if __GNUC_MINOR__ == 0 -+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0 - namespace sgi = std ; // GCC 3.0 - # else - namespace sgi = ::__gnu_cxx ; // GCC 3.1 and later - # endif -+# else -+# include -+# define hash_set unordered_set -+ namespace sgi = std ; - # endif - #else - namespace sgi = std ; - #endif - diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix index 1c4cba04d5..0ef2f7509b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix @@ -1,6 +1,6 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { @@ -16,6 +16,10 @@ buildGoModule rec { vendorSha256 = "sha256-KvUnDInUqFW7FypgsppIBQZKNu6HVsEeHtGwdqYtoys="; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X ktbs.dev/teler/common.Version=${version}") + ''; + # test require internet access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index 46ba57cea1..303e78d82e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3u3tsUwxj7lzqoydycIoYSd7ifb9pLlehDA3NwvzPOo="; + sha256 = "sha256-3qx9nL1lzVbtvVW3O9kQw4FoVuCqo8fxl8u1WXZNRFs="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; diff --git a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix index 3e904e6c0a..374bcf0e31 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://gt5.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/nq/default.nix b/third_party/nixpkgs/pkgs/tools/system/nq/default.nix index 551d18618a..e92016f85a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/nq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/nq/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nq"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "nq"; rev = "v${version}"; - sha256 = "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99"; + sha256 = "sha256-UfCeHwOD+tG6X2obW64DYZr6j90yh1Yl7My4ur+sqmk="; }; makeFlags = [ "PREFIX=$(out)" ]; postPatch = '' 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 f9e0e80478..168a6f8ec3 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.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "dduan"; repo = "tre"; rev = "v${version}"; - sha256 = "0syvhpnw9c5csxv8c4gdfwif9a9vl4rjkwj4mfglgxk227k1y53q"; + sha256 = "1yhrawn8xdl84f5f56i8fikidrfbjnqw5ckjagk7f6ngpcjc0wxm"; }; - cargoSha256 = "056wlxz8hzky8315rnn65nh7dd2yhx5323y3hq64g6aqj52vd734"; + cargoSha256 = "03zvykjmb61bn8h4pm93iayhw1d53qv3l635jxfii1q7kzjbdnx9"; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/l2md/default.nix b/third_party/nixpkgs/pkgs/tools/text/l2md/default.nix new file mode 100644 index 0000000000..e443cc42a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/l2md/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchgit, libgit2 }: + +stdenv.mkDerivation rec { + pname = "l2md"; + version = "unstable-2020-07-31"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git"; + rev = "2b9fae141fc2129940e0337732a35a3fc1c33455"; + sha256 = "PNNoD3a+rJwKH6wbOkvVU1IW4+xF7+zQaLFAlyLlYOI="; + }; + + buildInputs = [ libgit2 ]; + + installPhase = '' + mkdir -p $out/bin + cp l2md $out/bin + ''; + + meta = with lib; { + description = "Convert public-inbox archives to maildir messages"; + longDescription = '' + Quick and dirty hack to import lore.kernel.org list archives via git, + to export them in maildir format or through a pipe, and to keep them + periodically synced. + ''; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ yoctocell ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix index 3c16421bd9..580d30a583 100644 --- a/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/nawk/default.nix @@ -1,26 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, yacc }: +{ lib, stdenv, fetchFromGitHub, bison, buildPackages }: stdenv.mkDerivation rec { pname = "nawk"; - version = "20180827"; + version = "unstable-2021-02-15"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; - rev = version; - sha256 = "0qcsxhcwg6g3c0zxmbipqa8d8d5n8zxrq0hymb8yavsaz103fcl6"; + rev = "c0f4e97e4561ff42544e92512bbaf3d7d1f6a671"; + sha256 = "kQCvItpSJnDJMDvlB8ruY+i0KdjmAphRDqCKw8f0m/8="; }; - nativeBuildInputs = [ yacc ]; - - patchPhase = '' - substituteInPlace ./makefile \ - --replace "YACC = yacc -d -S" "" - ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ bison ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "HOSTCC=${if stdenv.buildPlatform.isDarwin then "clang" else "cc"}" + ]; installPhase = '' + runHook preInstall install -Dm755 a.out "$out/bin/nawk" install -Dm644 awk.1 "$out/share/man/man1/nawk.1" + runHook postInstall ''; meta = { @@ -33,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.konimex ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix index 9993263c1f..f553908d9c 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -52,6 +52,9 @@ in (buildEnv { buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; + # This is set primarily to help find-tarballs.nix to do its job + passthru.packages = pkgList.all; + postBuild = '' cd "$out" mkdir -p ./bin diff --git a/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix b/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix index d096f834ba..6ee7c84499 100644 --- a/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/bento4/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu ]; broken = stdenv.isAarch64; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix b/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix index ff2889b9b9..71b85b845e 100644 --- a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line interface for processing media filmed on GoPro HERO 3, 4, 5, 6, and 7 cameras"; homepage = "https://github.com/KonradIT/gopro-linux"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/video/harvid/default.nix b/third_party/nixpkgs/pkgs/tools/video/harvid/default.nix new file mode 100644 index 0000000000..812457f35c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/video/harvid/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, ffmpeg, libjpeg, libpng, pkg-config }: + +stdenv.mkDerivation rec { + pname = "harvid"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "x42"; + repo = "harvid"; + rev = "v${version}"; + sha256 = "0l1plfsfh2ixhlzg3hqqvjj42z7g422718a9kgbh7b4p882n71x7"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ ffmpeg libjpeg libpng ]; + + makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ]; + + postInstall = '' + mkdir -p $out/bin + mv $out/usr/local/bin/* $out/bin + mv $out/usr/local/share $out/ + rm -r $out/usr + ''; + + meta = with lib; { + description = + "Decodes still images from movie files and serves them via HTTP"; + longDescription = '' + harvid's intended use-case is to efficiently provide frame-accurate data + and act as second level cache for rendering the video-timeline in Ardour, + but it is not limited to that: it has applications for any task that + requires a high-performance frame-accurate online image extraction + processor. + ''; + homepage = "http://x42.github.io/harvid"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mitchmindtree ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix b/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix new file mode 100644 index 0000000000..bcd6d5601c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/video/xjadeo/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, freetype, libGLU +, libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }: + +stdenv.mkDerivation rec { + pname = "xjadeo"; + version = "0.8.10"; + + src = fetchFromGitHub { + owner = "x42"; + repo = "xjadeo"; + rev = "v${version}"; + sha256 = "0dma4cjgbrpy16x63zvfr0xss4lryl0zw7nvixvhq2f6z8day1ds"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ + ffmpeg + libjack2 + libX11 + xorg.libXext + xorg.libXpm + # The following are recommended in the README, but are seemingly + # unnecessary for a successful build. That said, the result of including + # these in the build process is possibly required at runtime in some cases, + # but I've not the time to test thoroughly for these cases. Should + # consider investigating and splitting these into options in the future. + freetype + libGLU + liblo + libXv + portmidi + ]; + + meta = with lib; { + description = "The X Jack Video Monitor"; + longDescription = '' + Xjadeo is a software video player that displays a video-clip in sync with + an external time source (MTC, LTC, JACK-transport). Xjadeo is useful in + soundtrack composition, video monitoring or any task that requires to + synchronizing movie frames with external events. + ''; + homepage = "http://xjadeo.sourceforge.net"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mitchmindtree ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix index 458996704a..9f34fb99c7 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/nixos-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nixos-shell"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixos-shell"; rev = version; - sha256 = "sha256-C0K20X0P4SYQV+xtQAUcEiX32kr3IF1RoYdkJ4R3aRM="; + sha256 = "sha256-HoY2diusDHXwR0BjYwKR3svLz5LrviE03yxyjWG9oPQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index b2ff3e93c3..6795cedf94 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -459,6 +459,7 @@ mapAliases ({ openssh_with_kerberos = openssh; # added 2018-01-28 onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 osquery = throw "osquery has been removed."; # added 2019-11-24 + osxfuse = macfuse-stubs; # added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 @@ -635,7 +636,8 @@ mapAliases ({ sambaMaster = throw "sambaMaster was removed in 2019-09-13: outdated and no longer needed"; samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 - saneBackendsGit = sane-backends-git; # added 2016-01-02 + saneBackendsGit = sane-backends; # added 2016-01-02 + sane-backends-git = sane-backends; # added 2021-02-19 saneFrontends = sane-frontends; # added 2016-01-02 sapic = throw "sapic was deprecated on 2019-1-19: sapic is bundled with 'tamarin-prover' now"; scaff = throw "scaff is deprecated - replaced by https://gitlab.com/jD91mZM2/inc (not in nixpkgs yet)"; # added 2020-03-01 @@ -692,7 +694,8 @@ mapAliases ({ speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 - spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16 + spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16 + spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 @@ -942,16 +945,33 @@ mapAliases ({ yakuake ; inherit (plasma5Packages) - bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth discover - kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 - kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard - kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration - plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings xdg-desktop-portal-kde + bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth + discover + kactivitymanagerd + kde-cli-tools kde-gtk-config kdeplasma-addons + kgamma5 + kinfocenter + kmenuedit + kscreen kscreenlocker ksshaskpass ksysguard + kwallet-pam kwayland-integration kwin kwrited + milou + oxygen + plasma-browser-integration + plasma-desktop + plasma-integration + plasma-nm + plasma-pa + plasma-systemmonitor + plasma-thunderbolt + plasma-vault + plasma-workspace plasma-workspace-wallpapers + polkit-kde-agent powerdevil + sddm-kcm systemsettings + xdg-desktop-portal-kde ; inherit (plasma5Packages.thirdParty) plasma-applet-caffeine-plus + plasma-applet-virtual-desktop-bar kwin-dynamic-workspaces kwin-tiling krohnkite diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 3b7831d879..0bdccaeb3f 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -158,6 +158,8 @@ in fishnet = callPackage ../servers/fishnet { }; + fission = callPackage ../development/tools/fission { }; + authy = callPackage ../applications/misc/authy { }; avro-tools = callPackage ../development/tools/avro-tools { }; @@ -195,6 +197,8 @@ in inherit (python3Packages) sphinx; }; + catatonit = callPackage ../applications/virtualization/catatonit { }; + cen64 = callPackage ../misc/emulators/cen64 { }; cereal = callPackage ../development/libraries/cereal { }; @@ -368,6 +372,7 @@ in fetchgit = callPackage ../build-support/fetchgit { git = buildPackages.gitMinimal; cacert = buildPackages.cacert; + git-lfs = buildPackages.git-lfs; }; fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; @@ -633,6 +638,8 @@ in _6tunnel = callPackage ../tools/networking/6tunnel { }; + _7zz = callPackage ../tools/archivers/7zz { }; + _9pfs = callPackage ../tools/filesystems/9pfs { }; a2ps = callPackage ../tools/text/a2ps { }; @@ -816,6 +823,10 @@ in flavour = "git"; }; + logseq = callPackage ../applications/misc/logseq { + electron = electron_11; + }; + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; microcom = callPackage ../applications/terminal-emulators/microcom { }; @@ -1381,6 +1392,8 @@ in hakrawler = callPackage ../tools/security/hakrawler { }; + harvid = callPackage ../tools/video/harvid { }; + hime = callPackage ../tools/inputmethods/hime {}; hinit = haskell.lib.justStaticExecutables haskellPackages.hinit; @@ -1407,6 +1420,8 @@ in lesspass-cli = callPackage ../tools/security/lesspass-cli { }; + mpdevil = callPackage ../applications/audio/mpdevil { }; + pacparser = callPackage ../tools/networking/pacparser { }; pass = callPackage ../tools/security/pass { }; @@ -1427,6 +1442,8 @@ in passExtensions = recurseIntoAttrs pass.extensions; + xjadeo = callPackage ../tools/video/xjadeo { }; + asc-key-to-qr-code-gif = callPackage ../tools/security/asc-key-to-qr-code-gif { }; go-audit = callPackage ../tools/system/go-audit { }; @@ -1794,6 +1811,8 @@ in btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; + btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; + btrbk = callPackage ../tools/backup/btrbk { asciidoc = asciidoc-full; }; @@ -2170,6 +2189,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + digitemp = callPackage ../tools/misc/digitemp { }; + dijo = callPackage ../tools/misc/dijo { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -2223,7 +2244,7 @@ in dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; - dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + inherit (ocamlPackages) dot-merlin-reader; dozenal = callPackage ../applications/misc/dozenal { }; @@ -2272,6 +2293,8 @@ in edac-utils = callPackage ../os-specific/linux/edac-utils { }; + eddy = libsForQt5.callPackage ../applications/graphics/eddy { }; + eggdrop = callPackage ../tools/networking/eggdrop { }; eksctl = callPackage ../tools/admin/eksctl { }; @@ -2390,7 +2413,7 @@ in fuzzel = callPackage ../applications/misc/fuzzel { }; - flashfocus = python3Packages.callPackage ../misc/flashfocus { }; + flashfocus = callPackage ../misc/flashfocus { }; qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; @@ -2523,6 +2546,8 @@ in hid-listen = callPackage ../tools/misc/hid-listen { }; + hidrd = callPackage ../tools/misc/hidrd { }; + hocr-tools = with python3Packages; toPythonApplication hocr-tools; home-manager = callPackage ../tools/package-management/home-manager {}; @@ -3136,6 +3161,8 @@ in bash_unit = callPackage ../tools/misc/bash_unit { }; + boltbrowser = callPackage ../tools/misc/boltbrowser { }; + bsc = callPackage ../tools/compression/bsc { inherit (llvmPackages) openmp; }; @@ -3830,6 +3857,8 @@ in drone-runner-exec = callPackage ../development/tools/continuous-integration/drone-runner-exec { }; + drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { }; + dropbear = callPackage ../tools/networking/dropbear { }; dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; @@ -3924,6 +3953,8 @@ in kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; + lychee = callPackage ../tools/networking/lychee { }; + magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; mcrcon = callPackage ../tools/networking/mcrcon {}; @@ -4450,6 +4481,8 @@ in freetds = callPackage ../development/libraries/freetds { }; + freetube = callPackage ../applications/video/freetube { }; + freqtweak = callPackage ../applications/audio/freqtweak { wxGTK = wxGTK31-gtk2; }; @@ -4840,6 +4873,8 @@ in gnuapl = callPackage ../development/interpreters/gnu-apl { }; + gnucap = callPackage ../applications/science/electronics/gnucap { }; + gnu-cobol = callPackage ../development/compilers/gnu-cobol { }; gnuclad = callPackage ../applications/graphics/gnuclad { }; @@ -5718,6 +5753,8 @@ in k6 = callPackage ../development/tools/k6 { }; + l2md = callPackage ../tools/text/l2md { }; + lab = callPackage ../applications/version-management/git-and-tools/lab { }; lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; @@ -6121,6 +6158,8 @@ in libnixxml = callPackage ../development/libraries/libnixxml { }; + libplctag = callPackage ../development/libraries/libplctag { }; + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libportal = callPackage ../development/libraries/libportal { }; @@ -6147,6 +6186,8 @@ in libzmf = callPackage ../development/libraries/libzmf {}; + librespeed-cli = callPackage ../tools/misc/librespeed-cli { }; + libreswan = callPackage ../tools/networking/libreswan { }; librest = callPackage ../development/libraries/librest { }; @@ -7403,6 +7444,8 @@ in cntlm = callPackage ../tools/networking/cntlm { }; + past-time = python3Packages.callPackage ../tools/misc/past-time { }; + pastebinit = callPackage ../tools/misc/pastebinit { }; pifi = callPackage ../applications/audio/pifi { }; @@ -7882,6 +7925,8 @@ in pulseSupport = config.pulseaudio or false; }; + scimark = callPackage ../misc/scimark { }; + screen = callPackage ../tools/misc/screen { inherit (darwin.apple_sdk.libs) utmp; }; @@ -8178,6 +8223,8 @@ in stubby = callPackage ../tools/networking/stubby { }; + sunwait = callPackage ../applications/misc/sunwait { }; + surface-control = callPackage ../applications/misc/surface-control { }; syntex = callPackage ../tools/graphics/syntex {}; @@ -8624,6 +8671,8 @@ in trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; + trunk = callPackage ../development/tools/trunk { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -10314,8 +10363,7 @@ in krank = haskell.lib.justStaticExecutables haskellPackages.krank; - # We use a version built with an older compiler because of https://github.com/pikajude/stylish-cabal/issues/12. - stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc865.stylish-cabal; + stylish-cabal = haskell.lib.justStaticExecutables haskellPackages.stylish-cabal; all-cabal-hashes = callPackage ../data/misc/hackage { }; @@ -11759,7 +11807,6 @@ in } // (lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); - spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; @@ -11780,6 +11827,8 @@ in tclreadline = callPackage ../development/interpreters/tclreadline { }; + trealla = callPackage ../development/interpreters/trealla { }; + wasm = ocamlPackages.wasm; proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; @@ -11943,6 +11992,8 @@ in astyle = callPackage ../development/tools/misc/astyle { }; + automaticcomponenttoolkit = callPackage ../development/tools/misc/automaticcomponenttoolkit { }; + awf = callPackage ../development/tools/misc/awf { }; aws-adfs = with python3Packages; toPythonApplication aws-adfs; @@ -12824,7 +12875,7 @@ in gconf = pkgs.gnome2.GConf; }; - # NOTE: Override and set icon-lang = null to use Awk instead of Icon. + # NOTE: Override and set useIcon = false to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; @@ -13008,6 +13059,8 @@ in semver-tool = callPackage ../development/tools/misc/semver-tool { }; + semantik = libsForQt5.callPackage ../applications/office/semantik { }; + sconsPackages = dontRecurseIntoAttrs (callPackage ../development/tools/build-managers/scons { }); scons = sconsPackages.scons_latest; @@ -13261,6 +13314,8 @@ in xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; + xcode-install = callPackage ../development/tools/xcode-install { }; + xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; @@ -13458,6 +13513,8 @@ in bctoolbox = callPackage ../development/libraries/bctoolbox { }; + bearssl = callPackage ../development/libraries/bearssl { }; + beecrypt = callPackage ../development/libraries/beecrypt { }; belcard = callPackage ../development/libraries/belcard { }; @@ -16077,10 +16134,6 @@ in opencl-clang = callPackage ../development/libraries/opencl-clang { }; - mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; - - mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; - mapnik = callPackage ../development/libraries/mapnik { }; marisa = callPackage ../development/libraries/marisa {}; @@ -17185,8 +17238,6 @@ in stlink = callPackage ../development/tools/misc/stlink { }; - steghide = callPackage ../tools/security/steghide {}; - stegseek = callPackage ../tools/security/stegseek {}; stlport = callPackage ../development/libraries/stlport { }; @@ -18204,6 +18255,10 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; + inspircd = callPackage ../servers/irc/inspircd { }; + + inspircdMinimal = inspircd.override { extraModules = []; }; + imgproxy = callPackage ../servers/imgproxy { }; ircdog = callPackage ../applications/networking/irc/ircdog { }; @@ -18289,7 +18344,7 @@ in mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12; mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp; - inherit (callPackages ../servers/mpd { }) + inherit (callPackages ../servers/mpd { stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv; }) mpd mpd-small mpdWithFeatures; libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; @@ -19363,7 +19418,9 @@ in inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; }; - osxfuse = callPackage ../os-specific/darwin/osxfuse { }; + macfuse-stubs = callPackage ../os-specific/darwin/macfuse { + inherit (darwin) libtapi; + }; osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; @@ -19630,6 +19687,8 @@ in tbs = callPackage ../os-specific/linux/tbs { }; + mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); @@ -20857,6 +20916,8 @@ in julia-mono = callPackage ../data/fonts/julia-mono { }; + juno-theme = callPackage ../data/themes/juno { }; + kanji-stroke-order-font = callPackage ../data/fonts/kanji-stroke-order-font {}; kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; @@ -20868,6 +20929,7 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { + inherit (gnome3) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -21899,6 +21961,8 @@ in inherit (gnome2) libgnomeui GConf; }; + corrscope = libsForQt5.callPackage ../applications/video/corrscope { }; + csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { @@ -22693,6 +22757,8 @@ in freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; + freeplane = callPackage ../applications/misc/freeplane { }; + freepv = callPackage ../applications/graphics/freepv { }; xfontsel = callPackage ../applications/misc/xfontsel { }; @@ -22878,6 +22944,8 @@ in giada = callPackage ../applications/audio/giada {}; + giara = callPackage ../applications/networking/giara { }; + gitit = callPackage ../applications/misc/gitit {}; gkrellm = callPackage ../applications/misc/gkrellm { @@ -23099,6 +23167,8 @@ in hugo = callPackage ../applications/misc/hugo { }; + go-org = callPackage ../applications/misc/go-org { }; + hydrogen = qt5.callPackage ../applications/audio/hydrogen { }; hydrogen_0 = callPackage ../applications/audio/hydrogen/0.nix { }; # Old stable, has GMKit. @@ -23775,6 +23845,8 @@ in inherit (darwin) libobjc; }; + handlr = callPackage ../tools/misc/handlr { }; + jftui = callPackage ../applications/video/jftui { }; lime = callPackage ../development/libraries/lime { }; @@ -24018,6 +24090,8 @@ in moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; + moonlight-qt = libsForQt5.callPackage ../applications/misc/moonlight-qt { }; + mooSpace = callPackage ../applications/audio/mooSpace { }; mop = callPackage ../applications/misc/mop { }; @@ -24125,6 +24199,7 @@ in mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix {}; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; + thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; @@ -24812,6 +24887,8 @@ in ponymix = callPackage ../applications/audio/ponymix { }; + portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { }; + pothos = libsForQt5.callPackage ../applications/radio/pothos { }; potrace = callPackage ../applications/graphics/potrace {}; @@ -25894,6 +25971,7 @@ in neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; neovim = wrapNeovim neovim-unwrapped { }; + neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { }; neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -26653,6 +26731,8 @@ in aeon = callPackage ../applications/blockchains/aeon { }; + balanceofsatoshis = nodePackages.balanceofsatoshis; + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; @@ -27800,7 +27880,6 @@ in zeroadPackages = dontRecurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK30; - stdenv = gcc9Stdenv; }); zeroad = zeroadPackages.zeroad; @@ -28819,6 +28898,8 @@ in simgrid = callPackage ../applications/science/misc/simgrid { }; + sumo = callPackage ../applications/science/networking/sumo { }; + spyder = with python3.pkgs; toPythonApplication spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; @@ -29024,6 +29105,8 @@ in dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; + demjson = with python3Packages; toPythonApplication demjson; + dosbox = callPackage ../misc/emulators/dosbox { }; emu2 = callPackage ../misc/emulators/emu2 { }; @@ -29155,6 +29238,8 @@ in inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; + hjson = with python3Packages; toPythonApplication hjson; + epkowa = callPackage ../misc/drivers/epkowa { }; utsushi = callPackage ../misc/drivers/utsushi { }; @@ -29182,6 +29267,8 @@ in libjack2 = jack2.override { prefix = "lib"; }; jack2Full = jack2; # TODO: move to aliases.nix + j2cli = with python3Packages; toPythonApplication j2cli; + jstest-gtk = callPackage ../tools/misc/jstest-gtk { }; keynav = callPackage ../tools/X11/keynav { }; @@ -29677,8 +29764,6 @@ in sane-backends = callPackage ../applications/graphics/sane/backends (config.sane or {}); - sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix (config.sane or {}); - senv = callPackage ../applications/misc/senv { }; brlaser = callPackage ../misc/cups/drivers/brlaser { }; @@ -29904,6 +29989,8 @@ in wasmer = callPackage ../development/interpreters/wasmer { }; + yabasic = callPackage ../development/interpreters/yabasic { }; + wasm-pack = callPackage ../development/tools/wasm-pack { inherit (darwin.apple_sdk.frameworks) Security; }; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 6c8e3e7d85..da70103ad6 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -3,12 +3,9 @@ let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ - "ghc822Binary" "ghc865Binary" "ghc8102Binary" "ghc8102BinaryMinimal" - "ghcjs" - "ghcjs86" "integer-simple" "native-bignum" "ghcHEAD" @@ -47,8 +44,6 @@ in { compiler = { - ghc822Binary = callPackage ../development/compilers/ghc/8.2.2-binary.nix { }; - ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { @@ -60,24 +55,6 @@ in { minimal = true; }; - ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; - }; - ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; - }; - ghc883 = callPackage ../development/compilers/ghc/8.8.3.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; - }; ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar bootPkgs = if stdenv.isAarch64 then @@ -88,32 +65,6 @@ in { buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; - ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; - }; - ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { - # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then - packages.ghc8102BinaryMinimal - else - packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; - }; - ghc8103 = callPackage ../development/compilers/ghc/8.10.3.nix { - # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then - packages.ghc8102BinaryMinimal - else - packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; - }; ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then @@ -131,19 +82,12 @@ in { llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc883; # no binary yet + bootPkgs = packages.ghc884; # no binary yet inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; }; - ghcjs = compiler.ghcjs86; - ghcjs86 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc865; - ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; - stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; - ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; - }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -172,12 +116,6 @@ in { # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { - ghc822Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc822Binary; - ghc = bh.compiler.ghc822Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc865Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865Binary; ghc = bh.compiler.ghc865Binary; @@ -196,41 +134,11 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc865 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc865; - ghc = bh.compiler.ghc865; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - }; - ghc882 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc882; - ghc = bh.compiler.ghc882; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; - }; - ghc883 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc883; - ghc = bh.compiler.ghc883; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; - }; ghc884 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc884; ghc = bh.compiler.ghc884; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; }; - ghc8101 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8101; - ghc = bh.compiler.ghc8101; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; - }; - ghc8102 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8102; - ghc = bh.compiler.ghc8102; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; - }; - ghc8103 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8103; - ghc = bh.compiler.ghc8103; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; - }; ghc8104 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8104; ghc = bh.compiler.ghc8104; @@ -246,13 +154,6 @@ in { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = packages.ghcjs86; - ghcjs86 = callPackage ../development/haskell-modules rec { - buildHaskellPackages = ghc.bootPkgs; - ghc = bh.compiler.ghcjs86; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; - }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. diff --git a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix index f9b20dd2bc..03d70a32f6 100644 --- a/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/kodi-packages.nix @@ -66,6 +66,8 @@ let self = rec { snes = callPackage ../applications/video/kodi-packages/controllers { controller = "snes"; }; }; + jellyfin = callPackage ../applications/video/kodi-packages/jellyfin { }; + joystick = callPackage ../applications/video/kodi-packages/joystick { }; netflix = callPackage ../applications/video/kodi-packages/netflix { }; @@ -96,18 +98,24 @@ let self = rec { chardet = callPackage ../applications/video/kodi-packages/chardet { }; + dateutil = callPackage ../applications/video/kodi-packages/dateutil { }; + idna = callPackage ../applications/video/kodi-packages/idna { }; inputstream-adaptive = callPackage ../applications/video/kodi-packages/inputstream-adaptive { }; inputstreamhelper = callPackage ../applications/video/kodi-packages/inputstreamhelper { }; + kodi-six = callPackage ../applications/video/kodi-packages/kodi-six { }; + myconnpy = callPackage ../applications/video/kodi-packages/myconnpy { }; requests = callPackage ../applications/video/kodi-packages/requests { }; signals = callPackage ../applications/video/kodi-packages/signals { }; + six = callPackage ../applications/video/kodi-packages/six { }; + urllib3 = callPackage ../applications/video/kodi-packages/urllib3 { }; }; in self diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index fd8165085f..30f6dca5f1 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -345,6 +345,12 @@ let faraday = callPackage ../development/ocaml-modules/faraday { }; + faraday-async = callPackage ../development/ocaml-modules/faraday/async.nix { }; + + faraday-lwt = callPackage ../development/ocaml-modules/faraday/lwt.nix { }; + + faraday-lwt-unix = callPackage ../development/ocaml-modules/faraday/lwt-unix.nix { }; + farfadet = callPackage ../development/ocaml-modules/farfadet { }; fdkaac = callPackage ../development/ocaml-modules/fdkaac { }; @@ -624,6 +630,8 @@ let merlin-extend = callPackage ../development/ocaml-modules/merlin-extend { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + metrics = callPackage ../development/ocaml-modules/metrics { }; metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; @@ -781,6 +789,8 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + jsonrpc = callPackage ../development/ocaml-modules/ocaml-lsp/jsonrpc.nix { }; + lsp = callPackage ../development/ocaml-modules/ocaml-lsp/lsp.nix { }; ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8; @@ -1398,7 +1408,10 @@ let omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; + google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { + # needs Base64 module + ocaml_extlib = ocaml_extlib.override { minimal = false; }; + }; hol_light = callPackage ../applications/science/logic/hol_light { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 2c021c24f2..a2aa171979 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -8682,6 +8682,10 @@ let url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-0.003001.tar.gz"; sha256 = "1q7im0zj238k5agwi7d1mz26a8r0wrxwfwp1l8n5k777gx3b5xhp"; }; + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/git-autofixup + ''; meta = { maintainers = [ maintainers.DamienCassou ]; description = "Create fixup commits for topic branches"; @@ -10951,11 +10955,11 @@ let url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; - propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PerlMagick PodParser TextUnidecode XMLLibXSLT ]; preCheck = '' rm t/931_epub.t # epub test fails ''; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ pkgs.makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; # shebangs need to be patched before executables are copied to $out preBuild = '' patchShebangs bin/ @@ -10964,6 +10968,12 @@ let shortenPerlShebang "$file" done ''; + postInstall = '' + for file in latexmlc latexmlmath latexmlpost ; do + # add runtime dependencies that cause silent failures when missing + wrapProgram $out/bin/$file --prefix PATH : ${lib.makeBinPath [ pkgs.ghostscript pkgs.potrace ]} + done + ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; license = lib.licenses.free; @@ -10972,19 +10982,11 @@ let libapreq2 = buildPerlPackage { pname = "libapreq2"; - version = "2.13"; + version = "2.16"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz"; - sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; + url = "mirror://cpan/authors/id/S/SH/SHAY/libapreq2-2.16.tar.gz"; + sha256 = "e04c855a3ea070b8863569fbae02fe828f534ac88755b23e24d3863cc9598349"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-12412.patch"; - url = "https://svn.apache.org/viewvc/httpd/apreq/trunk/library/parser_multipart.c?r1=1866760&r2=1866759&pathrev=1866760&view=patch"; - sha256 = "08zaw5pb2i4w1y8crhxmlf0d8gzpvi9z49x4nwlkg4j87x7gjvaa"; - stripLen = 2; - }) - ]; outputs = [ "out" ]; buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; propagatedBuildInputs = [ (pkgs.apacheHttpdPackages.mod_perl.override { inherit perl; }) ]; @@ -15025,10 +15027,10 @@ let NetAsyncHTTP = buildPerlModule { pname = "Net-Async-HTTP"; - version = "0.47"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.47.tar.gz"; - sha256 = "1lwy1ijrhibi087p3q5zvadhkq0slfrzfhb76cmkx4mpyv5v4l8f"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Async-HTTP-0.48.tar.gz"; + sha256 = "0gpp46lg7sr5xpsjhqkb022f9v88wy73carsrn5pvbmwjpwxcjwx"; }; buildInputs = [ HTTPCookies TestIdentity TestMetricsAny TestRefcount ]; propagatedBuildInputs = [ Future HTTPMessage IOAsync MetricsAny StructDumb URI ]; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 2b35c242ed..66563b3aa1 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -302,6 +302,8 @@ in { aionotify = callPackage ../development/python-modules/aionotify { }; + aionotion = callPackage ../development/python-modules/aionotion { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aiopulse = callPackage ../development/python-modules/aiopulse { }; @@ -1420,6 +1422,10 @@ in { cmdtest = callPackage ../development/python-modules/cmdtest { }; + cmigemo = callPackage ../development/python-modules/cmigemo { + inherit (pkgs) cmigemo; + }; + cmsis-svd = callPackage ../development/python-modules/cmsis-svd { }; cntk = callPackage ../development/python-modules/cntk { }; @@ -1841,6 +1847,8 @@ in { django-cache-url = callPackage ../development/python-modules/django-cache-url { }; + django-cacheops = callPackage ../development/python-modules/django-cacheops { }; + django_classytags = callPackage ../development/python-modules/django_classytags { }; django-cleanup = callPackage ../development/python-modules/django-cleanup { }; @@ -2072,6 +2080,8 @@ in { else callPackage ../development/python-modules/dulwich/0_19.nix { }; + dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; + dyn = callPackage ../development/python-modules/dyn { }; dynd = callPackage ../development/python-modules/dynd { }; @@ -3198,6 +3208,8 @@ in { iapws = callPackage ../development/python-modules/iapws { }; + iaqualink = callPackage ../development/python-modules/iaqualink { }; + ibis = callPackage ../development/python-modules/ibis { }; ibis-framework = callPackage ../development/python-modules/ibis-framework { }; @@ -3561,6 +3573,8 @@ in { jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + jupyter_server = callPackage ../development/python-modules/jupyter_server { }; + jupyterhub = callPackage ../development/python-modules/jupyterhub { }; jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; @@ -3579,6 +3593,8 @@ in { jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { }; + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; @@ -3954,6 +3970,7 @@ in { llfuse = callPackage ../development/python-modules/llfuse { inherit (pkgs) fuse; + inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration; }; llvmlite = callPackage ../development/python-modules/llvmlite { @@ -4361,6 +4378,8 @@ in { mpi4py = callPackage ../development/python-modules/mpi4py { }; + mplfinance = callPackage ../development/python-modules/mplfinance { }; + mplleaflet = callPackage ../development/python-modules/mplleaflet { }; mpmath = callPackage ../development/python-modules/mpmath { }; @@ -4482,6 +4501,8 @@ in { naturalsort = callPackage ../development/python-modules/naturalsort { }; + nbclassic = callPackage ../development/python-modules/nbclassic { }; + nbclient = callPackage ../development/python-modules/nbclient { }; nbconflux = callPackage ../development/python-modules/nbconflux { }; @@ -4834,6 +4855,8 @@ in { oyaml = callPackage ../development/python-modules/oyaml { }; + packageurl-python = callPackage ../development/python-modules/packageurl-python { }; + packaging = if isPy3k then callPackage ../development/python-modules/packaging { } else callPackage ../development/python-modules/packaging/2.nix { }; @@ -5583,8 +5606,12 @@ in { pydantic = callPackage ../development/python-modules/pydantic { }; + pydash = callPackage ../development/python-modules/pydash { }; + pydbus = callPackage ../development/python-modules/pydbus { }; + pydeconz = callPackage ../development/python-modules/pydeconz { }; + pydenticon = callPackage ../development/python-modules/pydenticon { }; pydexcom = callPackage ../development/python-modules/pydexcom { }; @@ -7619,6 +7646,8 @@ in { simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; + simplisafe-python = callPackage ../development/python-modules/simplisafe-python { }; + simpy = callPackage ../development/python-modules/simpy { }; singledispatch = callPackage ../development/python-modules/singledispatch { }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix index 656a8a5c0f..bfc576e655 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -115,6 +115,10 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // kpmcore = callPackage ../development/libraries/kpmcore { }; + mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { }; + + mapbox-gl-qml = libsForQt5.callPackage ../development/libraries/mapbox-gl-qml { }; + mauikit = callPackage ../development/libraries/mauikit { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { };